From 6f30486e741387d5a626cffd4bd55ad257819a48 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 21 Jan 2026 15:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E5=8E=BB=E9=99=A4=E5=91=A8=E6=9C=9F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nu/dto/DirectiveAsyncMQDto.java | 4 ++++ .../main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java | 2 -- .../main/java/com/nu/dto/DirectiveOpeLogMainMQDto.java | 2 -- .../main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java | 4 ++++ .../mapper/xml/DirectivePackageMapper.xml | 1 - .../directivesynclog/entity/DirectiveSyncLogInfo.java | 6 ++++++ .../servicedirective/entity/ConfigServiceDirective.java | 7 ------- .../mapper/xml/ConfigServiceDirectiveMapper.xml | 9 +-------- .../modules/servicetag/mapper/xml/ServiceTagMapper.xml | 1 - .../src/main/resources/application-uat.yml | 2 +- 10 files changed, 16 insertions(+), 22 deletions(-) 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 012db0e..4b5bbcd 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 @@ -68,6 +68,10 @@ public class DirectiveAsyncMQDto implements Serializable { * 服务时长（分钟） */ private String serviceDuration; + /** + * 超时时长（分钟） + */ + private String timeoutDuration; /** * 指令状态 */ 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 09755d3..2a2cdce 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 @@ -50,8 +50,6 @@ public class DirectiveOpeLogInfoMQDto implements Serializable { private BigDecimal tollPrice; /**提成价格*/ private BigDecimal comPrice; - /**周期类型 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 73ff2b9..6d436d1 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 @@ -45,8 +45,6 @@ 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 9d75cd1..6c4a7f8 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 @@ -81,6 +81,10 @@ public class DirectiveSyncLogInfoMQDto implements Serializable { * 服务时长（分钟） */ private String serviceDuration; + /** + * 超时时长（分钟） + */ + private String timeoutDuration; /** * 所属部门 */ 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 b75c736..513f8af 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 @@ -104,7 +104,6 @@ csd.iz_reimbursement, csd.iz_preferential, csd.charging_frequency, - csd.cycle_type, csd.service_content, csd.service_duration, csd.iz_enabled AS directive_iz_enabled, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivesynclog/entity/DirectiveSyncLogInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivesynclog/entity/DirectiveSyncLogInfo.java index ac2de9c..dd68003 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivesynclog/entity/DirectiveSyncLogInfo.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivesynclog/entity/DirectiveSyncLogInfo.java @@ -119,6 +119,12 @@ public class DirectiveSyncLogInfo implements Serializable { @Excel(name = "服务时长（分钟）", width = 15) @ApiModelProperty(value = "服务时长（分钟）") private java.lang.String serviceDuration; + /** + * 超时时长（分钟） + */ + @Excel(name = "超时时长（分钟）", width = 15) + @ApiModelProperty(value = "超时时长（分钟）") + private java.lang.String timeoutDuration; /** * 所属部门 */ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java index b1eaebc..04d4a5e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java @@ -96,13 +96,6 @@ public class ConfigServiceDirective implements Serializable { @ApiModelProperty(value = "收费频次") @Dict(dicCode = "billing_frequency") private java.lang.String chargingFrequency; - /** - * 周期类型 1日常护理 2周期护理 3即时护理 - */ - @Excel(name = "周期类型", width = 15) - @ApiModelProperty(value = "周期类型") - @Dict(dicCode = "period_type") - private java.lang.String cycleType; /** * 排序 */ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 1f642d5..14f0688 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -64,7 +64,6 @@ c.iz_reimbursement, c.iz_preferential, c.charging_frequency, - c.cycle_type, c.sort, c.service_content, c.service_duration, @@ -175,7 +174,6 @@ m.type_id, m.toll_price, m.com_price, - m.cycle_type, m.service_duration, m.timeout_duration, m.service_content, @@ -194,16 +192,11 @@ i.instruction_name as instructionName, c.category_name as categoryName, t.type_name as typeName, - m.directive_name, - dic.dit as cycleTypeName + m.directive_name from nu_config_service_directive m left join nu_config_service_instruction_tag i on m.instruction_tag_id = i.id left join nu_config_service_category c on m.category_id = c.id left join nu_config_service_type t on m.type_id = t.id - left join (select di.item_value as diva, di.item_text as dit - from sys_dict d - left join sys_dict_item di on d.id = di.dict_id where d.dict_code = 'period_type') dic - on m.cycle_type = dic.diva m.iz_enabled = 'Y' diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml index a4f0975..bed70a2 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml @@ -94,7 +94,6 @@ csd.iz_reimbursement, csd.iz_preferential, csd.charging_frequency, - csd.cycle_type, csd.service_content, csd.service_duration, csd.iz_enabled AS directive_iz_enabled, diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml index f14b8a5..c01299b 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml @@ -253,7 +253,7 @@ jeecg: app: http://localhost:8051 path: #文件上传根目录 设置 - upload: /opt/ope/upFiles + upload: /opt/ope #webapp文件路径 webapp: /opt/ope/webapp shiro: