diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java index 90c2f3d..7a916fa 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java @@ -36,9 +36,9 @@ public class CanAddElderTag implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private java.lang.String id; - /**nu_elder_tag.id*/ - @Excel(name = "nu_elder_tag.id", width = 15) - @ApiModelProperty(value = "nu_elder_tag.id") + /**nu_config_elder_tag.id*/ + @Excel(name = "nu_config_elder_tag.id", width = 15) + @ApiModelProperty(value = "nu_config_elder_tag.id") private java.lang.String tagId; /**标签类型 tx体型标签 qx情绪标签*/ @Excel(name = "标签类型 tx体型标签 qx情绪标签", width = 15) diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java index da5029a..a2a696e 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java @@ -25,7 +25,7 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("nu_elder_tag") +@TableName("nu_config_elder_tag") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_elder_tag对象", description="长者标签") diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/mapper/xml/ElderTagMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/mapper/xml/ElderTagMapper.xml index c2ae65e..2750cc0 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/mapper/xml/ElderTagMapper.xml +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/mapper/xml/ElderTagMapper.xml @@ -3,6 +3,6 @@ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java index e33aaa9..5a553a9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java @@ -22,7 +22,7 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("nu_directive_package") +@TableName("nu_config_directive_package") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_directive_package对象", description="服务指令包") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml index 795e42d..b75c736 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml @@ -75,7 +75,7 @@ - update nu_directive_package set total_duration = #{duration} where id = #{id} + update nu_config_directive_package set total_duration = #{duration} where id = #{id} @@ -142,14 +142,14 @@ cst.type_name AS cst_type_name, insTag.instruction_name AS instruction_name FROM - (SELECT * FROM nu_directive_package + (SELECT * FROM nu_config_directive_package del_flag = '0' and id in #{item.id} ) dp - LEFT JOIN nu_package_directive pd ON dp.id = pd.package_id + LEFT JOIN nu_config_package_directive pd ON dp.id = pd.package_id LEFT JOIN nu_config_service_directive csd ON pd.directive_id = csd.id LEFT JOIN nu_directive_body_tag bdt ON csd.id = bdt.directive_id LEFT JOIN nu_config_body_tag cdbt ON bdt.tag_id = cdbt.id @@ -164,7 +164,7 @@ - delete from nu_package_directive where package_id = #{package.id} + delete from nu_config_package_directive where package_id = #{package.id} - INSERT INTO nu_package_directive (package_id, directive_id, sort) + INSERT INTO nu_config_package_directive (package_id, directive_id, sort) VALUES (#{package.id}, #{directive.id}, #{directive.sort})