新增随访表单全量表单

health-admin/src/main/java/com/bzd/web/controller/dtp/PharmaceuticalServiceController.java

@@ -642,7 +642,7 @@ public class PharmaceuticalServiceController extends BaseController {
         pd1.put("id",pd.get("followUpPersonId"));
         pd1.put("followUpPersonName",pd.get("pharmacistName"));
         pd1.put("followUpPersonPhone",pd.get("phone"));//跟进人手机号
-        int  result= pharmaceuticalService.editFollowUpAssignById(pd1);//到这里
+        int  result= pharmaceuticalService.editFollowUpAssignById(pd1);
         if(result>0){
             AjaxResult.success("修改成功");
         }else{
@@ -665,7 +665,7 @@ public class PharmaceuticalServiceController extends BaseController {
         pd1.put("up","up");
         pd1.put("id",pd.get("taskId"));
         pd1.put("taskFollower",pd.get("pharmacistName"));
-        int  result= pharmaceuticalService.editFollowTaskAssignById(pd1);//到这里
+        int  result= pharmaceuticalService.editFollowTaskAssignById(pd1);
         if(result>0){
             AjaxResult.success("修改成功");
         }else{

health-admin/src/main/java/com/bzd/web/controller/gxhpz/FollowTaskController.java

@@ -157,9 +157,6 @@ public class FollowTaskController extends BaseController {
         String iscoordinate = (String)pd.get("iscoordinate");
         String returnObject = (String)pd.get("returnObject");
         String medicationStatus = (String)pd.get("medicationStatus");//用药状态
-        String adverse_reaction_rows = (String)pd.get("adverse_reaction_rows");//不良反应记录
-        String stoped = (String)pd.get("stoped");//直接永久停药：1是，0否
-        boolean isfllower = false;
         boolean newTask = false;
         if(StringUtils.isNotEmpty(returnMethod) && StringUtils.isNotEmpty(iscoordinate)
          && StringUtils.isNotEmpty(returnObject) && StringUtils.isNotEmpty(patientId) && StringUtils.isNotEmpty(id)){
@@ -178,7 +175,6 @@ public class FollowTaskController extends BaseController {
                 if (nextFollowTimeDate.after(currentDateTime)) {
                     // 如果下次随访时间大于当前时间，则任务状态为“待执行”
                     pd.put("taskStatus", "待执行");
-                    isfllower=true;
                     // 计算间隔天数
                     long diffInMillies = Math.abs(nextFollowTimeDate.getTime() - currentDateTime.getTime());
                     long intervalDays = TimeUnit.DAYS.convert(diffInMillies, TimeUnit.MILLISECONDS);
@@ -210,13 +206,21 @@ public class FollowTaskController extends BaseController {
         pd.put("updatedAt", DateUtils.getTime());//更新时间
         pd.put("actualFollowUpTime", DateUtils.getTime());//实际随访时间
         pd.put("completionTime", DateUtils.getTime());//完成时间
+        PageData pdTask=new PageData();
+        if(StringUtils.isNotEmpty(id)){
+            pdTask.put("id", id);
+            PageData pageDataTask = followTaskService.selectOneById(pdTask);//根据任务id查询随访任务数据
+            if(StringUtils.isNotNull(pageDataTask)){
+                pd.put("useForm", pageDataTask.get("useForm"));
+            }
+        }
 
         Integer update = followTaskService.update(pd);
         if(StringUtils.isNotEmpty(medicationStatus)){
           String perpetual_stopdrug_cause = (String)  pd.get("perpetual_stopdrug_cause");//永久停药原因
             if(StringUtils.isNotEmpty(perpetual_stopdrug_cause)  && perpetual_stopdrug_cause.equals("离世")){
                 //=离世时 关闭该患者所有计划任务
-                String planId =(String) pd.get("bc_planId");//计划状态：0待执行，1已完成，2已取消 bc_planId
+                String planId =(String) pd.get("bc_planId");
                 pd.put("planId", planId);
                 pd.put("storeId", getSysUser().getDeptId());
                 Integer closeResult = followPlanService.closeAllPlan(pd);//关闭该患者所有计划任务
@@ -225,9 +229,11 @@ public class FollowTaskController extends BaseController {
         }
 
         if(newTask){
+            String planId =(String) pd.get("bc_planId");
+            pd.put("planId", planId);
             //生成新任务 int FollowTask = dao.executeBatch("followTaskMapper.insertFollowTask", pdCPB);//预存数据任务
-            int addResult = followTaskService.addNewFollowTask(pd);//关闭该患者所有计划任务
-            System.out.println(pd+"<生成新任务>"+addResult);
+            int addResult = followTaskService.addNewFollowTask(pd);//生成下次随访任务
+            System.out.println(pd+"生成新任务结果="+addResult);
         }
         if(update<=0){
             return error("保存失败");
@@ -245,7 +251,7 @@ public class FollowTaskController extends BaseController {
             return prefix_followUp + "/closePlanPage";
     }
     /**
-     * 随访任务数据修改
+     * 随访任务数据修改返回数据页面
      *
      * @return
      * @throws Exception

health-admin/src/main/resources/static/health/css/input-styles.css

@@ -276,6 +276,7 @@ li {
 		display: block; /* 取消 flex 布局，改为块级元素 */
 		margin-bottom: 1em; /* 增加底部外边距 */
 	}
+
 	.mySelectClass {
 		width:285px !important;
 	}

health-admin/src/main/resources/templates/dtp/followUp/closePlanPage.html

@@ -50,7 +50,7 @@
                                             </tr>
                                             </thead>
                                             <tbody>
-                                            <!-- 数据行将被插入到这里 -->
+                                            <!-- 数据行将被插入 -->
                                             </tbody>
                                         </table>
 

health-admin/src/main/resources/templates/dtp/recipe/edit.html

@@ -171,7 +171,7 @@
             </tr>
             </thead>
             <tbody>
-            <!-- 数据行将被插入到这里 -->
+            <!-- 数据行将被插入 -->
             </tbody>
         </table>
     </div>

health-admin/src/main/resources/templates/dtp/recipe/newRecipe.html

@@ -193,7 +193,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                <!-- 数据行将被插入到这里 -->
+                <!-- 数据行将被插入 -->
                 </tbody>
             </table>
         </div>

health-admin/src/main/resources/templates/dtp/sfrw/SDtpYypzFollowUpSopAdd.html

@@ -40,7 +40,7 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <!-- 数据行将被插入到这里 -->
+                                <!-- 数据行将被插入 -->
                                 </tbody>
                             </table>
                         </div>
@@ -862,8 +862,10 @@
             '<select name="followUpSubject" id="sfzt' + count + '" class="styled-input">' +
             '<option value="">请选择</option>' +
             '<option value="用药指导">用药指导</option>' +
-            '<option value="脱落召回">脱落召回</option>' +
+            '<option value="复诊跟进">复诊跟进</option>' +
+            '<option value="不良反应收集反馈">不良反应收集反馈</option>' +
             '<option value="常规随访">常规随访</option>' +
+            '<option value="脱落召回">脱落召回</option>' +
             '</select>' +
             '<p>'+
             '</p>'+
@@ -873,8 +875,8 @@
             '</p>'+
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>任务素材&nbsp;'+
             '<select name="taskMaterial" id="1-' + count + '" class="styled-input">' +
-            '<option value="表单">表单</option>' +
-            '<option value="表单2">表单2</option>' +
+            '<option value="素材1">素材1</option>' +
+            '<option value="素材2">素材2</option>' +
             '</select>' +
             '<p>'+
             '</p><div id="rwdzform' + count + '" class="myDivrwdz">'+

health-admin/src/main/resources/templates/dtp/sfrw/SDtpYypzFollowUpSopPageEdit.html

@@ -62,7 +62,7 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <!-- 数据行将被插入到这里 -->
+                                <!-- 数据行将被插入 -->
 
                                 </tbody>
                             </table>
@@ -1170,8 +1170,10 @@
             '<select name="followUpSubject" id="sfzt' + count + '" class="styled-input">' +
             '<option value="">请选择</option>' +
             '<option value="用药指导">用药指导</option>' +
-            '<option value="脱落召回">脱落召回</option>' +
+            '<option value="复诊跟进">复诊跟进</option>' +
+            '<option value="不良反应收集反馈">不良反应收集反馈</option>' +
             '<option value="常规随访">常规随访</option>' +
+            '<option value="脱落召回">脱落召回</option>' +
             '</select>' +
             '<p>'+
             '</p>'+
@@ -1181,8 +1183,8 @@
             '</p>'+
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>任务素材&nbsp;'+
             '<select name="taskMaterial" id="1-' + count + '" class="styled-input">' +
-            '<option value="表单">表单</option>' +
-            '<option value="表单2">表单2</option>' +
+            '<option value="素材1">素材1</option>' +
+            '<option value="素材2">素材2</option>' +
             '</select>' +
             '<p>'+
             '</p><div id="rwdzform' + count + '" class="myDivrwdz">'+
@@ -1432,8 +1434,10 @@
                         <select name="followUpSubject" id="sfzt${count}" class="styled-input">
                             <option value="">请选择</option>
                             <option value="用药指导" ${node.followUpSubject === '用药指导' ? 'selected' : ''}>用药指导</option>
-                            <option value="脱落召回" ${node.followUpSubject === '脱落召回' ? 'selected' : ''}>脱落召回</option>
+                            <option value="复诊跟进" ${node.followUpSubject === '复诊跟进' ? 'selected' : ''}>复诊跟进</option>
+                            <option value="不良反应收集反馈" ${node.followUpSubject === '不良反应收集反馈' ? 'selected' : ''}>不良反应收集反馈</option>
                             <option value="常规随访" ${node.followUpSubject === '常规随访' ? 'selected' : ''}>常规随访</option>
+                            <option value="脱落召回" ${node.followUpSubject === '脱落召回' ? 'selected' : ''}>脱落召回</option>
                         </select>
                         <p></p>
                         <strong>&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>任务有效期&nbsp;
@@ -1441,8 +1445,8 @@
                         <p></p>
                         <strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>任务素材&nbsp;
                         <select name="taskMaterial" id="1-${count}" class="styled-input">
-                            <option value="表单" ${node.taskMaterial === '表单' ? 'selected' : ''}>表单</option>
-                            <option value="表单2" ${node.taskMaterial === '表单2' ? 'selected' : ''}>表单2</option>
+                            <option value="素材1" ${node.taskMaterial === '素材1' ? 'selected' : ''}>素材1</option>
+                            <option value="素材2" ${node.taskMaterial === '素材2' ? 'selected' : ''}>素材2</option>
                         </select>
                         <p></p><div id="rwdzform${count}" class="myDivuseForm">
                         <strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>使用表单&nbsp;

health-admin/src/main/resources/templates/gxhpz/addRepurchasedGoods.html

@@ -50,7 +50,7 @@
                                             </tr>
                                             </thead>
                                             <tbody>
-                                            <!-- 数据行将被插入到这里 -->
+                                            <!-- 数据行将被插入 -->
                                             </tbody>
                                         </table>
 

health-system/src/main/java/com/bzd/system/service/dtp/SDtpYypzFollowUpSopService.java

@@ -621,27 +621,33 @@ public class SDtpYypzFollowUpSopService {
             Date generateAdjustedDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
             job2.setExpiryDate(calculateExpiryDate(generateAdjustedDate, taskValidity));
             int STC=  jobService.insertJob2(job2);
+            if (STC > 0) { // 确保第一个任务插入成功
+               // 延迟1秒
+                Thread.sleep(1000);
+                createdDate = SDF.parse(job2.getLastTaskExecutionTime());//获取生成的时间日期 作为第几天后执行任务的基准时间
+                // 通过生成任务的时间 计算执行任务的时间
+                Calendar calendar3 = Calendar.getInstance();
+                calendar3.setTime(createdDate);
+                calendar3.add(Calendar.DAY_OF_MONTH, generationDaysAfter); // 根据 generationDaysAfter 生成后第几天执行任务 来决定执行任务的时间
+                Date generateTaskTime3 = calendar3.getTime();
 
+                // 执行任务 定时器
+                node.put("action", "execute");
+                SysJob job3 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, generationDaysAfter, generationHMS,generateTaskTime3.toString());
+                Date ExCutDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
+                job3.setExpiryDate(ExCutDate);
+                int STA= jobService.insertJob2(job3);
+                }
 
-            createdDate = SDF.parse(job2.getLastTaskExecutionTime());//获取生成的时间日期 作为第几天后执行任务的基准时间
-            // 通过生成任务的时间 计算执行任务的时间
-            Calendar calendar3 = Calendar.getInstance();
-            calendar3.setTime(createdDate);
-            calendar3.add(Calendar.DAY_OF_MONTH, generationDaysAfter); // 根据 generationDaysAfter 生成后第几天执行任务 来决定执行任务的时间
-            Date generateTaskTime3 = calendar3.getTime();
 
-            // 执行任务 定时器
-            node.put("action", "execute");
-            SysJob job3 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, generationDaysAfter, generationHMS,generateTaskTime3.toString());
-            Date ExCutDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
-            job3.setExpiryDate(ExCutDate);
-           int STA= jobService.insertJob2(job3);
         } catch (ParseException e) {
             e.printStackTrace();
         } catch (TaskException e) {
             throw new RuntimeException(e);
         } catch (SchedulerException e) {
             throw new RuntimeException(e);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
         }
     }
     /**1.2.2 时间条件+ 周期节点 PT ok*/
@@ -674,29 +680,35 @@ public class SDtpYypzFollowUpSopService {
             job2.setExpiryDate(calculateExpiryDate(generateAdjustedDate, taskValidity));
             job2.setRemainingExecutions(createTaskExecutionTimes); // 设置剩余执行次数
             int PTC= jobService.insertJob2(job2);
+            if (PTC > 0) { // 确保第一个任务插入成功
+                // 延迟1秒
+                Thread.sleep(1000);
+                // 通过生成任务的时间计算执行任务的时间
+                Calendar calendar3 = Calendar.getInstance();
+                calendar3.setTime(generateAdjustedDate);
+                calendar3.add(Calendar.DAY_OF_MONTH, generationDaysAfter); // 根据 generationDaysAfter 来决定执行任务的时间
+
+                Date executeTaskTime = calendar3.getTime();
+
+                // 执行任务 定时器
+                node.put("action", "execute");
+                SysJob job3 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, generationDaysAfter, generationHMS, executeTaskTime.toString());
+                Date ExCutDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
+                job3.setExpiryDate(ExCutDate);
+                job3.setMaxExecutions(createTaskExecutionTimes); // 设置最大执行次数
+                job3.setCurrentExecutionCount(0); // 初始化当前执行次数为0
+                job3.setRemainingExecutions(createTaskExecutionTimes); // 设置剩余执行次数
+                int PTA= jobService.insertJob2(job3);
+            }
 
-            // 通过生成任务的时间计算执行任务的时间
-            Calendar calendar3 = Calendar.getInstance();
-            calendar3.setTime(generateAdjustedDate);
-            calendar3.add(Calendar.DAY_OF_MONTH, generationDaysAfter); // 根据 generationDaysAfter 来决定执行任务的时间
-
-            Date executeTaskTime = calendar3.getTime();
-
-            // 执行任务 定时器
-            node.put("action", "execute");
-            SysJob job3 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, generationDaysAfter, generationHMS, executeTaskTime.toString());
-            Date ExCutDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
-            job3.setExpiryDate(ExCutDate);
-            job3.setMaxExecutions(createTaskExecutionTimes); // 设置最大执行次数
-            job3.setCurrentExecutionCount(0); // 初始化当前执行次数为0
-            job3.setRemainingExecutions(createTaskExecutionTimes); // 设置剩余执行次数
-            int PTA= jobService.insertJob2(job3);
         } catch (ParseException e) {
             e.printStackTrace();
         } catch (TaskException e) {
             throw new RuntimeException(e);
         } catch (SchedulerException e) {
             throw new RuntimeException(e);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
         }
     }
     /**1.2.3 事件条件+ 单次节点 SE*/
@@ -740,19 +752,23 @@ public class SDtpYypzFollowUpSopService {
                 Date generateAdjustedDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
                 job2.setExpiryDate(calculateExpiryDate(generateAdjustedDate, taskValidity));
                 int SEC= jobService.insertJob2(job2);
+                if (SEC > 0) { // 确保第一个任务插入成功
+                    // 延迟1秒
+                    Thread.sleep(1000);
+                    // 通过生成任务的时间计算执行任务的时间
+                    Calendar calendar3 = Calendar.getInstance();
+                    calendar3.setTime(generateAdjustedDate);
+                    calendar3.add(Calendar.DAY_OF_MONTH, generationDaysAfter); // 根据 generationDaysAfter 来决定执行任务的时间
+                    Date executeTaskTime = calendar3.getTime();
+
+                    // 执行任务 定时器
+                    node.put("action", "execute");
+                    SysJob job3 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, generationDaysAfter, generationHMS, executeTaskTime.toString());
+                    Date ExCutDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
+                    job3.setExpiryDate(ExCutDate);
+                    int SEA= jobService.insertJob2(job3);
+                }
 
-                // 通过生成任务的时间计算执行任务的时间
-                Calendar calendar3 = Calendar.getInstance();
-                calendar3.setTime(generateAdjustedDate);
-                calendar3.add(Calendar.DAY_OF_MONTH, generationDaysAfter); // 根据 generationDaysAfter 来决定执行任务的时间
-                Date executeTaskTime = calendar3.getTime();
-
-                // 执行任务 定时器
-                node.put("action", "execute");
-                SysJob job3 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, generationDaysAfter, generationHMS, executeTaskTime.toString());
-                Date ExCutDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
-                job3.setExpiryDate(ExCutDate);
-               int SEA= jobService.insertJob2(job3);
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -803,22 +819,26 @@ public class SDtpYypzFollowUpSopService {
             job2.setExpiryDate(calculateExpiryDate(generateAdjustedDate, taskValidity));
             job2.setRemainingExecutions(createTaskExecutionTimes); // 设置剩余执行次数
             int PEC=    jobService.insertJob2(job2);
+                if (PEC > 0) { // 确保第一个任务插入成功
+                    // 延迟1秒
+                    Thread.sleep(1000);
+                    // 通过生成任务的时间计算执行任务的时间
+                    Calendar calendar3 = Calendar.getInstance();
+                    calendar3.setTime(generateAdjustedDate);
+                    calendar3.add(Calendar.DAY_OF_MONTH, generationDaysAfter); // 根据 generationDaysAfter 来决定执行任务的时间的
+                    Date executeTaskTime = calendar3.getTime();
+
+                    // 执行任务 定时器
+                    node.put("action", "execute");
+                    SysJob job3 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, generationDaysAfter, generationHMS, executeTaskTime.toString());
+                    Date ExCutDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
+                    job3.setExpiryDate(ExCutDate);
+                    job3.setMaxExecutions(createTaskExecutionTimes); // 设置最大执行次数
+                    job3.setCurrentExecutionCount(0); // 初始化当前执行次数为0
+                    job3.setRemainingExecutions(createTaskExecutionTimes); // 设置剩余执行次数
+                    int PEA=  jobService.insertJob2(job3);
+                }
 
-            // 通过生成任务的时间计算执行任务的时间
-            Calendar calendar3 = Calendar.getInstance();
-            calendar3.setTime(generateAdjustedDate);
-            calendar3.add(Calendar.DAY_OF_MONTH, generationDaysAfter); // 根据 generationDaysAfter 来决定执行任务的时间
-            Date executeTaskTime = calendar3.getTime();
-
-            // 执行任务 定时器
-            node.put("action", "execute");
-            SysJob job3 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, generationDaysAfter, generationHMS, executeTaskTime.toString());
-            Date ExCutDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
-            job3.setExpiryDate(ExCutDate);
-            job3.setMaxExecutions(createTaskExecutionTimes); // 设置最大执行次数
-            job3.setCurrentExecutionCount(0); // 初始化当前执行次数为0
-            job3.setRemainingExecutions(createTaskExecutionTimes); // 设置剩余执行次数
-            int PEA=  jobService.insertJob2(job3);
         } catch (ParseException e) {
             e.printStackTrace();
         }

health-system/src/main/java/com/bzd/system/service/gxhpz/FollowTaskService.java

@@ -9,17 +9,22 @@ import com.bzd.common.utils.StringUtils;
 import com.bzd.common.utils.uuid.IdUtils;
 import com.bzd.quartz.domain.SysJob;
 import com.bzd.quartz.mapper.SysJobMapper;
+import com.bzd.quartz.service.ISysJobService;
 import com.bzd.system.service.dtp.SDtpYypzFollowUpSopService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 import static com.bzd.common.utils.ShiroUtils.getSysUser;
 
@@ -31,9 +36,8 @@ public class FollowTaskService {
     private DaoSupport daoSupport;
     @Autowired
     private com.bzd.system.service.dtp.SDtpYypzFollowUpSopService SDtpYypzFollowUpSopService;
-
     @Autowired
-    private SysJobMapper jobMapper;
+    ISysJobService jobService;
 
     /**
      * 查询列表 
@@ -55,7 +59,9 @@ public class FollowTaskService {
         PageData pdo= (PageData) daoSupport.findForObject("followTaskMapper.selectOneById", pd);
         return pdo;
     }
-
+    private static final SimpleDateFormat SDF_DATE_ONLY = new SimpleDateFormat("yyyy-MM-dd");
+    private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm:ss");
     /**
      * 根据下次随访时间添加新任务 随访途中 结束随访 中断随访的情况
      * @param pd
@@ -64,24 +70,38 @@ public class FollowTaskService {
      */
     @Transactional(rollbackFor = Exception.class)
     public int addNewFollowTask(final PageData pd) throws Exception {
-
         PageData pdnew = (PageData) daoSupport.findForObject("followTaskMapper.selectOneById", pd);
         PageData jobPd = (PageData) daoSupport.findForObject("followTaskMapper.getJobByTaskId", pdnew);
+        PageData pd3=new PageData();
+        pd3.put("id",pdnew.get("nodeId"));
+        pd3.put("mdmCode",pdnew.get("mdmCode"));
+        PageData Object = (PageData) daoSupport.findForObject("SDtpYypzFollowUpSopMapper.selectSOPNodeDrugById", pd3);
+        String createTaskStructures = (String) Object.get("createTaskStructures"); // 生成任务(按)
+        String activateNodeRule = (String) Object.get("activateNodeRule"); // 单次节点或周期节点
+        String nodeFlag="";
+        // 根据不同的生成任务条件和节点规则调用相应的处理方法
+        if ("时间条件".equals(createTaskStructures)) {
+            if ("单次节点".equals(activateNodeRule)) {
+                nodeFlag="ST";
+            } else if ("周期节点".equals(activateNodeRule)) {
+                nodeFlag="PT";
+            }
+        } else if ("事件条件".equals(createTaskStructures)) {
+            if ("单次节点".equals(activateNodeRule)) {
+                nodeFlag="SE";
+            } else if ("周期节点".equals(activateNodeRule)) {
+                nodeFlag="PE";
+            }
+        }
+        // 执行任务 定时器
+        String action="execute";
         // 将 PageData 转换为 SysJob 对象
         SysJob jobp = convertPageDataToSysJob(jobPd);
-
         PageData nodeConfig = (PageData) daoSupport.findForObject("followTaskMapper.getNodeConfigByNodeId", pdnew);
-
         // 解析下次随访时间
         String nextFollowTimeStr = (String) pd.get("next_follow_time");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime nextFollowTime = LocalDateTime.parse(nextFollowTimeStr, formatter);
-
-        // 生成任务ID
-        Integer taskId = (int) IdUtils.get10randomNumber(); // 假设 IdUtils 返回 long 类型，这里进行类型转换
-        pd.put("taskId", taskId);
-        pd.put("taskStatus", "未下发"); // 任务状态：0待执行,已下发，1已完成，2未完成，3已下发，4已取消
-        pd.put("createdAt", DateUtils.getTime());
         // 设置任务属性
         // 获取 storeId 并安全转换为 Integer
         Integer storeId = Integer.parseInt(pd.get("storeId").toString());
@@ -89,54 +109,100 @@ public class FollowTaskService {
         String patientId = (String) pdnew.get("patientId");
         long templateIdl = (long) pdnew.get("nodeId");
         String templateId= String.valueOf(templateIdl);
-
-        pd.put("taskName", pdnew.get("taskName"));
-        pd.put("taskTheme", pdnew.get("taskTheme"));
-        pd.put("businessBelonging", pdnew.get("businessBelonging"));
-        pd.put("patientName", pdnew.get("patientName"));
-        pd.put("nodeId", pdnew.get("nodeId"));
-        pd.put("patientId", pdnew.get("patientId"));
-        pd.put("mdmCode", pdnew.get("mdmCode"));
         Integer planId = Integer.parseInt(pd.get("planId").toString());
-        pd.put("storeId", storeId);
+        Integer taskId = Integer.parseInt(pdnew.get("taskId").toString());
         if (StringUtils.isNotNull(jobp)) {
-            jobp.setJobName(jobp.getJobName() + "二次任务"); // 任务名称
-
+            SysJob job = new SysJob();
+            job.setJobName(jobp.getJobName() + "二次任务"); // 任务名称
             // 获取任务有效期天数
             int taskValidityDays = 0;
             if (StringUtils.isNotNull(nodeConfig)) {
                 taskValidityDays = (int) nodeConfig.get("taskValidity"); // 配置的任务有效期天数
             }
-
-            // 计算任务有效期
             // 计算任务有效期
             LocalDateTime expiryLocalDateTime = nextFollowTime.plus(taskValidityDays, ChronoUnit.DAYS);
             Date expiryDate = Date.from(expiryLocalDateTime.atZone(ZoneId.systemDefault()).toInstant());
-            jobp.setExpiryDate(expiryDate); // 设置任务有效期
+            job.setExpiryDate(expiryDate); // 设置任务有效期
 
             // 生成 Cron 表达式
             String cronExpression = generateCronExpression(nextFollowTime);
-            jobp.setCronExpression(cronExpression); // 设置 Cron 表达式
+            job.setCronExpression(cronExpression); // 设置 Cron 表达式
 
             // 设置调用目标字符串
-            String invokeTarget = String.format("ryTask.triggerTask('%s', %d, '%s', '%s', %d, %d)",
-                    mdmCode, storeId, patientId, templateId, planId, taskId);
-            jobp.setInvokeTarget(invokeTarget); // 设置调用目标字符串
-            jobp.setTaskId(taskId.toString());
-            jobp.setRemark("回访中断后的二次计划任务");
-            jobp.setCreateBy(getSysUser().getLoginName());
-            jobp.setCreateTime(new Date());
-            jobp.setCurrentExecutionCount(0);
+            String invokeTarget = String.format("ryTask.triggerTask('%s','%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
+                    nextFollowTime, nodeFlag, action, mdmCode, storeId, patientId, templateId, planId, taskId);
+            job.setInvokeTarget(invokeTarget); // 设置调用目标字符串
+            job.setTaskId(taskId.toString());
+            job.setRemark("回访中断后的二次计划任务");
+            job.setCreateBy(getSysUser().getLoginName());
+            job.setCreateTime(new Date());
+            job.setCurrentExecutionCount(0);
             // 设置其他任务属性
-            jobp.setMisfirePolicy(ScheduleConstants.MISFIRE_FIRE_AND_PROCEED); // Cron 计划策略 执行一次
-
-            // 插入新任务
-            jobMapper.insertJob(jobp);
+            job.setMisfirePolicy(ScheduleConstants.MISFIRE_FIRE_AND_PROCEED); // Cron 计划策略 执行一次
+            job.setJobGroup(jobp.getJobGroup()); //任务组名
+            job.setJobName("二次"+jobp.getJobName()); // 任务名称
+            job.setConcurrent("1"); // 是否并发执行（0允许 1禁止）
+            job.setStatus("0");
+            job.setPlanId(planId.toString());
+            job.setStoreId(storeId.toString());
+            job.setPatientId(patientId);
+            job.setTaskId(taskId.toString());
+            if(nodeFlag.equals("PE") || nodeFlag.equals("PT")){//如果是周期节点  就要用剩余执行次数+1
+                jobp.setRemainingExecutions(jobp.getRemainingExecutions()+1); // 设置剩余执行次数+1
+                int j= jobService.updateJob(jobp);
+                System.out.println("设置剩余执行次数update job="+j);
+            }
+            return  jobService.insertJob(job);
+        }else {
+            return 0;
         }
-
-        return daoSupport.save("followTaskMapper.insertFollowTask", pd);
     }
+    /**3 生成表达式*/
+    public static String generateCronExpression4(String createdTime, int activateWhichDay, String generationHMS, boolean isActivationJob) {
+        // 正确的日期格式
+        SimpleDateFormat sdfInput = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy", Locale.US);
+        Calendar calendar = Calendar.getInstance();
+
+        try {
+            // 解析传入的创建时间
+            Date date = sdfInput.parse(createdTime);
+            calendar.setTime(date);
+
+            // 加上激活计划的天数
+            calendar.add(Calendar.DAY_OF_MONTH, activateWhichDay);
 
+            if (isActivationJob) {
+                // 对于激活任务，我们只关心日期部分
+                return String.format("%d %d %d %d %d ? %d",
+                        0, // 秒
+                        0, // 分钟
+                        0, // 小时
+                        calendar.get(Calendar.DAY_OF_MONTH), // 日
+                        calendar.get(Calendar.MONTH) + 1, // 月份（Calendar.MONTH 是从0开始计数的）
+                        calendar.get(Calendar.YEAR)); // 年份
+            } else {
+                // 设置具体执行的小时、分钟和秒
+                String[] timeParts = generationHMS.split(":");
+                calendar.set(Calendar.HOUR_OF_DAY, Integer.parseInt(timeParts[0]));
+                calendar.set(Calendar.MINUTE, Integer.parseInt(timeParts[1]));
+                calendar.set(Calendar.SECOND, Integer.parseInt(timeParts[2]));
+
+                // 返回Cron表达式
+                return String.format("%d %d %d %d %d ? %d",
+                        calendar.get(Calendar.SECOND),
+                        calendar.get(Calendar.MINUTE),
+                        calendar.get(Calendar.HOUR_OF_DAY),
+                        calendar.get(Calendar.DAY_OF_MONTH),
+                        calendar.get(Calendar.MONTH) + 1,
+                        calendar.get(Calendar.YEAR)); // 添加年份字段
+            }
+        } catch (ParseException e) {
+            // 提供默认值或采取其他措施处理异常
+            e.printStackTrace();
+            // 这里可以设置一个默认的cron表达式，例如立即执行的任务
+            return "0 0 0 * * ? *"; // 默认每天午夜执行的任务，并且包含年份占位符
+        }
+    }
     /**
      * 根据给定的下次随访时间生成 Cron 表达式
      *
@@ -206,6 +272,27 @@ public class FollowTaskService {
      * @throws Exception
      */
     public Integer update(PageData pd) throws Exception {
+        String suerForm= (String) pd.get("useForm");
+        if(StringUtils.isNotNull(suerForm)){
+            PageData pd1=new PageData();
+            pd1.put("taskId",pd.get("taskId"));
+            pd1.put("planId",pd.get("planId"));
+            pd1.put("storeId",pd.get("storeId"));
+            pd1.put("patientId",pd.get("patientId"));
+            if(suerForm.equals("全量表单")){
+                PageData pdObj= (PageData) daoSupport.findForObject("SGxhpzFollowUpRecordsMapper.selectFollowUpRecordsByTaskId", pd1);
+                if(StringUtils.isNotNull(pdObj)){
+                    pd.put("updatedTime",DateUtils.getTime());
+                    pd.put("operator",getSysUser().getLoginName());
+                    pd.put("follow_up_id",pdObj.get("id"));
+                    int a=  daoSupport.update("SGxhpzFollowUpRecordsMapper.updateSGxhpzFollowUpRecords", pd);
+                }else{
+                    pd.put("createdTime",DateUtils.getTime());
+                    pd.put("operator",getSysUser().getLoginName());
+                    int b= daoSupport.save("SGxhpzFollowUpRecordsMapper.insertSGxhpzFollowUpRecords", pd);
+                }
+            }
+        }
         return daoSupport.update("followTaskMapper.updateFollowTask", pd);
     }
 

health-system/src/main/resources/mapper/dtp/SDtpYypzFollowUpSopMapper.xml

@@ -113,7 +113,16 @@
             and up.templateId = #{templateId}
         </if>
     </select>
-
+    <!-- 通过模版id mdmCode查询节点和药品关联信息 -->
+    <select id="selectSOPNodeDrugById" parameterType="pd" resultType="pd">
+        select up.*,dr.* from s_dtp_yypz_nodeconfig up  left join s_dtp_yypz_template_drug dr on up.templateId=dr.templateId where 1=1
+        <if test="id !=null and id !='' ">
+            and up.id = #{id}
+        </if>
+        <if test="mdmCode !=null and mdmCode !='' ">
+            and dr.productCode = #{mdmCode}
+        </if>
+    </select>
     <!-- 通用查询映射结果 -->
 
     <select id="selectSDtpYypzFollowUpSopList" parameterType="pd" resultType="pd">

health-system/src/main/resources/mapper/dtp/SGxhpzFollowUpRecordsMapper.xml

@@ -22,7 +22,7 @@
                 combined_medication_other_adverse_reactions_handling = #{combinedMedicationOtherAdverseReactionsHandling},
             </if>
             <!-- 是否复查 -->
-            <if test="isReview != null">
+            <if test="isReview != null and isReview != ''">
                 is_review = #{isReview},
             </if>
             <!-- 影像学检查 医保类型 -->
@@ -122,16 +122,16 @@
                 treatment_type = #{treatmentType},
             </if>
             <!-- 用药前治疗方案 -->
-            <if test="preMedicationPlan != null and preMedicationPlan != ''">
-                pre_medication_plan = #{preMedicationPlan},
+            <if test="pre_medication_plan != null and pre_medication_plan != ''">
+                pre_medication_plan = #{pre_medication_plan},
             </if>
             <!-- 目前治疗方案 -->
-            <if test="currentTreatmentPlan != null and currentTreatmentPlan != ''">
-                current_treatment_plan = #{currentTreatmentPlan},
+            <if test="current_treatment_plan != null and current_treatment_plan != ''">
+                current_treatment_plan = #{current_treatment_plan},
             </if>
             <!-- 进展后治疗方案 -->
-            <if test="postProgressionTreatmentPlan != null and postProgressionTreatmentPlan != ''">
-                post_progression_treatment_plan = #{postProgressionTreatmentPlan},
+            <if test="post_progression_treatment_plan != null and post_progression_treatment_plan != ''">
+                post_progression_treatment_plan = #{post_progression_treatment_plan},
             </if>
             <!-- 有无药品适应症 -->
             <if test="hasMedicationIndications != null">
@@ -211,19 +211,19 @@
             </if>
             <!-- 共建项目描述 -->
             <if test="projectDescription != null">
-                project_description = #{projectDescription},
+                project_description = #{projectDFescription},
             </if>
             <!-- 更新时间 -->
             updatedTime = CURRENT_TIMESTAMP,
         </set>
-        WHERE id = #{id}
+        WHERE id = #{follow_up_id}
     </update>
     <!-- 随访记录全量表 添加-->
     <insert id="insertSGxhpzFollowUpRecords" parameterType="pd">
-        INSERT INTO s_gxhpz_follow_up_records (
+        INSERT INTO s_gxhpz_follow_up_records
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <!-- 合并用药是否引起不良反应 -->
-            <if test="combinedMedicationAdverseReaction != null">
+            <if test="combinedMedicationAdverseReaction != null and combinedMedicationAdverseReaction != ''">
                 combined_medication_adverse_reaction,
             </if>
             <!-- 合并用药其他不良反应 -->
@@ -239,7 +239,7 @@
                 combined_medication_other_adverse_reactions_handling,
             </if>
             <!-- 是否复查 -->
-            <if test="isReview != null">
+            <if test="isReview != null and isReview != ''">
                 is_review,
             </if>
             <!-- 影像学检查 医保类型 -->
@@ -247,7 +247,7 @@
                 imaging_insurance_type,
             </if>
             <!-- CT 单选 -->
-            <if test="ctCheck != null">
+            <if test="ctCheck != null and ctCheck != ''">
                 ct_check,
             </if>
             <!-- CT文本 -->
@@ -255,7 +255,7 @@
                 ct_text,
             </if>
             <!-- B超 单选 -->
-            <if test="ultrasoundCheck != null">
+            <if test="ultrasoundCheck != null and ultrasoundCheck != ''">
                 ultrasound_check,
             </if>
             <!-- B超文本 -->
@@ -263,7 +263,7 @@
                 ultrasound_text,
             </if>
             <!-- 核磁 单选 -->
-            <if test="mriCheck != null">
+            <if test="mriCheck != null and mriCheck != ''">
                 mri_check,
             </if>
             <!-- 核磁文本 -->
@@ -339,75 +339,75 @@
                 treatment_type,
             </if>
             <!-- 用药前治疗方案 -->
-            <if test="preMedicationPlan != null and preMedicationPlan != ''">
+            <if test="pre_medication_plan != null and pre_medication_plan != ''">
                 pre_medication_plan,
             </if>
             <!-- 目前治疗方案 -->
-            <if test="currentTreatmentPlan != null and currentTreatmentPlan != ''">
+            <if test="current_treatment_plan != null and current_treatment_plan != ''">
                 current_treatment_plan,
             </if>
             <!-- 进展后治疗方案 -->
-            <if test="postProgressionTreatmentPlan != null and postProgressionTreatmentPlan != ''">
+            <if test="post_progression_treatment_plan != null and post_progression_treatment_plan != ''">
                 post_progression_treatment_plan,
             </if>
             <!-- 有无药品适应症 -->
-            <if test="hasMedicationIndications != null">
+            <if test="hasMedicationIndications != null and hasMedicationIndications != ''">
                 has_medication_indications,
             </if>
             <!-- 药物对该疾病是否有效 -->
-            <if test="drugEffectiveness != null">
+            <if test="drugEffectiveness != null and drugEffectiveness != ''">
                 drug_effectiveness,
             </if>
             <!-- 药物间是否存在临床相互作用 -->
-            <if test="clinicalInteraction != null">
+            <if test="clinicalInteraction != null and clinicalInteraction != ''">
                 clinical_interaction,
             </if>
             <!-- 请描述临床相互作用 -->
-            <if test="clinicalInteractionDescription != null">
+            <if test="clinicalInteractionDescription != null and clinicalInteractionDescription != ''">
                 clinical_interaction_description,
             </if>
             <!-- 是否有不必要重复用药 -->
-            <if test="unnecessaryRepeatedMedication != null">
+            <if test="unnecessaryRepeatedMedication != null and unnecessaryRepeatedMedication != ''">
                 unnecessary_repeated_medication,
             </if>
             <!-- 重复用药首次使用日期 -->
-            <if test="repeatedMedicationFirstUseDate != null">
+            <if test="repeatedMedicationFirstUseDate != null and repeatedMedicationFirstUseDate != ''">
                 repeated_medication_first_use_date,
             </if>
             <!-- 请描述不必要重复用药 -->
-            <if test="unnecessaryRepeatedMedicationDescription != null">
+            <if test="unnecessaryRepeatedMedicationDescription != null and unnecessaryRepeatedMedicationDescription != ''">
                 unnecessary_repeated_medication_description,
             </if>
             <!-- 是否出现用药错误 -->
-            <if test="medicationError != null">
+            <if test="medicationError != null and medicationError != ''">
                 medication_error,
             </if>
             <!-- 用药错误出现时间 -->
-            <if test="medicationErrorTime != null">
+            <if test="medicationErrorTime != null and medicationErrorTime != ''">
                 medication_error_time,
             </if>
             <!-- 请描述用药错误 -->
-            <if test="medicationErrorDescription != null">
+            <if test="medicationErrorDescription != null and medicationErrorDescription != ''">
                 medication_error_description,
             </if>
             <!-- 用药记录 -->
-            <if test="medicationRecord != null">
+            <if test="medicationRecord != null and medicationRecord != ''">
                 medication_record,
             </if>
             <!-- 合并用药记录 -->
-            <if test="combinedMedicationRecord != null">
+            <if test="combinedMedicationRecord != null and combinedMedicationRecord != ''">
                 combined_medication_record,
             </if>
             <!-- 疼痛标准评分NRS -->
-            <if test="painNrsScore != null">
+            <if test="painNrsScore != null and painNrsScore != ''">
                 pain_nrs_score,
             </if>
             <!-- 体力状况评分 -->
-            <if test="physicalConditionScore != null">
+            <if test="physicalConditionScore != null and physicalConditionScore != ''">
                 physical_condition_score,
             </if>
             <!-- 本次回访是否咨询 -->
-            <if test="isConsultation != null">
+            <if test="isConsultation != null and isConsultation != ''">
                 is_consultation,
             </if>
             <!-- 咨询问题类型 -->
@@ -419,44 +419,44 @@
                 specific_question,
             </if>
             <!-- 药师解答 -->
-            <if test="pharmacistResponse != null">
+            <if test="pharmacistResponse != null and pharmacistResponse != ''">
                 pharmacist_response,
             </if>
             <!-- 患者病情评估 -->
-            <if test="patientConditionAssessment != null">
+            <if test="patientConditionAssessment != null and patientConditionAssessment != ''">
                 patient_condition_assessment,
             </if>
             <!-- 共建项目描述 -->
-            <if test="projectDescription != null">
+            <if test="projectDescription != null and projectDescription != ''">
                 project_description,
             </if>
             <!-- 任务id -->
-            <if test="taskId != null and taskId != ''">
-                task_id,
+            <if  test="id != null and id != ''">
+                taskId,
             </if>
             <!-- 计划ID -->
             <if test="planId != null and planId != ''">
-                plan_id,
+                planId,
             </if>
             <!-- 患者id -->
             <if test="patientId != null and patientId != ''">
-                patient_id,
+                patientId,
             </if>
             <!-- 门店id -->
-            <if test="storeId != null and storeId != ''">
-                store_id,
+            <if test="storeId != null">
+                storeId,
             </if>
             <!-- 创建时间 -->
-            created_time,
-            <!-- 更新时间 -->
-            updated_time,
+            <if test="createdTime != null and createdTime != ''">
+                createdTime,
+            </if>
             <!-- 操作人 -->
             operator
         </trim>
-        ) VALUES (
+         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <!-- 合并用药是否引起不良反应 -->
-        <if test="combinedMedicationAdverseReaction != null">
+        <if test="combinedMedicationAdverseReaction != null and combinedMedicationAdverseReaction != ''">
             #{combinedMedicationAdverseReaction},
         </if>
         <!-- 合并用药其他不良反应 -->
@@ -472,7 +472,7 @@
             #{combinedMedicationOtherAdverseReactionsHandling},
         </if>
         <!-- 是否复查 -->
-        <if test="isReview != null">
+        <if test="isReview != null and isReview != ''">
             #{isReview},
         </if>
         <!-- 影像学检查 医保类型 -->
@@ -480,7 +480,7 @@
             #{imagingInsuranceType},
         </if>
         <!-- CT 单选 -->
-        <if test="ctCheck != null">
+        <if test="ctCheck != null and ctCheck != ''">
             #{ctCheck},
         </if>
         <!-- CT文本 -->
@@ -488,7 +488,7 @@
             #{ctText},
         </if>
         <!-- B超 单选 -->
-        <if test="ultrasoundCheck != null">
+        <if test="ultrasoundCheck != null and ultrasoundCheck != ''">
             #{ultrasoundCheck},
         </if>
         <!-- B超文本 -->
@@ -496,7 +496,7 @@
             #{ultrasoundText},
         </if>
         <!-- 核磁 单选 -->
-        <if test="mriCheck != null">
+        <if test="mriCheck != null and mriCheck != ''">
             #{mriCheck},
         </if>
         <!-- 核磁文本 -->
@@ -572,123 +572,135 @@
             #{treatmentType},
         </if>
         <!-- 用药前治疗方案 -->
-        <if test="preMedicationPlan != null and preMedicationPlan != ''">
-            #{preMedicationPlan},
+        <if test="pre_medication_plan != null and pre_medication_plan != ''">
+            #{pre_medication_plan},
         </if>
         <!-- 目前治疗方案 -->
-        <if test="currentTreatmentPlan != null and currentTreatmentPlan != ''">
-            #{currentTreatmentPlan},
+        <if test="current_treatment_plan != null and current_treatment_plan != ''">
+            #{current_treatment_plan},
         </if>
         <!-- 进展后治疗方案 -->
-        <if test="postProgressionTreatmentPlan != null and postProgressionTreatmentPlan != ''">
-            #{postProgressionTreatmentPlan},
+        <if test="post_progression_treatment_plan != null and post_progression_treatment_plan != ''">
+            #{post_progression_treatment_plan},
         </if>
         <!-- 有无药品适应症 -->
-        <if test="hasMedicationIndications != null">
+        <if test="hasMedicationIndications != null and hasMedicationIndications != ''">
             #{hasMedicationIndications},
         </if>
         <!-- 药物对该疾病是否有效 -->
-        <if test="drugEffectiveness != null">
+        <if test="drugEffectiveness != null and drugEffectiveness != ''">
             #{drugEffectiveness},
         </if>
         <!-- 药物间是否存在临床相互作用 -->
-        <if test="clinicalInteraction != null">
+        <if test="clinicalInteraction != null and clinicalInteraction != ''">
             #{clinicalInteraction},
         </if>
         <!-- 请描述临床相互作用 -->
-        <if test="clinicalInteractionDescription != null">
-            #{clinical_interaction_description},
+        <if test="clinicalInteractionDescription != null and clinicalInteractionDescription != ''">
+            #{clinicalInteractionDescription},
         </if>
-        <if test="unnecessaryRepeatedMedication != null">
-            unnecessary_repeated_medication = #{unnecessaryRepeatedMedication},
+        <if test="unnecessaryRepeatedMedication != null and unnecessaryRepeatedMedication != ''">
+            #{unnecessaryRepeatedMedication},
         </if>
         <!-- 重复用药首次使用日期 -->
-        <if test="repeatedMedicationFirstUseDate != null">
-            repeated_medication_first_use_date = #{repeatedMedicationFirstUseDate},
+        <if test="repeatedMedicationFirstUseDate != null and repeatedMedicationFirstUseDate != ''">
+            #{repeatedMedicationFirstUseDate},
         </if>
         <!-- 请描述不必要重复用药 -->
-        <if test="unnecessaryRepeatedMedicationDescription != null">
-            unnecessary_repeated_medication_description = #{unnecessaryRepeatedMedicationDescription},
+        <if test="unnecessaryRepeatedMedicationDescription != null and unnecessaryRepeatedMedicationDescription != ''">
+            #{unnecessaryRepeatedMedicationDescription},
         </if>
         <!-- 是否出现用药错误 -->
-        <if test="medicationError != null">
-            medication_error = #{medicationError},
+        <if test="medicationError != null and medicationError != ''">
+           #{medicationError},
         </if>
         <!-- 用药错误出现时间 -->
-        <if test="medicationErrorTime != null">
-            medication_error_time = #{medicationErrorTime},
+        <if test="medicationErrorTime != null and medicationErrorTime != ''">
+             #{medicationErrorTime},
         </if>
         <!-- 请描述用药错误 -->
-        <if test="medicationErrorDescription != null">
-            medication_error_description = #{medicationErrorDescription},
+        <if test="medicationErrorDescription != null and medicationErrorDescription != ''">
+             #{medicationErrorDescription},
         </if>
         <!-- 用药记录 -->
-        <if test="medicationRecord != null">
-            medication_record = #{medicationRecord},
+        <if test="medicationRecord != null and medicationRecord != ''">
+            #{medicationRecord},
         </if>
         <!-- 合并用药记录 -->
-        <if test="combinedMedicationRecord != null">
-            combined_medication_record = #{combinedMedicationRecord},
+        <if test="combinedMedicationRecord != null and combinedMedicationRecord != ''">
+           #{combinedMedicationRecord},
         </if>
         <!-- 疼痛标准评分NRS -->
-        <if test="painNrsScore != null">
-            pain_nrs_score = #{painNrsScore},
+        <if test="painNrsScore != null and painNrsScore != ''">
+             #{painNrsScore},
         </if>
         <!-- 体力状况评分 -->
-        <if test="physicalConditionScore != null">
-            physical_condition_score = #{physicalConditionScore},
+        <if test="physicalConditionScore != null and physicalConditionScore != ''">
+             #{physicalConditionScore},
         </if>
         <!-- 本次回访是否咨询 -->
-        <if test="isConsultation != null">
-            is_consultation = #{isConsultation},
+        <if test="isConsultation != null and isConsultation != ''">
+            #{isConsultation},
         </if>
         <!-- 咨询问题类型 -->
         <if test="consultationType != null and consultationType != ''">
-            consultation_type = #{consultationType},
+            #{consultationType},
         </if>
         <!-- 具体问题 -->
         <if test="specificQuestion != null and specificQuestion != ''">
-            specific_question = #{specificQuestion},
+            #{specificQuestion},
         </if>
         <!-- 药师解答 -->
-        <if test="pharmacistResponse != null">
-            pharmacist_response = #{pharmacistResponse},
+        <if test="pharmacistResponse != null and pharmacistResponse != ''">
+             #{pharmacistResponse},
         </if>
         <!-- 患者病情评估 -->
-        <if test="patientConditionAssessment != null">
-            patient_condition_assessment = #{patientConditionAssessment},
+        <if test="patientConditionAssessment != null and patientConditionAssessment != ''">
+           #{patientConditionAssessment},
         </if>
         <!-- 共建项目描述 -->
-        <if test="projectDescription != null">
-            project_description = #{projectDescription},
+        <if test="projectDescription != null and projectDescription != ''">
+            #{projectDescription},
         </if>
         <!-- 任务id -->
-        <if test="taskId != null and taskId != ''">
-            taskId = #{taskId},
+        <if test="id != null and id != ''">
+             #{id},
         </if>
         <!-- 计划ID -->
         <if test="planId != null and planId != ''">
-            planId = #{planId},
+             #{planId},
         </if>
         <!-- 患者id -->
         <if test="patientId != null and patientId != ''">
-            patientId = #{patientId},
+           #{patientId},
         </if>
         <!-- 门店id -->
-        <if test="storeId != null and storeId != ''">
-            storeId = #{storeId},
+        <if test="storeId != null">
+             #{storeId},
         </if>
         <!-- 创建时间 -->
-        <if test="createdTime != null">
-            createdTime = #{createdTime},
+        <if test="createdTime != null and createdTime != ''">
+             #{createdTime},
         </if>
-        <!-- 更新时间 -->
-        updatedTime = CURRENT_TIMESTAMP,
         <!-- 操作人 -->
         <if test="operator != null and operator != ''">
-            operator = #{operator},
+           #{operator},
         </if>
-       </trim>)
+       </trim>
     </insert>
-
+    <select id="selectFollowUpRecordsByTaskId" parameterType="pd" resultType="pd">
+    select * from s_gxhpz_follow_up_records where 1=1
+    <if test="taskId !=null and taskId !='' ">
+        and taskId = #{taskId}
+    </if>
+    <if test="patientId !=null and patientId !='' ">
+        and patientId = #{patientId}
+    </if>
+    <if test="storeId !=null and storeId !='' ">
+        and storeId = #{storeId}
+    </if>
+    <if test="patientId !=null and patientId !='' ">
+        and patientId = #{patientId}
+    </if>
+   </select>
 </mapper>

health-system/src/main/resources/mapper/gxhpz/followTaskMapper.xml

@@ -67,7 +67,61 @@
 
     <!-- 根据ID查询单个任务 -->
     <select id="selectOneById" parameterType="pd" resultType="pd">
-        select t.*,p.name,
+        select t.*,
+               mr.id as mrId,
+               mr.combined_medication_adverse_reaction AS combinedMedicationAdverseReaction,
+               mr.combined_medication_other_adverse_reactions AS combinedMedicationOtherAdverseReactions,
+               mr.combined_medication_other_adverse_reactions_image AS combinedMedicationOtherAdverseReactionsImage,
+               mr.combined_medication_other_adverse_reactions_handling AS combinedMedicationOtherAdverseReactionsHandling,
+               mr.is_review AS isReview,
+               mr.imaging_insurance_type AS imagingInsuranceType,
+               mr.ct_check AS ctCheck,
+               mr.ct_text AS ctText,
+               mr.ultrasound_check AS ultrasoundCheck,
+               mr.ultrasound_text AS ultrasoundText,
+               mr.mri_check AS mriCheck,
+               mr.mri_text AS mriText,
+               mr.other_imaging_examinations AS otherImagingExaminations,
+               mr.imaging_examinations_image AS imagingExaminationsImage,
+               mr.tumor_marker_check AS tumorMarkerCheck,
+               mr.cea AS cea,
+               mr.afp AS afp,
+               mr.ca_199 AS ca199,
+               mr.ca125 AS ca125,
+               mr.ca153 AS ca153,
+               mr.hcg AS hcg,
+               mr.nse AS nse,
+               mr.cyfra21_1 AS cyfra211,
+               mr.tg AS tg,
+               mr.psa AS psa,
+               mr.tumor_marker_image AS tumorMarkerImage,
+               mr.lab_test_indicators AS labTestIndicators,
+               mr.lab_test_indicators_image AS labTestIndicatorsImage,
+               mr.treatment_type AS treatmentType,
+               mr.pre_medication_plan AS preMedicationPlan,
+               mr.current_treatment_plan AS currentTreatmentPlan,
+               mr.post_progression_treatment_plan AS postProgressionTreatmentPlan,
+               mr.has_medication_indications AS hasMedicationIndications,
+               mr.drug_effectiveness AS drugEffectiveness,
+               mr.clinical_interaction AS clinicalInteraction,
+               mr.clinical_interaction_description AS clinicalInteractionDescription,
+               mr.unnecessary_repeated_medication AS unnecessaryRepeatedMedication,
+               mr.repeated_medication_first_use_date AS repeatedMedicationFirstUseDate,
+               mr.unnecessary_repeated_medication_description AS unnecessaryRepeatedMedicationDescription,
+               mr.medication_error AS medicationError,
+               mr.medication_error_time AS medicationErrorTime,
+               mr.medication_error_description AS medicationErrorDescription,
+               mr.medication_record AS medicationRecord,
+               mr.combined_medication_record AS combinedMedicationRecord,
+               mr.pain_nrs_score AS painNrsScore,
+               mr.physical_condition_score AS physicalConditionScore,
+               mr.is_consultation AS isConsultation,
+               mr.consultation_type AS consultationType,
+               mr.specific_question AS specificQuestion,
+               mr.pharmacist_response AS pharmacistResponse,
+               mr.patient_condition_assessment AS patientConditionAssessment,
+               mr.project_description AS projectDescription,
+               p.name,
                p.dateBirth,
                p.age,
                p.gender,
@@ -91,6 +145,7 @@
             DATE_FORMAT(t.timeFirstDiagnosis, '%Y-%m-%d') AS timeFirstDiagnosis2,
         DATE_FORMAT(p.timeFirstDiagnosis, '%Y-%m-%d %H:%i:%s') AS FirstDiagnosis
         from s_gxhpz_follow_task t
+            left join s_gxhpz_follow_up_records mr on t.taskId = mr.taskId
             left join s_dtp_ysfw_archive_management p on t.patientId = p.id
             left join s_gxhpz_follow_task_node n on t.taskId = n.taskId
             where t.id = #{id}
@@ -687,7 +742,8 @@
     </delete>
     <!--查询定时任务-->
     <select id="getJobByTaskId" parameterType="pd" resultType="pd">
-        select  * from sys_job where task_id = #{taskId}
+        select  * from sys_job where task_id = #{taskId} ORDER BY create_time DESC
+            LIMIT 1;
     </select>
     <!--查询模版节点配置的任务的有效期天数-->
     <select id="getNodeConfigByNodeId" parameterType="pd" resultType="pd">