yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务指令周期类型改为指令类型

This commit is contained in:
1378012178@qq.com 2026-01-15 11:13:25 +08:00
parent e373408852
commit 1e81b61483
33 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
View File

@ -53,7 +53,7 @@ public class DirectiveAsyncMQDto implements Serializable {
*/ */
private String chargingFrequency; private String chargingFrequency;
/** /**
* 周期类型 1日常护理 2周期护理 3即时护理 * 指令类型 1日常护理 2周期护理 3即时护理
*/ */
private String cycleType; private String cycleType;
/** /**
@ -155,7 +155,7 @@ public class DirectiveAsyncMQDto implements Serializable {
private String categoryName; private String categoryName;
//服务类型中文名称 //服务类型中文名称
private String typeName; private String typeName;
//周期类型中文名称 //指令类型中文名称
private String cycleTypeName; private String cycleTypeName;
//体型标签id,id,id //体型标签id,id,id
private String bodyTags; private String bodyTags;

2
nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java
View File

@ -40,7 +40,7 @@ public class DirectiveOpeLogInfoMQDto implements Serializable {
private BigDecimal tollPrice; private BigDecimal tollPrice;
/**提成价格*/ /**提成价格*/
private BigDecimal comPrice; private BigDecimal comPrice;
/**周期类型 1日常护理 2周期护理 3即时护理*/ /**指令类型 1日常护理 2周期护理 3即时护理*/
private String cycleType; private String cycleType;
/**服务说明*/ /**服务说明*/
private String serviceContent; private String serviceContent;

2
nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java
View File

@ -34,7 +34,7 @@ public class DirectiveOpeLogMainMQDto implements Serializable {
private String typeName; private String typeName;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型名称*/ /**指令类型名称*/
private String cycleTypeName; private String cycleTypeName;
private List<DirectiveOpeLogInfoMQDto> opeInfoList; private List<DirectiveOpeLogInfoMQDto> opeInfoList;

2
nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java
View File

@ -76,7 +76,7 @@ public class DirectiveSyncLogInfoMQDto implements Serializable {
*/ */
private BigDecimal comPrice; private BigDecimal comPrice;
/** /**
* 周期类型 1日常护理 2周期护理 3即时护理 * 指令类型 1日常护理 2周期护理 3即时护理
*/ */
private String cycleType; private String cycleType;
/** /**

4
nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java
View File

@ -40,9 +40,9 @@ public class CareDirectiveEntity implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

4
nursing-unit-common/src/main/java/com/nu/entity/CareOrdersEntity.java
View File

@ -48,9 +48,9 @@ public class CareOrdersEntity implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

4
nursing-unit-common/src/main/java/com/nu/entity/CareOrdersSubEntity.java
View File

@ -59,9 +59,9 @@ public class CareOrdersSubEntity implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

4
nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java
View File

@ -64,9 +64,9 @@ public class DirectiveOrderEntity implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

4
nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java
View File

@ -63,9 +63,9 @@ public class DirectiveOrderSubEntity implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

2
nursing-unit-common/src/main/java/com/nu/entity/ElderServerEntity.java
View File

@ -47,7 +47,7 @@ public class ElderServerEntity implements Serializable {
private String bodyTagName; private String bodyTagName;
/**情绪标签名称*/ /**情绪标签名称*/
private String emotionTagName; private String emotionTagName;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**纵向定位*/ /**纵向定位*/
private String positioningLong; private String positioningLong;

4
nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java
View File

@ -34,9 +34,9 @@ public class InvoicingDirectiveEntity implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

4
nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java
View File

@ -47,9 +47,9 @@ public class InvoicingOrdersEntity implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

4
nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveEntity.java
View File

@ -38,9 +38,9 @@ public class LogisticsDirectiveEntity implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

12
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java
View File

@ -76,13 +76,13 @@ public class BizConfigServiceDirective implements Serializable {
@Excel(name = "收费频次 1按次收费 2按天收费", width = 15) @Excel(name = "收费频次 1按次收费 2按天收费", width = 15)
@ApiModelProperty(value = "收费频次 1按次收费 2按天收费") @ApiModelProperty(value = "收费频次 1按次收费 2按天收费")
private String chargingFrequency; private String chargingFrequency;
/**周期类型 1日常护理 2周期护理 3即时护理*/ /**指令类型 1日常护理 2周期护理 3即时护理*/
@Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) @Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15)
@ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") @ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理")
private String cycleType; private String cycleType;
/**周期类型 1日常护理 2周期护理 3即时护理*/ /**指令类型 1日常护理 2周期护理 3即时护理*/
@Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) @Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15)
@ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") @ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理")
@TableField(exist = false) @TableField(exist = false)
private String cycleTypeName; private String cycleTypeName;
/**排序*/ /**排序*/

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java
View File

