From 68321d3f032feb9d88e184c65c371db5a3f5f3a3 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 21 Jan 2026 14:55:38 +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=E8=A1=A8=E5=8E=BB=E9=99=A4=E5=91=A8=E6=9C=9F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=BC=95=E5=8F=91=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/dto/DirectiveAsyncMQDto.java | 4 ++++ .../com/nu/dto/DirectiveOpeLogInfoMQDto.java | 2 -- .../com/nu/dto/DirectiveOpeLogMainMQDto.java | 2 -- .../com/nu/dto/DirectiveSyncLogInfoMQDto.java | 4 ++++ .../entity/BizConfigServiceDirective.java | 4 ---- .../xml/BizConfigServiceDirectiveMapper.xml | 3 --- .../care/mapper/xml/CareDirectivePlanMapper.xml | 4 +--- .../xml/NuBizCustomerCareTempInfoMapper.xml | 4 +--- .../mapper/xml/DirectivePackageMapper.xml | 1 - .../entity/DirectiveSyncLogInfo.java | 6 ++++++ .../ConfigServiceDirectiveController.java | 15 ++++----------- .../entity/ConfigServiceDirective.java | 10 ---------- .../mapper/xml/ConfigServiceDirectiveMapper.xml | 17 +++-------------- .../impl/ConfigServiceDirectiveServiceImpl.java | 1 + .../servicetag/mapper/xml/ServiceTagMapper.xml | 1 - 15 files changed, 24 insertions(+), 54 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 bae6e473..ec341d2f 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 b758e6b9..c1e3f032 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 @@ -42,8 +42,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 8a3d1ebc..e7859e80 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,8 +34,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 55c2d229..d6edb66e 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 @@ -87,6 +87,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/biz/common/entity/BizConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java index 27e27c00..61345ee8 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,10 +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即时护理") - private String cycleType; /**指令类型 1日常护理 2周期护理 3即时护理*/ @Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15) @ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml index 2f1b20b0..bd634305 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml @@ -16,8 +16,6 @@ csd.iz_reimbursement, csd.iz_preferential, csd.charging_frequency, - csd.cycle_type as cycleType, - dict.item_text AS cycleTypeName, csd.service_content, csd.service_duration, csd.iz_enabled, @@ -36,7 +34,6 @@ FROM nu_config_service_directive csd LEFT JOIN nu_config_service_category csc ON csd.category_id = csc.id LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id - LEFT JOIN (select * from sys_dict_item where dict_id = '1900374791386140674') dict on csd.cycle_type = dict.item_value ) a ${ew.customSqlSegment} 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 52f62b73..0f771e0a 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 @@ -123,14 +123,12 @@ select a.package_id,a.cycle_type,a.cycle_value,b.*, c.category_name AS category_name, d.type_name AS type_name, - e.instruction_name AS instruction_name, - f.item_text AS cycle_type_name + e.instruction_name AS instruction_name from nu_config_package_directive a left join nu_config_service_directive b on a.directive_id = b.id left join nu_config_service_category c on b.category_id = c.id left join nu_config_service_type d on b.type_id = d.id left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id - left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = b.cycle_type AND a.package_id = #{params.packageId} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml index 0c91f3b8..7d617cb4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml @@ -9,14 +9,12 @@ select a.package_id,a.cycle_type,a.cycle_value,b.*, c.category_name AS category_name, d.type_name AS type_name, - e.instruction_name AS instruction_name, - f.item_text AS cycle_type_name + e.instruction_name AS instruction_name from nu_config_package_directive a left join nu_config_service_directive b on a.directive_id = b.id left join nu_config_service_category c on b.category_id = c.id left join nu_config_service_type d on b.type_id = d.id left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id - left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = b.cycle_type AND a.package_id = #{params.packageId} 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 3a9cb077..96e52ec5 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 @@ -115,7 +115,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/config/directivesynclog/entity/DirectiveSyncLogInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivesynclog/entity/DirectiveSyncLogInfo.java index 619c48b8..fac4c3e5 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 @@ -125,6 +125,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/config/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java index 983330d0..ec1e0343 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 @@ -90,7 +90,6 @@ public class ConfigServiceDirectiveController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); queryWrapper.select("id"); @@ -151,7 +150,6 @@ public class ConfigServiceDirectiveController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); queryWrapper.select("id"); @@ -230,7 +228,6 @@ public class ConfigServiceDirectiveController extends JeecgController infoList = Lists.newArrayList(); DirectiveOpeLogInfoMQDto info = new DirectiveOpeLogInfoMQDto(); @@ -320,7 +315,6 @@ public class ConfigServiceDirectiveController extends JeecgController infoList = Lists.newArrayList(); //修改前 @@ -453,9 +446,9 @@ public class ConfigServiceDirectiveController extends JeecgController m.iz_enabled = '0' @@ -276,16 +270,11 @@ m.*, i.instruction_name as instructionName, c.category_name as categoryName, - t.type_name as typeName, - dic.dit as cycleTypeName + t.type_name as typeName 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 where m.id = #{id} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index d66d8774..9eede42b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -624,6 +624,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl