diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java index 61345ee8..29eac14e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java @@ -76,11 +76,6 @@ public class BizConfigServiceDirective implements Serializable { @Excel(name = "收费频次 1按次收费 2按天收费", width = 15) @ApiModelProperty(value = "收费频次 1按次收费 2按天收费") private String chargingFrequency; - /**指令类型 1日常护理 2周期护理 3即时护理*/ - @Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15) - @ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理") - @TableField(exist = false) - private String cycleTypeName; /**排序*/ @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml index 84c14673..5cea3783 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml @@ -138,17 +138,11 @@ cycle_type varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型', cycle_value varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期值', preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图', - net_preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图-网络地址', preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图', - net_preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图-网络地址', mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件', - net_mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件-网络地址', mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件', - net_mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件-网络地址', service_duration varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务时长（分钟）', service_content varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务说明', - package_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包ID', - package_name varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包名称', iz_package varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否是服务指令包 Y是 N否', toll_price decimal(12,4) NULL DEFAULT NULL COMMENT '收费价格', com_price decimal(12,4) NULL DEFAULT NULL COMMENT '提成价格', diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml index 0f771e0a..4fc0c8b3 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml @@ -115,26 +115,6 @@ where id = #{id} - - - - select a.package_id,a.cycle_type,a.cycle_value,b.*, + select a.package_id,b.*, c.category_name AS category_name, d.type_name AS type_name, e.instruction_name AS instruction_name diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml index 96e52ec5..b607daa5 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml @@ -32,7 +32,6 @@ - @@ -48,8 +47,6 @@ - - @@ -101,8 +98,6 @@ dp.start_time_str, dp.end_time_str, dp.instruction_tag_id, - pd.cycle_type AS cycleTypeShow, - pd.cycle_value AS cycleTypeValue, dp.total_duration, dp.timeout_duration, csd.id AS directive_id, @@ -198,10 +193,10 @@ - INSERT INTO nu_config_package_directive (package_id, directive_id, sort,cycle_type,cycle_value) + INSERT INTO nu_config_package_directive (package_id, directive_id, sort) VALUES - (#{package.id}, #{directive.id}, #{directive.sort}, #{directive.cycleTypeShow}, #{directive.cycleTypeValue}) + (#{package.id}, #{directive.id}, #{directive.sort}) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java index a330a245..07060f1d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java @@ -323,8 +323,8 @@ public class ConfigServiceDirective implements Serializable { private boolean ownExist;//本平台是否存在该指令 @TableField(exist = false) private boolean targetExist;//目标平台是否存在该指令 - @TableField(exist = false) - private String cycleTypeShow; +// @TableField(exist = false) +// private String cycleTypeShow; // @TableField(exist = false) // private String cycleTypeValue; @TableField(exist = false) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml index 6ab309df..049a3605 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml @@ -26,7 +26,6 @@ -