diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java index 012db0e8..bae6e473 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java @@ -53,7 +53,7 @@ public class DirectiveAsyncMQDto implements Serializable { */ private String chargingFrequency; /** - * 周期类型 1日常护理 2周期护理 3即时护理 + * 指令类型 1日常护理 2周期护理 3即时护理 */ private String cycleType; /** @@ -155,7 +155,7 @@ public class DirectiveAsyncMQDto implements Serializable { private String categoryName; //服务类型中文名称 private String typeName; - //周期类型中文名称 + //指令类型中文名称 private String cycleTypeName; //体型标签id,id,id private String bodyTags; diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java index 4c27f51d..8612b15f 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java @@ -40,7 +40,7 @@ public class DirectiveOpeLogInfoMQDto implements Serializable { private BigDecimal tollPrice; /**提成价格*/ private BigDecimal comPrice; - /**周期类型 1日常护理 2周期护理 3即时护理*/ + /**指令类型 1日常护理 2周期护理 3即时护理*/ private String cycleType; /**服务说明*/ private String serviceContent; diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java index a76357e8..8a3d1ebc 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java @@ -34,7 +34,7 @@ public class DirectiveOpeLogMainMQDto implements Serializable { private String typeName; /**服务指令名称*/ private String directiveName; - /**周期类型名称*/ + /**指令类型名称*/ private String cycleTypeName; private List opeInfoList; diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java index c36550db..55c2d229 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java @@ -76,7 +76,7 @@ public class DirectiveSyncLogInfoMQDto implements Serializable { */ private BigDecimal comPrice; /** - * 周期类型 1日常护理 2周期护理 3即时护理 + * 指令类型 1日常护理 2周期护理 3即时护理 */ private String cycleType; /** diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java index 977dc370..80c2cee7 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java @@ -40,9 +40,9 @@ public class CareDirectiveEntity implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CareOrdersEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CareOrdersEntity.java index d8ef8cb0..d0b3cdae 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CareOrdersEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CareOrdersEntity.java @@ -48,9 +48,9 @@ public class CareOrdersEntity implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CareOrdersSubEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CareOrdersSubEntity.java index 30024f97..670c8eb0 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CareOrdersSubEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CareOrdersSubEntity.java @@ -59,9 +59,9 @@ public class CareOrdersSubEntity implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java index 433bb032..0ba80adf 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java @@ -64,9 +64,9 @@ public class DirectiveOrderEntity implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java index 228d0d66..740a94a2 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java @@ -63,9 +63,9 @@ public class DirectiveOrderSubEntity implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java index 348635fe..b51b2cfa 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java @@ -47,7 +47,7 @@ public class ElderServerEntity implements Serializable { private String bodyTagName; /**情绪标签名称*/ private String emotionTagName; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**纵向定位*/ private String positioningLong; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java index a7b023e4..236d465e 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java @@ -34,9 +34,9 @@ public class InvoicingDirectiveEntity implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java index 21127a6c..94618c19 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java @@ -47,9 +47,9 @@ public class InvoicingOrdersEntity implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveEntity.java index e9ffc258..ecae86b6 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveEntity.java @@ -38,9 +38,9 @@ public class LogisticsDirectiveEntity implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; 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 9c79d7e6..142b5376 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,13 +76,13 @@ 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即时护理") + /**指令类型 1日常护理 2周期护理 3即时护理*/ + @Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15) + @ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理") private String cycleType; - /**周期类型 1日常护理 2周期护理 3即时护理*/ - @Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) - @ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") + /**指令类型 1日常护理 2周期护理 3即时护理*/ + @Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15) + @ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理") @TableField(exist = false) private String cycleTypeName; /**排序*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java index 0b20ec83..7f441248 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java @@ -55,10 +55,10 @@ public class DirectiveDataPool implements Serializable { /**服务指令名称*/ private String directiveName; - /**周期类型ID 1日常护理 2周期护理 3即时护理*/ + /**指令类型ID 1日常护理 2周期护理 3即时护理*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPoolSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPoolSub.java index 298e84bc..44a3db2e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPoolSub.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPoolSub.java @@ -56,9 +56,9 @@ public class DirectiveDataPoolSub implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; 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 6d92c427..13e2a883 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 @@ -73,8 +73,8 @@ elder_name varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '长者名称', directive_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令ID，nu_config_service_directive.id', directive_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令名称', - cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期类型ID', - cycle_type varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期类型', + cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型ID', + 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 '服务指令图片大图-网络地址', @@ -120,8 +120,8 @@ type_name varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类型名称', directive_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令ID，nu_config_service_directive.id', directive_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令名称', - cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期类型ID', - cycle_type varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期类型', + cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型ID', + 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 '服务指令图片大图-网络地址', @@ -217,8 +217,8 @@ employee_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '员工姓名', directive_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令ID，nu_config_service_directive.id', directive_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令名称', - cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期类型ID', - cycle_type varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期类型', + cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型ID', + 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 '服务指令图片大图-网络地址', @@ -279,8 +279,8 @@ type_name varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类型名称', directive_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令ID，nu_config_service_directive.id', directive_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令名称', - cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期类型ID', - cycle_type varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期类型', + cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型ID', + 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 '服务指令图片大图-网络地址', diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java index 435d53f0..82388ab1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java @@ -57,9 +57,9 @@ public class DirectiveOrder implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderSub.java index 5a60ad7b..c9c3d2ab 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderSub.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderSub.java @@ -66,9 +66,9 @@ public class DirectiveOrderSub implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlan.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlan.java index c2be1f58..139ccd2e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlan.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlan.java @@ -49,9 +49,9 @@ public class CareDirectivePlan implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; 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 7a5c9cb1..1ebe6a19 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 @@ -184,7 +184,7 @@ ) -- 条件2: 日常类型指令 (cycle_type_id = '1') OR p.cycle_type_id = '1' - -- 条件3: 周期类型指令 (cycle_type_id = '2') + -- 条件3: 指令类型指令 (cycle_type_id = '2') OR ( p.cycle_type_id = '2' AND ( @@ -298,7 +298,7 @@ ) -- 条件2: 日常类型指令 (cycle_type_id = '1') OR p.cycle_type_id = '1' - -- 条件3: 周期类型指令 (cycle_type_id = '2') + -- 条件3: 指令类型指令 (cycle_type_id = '2') OR ( p.cycle_type_id = '2' AND ( diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/entity/InvoicingDirectivePlan.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/entity/InvoicingDirectivePlan.java index 032bd71b..6c2ea685 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/entity/InvoicingDirectivePlan.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/entity/InvoicingDirectivePlan.java @@ -50,9 +50,9 @@ public class InvoicingDirectivePlan implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml index e069e2bd..05f6f52a 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml @@ -43,7 +43,7 @@ ) -- 条件2: 日常类型指令 (cycle_type_id = '1') OR p.cycle_type_id = '1' - -- 条件3: 周期类型指令 (cycle_type_id = '2') + -- 条件3: 指令类型指令 (cycle_type_id = '2') OR ( p.cycle_type_id = '2' AND ( diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java index 5dc30dd0..8cba642b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java @@ -54,9 +54,9 @@ public class LogisticsDirectivePlan implements Serializable { private String directiveId; /**服务指令名称*/ private String directiveName; - /**周期类型ID*/ + /**指令类型ID*/ private String cycleTypeId; - /**周期类型*/ + /**指令类型*/ private String cycleType; /**周期值*/ private String cycleValue; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml index 93fe9606..c2c77461 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml @@ -44,7 +44,7 @@ ) -- 条件2: 日常类型指令 (cycle_type_id = '1') OR p.cycle_type_id = '1' - -- 条件3: 周期类型指令 (cycle_type_id = '2') + -- 条件3: 指令类型指令 (cycle_type_id = '2') OR ( p.cycle_type_id = '2' AND ( diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java index b476a62b..f9f9b149 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java @@ -71,10 +71,10 @@ public class CanAddDirective implements Serializable { @ApiModelProperty(value = "服务指令") private java.lang.String directiveName; /** - * 周期类型 1日常护理 2周期护理 3即时护理 + * 指令类型 1日常护理 2周期护理 3即时护理 */ - @Excel(name = "周期类型", width = 20) - @ApiModelProperty(value = "周期类型") + @Excel(name = "指令类型", width = 20) + @ApiModelProperty(value = "指令类型") private java.lang.String cycleType; /** * 收费价格 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempInfo.java index b81effce..327995f0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempInfo.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempInfo.java @@ -75,13 +75,13 @@ public class NuBizCustomerCareTempInfo implements Serializable { @Excel(name = "即时指令焦点图片", width = 15) @ApiModelProperty(value = "即时指令焦点图片") private java.lang.String immediateFileFocus; - /**周期类型ID*/ - @Excel(name = "周期类型ID", width = 15) - @ApiModelProperty(value = "周期类型ID") + /**指令类型ID*/ + @Excel(name = "指令类型ID", width = 15) + @ApiModelProperty(value = "指令类型ID") private java.lang.String cycleTypeId; - /**周期类型*/ - @Excel(name = "周期类型", width = 15) - @ApiModelProperty(value = "周期类型") + /**指令类型*/ + @Excel(name = "指令类型", width = 15) + @ApiModelProperty(value = "指令类型") private java.lang.String cycleType; /**周期值*/ @Excel(name = "周期值", width = 15) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java index 02a7416b..7791012d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java @@ -67,10 +67,10 @@ public class DirectiveMedia implements Serializable { @Dict(dicCode = "id", dictTable = "nu_config_service_type", dicText = "type_name", ds = "${nu.org.master.code}") private java.lang.String typeId; /** - * 周期类型 + * 指令类型 */ - @Excel(name = "周期类型", width = 15) - @ApiModelProperty(value = "周期类型") + @Excel(name = "指令类型", width = 15) + @ApiModelProperty(value = "指令类型") @Dict(dicCode = "period_type", ds = "${nu.org.master.code}") private java.lang.String cycleType; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java index 339a3318..619c48b8 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java @@ -107,10 +107,10 @@ public class DirectiveSyncLogInfo implements Serializable { @ApiModelProperty(value = "提成价格") private java.math.BigDecimal comPrice; /** - * 周期类型 1日常护理 2周期护理 3即时护理 + * 指令类型 1日常护理 2周期护理 3即时护理 */ - @Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) - @ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") + @Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15) + @ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理") @Dict(dicCode = "period_type") private java.lang.String cycleType; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java index e6da28b7..f62c87ee 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java @@ -308,7 +308,7 @@ public class ConfigServiceDirectiveController extends JeecgController infoList = Lists.newArrayList(); DirectiveOpeLogInfoMQDto info = new DirectiveOpeLogInfoMQDto(); @@ -323,7 +323,7 @@ public class ConfigServiceDirectiveController extends JeecgController infoList = Lists.newArrayList(); //修改前 @@ -455,7 +455,7 @@ public class ConfigServiceDirectiveController extends JeecgController getTreeData(String filterIzEnabled) { - //查询周期类型字典项备用 + //查询指令类型字典项备用 List period_type = sysBaseAPI.getDictItems("period_type"); Map cycleTypeMap = Maps.newHashMap(); period_type.stream().forEach(p -> { @@ -621,7 +621,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl