From e8e3a715d590705bae503e3b7634fbce2edd253e Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 19 Jan 2026 16:48:19 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=EF=BC=9A=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E7=B1=BB=E5=9E=8B=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=95=BF=E5=9B=9E=E6=98=BE=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=202=E3=80=81=E8=B0=83=E6=95=B4=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8D=A1=E7=89=87=E4=BA=86=E8=A7=A3=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=EF=BC=9A=E5=8E=BB=E9=99=A4=E5=91=A8=E6=9C=9F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E5=A2=9E=E5=8A=A0=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E5=9B=9E=E6=98=BE=203=E3=80=81=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E7=AE=A1=E7=90=86-=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4-=E6=8C=87=E4=BB=A4=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=B6=85=E6=97=B6=E6=97=B6=E9=95=BF?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8E=E5=9B=9E=E6=98=BE=E5=8F=8A=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E8=B6=85=E6=97=B6=E6=97=B6=E9=95=BF?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java | 2 ++ .../com/nu/modules/directivebk/entity/DirectiveBkItem.java | 6 ++++++ .../modules/directiveopelog/entity/DirectiveOpeLogInfo.java | 4 ++++ .../servicedirective/entity/ConfigServiceDirective.java | 6 ++++++ .../mapper/xml/ConfigServiceDirectiveMapper.xml | 5 ++++- 5 files changed, 22 insertions(+), 1 deletion(-) 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 5f6aca9..09755d3 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 @@ -56,6 +56,8 @@ public class DirectiveOpeLogInfoMQDto implements Serializable { private String serviceContent; /**服务时长（分钟）*/ private String serviceDuration; + /**超时时长（分钟）*/ + private String timeoutDuration; /**所属部门*/ private String sysOrgCode; /**语音文件*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java index 8d026dd..0f1f5a0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java @@ -149,6 +149,12 @@ public class DirectiveBkItem implements Serializable { @Excel(name = "服务时长（分钟）", width = 18) @ApiModelProperty(value = "服务时长（分钟）") private java.lang.String serviceDuration; + /** + * 超时时长（分钟） + */ + @Excel(name = "超时时长（分钟）", width = 18) + @ApiModelProperty(value = "超时时长（分钟）") + private java.lang.String timeoutDuration; /** * 是否启用 Y启用 N未启用 */ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java index 1667e69..62380e7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java @@ -91,6 +91,10 @@ public class DirectiveOpeLogInfo implements Serializable { @Excel(name = "服务说明", width = 15) @ApiModelProperty(value = "服务说明") private String serviceContent; + /**超时时长（分钟）*/ + @Excel(name = "超时时长（分钟）", width = 15) + @ApiModelProperty(value = "超时时长（分钟）") + private String timeoutDuration; /**服务时长（分钟）*/ @Excel(name = "服务时长（分钟）", width = 15) @ApiModelProperty(value = "服务时长（分钟）") 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 13959c2..b1eaebc 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 @@ -121,6 +121,12 @@ public class ConfigServiceDirective 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/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 83c288e..1f642d5 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 @@ -19,6 +19,7 @@ + @@ -67,6 +68,7 @@ c.sort, c.service_content, c.service_duration, + c.timeout_duration, c.status, c.iz_enabled, c.del_flag, @@ -175,6 +177,7 @@ m.com_price, m.cycle_type, m.service_duration, + m.timeout_duration, m.service_content, m.iz_enabled, m.del_flag, @@ -202,7 +205,7 @@ 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 = '0' + m.iz_enabled = 'Y' AND m.id NOT IN