@ -55,10 +55,10 @@ public class DirectiveDataPool implements Serializable {
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID 1日常护理 2周期护理 3即时护理*/ /**指令类型ID 1日常护理 2周期护理 3即时护理*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPoolSub.java
View File

@ -56,9 +56,9 @@ public class DirectiveDataPoolSub implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml
View File

@ -73,8 +73,8 @@
elder_name varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '长者名称', 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_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 '服务指令名称', 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_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 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 '周期值', 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 '服务指令图片大图', 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 '服务指令图片大图-网络地址', 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 '服务类型名称', 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_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 '服务指令名称', 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_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 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 '周期值', 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 '服务指令图片大图', 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 '服务指令图片大图-网络地址', 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 '员工姓名', 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_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 '服务指令名称', 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_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 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 '周期值', 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 '服务指令图片大图', 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 '服务指令图片大图-网络地址', 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 '服务类型名称', 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_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 '服务指令名称', 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_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 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 '周期值', 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 '服务指令图片大图', 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 '服务指令图片大图-网络地址', net_preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图-网络地址',

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java
View File

@ -57,9 +57,9 @@ public class DirectiveOrder implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderSub.java
View File

@ -66,9 +66,9 @@ public class DirectiveOrderSub implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlan.java
View File

@ -49,9 +49,9 @@ public class CareDirectivePlan implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml
View File

@ -184,7 +184,7 @@
) )
-- 条件2: 日常类型指令 (cycle_type_id = '1') -- 条件2: 日常类型指令 (cycle_type_id = '1')
OR p.cycle_type_id = '1' OR p.cycle_type_id = '1'
-- 条件3: 周期类型指令 (cycle_type_id = '2') -- 条件3: 指令类型指令 (cycle_type_id = '2')
OR ( OR (
p.cycle_type_id = '2' p.cycle_type_id = '2'
AND ( AND (
@ -298,7 +298,7 @@
) )
-- 条件2: 日常类型指令 (cycle_type_id = '1') -- 条件2: 日常类型指令 (cycle_type_id = '1')
OR p.cycle_type_id = '1' OR p.cycle_type_id = '1'
-- 条件3: 周期类型指令 (cycle_type_id = '2') -- 条件3: 指令类型指令 (cycle_type_id = '2')
OR ( OR (
p.cycle_type_id = '2' p.cycle_type_id = '2'
AND ( AND (

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/entity/InvoicingDirectivePlan.java
View File

@ -50,9 +50,9 @@ public class InvoicingDirectivePlan implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml
View File

@ -43,7 +43,7 @@
) )
-- 条件2: 日常类型指令 (cycle_type_id = '1') -- 条件2: 日常类型指令 (cycle_type_id = '1')
OR p.cycle_type_id = '1' OR p.cycle_type_id = '1'
-- 条件3: 周期类型指令 (cycle_type_id = '2') -- 条件3: 指令类型指令 (cycle_type_id = '2')
OR ( OR (
p.cycle_type_id = '2' p.cycle_type_id = '2'
AND ( AND (

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java
View File

@ -54,9 +54,9 @@ public class LogisticsDirectivePlan implements Serializable {
private String directiveId; private String directiveId;
/**服务指令名称*/ /**服务指令名称*/
private String directiveName; private String directiveName;
/**周期类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**周期类型*/ /**指令类型*/
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml
View File

@ -44,7 +44,7 @@
) )
-- 条件2: 日常类型指令 (cycle_type_id = '1') -- 条件2: 日常类型指令 (cycle_type_id = '1')
OR p.cycle_type_id = '1' OR p.cycle_type_id = '1'
-- 条件3: 周期类型指令 (cycle_type_id = '2') -- 条件3: 指令类型指令 (cycle_type_id = '2')
OR ( OR (
p.cycle_type_id = '2' p.cycle_type_id = '2'
AND ( AND (

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java
View File

@ -71,10 +71,10 @@ public class CanAddDirective implements Serializable {
@ApiModelProperty(value = "服务指令") @ApiModelProperty(value = "服务指令")
private java.lang.String directiveName; private java.lang.String directiveName;
/** /**
* 周期类型 1日常护理 2周期护理 3即时护理 * 指令类型 1日常护理 2周期护理 3即时护理
*/ */
@Excel(name = "周期类型", width = 20) @Excel(name = "指令类型", width = 20)
@ApiModelProperty(value = "周期类型") @ApiModelProperty(value = "指令类型")
private java.lang.String cycleType; private java.lang.String cycleType;
/** /**
* 收费价格 * 收费价格

12
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempInfo.java
View File

@ -75,13 +75,13 @@ public class NuBizCustomerCareTempInfo implements Serializable {
@Excel(name = "即时指令焦点图片", width = 15) @Excel(name = "即时指令焦点图片", width = 15)
@ApiModelProperty(value = "即时指令焦点图片") @ApiModelProperty(value = "即时指令焦点图片")
private java.lang.String immediateFileFocus; private java.lang.String immediateFileFocus;
/**周期类型ID*/ /**指令类型ID*/
@Excel(name = "周期类型ID", width = 15) @Excel(name = "指令类型ID", width = 15)
@ApiModelProperty(value = "周期类型ID") @ApiModelProperty(value = "指令类型ID")
private java.lang.String cycleTypeId; private java.lang.String cycleTypeId;
/**周期类型*/ /**指令类型*/
@Excel(name = "周期类型", width = 15) @Excel(name = "指令类型", width = 15)
@ApiModelProperty(value = "周期类型") @ApiModelProperty(value = "指令类型")
private java.lang.String cycleType; private java.lang.String cycleType;
/**周期值*/ /**周期值*/
@Excel(name = "周期值", width = 15) @Excel(name = "周期值", width = 15)

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java
View File

@ -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}") @Dict(dicCode = "id", dictTable = "nu_config_service_type", dicText = "type_name", ds = "${nu.org.master.code}")
private java.lang.String typeId; private java.lang.String typeId;
/** /**
* 周期类型 * 指令类型
*/ */
@Excel(name = "周期类型", width = 15) @Excel(name = "指令类型", width = 15)
@ApiModelProperty(value = "周期类型") @ApiModelProperty(value = "指令类型")
@Dict(dicCode = "period_type", ds = "${nu.org.master.code}") @Dict(dicCode = "period_type", ds = "${nu.org.master.code}")
private java.lang.String cycleType; private java.lang.String cycleType;
/** /**

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java
View File

@ -107,10 +107,10 @@ public class DirectiveSyncLogInfo implements Serializable {
@ApiModelProperty(value = "提成价格") @ApiModelProperty(value = "提成价格")
private java.math.BigDecimal comPrice; private java.math.BigDecimal comPrice;
/** /**
* 周期类型 1日常护理 2周期护理 3即时护理 * 指令类型 1日常护理 2周期护理 3即时护理
*/ */
@Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) @Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15)
@ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") @ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理")
@Dict(dicCode = "period_type") @Dict(dicCode = "period_type")
private java.lang.String cycleType; private java.lang.String cycleType;
/** /**

10
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java
View File

@ -308,7 +308,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
mainMQDto.setCategoryName(configServiceDirective.getCategoryName());//服务类别名称 mainMQDto.setCategoryName(configServiceDirective.getCategoryName());//服务类别名称
mainMQDto.setTypeName(configServiceDirective.getTypeName());//服务类型名称 mainMQDto.setTypeName(configServiceDirective.getTypeName());//服务类型名称
mainMQDto.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称 mainMQDto.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
mainMQDto.setCycleTypeName(configServiceDirective.getCycleTypeName());//周期类型名称 mainMQDto.setCycleTypeName(configServiceDirective.getCycleTypeName());//指令类型名称
List<DirectiveOpeLogInfoMQDto> infoList = Lists.newArrayList(); List<DirectiveOpeLogInfoMQDto> infoList = Lists.newArrayList();
DirectiveOpeLogInfoMQDto info = new DirectiveOpeLogInfoMQDto(); DirectiveOpeLogInfoMQDto info = new DirectiveOpeLogInfoMQDto();
@ -323,7 +323,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称 info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
info.setTollPrice(configServiceDirective.getTollPrice());//收费价格 info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
info.setComPrice(configServiceDirective.getComPrice());//提成价格 info.setComPrice(configServiceDirective.getComPrice());//提成价格
info.setCycleType(configServiceDirective.getCycleType());//周期类型 info.setCycleType(configServiceDirective.getCycleType());//指令类型
info.setServiceContent(configServiceDirective.getServiceContent());//服务说明 info.setServiceContent(configServiceDirective.getServiceContent());//服务说明
info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长 info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长
info.setSysOrgCode(configServiceDirective.getSysOrgCode());//所属部门 info.setSysOrgCode(configServiceDirective.getSysOrgCode());//所属部门
@ -438,7 +438,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
mainMQDto.setCategoryName(configServiceDirective.getCategoryName());//服务类别名称 mainMQDto.setCategoryName(configServiceDirective.getCategoryName());//服务类别名称
mainMQDto.setTypeName(configServiceDirective.getTypeName());//服务类型名称 mainMQDto.setTypeName(configServiceDirective.getTypeName());//服务类型名称
mainMQDto.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称 mainMQDto.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
mainMQDto.setCycleTypeName(configServiceDirective.getCycleTypeName());//周期类型名称 mainMQDto.setCycleTypeName(configServiceDirective.getCycleTypeName());//指令类型名称
List<DirectiveOpeLogInfoMQDto> infoList = Lists.newArrayList(); List<DirectiveOpeLogInfoMQDto> infoList = Lists.newArrayList();
//修改前 //修改前
@ -455,7 +455,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setDirectiveName(his.getDirectiveName());//服务指令名称 info.setDirectiveName(his.getDirectiveName());//服务指令名称
info.setTollPrice(his.getTollPrice());//收费价格 info.setTollPrice(his.getTollPrice());//收费价格
info.setComPrice(his.getComPrice());//提成价格 info.setComPrice(his.getComPrice());//提成价格
info.setCycleType(his.getCycleType());//周期类型 info.setCycleType(his.getCycleType());//指令类型
info.setServiceContent(his.getServiceContent());//服务说明 info.setServiceContent(his.getServiceContent());//服务说明
info.setServiceDuration(his.getServiceDuration());//服务时长 info.setServiceDuration(his.getServiceDuration());//服务时长
info.setSysOrgCode(his.getSysOrgCode());//所属部门 info.setSysOrgCode(his.getSysOrgCode());//所属部门
@ -483,7 +483,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称 info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
info.setTollPrice(configServiceDirective.getTollPrice());//收费价格 info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
info.setComPrice(configServiceDirective.getComPrice());//提成价格 info.setComPrice(configServiceDirective.getComPrice());//提成价格
info.setCycleType(configServiceDirective.getCycleType());//周期类型 info.setCycleType(configServiceDirective.getCycleType());//指令类型
info.setServiceContent(configServiceDirective.getServiceContent());//服务说明 info.setServiceContent(configServiceDirective.getServiceContent());//服务说明
info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长 info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长
info.setSysOrgCode(his.getSysOrgCode());//所属部门 info.setSysOrgCode(his.getSysOrgCode());//所属部门

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java
View File

@ -97,10 +97,10 @@ public class ConfigServiceDirective implements Serializable {
@Dict(dicCode = "billing_frequency") @Dict(dicCode = "billing_frequency")
private java.lang.String chargingFrequency; private java.lang.String chargingFrequency;
/** /**
* 周期类型 1日常护理 2周期护理 3即时护理 * 指令类型 1日常护理 2周期护理 3即时护理
*/ */
@Excel(name = "周期类型", width = 15) @Excel(name = "指令类型", width = 15)
@ApiModelProperty(value = "周期类型") @ApiModelProperty(value = "指令类型")
@Dict(dicCode = "period_type") @Dict(dicCode = "period_type")
private java.lang.String cycleType; private java.lang.String cycleType;
/** /**
@ -295,7 +295,7 @@ public class ConfigServiceDirective implements Serializable {
//服务类型中文名称 //服务类型中文名称
@TableField(exist = false) @TableField(exist = false)
private String typeName; private String typeName;
//周期类型中文名称 //指令类型中文名称
@TableField(exist = false) @TableField(exist = false)
private String cycleTypeName; private String cycleTypeName;
//媒体资源存储路径名 //媒体资源存储路径名

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/TreeNode.java
View File

@ -12,7 +12,7 @@ public class TreeNode {
private String key; private String key;
private String title; private String title;
private String cycleTypeName;//周期类型 private String cycleTypeName;//指令类型
private int level; private int level;
private String instructionId; private String instructionId;
private String categoryId; private String categoryId;

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
View File

@ -373,7 +373,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
@Override @Override
public List<TreeNode> getTreeData(String filterIzEnabled) { public List<TreeNode> getTreeData(String filterIzEnabled) {
//查询周期类型字典项备用 //查询指令类型字典项备用
List<DictModel> period_type = sysBaseAPI.getDictItems("period_type"); List<DictModel> period_type = sysBaseAPI.getDictItems("period_type");
Map<String, String> cycleTypeMap = Maps.newHashMap(); Map<String, String> cycleTypeMap = Maps.newHashMap();
period_type.stream().forEach(p -> { period_type.stream().forEach(p -> {
@ -621,7 +621,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
info.setDirectiveName(item.getDirectiveName());//服务指令名称 info.setDirectiveName(item.getDirectiveName());//服务指令名称
info.setTollPrice(item.getTollPrice());//收费价格 info.setTollPrice(item.getTollPrice());//收费价格
info.setComPrice(item.getComPrice());//提成价格 info.setComPrice(item.getComPrice());//提成价格
info.setCycleType(item.getCycleType());//周期类型 info.setCycleType(item.getCycleType());//指令类型
info.setServiceContent(item.getServiceContent());//服务说明 info.setServiceContent(item.getServiceContent());//服务说明
info.setServiceDuration(item.getServiceDuration());//服务时长 info.setServiceDuration(item.getServiceDuration());//服务时长
info.setSysOrgCode(item.getSysOrgCode());//所属部门 info.setSysOrgCode(item.getSysOrgCode());//所属部门