解决服务指令去除周期类型引发的报错

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

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;
 	/**服务时长（分钟）*/

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<DirectiveOpeLogInfoMQDto> opeInfoList;
 }

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;
     /**
      * 所属部门
      */

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,

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;
     /**
      * 所属部门
      */

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;
     /**
      * 排序
      */

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
         <where>
             m.iz_enabled = 'Y'
             <if test="existIds != null and existIds.length > 0">

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,

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: