增加 任务执行类型 批量处理字段 入库

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroute/SignPatientManageRoute.java

@@ -135,5 +135,9 @@ public class SignPatientManageRoute extends BaseEntity {
     @Excel(name = "任务计划执行时间，格式：YYYY-MM-dd HH:mm:ss", width = 30, dateFormat = "YYYY-MM-dd HH:mm:ss")
     private LocalDateTime routePlanTime;
 
+    /** 导入患者主表ID */
+    @ApiModelProperty(value = "导入患者主表ID")
+    @Excel(name = "导入患者主表ID")
+    private String importMainId;
 
 }

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java

@@ -56,9 +56,9 @@ public class SignPatientManageRouteNode extends BaseEntity {
     private String taskExcuteType;
 
     /** 任务计划执行时间，格式：YYYY-MM-dd HH:mm */
-    @ApiModelProperty(value = "任务计划执行时间，格式：YYYY-MM-dd HH:mm")
+    @ApiModelProperty(value = "任务计划执行时间，格式：yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "YYYY-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @Excel(name = "任务计划执行时间，格式：YYYY-MM-dd HH:mm:ss", width = 30, dateFormat = "YYYY-MM-dd HH:mm:ss")
+    @Excel(name = "任务计划执行时间，格式：yyyy-MM-dd HH:mm", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private LocalDateTime nodePlanTime;
 
 

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java

@@ -186,6 +186,8 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
         signPatientManageRoute.setTaskCreateType(TaskCreateTypeEnum.MANUAL_CREATE.getInfo());
         signPatientManageRoute.setCreateBy(SecurityUtils.getUsername());
         signPatientManageRoute.setCreateTime(LocalDateTime.now());
+        if(StringUtils.isNotBlank(signPatientManageRoute.getImportMainId()))
+        { signPatientManageRoute.setTaskExcuteType(TaskExcuteTypeEnum.BATCH_TASK.getInfo());}
         int insertRoute = signPatientManageRouteMapper.insertSignPatientManageRoute(signPatientManageRoute);
         if (insertRoute < 0) {
             return AjaxResult.error("新增签约患者管理任务路径失败！请联系管理员！");
@@ -208,6 +210,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
         //更新 签约记录的 审核状态为 未审核  zyk  20241204
         SignPatientRecord signPatientRecord = new SignPatientRecord();
         signPatientRecord.setRouteCheckStatus(RouteCheckStatusEnum.UNAUDITED.getInfo());
+
         signPatientRecord.setId(signPatientManageRoute.getSignPatientRecordId());
         int updateRecord = signPatientRecordMapper.updateByPrimaryKeySelective(signPatientRecord);
         if (updateRecord < 0) {
@@ -995,6 +998,11 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
      */
     private void extracted(SignPatientManageRouteVO signPatientManageRoute, List<SignPatientManageRouteNode> signPatientManageRouteNodes, SignPatientManageRouteNode routeNode) {
         SignPatientManageRouteNode signPatientManageRouteNode = new SignPatientManageRouteNode();
+        //如果 导入患者主表id不为空，则认为此任务是批量执行类型
+        if(StringUtils.isNotBlank(signPatientManageRoute.getImportMainId()))
+            signPatientManageRouteNode.setTaskExcuteType(TaskExcuteTypeEnum.BATCH_TASK.getInfo());
+        else
+            signPatientManageRouteNode.setTaskExcuteType(TaskExcuteTypeEnum.ACTUAL_TIME_TASK.getInfo());
         //电话外呼
         if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.PHONE_OUTBOUND.getInfo().equals(routeNode.getTaskNodeType())) {
             signPatientManageRouteNode.setPhonePushSign(Objects.isNull(routeNode.getPhonePushSign()) ? null : routeNode.getPhonePushSign());

postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/SignPatientManageRouteVO.java

@@ -1,8 +1,10 @@
 package com.xinelu.manage.vo.signpatientmanageroute;
 
+import com.xinelu.common.annotation.Excel;
 import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute;
 import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode;
 import com.xinelu.manage.vo.signroutetriggercondition.SignRouteTriggerConditionVO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,6 +20,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class SignPatientManageRouteVO extends SignPatientManageRoute {
 
+    /** 批量导入表(patient_info_import_main表)ID */
+    @ApiModelProperty(value = "批量导入表ID")
+    private String importMainId;
+
     /**
      * 患者管理任务路径id
      */

postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml

@@ -494,6 +494,10 @@
             </if>
             <if test="routeRemark != null">route_remark,
             </if>
+            <if test="taskExcuteType != null">task_excute_type,
+            </if>
+            <if test="importMainId != null">import_main_id,
+            </if>
             <if test="routePlanTime != null">route_plan_time,
             </if>
             <if test="createBy != null">create_by,
@@ -542,6 +546,10 @@
             </if>
             <if test="routeRemark != null">#{routeRemark},
             </if>
+            <if test="taskExcuteType != null">#{taskExcuteType},
+            </if>
+            <if test="importMainId != null">#{importMainId},
+            </if>
             <if test="routePlanTime != null">#{route_plan_time},
             </if>
             <if test="createBy != null">#{createBy},