1、调整镜像管理-服务指令-操作日志：去除周期类型、增加超时时长回显，调整字段展示顺序

2、调整镜像管理-服务指令-机构卡片了解更多：去除周期类型、增加超时时长回显
3、调整镜像管理-服务指令-指令备份：增加超时时长保存与回显及导出增加超时时长回显

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;
 	/**语音文件*/

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未启用
      */

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 = "服务时长（分钟）")

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;
     /**
      * 指令状态
      */

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml

@@ -19,6 +19,7 @@
         <result property="sort" column="sort"/>
         <result property="serviceContent" column="service_content"/>
         <result property="serviceDuration" column="service_duration"/>
+        <result property="timeoutDuration" column="timeout_duration"/>
         <result property="status" column="status"/>
         <result property="izEnabled" column="iz_enabled"/>
         <result property="delFlag" column="del_flag"/>
@@ -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
         <where>
-            m.iz_enabled = '0'
+            m.iz_enabled = 'Y'
             <if test="existIds != null and existIds.length > 0">
                 AND m.id NOT IN
                 <foreach collection="existIds" item="id" open="(" separator="," close=")">