修改随访表单定时任务

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

@@ -8,6 +8,7 @@ import com.bzd.common.core.controller.BaseController;
 import com.bzd.common.core.domain.AjaxResult;
 import com.bzd.common.core.page.TableDataInfo;
 import com.bzd.common.enums.BusinessType;
+import com.bzd.common.utils.DateUtils;
 import com.bzd.common.utils.ServletUtils;
 import com.bzd.common.utils.StringUtils;
 import com.bzd.common.utils.file.FileUploadUtils;
@@ -25,6 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import static com.bzd.common.config.datasource.DynamicDataSourceContextHolder.log;
+import static oshi.util.UserGroupInfo.getUser;
 
 /**
  * 药事服务管理
@@ -457,7 +459,7 @@ public class PharmaceuticalServiceController extends BaseController {
      * @throws Exception
      */
     @RequiresPermissions("dtp:pmService:remove")
-    @Log(title = "档案管理删除", businessType = BusinessType.DELETE)
+    @Log(title = "随访任务数据删除", businessType = BusinessType.DELETE)
     @PostMapping("/followUpRemove")
     @ResponseBody
     public AjaxResult followUpRemove() throws Exception {
@@ -499,7 +501,7 @@ public class PharmaceuticalServiceController extends BaseController {
      * 保存随访任务数据修改
      */
     @RequiresPermissions("dtp:pmService:edit")
-    @Log(title = "档案管理修改", businessType = BusinessType.UPDATE)
+    @Log(title = "访任务数据修改", businessType = BusinessType.UPDATE)
     @PostMapping("/followUpEdit")
     @ResponseBody
     public AjaxResult followUpEditSave() {
@@ -539,9 +541,21 @@ public class PharmaceuticalServiceController extends BaseController {
     public String followUpAssign() {
         return prefix_followUp_assign + "/followUpAssignList";
     }
-
     /**
-     * 随访任务数据查询
+     * 添加随访任务跟进人
+     *
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("dtp:pmService:add")
+    @GetMapping("/followUpAssignAdd")
+    public String followUpAssignAdd(ModelMap mmap) throws Exception {
+        PageData pd = this.getPageData();
+        mmap.put("posts", 1);
+        return prefix_followUp_assign + "/followUpAssignAdd";
+    }
+    /**
+     * 任务跟进人查询
      * @return
      * @throws Exception
      */
@@ -551,9 +565,110 @@ public class PharmaceuticalServiceController extends BaseController {
     public TableDataInfo followUpAssignList() throws Exception {
         PageData pd = this.getPageData();
         startPage();
-        List<PageData> pageData = pharmaceuticalService.findFollowUpAssignList(pd);
+       String storeId = (String) pd.get("storeId");
+        String flag = (String) pd.get("flag");
+        if(StringUtils.isNotEmpty(flag)){
+            if(flag.equals("1") && StringUtils.isEmpty(storeId)){
+                pd.put("storeId", getSysUser().getDeptId());
+            }
+            if(flag.equals("2")){
+                pd.put("noAssign", "noAssign");
+            }
+            if(flag.equals("3")){
+                pd.put("yesAssign", "yesAssign");
+            }
+            if(flag.equals("4")){
+                pd.put("status", 0);//离职 无效的
+            }
+            if(StringUtils.isEmpty(storeId)){
+                pd.put("storeId", getSysUser().getDeptId());
+            }
+            if(flag.equals("5")){
+                //员工离职交接
+                pd.put("storeId", getSysUser().getDeptId());
+                pd.put("status", 0);//离职 无效的
+                pd.put("default_follow_up", 1);//是否是该门店的默认跟进人：1是，2否
+                //position
+                pd.put("position", "任务跟进人");
+                List<PageData> pageData = pharmaceuticalService.getFollow_up_assignLZJJList(pd);
+                return getDataTable(pageData);
+            }else{
+                List<PageData> pageData = pharmaceuticalService.getFollow_up_assignList(pd);
+                return getDataTable(pageData);
+            }
+        }else{
+            if(StringUtils.isEmpty(storeId)){
+                pd.put("storeId", getSysUser().getDeptId());
+            }
+            List<PageData> pageData = pharmaceuticalService.getFollow_up_assignList(pd);
+            return getDataTable(pageData);
+        }
+
+    }
+    /**
+     * 随访跟进人分配 查询
+     * @return selectPharmacistsByStoreId position position phone status
+     * @throws Exception
+     */
+    @RequiresPermissions("dtp:pmService:followUpAssignList")
+    @PostMapping("/selectPharmacistsByStoreId")
+    @ResponseBody
+    public TableDataInfo selectPharmacistsByStoreId() throws Exception {
+        PageData pd = this.getPageData();
+        startPage();
+        pd.put("storeId", getSysUser().getDeptId());
+        pd.put("position", "任务跟进人");
+        pd.put("status", 1);
+        List<PageData> pageData = pharmaceuticalService.selectPharmacistsByStoreId(pd);
         return getDataTable(pageData);
     }
+    /**
+     * 修改随访跟进人
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("dtp:pmService:edit")
+    @PostMapping("/editFollowUpAssign")
+    @ResponseBody
+    public AjaxResult editFollowUpAssignById() throws Exception {
+        PageData pd = this.getPageData();
+        startPage();
+        PageData pd1 = new PageData();
+        pd1.put("up","up");
+        pd1.put("id",pd.get("followUpPersonId"));
+        pd1.put("followUpPersonName",pd.get("pharmacistName"));
+        pd1.put("followUpPersonPhone",pd.get("phone"));//跟进人手机号
+        int  result= pharmaceuticalService.editFollowUpAssignById(pd1);//到这里
+        if(result>0){
+            AjaxResult.success("修改成功");
+        }else{
+            return AjaxResult.error("修改失败");
+        }
+        return null;
+    }
+    /**
+     * 修改随访跟进人
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("dtp:pmService:edit")
+    @PostMapping("/editFollowTaskAssignById")
+    @ResponseBody
+    public AjaxResult editFollowTaskAssignById() throws Exception {
+        PageData pd = this.getPageData();
+        startPage();
+        PageData pd1 = new PageData();
+        pd1.put("up","up");
+        pd1.put("id",pd.get("taskId"));
+        pd1.put("taskFollower",pd.get("pharmacistName"));
+        int  result= pharmaceuticalService.editFollowTaskAssignById(pd1);//到这里
+        if(result>0){
+            AjaxResult.success("修改成功");
+        }else{
+            return AjaxResult.error("修改失败");
+        }
+        return null;
+    }
 
     /**
      * 随访任务数据删除 根据id
@@ -866,4 +981,33 @@ public class PharmaceuticalServiceController extends BaseController {
             return AjaxResult.error("系统异常：" + e.getMessage());
         }
     }
+    /**
+     * 保存购药记录药品的单次计量单位和单次剂量的数据修改
+     */
+    @RequiresPermissions("dtp:pmService:edit")
+    @Log(title = "购药记录药修改", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateDrugPurchaseRecord")
+    @ResponseBody
+    public AjaxResult updateDrugPurchaseRecord() {
+        PageData pd = this.getPageData();
+        pd.put("up", "up");
+        try {
+            pd.put("updatedTime", DateUtils.getTime());
+            pd.put("updatedBy", getSysUser().getLoginName());
+            Integer updateResult = pharmaceuticalService.updateDrugPurchaseRecord(pd);
+            if (updateResult == 1) {
+                // 成功更新
+                return AjaxResult.success("修改成功");
+            } else {
+                // 更新失败
+                logger.error("Failed to update DrugRecord with ID: {}", pd.get("id"));
+                return AjaxResult.error("修改失败");
+            }
+        } catch (Exception e) {
+            // 异常处理
+            logger.error("Error occurred while updating DrugRecord with ID: {}, Exception: {}", pd.get("id"), e.getMessage(), e);
+            return AjaxResult.error("系统异常：" + e.getMessage());
+        }
+    }
+
 }

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

@@ -195,7 +195,7 @@ public class RecipeRegisterController extends BaseController {
     public AjaxResult saveCFDJ() throws Exception {
         PageData pd = this.getPageData();
         PageData p = dtpService.saveCFDJ(pd);
-        if(p.get("code").toString().equals("200")){
+        if(StringUtils.isNotNull(p)   && p.get("code").toString().equals("200")){
             return AjaxResult.success(p);
         }else{
             return AjaxResult.error(p.get("msg").toString(),"");

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

@@ -18,9 +18,13 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 随访任务任务控制层
@@ -50,6 +54,8 @@ public class FollowTaskController extends BaseController {
     public TableDataInfo TaskList() throws Exception {
         PageData pd = this.getPageData();
         startPage();
+        //随访任务表单展示信息：只展示任务动作为表单任务的数据，不显示触达任务的数据
+        pd.put("taskActionTaskType","表单任务");//任务动作(任务类型) 触达任务 表单任务
         List<PageData> pageData = followTaskService.findForList(pd);
         return  getDataTable(pageData);
     }
@@ -63,6 +69,7 @@ public class FollowTaskController extends BaseController {
     public TableDataInfo PlanList() throws Exception {
         PageData pd = this.getPageData();
         startPage();
+
         List<PageData> pageData = followPlanService.findForList(pd);
         return  getDataTable(pageData);
     }
@@ -149,21 +156,94 @@ public class FollowTaskController extends BaseController {
         String returnMethod = (String)pd.get("returnMethod");
         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)){
             pd.put("taskStatus", "已完成");//任务状态：\r\n,0待执行，\r\n1已完成，\r\n2未完成，\r\n3已下发，\r\n4已取消
         }
+        String next_follow_time = (String) pd.get("next_follow_time");
+        if (StringUtils.isNotEmpty(next_follow_time)) {
+            try {
+                // 获取当前时间
+                String currentTime = DateUtils.getTime(); // 假设返回格式为 "yyyy-MM-dd HH:mm:ss"
+                // 解析日期字符串
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date nextFollowTimeDate = dateFormat.parse(next_follow_time);
+                Date currentDateTime = dateFormat.parse(currentTime);
+                // 比较两个日期
+                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);
+
+                    // 将间隔天数放入 pd 中
+                    pd.put("interval_this_time", (int) intervalDays);
+
+                    newTask=true;//=true符合条件 下次任务随访时间 意味着生成一个新的任务
+
+                } else {
+                    // 如果下次随访时间小于或等于当前时间，则任务状态为“已完成”
+                    pd.put("taskStatus", "已完成");
+                    pd.put("interval_this_time", 0); // 已完成的任务不需要显示间隔天数
+                }
+            } catch (ParseException e) {
+                e.printStackTrace();
+                // 处理日期解析异常
+                pd.put("taskStatus", "解析错误");
+                pd.put("interval_this_time", null);
+            }
+        }
+//        else {
+//            // 如果下次随访时间为空，则默认任务状态为“未完成”
+//            pd.put("taskStatus", "未完成");
+//            pd.put("interval_this_time", null);
+//        }
+        pd.put("storeId", getSysUser().getDeptId());//登记人
         pd.put("operator", getSysUser().getLoginName());//登记人
         pd.put("updatedAt", DateUtils.getTime());//更新时间
         pd.put("actualFollowUpTime", DateUtils.getTime());//实际随访时间
         pd.put("completionTime", DateUtils.getTime());//完成时间
+
         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
+                pd.put("planId", planId);
+                pd.put("storeId", getSysUser().getDeptId());
+                Integer closeResult = followPlanService.closeAllPlan(pd);//关闭该患者所有计划任务
+                System.out.println(pd+"<参数操作结果>"+closeResult);
+            }
+        }
+
+        if(newTask){
+            //生成新任务 int FollowTask = dao.executeBatch("followTaskMapper.insertFollowTask", pdCPB);//预存数据任务
+            int addResult = followTaskService.addNewFollowTask(pd);//关闭该患者所有计划任务
+            System.out.println(pd+"<生成新任务>"+addResult);
+        }
         if(update<=0){
             return error("保存失败");
         }
         return toAjax(update);
     }
-
+    /**
+     * 关闭计划原因页面
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("gxhpz:task:edit")
+    @GetMapping("/closePlanPage/{id}")
+    public String closePlanPage(@PathVariable("id") Long id, ModelMap mmap) throws Exception {
+            return prefix_followUp + "/closePlanPage";
+    }
     /**
      * 随访任务数据修改
      *
@@ -180,13 +260,18 @@ public class FollowTaskController extends BaseController {
         PageData pd3=new PageData();
         PageData pd4=new PageData();
         PageData pd5=new PageData();
+        PageData pd6=new PageData();
         PageData pdt1=new PageData();
         PageData pdt2=new PageData();
         PageData pageData = followTaskService.selectOneById(pd);//根据任务id查询随访任务数据
-
+       String pagIndex="精简表单";//默认为精简表单
         if (StringUtils.isNotNull(pageData)) {
+            String useForm= (String) pageData.get("useForm");
+            if(StringUtils.isNotEmpty(useForm)){
+                pagIndex=useForm;
+            }
             pd2.put("patientId", pageData.get("patientId"));
-
+            pd2.put("storeId", getSysUser().getDeptId());
             pd3.put("patientId", pageData.get("patientId"));//去查计划的条件 常规随访的
             pd3.put("mdmCode", pageData.get("mdmCode"));//去查计划的条件 常规随访的
             pd3.put("businessBelonging", "常规随访");//去查计划的条件 常规随访的
@@ -197,41 +282,44 @@ public class FollowTaskController extends BaseController {
 
             pd5.put("id", pageData.get("patientId"));//去查购药记录的条件
             PageData Plan1 = followPlanService.selectPlanByCPB(pd3);//去查计划 常规随访的
-            pd1 = pharmaceuticalService.selectPatientById(pd2);//查询患者信息
+            //pd1 = pharmaceuticalService.selectPatientById(pd2);//查询患者信息
+            pd1 = pharmaceuticalService.selectFollowUpPerson(pd2);//查询跟进人数据信息
             if(StringUtils.isNotNull(Plan1)){
 
                 pdt1.put("planId", Plan1.get("planId"));
-                pd1.put("planId_cg", Plan1.get("planId"));
-                pd1.put("Plan1",Plan1);//常规随访的 类型的计划
-                pd1.put("follow_up_person",Plan1.get("follow_up_person"));
-                pd1.put("productName",Plan1.get("productName"));
-                pd1.put("specification",Plan1.get("specification"));
-                pd1.put("businessBelonging",Plan1.get("businessBelonging"));
-                pd1.put("createdBy",Plan1.get("createdBy"));
-                pd1.put("createdTime",  Plan1.get("createdTime1"));
-                pd1.put("updatedBy",Plan1.get("updatedBy"));
-                pd1.put("updatedTime",Plan1.get("updatedTime1"));
+                pageData.put("planId_cg", Plan1.get("planId"));
+                pageData.put("mdmCode_cg", Plan1.get("mdmCode"));
+                pageData.put("Plan1",Plan1);//常规随访的 类型的计划
+                pageData.put("follow_up_person",Plan1.get("follow_up_person"));
+                pageData.put("follow_up_person_id",Plan1.get("follow_up_person_id"));
+                pageData.put("productName",Plan1.get("productName"));
+                pageData.put("specification",Plan1.get("specification"));
+                pageData.put("businessBelonging",Plan1.get("businessBelonging"));
+                pageData.put("createdBy",Plan1.get("createdBy"));
+                pageData.put("createdTime",  Plan1.get("createdTime1"));
+                pageData.put("updatedBy",Plan1.get("updatedBy"));
+                pageData.put("updatedTime",Plan1.get("updatedTime1"));
                 // 获取原始的状态值并进行处理
                 Integer status  = (Integer) Plan1.get("status");
                 if (status != null) {
                     switch (status) {
                         case 0:
-                            pd1.put("status","关闭");
+                            pageData.put("status","关闭");
                             break;
                         case 1:
-                            pd1.put("status","进行中");
+                            pageData.put("status","进行中");
                             break;
                         case 2:
-                            pd1.put("status","待开启");
+                            pageData.put("status","待开启");
                             break;
                         default:
-                            pd1.put("status","待开启");
+                            pageData.put("status","待开启");
                             break;
                     }
                 }
                 List<PageData> listTask1= followTaskService.findForList(pdt1);//去查任务 常规随访
                 if(listTask1.size()>0){
-                    pd1.put("listTask1",listTask1);
+                    pageData.put("listTask1",listTask1);
                 }
             }
 
@@ -242,75 +330,93 @@ public class FollowTaskController extends BaseController {
                    pdt2.put("planId", planIdrw);
                    List<PageData> listTask2= followTaskService.findForList(pdt2);//去查任务 脱落召回
                    if(listTask2.size()>0){
-                       pd1.put("listTask2",listTask2);
+                       pageData.put("listTask2",listTask2);
                    }
                }
-                pd1.put("planId_tl", Plan2.get("planId"));
-
-
-                pd1.put("follow_up_person2",Plan2.get("follow_up_person"));
-                pd1.put("productName2",Plan2.get("productName"));
-                pd1.put("specification2",Plan2.get("specification"));
-                pd1.put("businessBelonging2",Plan2.get("businessBelonging"));
-                pd1.put("createdBy2",Plan2.get("createdBy"));
-                pd1.put("createdTime2",Plan2.get("createdTime1"));
-                pd1.put("updatedBy2",Plan2.get("updatedBy"));
-                pd1.put("updatedTime2",Plan2.get("updatedTime1"));
-                pd1.put("Plan2",Plan2);//脱落召回 类型的计划
+                pageData.put("planId_tl", Plan2.get("planId"));
+                pageData.put("mdmCode_tl", Plan2.get("mdmCode"));
+                pageData.put("follow_up_person2",Plan2.get("follow_up_person"));
+                pageData.put("productName2",Plan2.get("productName"));
+                pageData.put("specification2",Plan2.get("specification"));
+                pageData.put("businessBelonging2",Plan2.get("businessBelonging"));
+                pageData.put("createdBy2",Plan2.get("createdBy"));
+                pageData.put("createdTime2",Plan2.get("createdTime1"));
+                pageData.put("updatedBy2",Plan2.get("updatedBy"));
+                pageData.put("updatedTime2",Plan2.get("updatedTime1"));
+                pageData.put("Plan2",Plan2);//脱落召回 类型的计划
                 //pd1.put("status2",Plan2.get("status"));
                 // 获取原始的状态值并进行处理
                 Integer status2  = (Integer) Plan2.get("status");
                 if (status2 != null) {
                     switch (status2) {
                         case 0:
-                            pd1.put("status2","关闭");
+                            pageData.put("status2","关闭");
                             break;
                         case 1:
-                            pd1.put("status2","进行中");
+                            pageData.put("status2","进行中");
                             break;
                         case 2:
-                            pd1.put("status2","待开启");
+                            pageData.put("status2","待开启");
                             break;
                         default:
-                            pd1.put("status2","待开启");
+                            pageData.put("status2","待开启");
                             break;
                     }
                 }
 
             }
+            pd6.put("patientId", pageData.get("patientId"));
+            pd6.put("storeId", getSysUser().getDeptId());
+            List<PageData>  dValueList =pharmaceuticalService.getPatienDvalueList(pd6);//查询患者购药D值用药天数
+            pageData.put("dValueList",dValueList);
             PageData  Degree =followPlanService.getPerfectionDegree(pd2);//查询档案完善度百分比
             List<PageData>  records =pharmaceuticalService.getDrugPurchaseList(pd5);//去查购药记录
-            pd1.put("taskId", pageData.get("id"));
-            pd1.put("patientId", pd1.get("id"));
             if(StringUtils.isNotNull(Degree)){
-                pd1.put("filledFieldsCount",Degree.get("filledFieldsCount"));//字段完成数量
+                pageData.put("filledFieldsCount",Degree.get("filledFieldsCount"));//字段完成数量
                 // 获取原始的完成度百分比并四舍五入
                 Object completenessObj = Degree.get("completenessPercentage");
                 if (completenessObj instanceof BigDecimal) {
                     BigDecimal completenessPercentage = (BigDecimal) completenessObj;
                     // 使用 BigDecimal 的setScale 方法进行四舍五入
                     BigDecimal roundedPercentage = completenessPercentage.setScale(0, BigDecimal.ROUND_HALF_UP);
-                    pd1.put("completenessPercentage", roundedPercentage.intValue()); // 将四舍五入后的值放入 pd1
+                    pageData.put("completenessPercentage", roundedPercentage.intValue()); // 将四舍五入后的值放入 pd1
                 }
             }
            if(records.size()>0){
-               pd1.put("recordsData",records);
+               pageData.put("recordsData",records);
            }
+            //任务跟进人数据
+            if(StringUtils.isNotNull(pd1)){
+                pageData.put("followUpPersonName",pd1.get("followUpPersonName"));//随访跟进人姓名
+                pageData.put("followUpPersonId",pd1.get("id"));//随访跟进id
+            }
+
             //本次任务单个
-            pd1.put("bc_id",pageData.get("id"));//本次任务id
-            pd1.put("bc_planId",pageData.get("planId"));//本次任务的计划id
-            pd1.put("bc_appointmentDate",pageData.get("appointmentDate1"));//预约日期
-            pd1.put("bc_businessBelonging",pageData.get("businessBelonging"));//businessBelonging
-            pd1.put("bc_taskName",pageData.get("taskName"));//任务名称
-            pd1.put("bc_taskTheme",pageData.get("taskTheme"));//任务主题
-            pd1.put("bc_productName",pageData.get("productName"));//商品名
-            pd1.put("bc_taskFollower",pageData.get("taskFollower"));//任务跟进人
-            pd1.put("bc_taskStatus",pageData.get("taskStatus"));//任务状态 0待执行，\r\n1已完成，\r\n2未完成，\r\n3已下发，\r\n4已取消
-            mmap.putAll(pd1);
+            pageData.put("bc_id",pageData.get("id"));//本次任务id
+            pageData.put("bc_planId",pageData.get("planId"));//本次任务的计划id
+            pageData.put("bc_appointmentDate",pageData.get("appointmentDate1"));//预约日期
+            pageData.put("bc_businessBelonging",pageData.get("businessBelonging"));//businessBelonging
+            pageData.put("bc_taskName",pageData.get("taskName"));//任务名称
+            pageData.put("bc_taskTheme",pageData.get("taskTheme"));//任务主题
+            pageData.put("bc_productName",pageData.get("productName"));//商品名
+            pageData.put("bc_taskFollower",pageData.get("taskFollower"));//任务跟进人
+            pageData.put("timeFirstDiagnosis",pageData.get("timeFirstDiagnosis2"));//确诊后首次用药日期
+            pageData.put("FirstDiagnosis",pageData.get("FirstDiagnosis"));//首次确诊时间
+            pageData.put("bc_next_follow_time",pageData.get("next_follow_time2"));//下次随访时间
+            pageData.put("bc_next_taskTheme",pageData.get("next_taskTheme"));//下次任务主题
+            pageData.put("interval_this_time",pageData.get("interval_this_time"));//间隔时间
+
+            pageData.put("bc_taskStatus",pageData.get("taskStatus"));//任务状态 0待执行，\r\n1已完成，\r\n2未完成，\r\n3已下发，\r\n4已取消
+            mmap.putAll(pageData);
         }else{
             mmap.put("未查询到数据 id",id);
         }
-        return prefix_followUp + "/followUpEdit";
+        if(pagIndex.equals("全量表单")){
+            return prefix_followUp + "/followUpEditAll";//全量表单
+        }else {
+            return prefix_followUp + "/followUpEdit";//followUpEdit 精简的表单
+        }
+
     }
 
     /**
@@ -342,13 +448,13 @@ public class FollowTaskController extends BaseController {
     public AjaxResult closePlan() throws Exception
     {
         PageData pd = this.getPageData();
+        System.out.println("关闭计划"+pd);
         Integer update = followPlanService.closePlan(pd);
         if(update>0){
             return AjaxResult.success("关闭计划成功");
         }else{
             return AjaxResult.error("关闭计划失败");
         }
-
     }
     /**
      * 关闭任务

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

@@ -50,7 +50,7 @@ public class PharmacistsController extends BaseController {
         return  getDataTable(pageData);
     }
     /**
-     * 新增页面
+     * 新增药师页面
      */
     @GetMapping("/add")
     public String add(ModelMap mmap)
@@ -59,6 +59,16 @@ public class PharmacistsController extends BaseController {
         return prefix + "/pharmacistsAdd";
     }
     /**
+     * 新增任务跟进人页面
+     */
+    @GetMapping("/add2")
+    public String add2(ModelMap mmap)
+    {
+        mmap.put("posts", 1);
+        return prefix + "/followUpTaskAdd";
+    }
+
+    /**
      * 审核药师新增
      */
     //@RequiresPermissions("server:serv:add")
@@ -70,8 +80,6 @@ public class PharmacistsController extends BaseController {
         int result = pharmacistsService.save(pd);
         if(result>0){
             return AjaxResult.success("成功");
-        }if(result == -1){
-            return AjaxResult.warn("D值编码已存在");
         }else {
             return AjaxResult.error("失败");
         }

health-admin/src/main/resources/application-dev.yml

@@ -61,3 +61,7 @@ spring:
                     config:
                         multi-statement-allow: true
 
+    #时区设置
+    jackson:
+        time-zone: GMT+8
+        date-format: yyyy-MM-dd HH:mm:ss

health-admin/src/main/resources/application.yml

@@ -73,7 +73,10 @@ spring:
     restart:
       # 热部署开关
       enabled: true
-
+   #时区设置
+    jackson:
+      time-zone: GMT+8
+      date-format: yyyy-MM-dd HH:mm:ss
 # MyBatis
 mybatis:
   # 搜索指定包别名

health-admin/src/main/resources/static/health/js/ry-ui.js

@@ -1257,6 +1257,11 @@ var table = {
                 }
             },
             // 修改信息，以tab页展现
+            editTabHz: function(id) {
+                table.set();
+                $.modal.openTab("患者档案", $.operate.editHzUrl(id));
+            },
+            // 修改信息，以tab页展现
             editTab: function(id) {
                 table.set();
                 $.modal.openTab("修改" + table.options.modalName, $.operate.editUrl(id));
@@ -1298,6 +1303,21 @@ var table = {
                 return url;
             },
             // 修改访问地址
+            editHzUrl: function(id) {
+                var url = "/404.html";
+                if ($.common.isNotEmpty(id)) {
+                    url = table.options.updateHzUrl.replace("{id}", id);
+                } else {
+                    var id = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
+                    if (id.length == 0) {
+                        $.modal.alertWarning("请至少选择一条记录");
+                        return;
+                    }
+                    url = table.options.updateHzUrl.replace("{id}", id);
+                }
+                return url;
+            },
+            // 修改访问地址
             editUrl2: function(id) {
                 var url = "/404.html";
                 if ($.common.isNotEmpty(id)) {

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

@@ -0,0 +1,530 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增复购品')" />
+    <th:block th:include="include :: select2-css" />
+    <th:block th:include="include :: bootstrap-fileinput-css" />
+</head>
+<body>
+<div class="main-content">
+
+    <div class="form-horizontal">
+        <input type="hidden" id="id" name="id" th:value="${id}">
+        <div class="customize-form-group">
+            <label style="color:olive;font-size: 15px;">复购配置->关联D值品:</label>
+            <input name="dValueKey" placeholder="输入D值品名称或D值id查询" class="styled-input" type="text" id="dValueKeyInput">
+            <input name="dValueId" placeholder="D值品id" class="styled-input" style="width: 60px;" type="text" readonly id="dValueIdInput">
+            <input name="dValueNameInput" placeholder="" class="styled-input" type="text" disabled id="dValueNameInput">
+            <button type="button" data-toggle="modal" data-target="#myModal" class="styled-input" style="width: 70px; color: #1E9FFF" id="addDvalueButton111">新增D值</button>
+        </div>
+        <p class="pull-right">
+        <div class="customize-form-group">
+            <div class="panel-body">
+                <div class="form-group" id="formGroup">
+                    <div class="col-sm-12">
+                        <div class="col-sm-11" id="carGroup">
+                            <!-- 假设这是你的 HTML 结构 -->
+                            <div id="iboxContainer">
+                                <div class="ibox" id="data-ibox">
+                                    <div class="ibox-title">复购药品</div>
+                                    <div class="ibox-content">
+                                        <table class="table table-bordered" id="drugInfoTable">
+
+
+                                            <thead>
+                                            <tr>
+                                                <th>药品编码</th>
+                                                <th>药品名</th>
+                                                <th>通用名</th>
+                                                <th>规格</th>
+                                                <th>包装</th>
+                                                <th>厂家简称</th>
+                                                <th class="hidden-column">是否随访管理品</th>
+                                                <th class="hidden-column">是否冷链管理品</th>
+                                                <th class="hidden-column">是否登记管理品</th>
+                                                <th class="hidden-column">是否慈善援助管理品</th>
+                                                <th class="hidden-column">给药方式</th>
+                                                <th class="hidden-column">说明书适应症</th>
+                                                <th class="hidden-column">用法用量</th>
+                                                <th>操作 + <a type="button" class="btn btn-xs btn-info"  onclick="selectUsersToParentCallBack2()">添加药品</a></th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <!-- 数据行将被插入到这里 -->
+                                            </tbody>
+                                        </table>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+        </p>
+        <div class="center-block ibox-title" >
+            <label class="is-required">请选择提交方式：</label>
+<!--            th:checked="${dict.dictValue}==${status}"-->
+            <div class="input-groups" th:with="type=${@dict.getType('gxhpz_yppz_dzpztjfs')}">
+                <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  name="saveStatus" id="saveStatus">
+            </div>
+        </div>
+    </div>
+
+    <div class="modal inmodal" id="myModal" tabindex="-1" role="dialog" aria-hidden="true">
+        <div class="modal-dialog">
+            <form class="form-horizontal" id="form-relation-add">
+                <div class="modal-content animated bounceInRight">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
+                        </button>
+                        <h4 class="modal-title">新增D值</h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="customize-search-form">
+                            <div class="customize-form-group edit">
+                                <label>D值品id</label>
+                                <div class="input-group">
+                                    <input type="text" placeholder="系统自动赋值" class="styled-input edit_inputs"  style="width: 350px;height: 50px;" id="dvauleId" name="dvauleid" disabled>
+                                </div>
+                            </div>
+                            <div class="customize-form-group edit">
+                                <label>D值品名称</label>
+                                <div class="input-group">
+                                    <input type="text" placeholder="=商品名&通用名&生产厂家简称" class="styled-input edit_inputs"  style="width: 350px; height: 50px;" id="dname" name="dname">
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                        <button type="button" class="btn btn-primary" onclick="saveRow()">确定</button>
+                    </div>
+                </div>
+
+            </form>
+
+        </div>
+    </div>
+</div>
+
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: select2-js" />
+<th:block th:include="include :: bootstrap-fileinput-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "yppz/drugConfig";
+    var prefix_yp = ctx + "dtp/recipe";
+    var prefix_dzpz = ctx + "dzpz/dvalueConfig";
+    var data;
+    var hzparam =[];
+    var hzparam2 =[];
+    var dvauleid='';
+    var dname='';
+
+    // 定义一个函数来更新按钮的可见性
+    function updateButtonVisibility() {
+        var dValueId = $('#dValueIdInput').val().trim();
+        if (dValueId) {
+            $('#addDvalueButton').hide();
+        } else {
+            $('#addDvalueButton').show();
+        }
+    }
+    $(document).ready(function() {
+        // 假设pageData中有drugCode, productName等属性
+        var drugCode = /*[[${drugCode}]]*/ '';
+        var productName = /*[[${productName}]]*/ '';
+
+        console.log("Drug Code: " + drugCode);
+        console.log("Product Name: " + productName);
+
+        // 使用Thymeleaf的语法来获取后端传来的值
+        var drugData = /*[[${drugData}]]*/ {};
+if(drugData != null || drugData != undefined){
+    console.log("data===" + JSON.stringify(drugData));
+    var tableBody = $('#drugInfoTable tbody');
+    var row = `
+            <tr data-product-id="` + drugData.id + `">
+                <td>` + drugData.mdmCode + `</td>
+                <td>` + drugData.productName + `</td>
+                <td>` + drugData.genericName + `</td>
+                <td>` + drugData.specification + `</td>
+                <td>` + drugData.packaging + `</td>
+                <td>` + drugData.manufacturerShortName + `</td>
+
+                <td class="hidden-column">` + drugData.isFollowUpManaged + `</td>
+                <td class="hidden-column">` + drugData.isColdChainManaged + `</td>
+                <td class="hidden-column">` + drugData.isRegisteredManaged + `</td>
+                <td class="hidden-column">` + drugData.isCharityAidManaged + `</td>
+                <td class="hidden-column">` + drugData.administrationMethod + `</td>
+                <td class="hidden-column">` + drugData.indicationDescription + `</td>
+                <td class="hidden-column">` + drugData.dosageAndAdministration + `</td>
+                <td><button onclick="deleteRow('` + drugData.id + `')" class="btn btn-danger">删除</button></td>
+             </tr>`;
+
+    tableBody.append(row);
+}
+
+        let timeout;
+
+        // 监听 dValueKey 输入框的 input 事件
+        $('#dValueKeyInput').on('input', function() {
+            clearTimeout(timeout);
+            var query = $('#dValueKeyInput').val().trim();
+            // 如果输入为空，清空 dValueId 输入框并停止进一步操作
+            if (!query) {
+                $('#dValueIdInput').val('');
+                $('#dValueName').val('');
+
+                updateButtonVisibility(); // 更新按钮可见性
+                return;
+            }
+
+            // 使用防抖机制延迟发送请求
+            timeout = setTimeout(() => {
+                // 发送 AJAX 请求到服务器查询数据
+                hzparam={query:query};//模拟微信扫码获取微信openId
+                console.log("hzparam===="+hzparam);
+                var tableBody = $('#drugInfoTable tbody');
+                // 清空表格中的所有数据行
+               // $('#drugInfoTable tbody').empty();
+                $.ajax({
+                    cache: true,
+                    type: "POST",
+                    url: prefix_dzpz+'/searchDvalue', // 替换为实际的搜索 URL
+                    data: hzparam,
+                    async: false,
+                    success: function (data) {
+                        console.log("data===="+data);
+                        if(data.code==0){
+
+                            // 如果找到匹配的数据，更新 dValueId 输入框
+                            $('#dValueIdInput').val(data.data.d_value_code);
+                            $('#dValueKeyInput').val(data.data.d_value_code);
+                            $('#dValueNameInput').val(data.data.dValueName);
+
+                            updateButtonVisibility(); // 更新按钮可见性
+            //                 var row = `
+            //     <tr data-product-id="${data.data.id}">
+            //         <td>${data.data.mdmCode}</td>
+            //         <td>${data.data.productName}</td>
+            //         <td>${data.data.genericName}</td>
+            //         <td>${data.data.specification}</td>
+            //          <td>${data.data.packaging}</td>
+            //         <td>${data.data.manufacturerShortName}</td>
+            //          <td class="hidden-column">${data.isFollowUpManaged}</td>
+            //         <td class="hidden-column">${data.isColdChainManaged}</td>
+            //         <td class="hidden-column">${data.isRegisteredManaged}</td>
+            //         <td class="hidden-column">${data.isCharityAidManaged}</td>
+            //         <td class="hidden-column">${data.administrationMethod}</td>
+            //         <td class="hidden-column">${data.indicationDescription}</td>
+            //         <td class="hidden-column">${data.dosageAndAdministration}</td>
+            //         <td><button onclick="deleteRow('${data.data.id}')" class="btn btn-danger">删除</button></td>
+            //     </tr>
+            // `;
+            //                 tableBody.append(row);
+                        }else{
+                            // 清空表格中的所有数据行
+                           // $('#drugInfoTable tbody').empty();
+                            // 如果没有找到匹配的数据，清空 dValueId 输入框
+                            $('#dValueIdInput').val('');
+                            updateButtonVisibility(); // 更新按钮可见性
+                        }
+
+                    },
+                    error: function(error) {
+                        // 清空 dValueId 输入框
+                        $('#dValueIdInput').val('');
+                    }
+                });
+
+            }, 360); // 300ms 的延迟
+        });
+        // 页面加载时检查 dValueIdInput 的初始状态
+        updateButtonVisibility();
+    });
+
+    function submitHandler() {
+        submitDrugInfo();
+    }
+    // callBack获取父窗口方法（方式二） $('#myModal').modal('show');  $('#myModal').modal('hide');  $.modal.close(); openId = document.getElementById('openId').value;
+    function selectUsersToParentCallBack2(){
+        var options = {
+            title: '添加维护D值品',
+            width: 1000,
+            height: 600,
+            url: prefix + '/allDrugsInfo',
+            callBack: doSubmit2
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit2(index, layero){
+        var rows = layero.find("iframe")[0].contentWindow.selectTableObject();
+        if (rows.length == 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
+        }
+
+        var tableBody = $('#drugInfoTable tbody');
+
+        rows.forEach(function(item) {
+            // 检查是否已经存在该药品
+            if (!isProductExist(item.productId)) {
+                // 向表格中添加一行
+                var row = `
+                <tr data-product-id="${item.productId}">
+                    <td>${item.mdmCode}</td>
+                    <td>${item.productName}</td>
+                    <td>${item.genericName}</td>
+                    <td>${item.specification}</td>
+                     <td>${item.packaging}</td>
+                    <td>${item.manufacturerShortName}</td>
+                    <td class="hidden-column">${item.isFollowUpManaged}</td>
+                    <td class="hidden-column">${item.isColdChainManaged}</td>
+                    <td class="hidden-column">${item.isRegisteredManaged}</td>
+                    <td class="hidden-column">${item.isCharityAidManaged}</td>
+                    <td class="hidden-column">${item.administrationMethod}</td>
+                    <td class="hidden-column">${item.indicationDescription}</td>
+                    <td class="hidden-column">${item.dosageAndAdministration}</td>
+
+                    <td><button onclick="deleteRow('${item.productId}')" class="btn btn-danger">删除</button></td>
+                </tr>
+            `;
+
+                tableBody.append(row);
+            } else {
+                $.modal.alertWarning(`药品 ${item.productName} 已经添加了`);
+            }
+        });
+
+        $.modal.close(index);
+    }
+
+    function deleteRow(productId) {
+        // 删除对应行
+        $('#drugInfoTable tbody tr[data-product-id="' + productId + '"]').remove();
+    }
+
+    function isProductExist(productId) {
+        // 检查表格中是否已经存在该药品
+        return $('#drugInfoTable tbody tr[data-product-id="' + productId + '"]').length > 0;
+    }
+    function getSelectedSaveStatus() {
+        return $('input[name="saveStatus"]:checked').val();
+    }
+    function getTableData() {
+        var tableRows = [];
+        $('#drugInfoTable tbody tr').each(function(index, row) {
+            var rowData = {
+                mdmCode: $(row).find('td:eq(0)').text().trim(),
+                productName: $(row).find('td:eq(1)').text().trim(),
+                genericName: $(row).find('td:eq(2)').text().trim(),
+                specification: $(row).find('td:eq(3)').text().trim(),
+                packaging: $(row).find('td:eq(4)').text().trim(),
+                manufacturerShortName: $(row).find('td:eq(5)').text().trim(),
+                // 隐藏列的数据可以从data-*属性中获取
+                isFollowUpManaged: $(row).data('is-follow-up-managed'),
+                isColdChainManaged: $(row).data('is-cold-chain-managed'),
+                isRegisteredManaged: $(row).data('is-registered-managed'),
+                isCharityAidManaged: $(row).data('is-charity-aid-managed'),
+                administrationMethod: $(row).data('administration-method'),
+                indicationDescription: $(row).data('indication-description'),
+                dosageAndAdministration: $(row).data('dosage-and-administration'),
+                productId: $(row).data('product-id')
+            };
+            tableRows.push(rowData);
+        });
+        return tableRows;
+    }
+    function submitDrugInfo() {
+        debugger
+       // $('#dValueIdInput').val('');
+        var dValueId = $('#dValueIdInput').val().trim();
+        var dValueName = $('#dValueNameInput').val().trim();
+        if (!dValueId) {
+            $.modal.alertWarning("请输入有效的D值id");
+            return;
+        }
+        var flag = false;
+       var saveStatus = getSelectedSaveStatus();
+        console.log("saveStatus===="+saveStatus);
+        if(saveStatus =='' || saveStatus ==undefined){
+            $.modal.alertWarning("请选择提交方式");
+            return false;
+        }
+        var saveStatusIn=null;
+        if(saveStatus=="保存"){
+            saveStatusIn=0;
+        }
+        if(saveStatus=="保存并启用"){
+            saveStatusIn= 1;
+        }
+        // 创建一个 FormData 对象用于提交表单数据
+        var formData = new FormData();
+        formData.append('saveStatus', saveStatusIn);
+        formData.append('dValueId', dValueId);
+        formData.append('dValueName', dValueName);
+        formData.append('type', '1');//标记为关联配置操作
+        // 将药物数据序列化为 JSON 字符串并添加到 FormData 中
+
+        formData.append('drugData', JSON.stringify(getTableData()));
+
+        // 发送 AJAX 请求或构建表单进行提交
+        $.ajax({
+            url: prefix + "/editDrugConfig",
+            method: 'POST',
+            data: formData,
+            processData: false,  // 不处理数据，因为 data 已经是字符串
+            contentType: false,  // 不设置内容类型，让浏览器自动设置
+            success: function(response) {
+                console.log('提交成功ok:', response);
+                $.modal.msgSuccess(response.msg);
+                $.modal.close();
+                $.operate.successCallback(response);
+                // 处理成功响应...
+            },
+            error: function(error) {
+                $.modal.alertError("失败");
+                console.error('提交失败:', error);
+                // 处理错误响应...
+            }
+        });
+    }
+    function saveRow() {
+        // 获取表单数据 form-relation-add relationTable 联系人电话 lxrdh 联系人姓名 lxrxm 联系人关系 lxrgx
+        dname = document.getElementById('dname').value;
+        //dvauleid = document.getElementById('dvauleid').value;
+        // 检查数据是否为空
+        if (!dname) {
+            $.modal.alert('请填写D值名称');
+            return;
+        }
+        hzparam2={nameValue:dname};
+        console.log("hzparam========"+hzparam)
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: prefix_dzpz + "/createDVauleId",
+            data: hzparam2,
+            async: false,
+            success: function (data) {
+                if(data.code==0){
+                    dvauleid = data.data.dvauleid;
+                    // 如果找到匹配的数据，更新 dValueId 输入框
+                    $('#dValueIdInput').val(data.data.dvauleid);
+                    $('#dValueKeyInput').val(data.data.dValueName);
+                    $('#dValueNameInput').val(data.data.dValueName);
+                    flag = true;
+                    // 关闭模态框
+                    $('#myModal').modal('hide');
+                    //$.modal.close();
+                }else{
+                    $('#dValueIdInput').val("");
+                    $('#dValueKeyInput').val("");
+                    $('#dValueNameInput').val("");
+                    $.modal.alertError(data.msg);
+                }
+
+            } ,error: function (request) {
+                $.modal.alertError("提交失败");
+            },
+        });
+
+    }
+
+</script>
+<style>
+    .center-block {
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+        width: fit-content;
+    }
+    .hidden {
+        display: none;
+    }
+    .ibox {
+        width: 700px;
+        margin-bottom: 20px;
+        border: 1px solid #e7eaec;
+        border-radius: 4px;
+    }
+    .ibox-title {
+        background-color: #f3f3f4;
+        border-bottom: 1px solid #e7eaec;
+        padding: 10px 15px;
+        font-size: 16px;
+    }
+    .ibox-content {
+        padding: 15px;
+    }
+    .ibox-content h4 {
+        margin-top: 0;
+    }
+    .customize-form-group2 {
+        display: inline-block;
+    }
+    .styled-input2 {
+        padding: 5px;
+        border: 1px solid #ccc;
+        border-radius: 4px;
+        width: 200px;
+    }
+    .styled-input3 {
+        display: inline-block;
+        padding: 5px;
+        border: 1px solid #ccc;
+        border-radius: 4px;
+        width: 100px;
+    }
+    .styled-input4 {
+        display: inline-block;
+        padding: 5px;
+        border: 1px solid #ccc;
+        border-radius: 4px;
+        width: 100px;
+    }
+    .col-sm-6 {
+        width: 125%;
+    }
+    .form-horizontal .form-group {
+        margin-right: 384px;
+        margin-left: 3px;
+    }
+    input[type=file] {
+        display: none;
+    }
+    .form-group {
+        margin-bottom: -1px;
+    }
+    /* 添加一些基础样式 */
+    body {
+        font-family: Arial, sans-serif;
+    }
+    table {
+        width: 400px;
+        border-collapse: collapse;
+    }
+    th, td {
+        text-align: left;
+        padding: 8px;
+        border-bottom: 1px solid #ddd;
+    }
+    tr:nth-child(even) {
+        width: 15px;
+        background-color: #f2f2f2;
+    }
+    .hidden-column {
+        display: none;
+    }
+</style>
+</body>
+</html>
+
+
+
+

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

@@ -0,0 +1,2337 @@
+ <!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('随访任务详情')" />
+    <th:block th:include="include :: layout-latest-css" />
+    <th:block th:include="include :: ztree-css" />
+    <th:block th:include="include :: select2-css" />
+    <th:block th:include="include :: bootstrap-editable-css" />
+
+</head>
+<style>
+    .select2-dropdown {
+        z-index: 9999 !important;
+    }
+    .tabs-container {
+        position: relative;
+    }
+    .styled-input5 {
+        /*display: block; /* 使其独占一行 */
+        width: 150px; /* 宽度为容器宽度 */
+        height: 26px;
+        padding: 6px; /* 内边距 */
+        font-size: 14px; /* 字体大小 */
+        color: #333; /* 字体颜色 */
+        /*background-color: #fff; !* 背景颜色 *!*/
+        border: 1px solid #ccc; /* 边框 */
+        border-radius: 4px; /* 圆角边框 */
+        outline: none; /* 移除轮廓 */
+        transition: all 0.3s ease; /* 过渡动画 */
+    }
+    .btn {
+        background-color: #f2f2f2;
+        border: none;
+        color: black;
+        padding: 5px 10px;
+        text-align: center;
+        text-decoration: none;
+        display: inline-block;
+        font-size: 16px;
+        margin: 4px 2px;
+        cursor: pointer;
+    }
+
+    .btn-primary {
+        background-color: #1a7bb9;
+        color: white;
+    }
+
+    .btn-w-m {
+        width: max-content;
+    }
+
+    .btn-default {
+        background-color: #f2f2f2;
+        color: black;
+    }
+    .btn:hover {
+        opacity: 0.8;
+    }
+    .tab-1a {
+        padding-left: 50px;
+        width: 100px;
+        font-size: 15px
+    }
+    .tab-1b {
+        width: 100px;
+        color: blue;
+        font-size:15px;
+    }
+    .task-follow-up {
+        display: flex;
+        align-items: center;
+    }
+
+    .follow-up-person, .plan-buttons {
+        flex: 1;
+    }
+
+    .plan-buttons {
+        text-align: right;
+    }
+    .ibox-title2 {
+        display: flex;
+        align-items: center;
+        justify-content: start;
+        padding: 6px;
+        border-bottom: 1px solid #ddd;
+    }
+    .right-aligned-link {
+        float: right;
+        margin-left: 20px; /* 增加左侧边距 */
+    }
+
+    .right-aligned-link::after {
+        content: ">";
+        color: blue;
+    }
+    .task-info {
+        flex: 1;
+    }
+
+    .task-details {
+        flex: 2;
+        display: flex;
+        align-items: center;
+        gap: 0px;
+    }
+
+    .task-buttons {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        gap: 10px;
+    }
+
+    .task-buttons span {
+        margin-left: 10px;
+    }
+
+    .task-details span {
+        display: flex;
+        align-items: center;
+        gap: 1px;
+    }
+    .custom-file-upload {
+        position: relative;
+        overflow: hidden;
+        cursor: pointer;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .custom-file-upload input[type=file] {
+        opacity: 0;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+        position: absolute;
+    }
+
+    .custom-file-upload label {
+        background-color: white;
+        border: 2px dashed #007bff;
+        color: #007bff;
+        padding: 20px;
+        text-align: center;
+        display: block;
+        min-height: 150px;
+    }
+    #hbyyjlTable {
+        width: 100%;
+        border-collapse: collapse;
+    }
+
+     th,
+     td {
+        padding: 10px;
+        text-align: center;
+        border-bottom: 1px solid #ddd;
+    }
+
+     thead th {
+        background-color: #f2f2f2;
+        font-weight: bold;
+    }
+
+     tbody tr:hover {
+        background-color: #f5f5f5;
+    }
+
+     .no-data {
+        text-align: center;
+        padding: 0px;
+    }
+
+    .btn-primarys {
+        margin-left: 10px;
+        color: green;
+    }
+
+
+
+    .customize-form-group3 {
+        width: 700px;
+        display: flex;
+    }
+
+    .input-groups3 {
+        flex-direction: column;
+    }
+
+    .radio-item {
+        margin-bottom: 10px;
+    }
+
+    .radio-item label {
+        margin-left: 5px;
+    }
+    .hidden {
+        display: none;
+    }
+
+    .shown {
+        display: block;
+    }
+</style>
+<script>
+
+</script>
+<body>
+<div class="">
+    <div class="ibox">
+        <form id="form-followUp-edit1">
+        <div class="ibox-title">
+            <button class="btn btn-w-m btn-primary"  onclick="editArchives()">完善档案</button>
+            <button type="button" class="btn btn-sm btn-danger pull-right" onclick="closeItem()">返回上一级</button>
+        </div>
+        <div class="customize-form-group">
+            <label>姓名：</label>
+            <input name="name" id="name"   class="select-input" type="text"  th:value="${name}" disabled="true"/>
+            &nbsp;&nbsp; <i class="fa" th:class="${realNameStatus == 1 ? 'fa fa-check' : 'fa fa-close'}" id="checkName"  ></i>
+            &nbsp;
+            <input name="realNameStatus" id="realNameStatus" class="status" type="text"   th:value="${realNameStatus == 1 ? '已实名' : (realNameStatus == 0 ? '未实名' : '')}" readonly>
+            <label>性别：</label>
+            <input name="gender" id="gender"  type="text" class="select-input"  th:value="${gender == 1 ? '女' : (gender == 0 ? '男' : '')}" readonly>
+            <span class="span_line" readonly></span>
+            <label>出生年月：</label>
+            <input name="dateBirth" id="dateBirth" placeholder="出生年月" class="select-input"  type="text"    th:value="${dateBirth}" disabled="true" />
+            <span class="status" style="width: 66px">
+            <input  name="age" type="text" id="age" th:value="${age}" style="text-align: center;width: 30px;border: none;" readonly />岁</span>
+        </div>
+        <div class="customize-form-group">
+            <div th:each="item : ${dValueList}" style="margin-bottom: 10px; border: 1px solid #ccc; padding: 10px;">
+            <span>
+                <strong>药品: <code th:text="${item.genericName}"></code></strong><br>
+                <strong>用药状态: <code th:text="${item.medication_status}"></code></strong><br>
+                <strong>剩余用药天数: <code th:text="${item.sum_total}"></code>天</strong><br>
+            </span>
+            </div>
+        </div>
+
+        <div class="ibox-content">
+            <div>
+                <span>档案完善度：已完善---><div></div></span>
+                <div class="stat-percent" th:text="${completenessPercentage} + ' %'"></div>
+                <div class="progress progress-mini">
+                    <!-- 使用 Thymeleaf 的 th:style 属性动态设置样式 -->
+                    <div class="progress-bar" th:style="'width: ' + ${completenessPercentage} + '%;'"></div>
+                </div>
+            </div>
+        </div>
+     </form>
+    </div>
+    <div class="ui-layout-center">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="tabs-container">
+                    <ul class="nav nav-tabs" id="myUlTabs">
+                        <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true"> 基本信息</a>
+                        </li>
+                        <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">用药购药</a>
+                        </li>
+                        <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">随访计划</a>
+                        </li>
+                    </ul>
+                    <div class="tab-content">
+                        <div id="tab-1" class="tab-pane active">
+                                <form class="customize-search-form" id="form-followUp-edit2" >
+
+                                    <div class="customize-form-group edit">
+                                        <label>手机号码：</label>
+                                        <input name="phoneNumber" id="phoneNumber" class="styled-input" type="text" maxlength="30" th:value="${phoneNumber}" disabled="true">
+                                        <span class="span_line" readonly></span>
+                                    </div>
+
+                                    <div class="customize-form-group">
+                                        <label>配送地址：</label>
+                                        <input name="addr" disabled="true"  id="addr" class="styled-input " type="text" th:value="${addr}">
+                                        <span class="span_line" readonly></span>
+                                    </div>
+                                    <div class="customize-form-group">
+                                        <label>联系人手机号：</label>
+                                        <input name="contactPhone" disabled="true"  id="contactPhone" class="styled-input" type="text" th:value="${contactPhone}">
+                                        <span class="span_line" readonly></span>
+                                    </div>
+                                    <div class="customize-form-group">
+                                        <label>联系人姓名：</label>
+                                        <input name="contactName"disabled="true"  id="contactName" class="styled-input" type="text" th:value="${contactName}">
+                                        <span class="span_line" readonly></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label>D值品名称：</label>
+                                        <input name="dvalueName" id="dvalueName" class="styled-input" type="text"  th:value="${dvalueName}" disabled="true">
+                                        <span class="span_line" readonly></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label>D值品天数：</label>
+                                        <input name="dvalueDay" id="dvalueDay" class="styled-input" type="text" th:value="${dvalueDay}" disabled="true">
+                                        <span class="span_line" readonly></span>
+                                    </div>
+                                    <div class="customize-form-group edit select-time">
+                                        <label>首次确诊时间：</label>
+                                        <input name="timeFirstDiagnosis" disabled="true" class="styled-input"  type="text"  th:value="${timeFirstDiagnosis}">
+                                        <span class="span_line" readonly></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label >证件号码：</label>
+                                        <input name="documentType" placeholder="证件类型" class="styled-input short" style="font-size: 13px" type="text"  th:value="${documentType}" disabled="true">
+                                        <input name="documentNumber" placeholder="请输入证件号码" class="styled-input" type="text" maxlength="30" th:value="${documentNumber}" disabled="true">
+                                        <span class="span_line" readonly></span>
+                                    </div>
+                                    <div class="customize-form-group-container">
+                                        <div class="customize-form-group">
+                                            <label class="col-sm-1 control-label">肿瘤发病部位疾病：</label>
+                                            <select id="category-select1"   class="styled-input edit_inputs select2-multiple"  placeholder="肿瘤发病部位疾病" disabled="true">
+                                            </select>
+                                        </div>
+                                        <div class="customize-form-group">
+                                            <label class="col-sm-1 control-label">肿瘤治疗并发症与合并症：</label>
+                                            <select id="category-select2" class="styled-input edit_inputs select2-multiple"  placeholder="肿瘤治疗并发症与合并症" disabled="true">
+                                            </select>
+                                        </div>
+                                        <div class="customize-form-group">
+                                            <label class="col-sm-1 control-label">风湿免疫疾病名称：</label>
+                                            <select id="category-select3"   class="styled-input edit_inputs select2-multiple"  placeholder="风湿免疫疾病名称" disabled="true">
+                                            </select>
+                                        </div>
+                                        <div class="customize-form-group">
+                                            <label class="col-sm-1 control-label">罕见病疾病：</label>
+                                            <select id="category-select4" class="styled-input edit_inputs select2-multiple"  placeholder="罕见病疾病" disabled="true">
+                                            </select>
+                                        </div>
+                                        <div class="customize-form-group">
+                                            <label class="col-sm-1 control-label">感染类疾病：</label>
+                                            <select id="category-select5"   class="styled-input edit_inputs select2-multiple"  placeholder="感染类疾病" disabled="true">
+                                            </select>
+                                        </div>
+                                        <div class="customize-form-group">
+                                            <label class="col-sm-1 control-label">临时慢病：</label>
+                                            <select id="category-select6"   class="styled-input edit_inputs select2-multiple"  placeholder="临时慢病" disabled="true">
+                                            </select>
+                                        </div>
+                                    </div>
+                                </form>
+                        </div>
+                        <div id="tab-2" class="tab-pane">
+                                    <div class="panel-body">
+                                            <div class="row">
+                                                <div class="col-sm-12 select-table table-striped">
+                                                    <table id="bootstrap-table-2"></table>
+                                                </div>
+                                            </div>
+                                    </div>
+                        </div>
+                    <div id="tab-3" class="tab-pane">
+                            <div class="task-follow-up">
+                                <div class="follow-up-person">
+                                    <label  style="padding-left: 10px;">随访跟进人：</label>
+<!--                                    <code style="font-size: 1.5rem;width: 200px;padding-left: 15px;">-->
+<!--                                        随访跟进人:-->
+<!--                                    </code>-->
+                                    <code id="followUpPersonNameCode" style="font-size: 1.5rem;width: 200px;padding-left: 15px;" th:text="${followUpPersonName}">
+                                    </code>
+<!--                                    <code type="text" id="follow_up_person"  style="border: none; width: 55px; color: red;"  th:value="${follow_up_person}">-->
+<!--                                    </code>-->
+                                    <input type="hidden" id="followUpPersonId" name="followUpPersonId" th:value="${followUpPersonId}"/>
+                                    <input type="hidden" id="followUpPersonName" name="followUpPersonName" th:value="${followUpPersonName}"/>
+                                    <a href="#" onclick="editSFGenJinRen()">修改<i class="glyphicon glyphicon-pencil"></i></a>
+                                </div>
+                                <div class="plan-buttons">
+<!--                                    <button class="btn btn-w-m btn-primary" onclick="showAllPlan()">查看全部计划</button>-->
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="ibox-content">
+                                    <div class="ibox-title2">
+                                             <code style="font-size: 1.5rem;width: 200px;" th:text="${productName}">
+                                             </code>
+                                        <code style="font-size: 1.5rem; width: 200px;" th:text="${specification}">
+                                        </code>
+                                        <code style="font-size: 1.5rem;color: #00B83F;padding-right: 30px;"><i class="glyphicon glyphicon-ice-lolly" th:text="${businessBelonging}"></i></code>
+                                        <code style="font-size: 1.5rem;color: #00B83F;padding-right: 30px;"
+                                              th:text="${status == '关闭'? '已关闭' : status}">
+                                            <!-- 默认文本将被 Thymeleaf 动态替换 -->
+                                        </code>
+                                        <!-- 根据 status 的值决定是否显示关闭计划按钮 -->
+                                        <a th:if="${status != '关闭'}" onclick="closePlan(1)" href="javascript:void(0)" class="right-aligned-link">关闭计划</a>
+                                    </div>
+                                    </div>
+                            </div>
+                            <div class="row">
+                                <div class="ibox-content">
+                                    <div class="ibox-title2">
+                                        <span style="padding-left: 10px;font-size:15px;">创建人:</span>
+                                        <span style="width: 120px;color: #2E2D3C;font-size:15px;padding-right: 40px;" th:text="${createdBy}"></span>
+                                        <span style="font-size:15px;">开始时间:</span> <span style="width: 220px;color: #2E2D3C;font-size:15px;padding-right: 70px;" th:text="${createdTime}"></span>
+                                        <span style="font-size:15px;">更新人:</span> <span style="width: 100px;color: #2E2D3C;font-size:15px;" th:text="${updatedBy}"></span>
+                                        <span style="font-size:15px;">更新时间:</span> <span style="width: 220px;color: #2E2D3C;font-size:15px;padding-right: 70px;" th:text="${updatedTime}"></span>
+<!--                                    <a href="javascript:void(0)" onclick="ViewOperationLog()" class="right-aligned-link">查看操作记录</a>-->
+                                    </div>
+
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-12 select-table table-striped">
+                                    <table id="bootstrap-table-4"></table>
+                                </div>
+                            </div>
+                        <div class="row">
+                            <div class="ibox-content">
+                                <div class="ibox-title2">
+                                    <code style="font-size: 1.5rem;width: 200px;" th:text="${productName2}">
+                                    </code>
+                                    <code style="font-size: 1.5rem; width: 200px;" th:text="${specification2}">
+                                    </code>
+                                    <code style="font-size: 1.5rem;color:#ec971f;padding-right: 30px;"><i class="glyphicon glyphicon-ice-lolly-tasted" th:text="${businessBelonging2}"></i></code>
+                                    <code style="font-size: 1.5rem;color: #00B83F;padding-right: 30px;"
+                                          th:text="${status2 == '关闭'? '已关闭' : status2}">
+                                        <!-- 默认文本将被 Thymeleaf 动态替换 -->
+                                    </code>
+                                    <a th:if="${status2 != '关闭'}" onclick="closePlan(2)" href="javascript:void(0)" class="right-aligned-link">关闭计划</a>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="ibox-content">
+                                <div class="ibox-title2">
+                                    <span style="padding-left: 10px;font-size:15px;">创建人:</span>
+                                    <span style="width: 120px;color: #2E2D3C;font-size:15px;padding-right: 40px;" th:text="${createdBy2}"></span>
+                                    <span style="font-size:15px;">开始时间:</span> <span style="width: 220px;color: #2E2D3C;font-size:15px;padding-right: 70px;" th:text="${createdTime2}"></span>
+                                    <span style="font-size:15px;">更新人:</span> <span style="width: 100px;color: #2E2D3C;font-size:15px;" th:text="${updatedBy2}"></span>
+                                    <span style="font-size:15px;">更新时间:</span> <span style="width: 220px;color: #2E2D3C;font-size:15px;padding-right: 70px;" th:text="${updatedTime2}"></span>
+                                    <!--                                    <a href="javascript:void(0)" onclick="ViewOperationLog()" class="right-aligned-link">查看操作记录</a>-->
+                                </div>
+
+                            </div>
+                        </div>
+                            <div class="row">
+                                <div class="col-sm-12 select-table table-striped">
+                                    <table id="bootstrap-table-5"></table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="ibox-content">
+            <div class="ibox-title2">
+                <div class="task-info">
+                    <h4>本次任务 <code style="font-size: 1.5rem;" th:text="${bc_taskStatus}"></code></h4>
+                </div>
+                    <span style="font-size:15px;">任务名称：
+                        <span style="font-size:15px;" th:text="${bc_taskName}"></span> &nbsp;&nbsp;&nbsp;&nbsp;
+                    </span>
+                    <span style="font-size:15px;">药品：
+                        <span style="font-size:15px;" th:text="${bc_productName}"></span> &nbsp;&nbsp;&nbsp;&nbsp;
+                    </span>
+                        <span style="font-size:15px;">任务主题：
+                            <span>
+                                <select name="taskTheme" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_sfrw_rwzt')}">
+                                    <option value="">请选择</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${bc_taskTheme}"></option>
+                                </select>
+                           </span> &nbsp;&nbsp;&nbsp;&nbsp;
+                       </span>
+                    <span style="font-size:15px;">任务跟进人：
+                        <input type="hidden" id="bc_taskFollower" name="bc_taskFollower" th:value="bc_taskFollower"/>
+                        <span id="bc_taskFollowerCode" style="color: #2E2D3C;font-size:15px;"><code style="font-size: 1.4rem;font-size:15px;" th:text="${bc_taskFollower}" ></code></span>
+                       <a onclick="editTaskGenJinRen()" style="font-size:15px;"> 修改 <i class="glyphicon glyphicon-pencil"></i></a>
+                    </span>
+
+                <div class="task-buttons">
+<!--                    <button class="btn btn-w-m btn-primary" onclick="showDetailHistory()">查看历史随访</button>-->
+                </div>
+            </div>
+        </div>
+        <form id="form-followUp-edit3" class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12">
+                <div class="panel blank-panel">
+                    <div class="panel-heading" style="width: 1100px;">
+                        <div class="panel-options">
+                            <ul class="nav nav-tabs" id="myTabs2">
+                                <li class="active"><a data-toggle="tab" href="#tab-4" aria-expanded="true">本次任务</a>
+                                </li>
+                                <li class=""><a data-toggle="tab" href="#tab-6">用药依从性</a>
+                                </li>
+                                <li class=""><a data-toggle="tab" href="#tab-7" >不良反应</a>
+                                </li>
+                                <li class=""><a data-toggle="tab" href="#tab-8">药物有效性</i></a>
+                                </li>
+                                <li class=""><a data-toggle="tab" href="#tab-9">治疗方案</a>
+                                </li>
+                                <li class=""><a data-toggle="tab" href="#tab-10">适宜性评估</a>
+                                </li>
+                                <li class=""><a data-toggle="tab" href="#tab-11">用药记录</a>
+                                </li>
+                                <li class=""><a data-toggle="tab" href="#tab-12">量表测评</a>
+                                </li>
+                                <li class=""><a data-toggle="tab" href="#tab-13">患者咨询</a>
+                                </li>
+                                <li class=""><a data-toggle="tab" href="#tab-14">其他</a>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+
+                    <div class="panel-body">
+                        <div class="tab-content">
+                            <div id="tab-4" class="tab-pane active">
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">回访方式：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_huifangfangshi')}">
+                                        <input type="hidden" id="id" name="id" th:value="${bc_id}">
+                                        <input type="hidden" id="planId" name="planId" th:value="${planId}">
+                                        <input type="hidden" id="bc_planId" name="bc_planId" th:value="${bc_planId}">
+                                        <input type="hidden" id="planId_cg" name="planId_cg" th:value="${planId_cg}">
+                                        <input type="hidden" id="planId_tl" name="planId_tl" th:value="${planId_tl}">
+                                        <input type="hidden" id="patientId" name="patientId" th:value="${patientId}">
+                                        <input type="radio" class="form-check-radio" name="returnMethod" id="returnMethod" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"   th:checked="${dict.dictLabel}==${returnMethod}">
+                                    </div>
+
+                                    <span class="status"></span>
+                                </div>
+
+                                <div id="weixin" class="hidden">
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required" for="returnImgUrl">回访图片：</label>
+                                        <div class="custom-file-upload">
+                                            <input type="file" id="returnImgUrl" accept=".jpg,.jpeg,.png,.gif">
+                                            <label for="returnImgUrl"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#007bff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg></label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div id="mianfang" class="hidden">
+                                    <div class="customize-form-group edit">
+                                        <label>面访记录：</label>
+                                        <div class="input-groups"  style="width: 50%">
+                                            <input name="InterviewRecord" id="InterviewRecord" placeholder="请输入面访记录" class="styled-input edit_inputs" type="text" th:value="${InterviewRecord}">
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                </div>
+                                <div class="customize-form-group">
+                                    <label>回访对象：</label>
+                                    <select name="returnObject" class="select-input edit_inputs" id="returnObject" th:with="type=${@dict.getType('sys_select_dtp_ysfw_huifangduixaing')}">
+                                        <option value="">请选择</option>
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                                th:selected="${dict.dictLabel}==${returnObject}"></option>
+                                    </select>
+                                    <span class="status"></span>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">是否配合：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                        <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  th:checked="${dict.dictValue}==${iscoordinate}"  name="iscoordinate" id="iscoordinate">
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                            </div>
+                            <div id="tab-6" class="tab-pane active">
+                                <div class="customize-form-group edit" >
+                                    <label>用药状态:</label>
+                                    <div class="input-groups" style="width: 90%" th:with="type=${@dict.getType('sys_gxhpz_yyycx')}">
+                                        <input type="radio" class="form-check-radio" name="medicationStatus"  id="medicationStatus" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"   th:checked="${dict.dictLabel}==${medicationStatus}" >
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">确诊后首次用药日期：</label>
+                                    <div class="input-groups">
+                                        <input name="timeFirstDiagnosis" id="timeFirstDiagnosis" placeholder="确诊后首次用药日期" class="time-input time-input2" type="text"  th:value="${timeFirstDiagnosis}" required>
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div id="csyzyy" class="hidden">
+                                <div class="customize-form-group edit" >
+                                    <label>慈善援助用药：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_gxhpz_chishan_yzyy')}">
+                                        <input type="radio" name="charitable" id="charitable" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${chishanyy}"  >
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                </div>
+                                <div id="yjty" class="hidden">
+                                <div class="customize-form-group edit">
+                                    <label>永久停药时间：</label>
+                                    <div class="input-groups">
+                                        <input name="permanentStopTime" id="permanentStopTime" placeholder="永久停药时间" class="time-input time-input2" type="text"  th:value="${permanentStopTime}" required>
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">永久停药原因：</label>
+                                    <div class="input-groups" style="width: 90%" th:with="type=${@dict.getType('sys_gxhpz_yong_jiu_ting_yao_yuanyin')}">
+                                        <input type="radio" id="perpetual_stopdrug_cause" name="perpetual_stopdrug_cause" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${perpetual_stopdrug_cause}"  >
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label>直接永久停药：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
+                                        <input type="radio" id="stoped" name="stoped" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${stoped}"   >
+                                    </div>
+                                    <span class="status"></span>
+                                    <span class="status"></span>
+                                </div>
+                                </div>
+                                <div id="qtgyqgy" class="hidden">
+                                <div class="customize-form-group edit">
+                                    <label>其他渠道购药：</label>
+                                    <div class="input-groups" style="width: 90%" th:with="type=${@dict.getType('sys_gxhpz_othetqd_gy')}">
+                                        <input type="radio" id="other_channels"   name="other_channels" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${other_channels}">
+                                    </div>
+                                    <span class="status"></span>
+                                    <span class="status"></span>
+                                </div>
+                                </div>
+                                <div id="ycgyycjy" class="hidden">
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">延迟购药(医嘱建议):</label>
+                                    <div class="input-groups" style="width: 90%" th:with="type=${@dict.getType('sys_gxhpz_yanchi_gy_ys_jy')}">
+                                        <input type="radio" id="delay_purchase_doctor"   name="delay_purchase_doctor" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${delay_purchase_doctor}">
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                </div>
+                                <div id="ycgyhzyybgf" class="hidden">
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">延迟购药(用药不规范):</label>
+                                    <div class="input-groups" style="width: 90%" th:with="type=${@dict.getType('sys_gxhpz_yanchi_gyhzyybgf')}">
+                                        <input type="radio" id="delayed_purchase_drugs"   name="delayed_purchase_drugs"  class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${delayed_purchase_drugs}">
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                            </div>
+                             </div>
+                            <div id="tab-7" class="tab-pane active">
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">是否出现不良反应：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
+                                        <input type="radio" class="form-check-radio"  th:each="dict : ${type}"  name="is_adverse_reaction" id="is_adverse_reaction" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"   th:checked="${dict.dictLabel}==${is_adverse_reaction}">
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">合并用药是否引起不良反应：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
+                                        <input type="radio" class="form-check-radio"  th:each="dict : ${type}"  name="hbis_adverse_reaction" id="hbis_adverse_reaction" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"   th:checked="${dict.dictLabel}==${hbis_adverse_reaction}">
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div id="hbyyqtblfydiv">
+                                    <div class="customize-form-group edit">
+                                        <label>合并用药其他不良反应：</label>
+                                        <div class="input-groups">
+                                            <input name="weight" id="hbyyqtblfy" placeholder="合并用药其他不良反应" class="styled-input edit_inputs" type="text"  th:value="${weight}">
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label  for="blfyclfsImage">合并用药其他不良反应图片：</label>
+                                        <div class="custom-file-upload">
+                                            <input type="file" id="blfyclfsImage" name="blfyclfsImage" accept=".jpg,.jpeg,.png,.gif">
+                                            <label for="blfyclfsImage"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#007bff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg></label>
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label>合并用药其他不良反应处理：</label>
+                                        <textarea id="hbyyqtblfycl" name="hbyyqtblfycl" class="styled-input edit_inputs textareas"
+                                                  style="width: auto;height: auto ;border: 1px solid ;"
+                                                  th:text="${hbyyqtblfycl}" placeholder="合并用药其他不良反应处理..." rows="4" cols="112" ></textarea>
+                                        <span class="status"></span>
+                                    </div>
+
+                                </div>
+                                <div id="bulfydiv" class="hidden">
+
+                                    <div class="customize-form-group edit">
+                                        <label>不良反应时间：</label>
+                                        <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
+                                            <input name="adverse_reaction_time" id="adverse_reaction_time" placeholder="不良反应时间" class="time-input time-input2" type="text"  th:value="${adverse_reaction_time}" required>
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                    <span class="status"></span>
+                                     <div  class="tab-pane fade in active">
+                                      <div class="panel-body">
+                                        <div class="customize-search-form">
+                                            <div class="customize-form-group edit">
+                                                <div style="/*display: flex;*/">
+                                                    <label style="width: auto;">不良反应症状:</label>
+                                                    <button type="button" data-toggle="modal"  class="btn btn-ms btn-primary" data-target="#myModal5">新增</button>
+                                                    <table id="byfyTable" style="width: 340px;">
+                                                        <thead>
+                                                        <tr>
+                                                            <th>序号</th>
+                                                            <th>不良反应症状</th>
+                                                            <th>操作</th>
+                                                        </tr>
+                                                        </thead>
+                                                        <tbody id="blfyTableBody">
+                                                        <!-- 表格行将在这里动态添加 -->
+                                                        </tbody>
+                                                    </table>
+                                                </div>
+
+                                                <div class="modal inmodal fade" id="myModal5" tabindex="-1" role="dialog" aria-hidden="true">
+                                                    <div class="modal-dialog modal-lg" style="width: 1000px">
+                                                        <div class="modal-content">
+                                                            <div class="modal-header">
+                                                                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                                                                </button>
+                                                                <h4 class="modal-title">不良反应系统</h4>
+                                                                <!--<small class="font-bold">这里可以显示副标题。</small>-->
+                                                            </div>
+                                                            <div class="modal-body">
+                                                                <div id="element1" class="row">
+                                                                    <div class="col-sm-2">
+                                                                        <select class="province form-control m-b" data-first-title="选择不良反应">
+                                                                            <option value="">请选择</option>
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="col-sm-3">
+                                                                        <select class="city form-control m-b" data-first-title="选择不良反应位置">
+                                                                            <option value="">请选择</option>
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="col-sm-7">
+                                                                        <select class="area form-control m-b" data-first-title="选择不良反应数值">
+                                                                            <option value="">请选择</option>
+                                                                        </select>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="modal-footer">
+                                                                <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                                                                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="selectAdverseReactions()">保存</button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+                            </div>
+
+                            <div id="tab-8" class="tab-pane active">
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">是否复查：</label>
+                                    <select name="patientAwareness" class="select-input" th:with="type=${@dict.getType('sys_yes_no')}" required>
+                                        <option value="">请选择</option>
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                                th:selected="${dict.dictLabel}==${patientAwareness}"></option>
+                                    </select>
+                                    <span class="status"></span>
+                                </div>
+                                <div id="sffcyes">
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required">影像学检查：</label>
+                                        <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_bxlx')}" id="targetInsuranceDiv">
+                                            <input type="checkbox" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"   name="insurance2">
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div id="ctradio">
+                                        <div class="customize-form-group edit" >
+                                            <label>CT：</label>
+                                            <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_mqjjzt')}">
+                                                <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${followUpFeedbackDoctor}"  name="followUpFeedbackDoctor" >
+                                            </div>
+                                            <span class="status"></span>
+                                        </div>
+
+                                        <div class="customize-form-group edit">
+                                            <label>CT文本：</label>
+                                            <div class="input-groups">
+                                                <input name="weight" id="CTtext" placeholder="请输入CT文本" class="styled-input edit_inputs" type="text"  th:value="${weight}">
+                                            </div>
+                                            <span class="status"></span>
+                                        </div>
+                                    </div>
+                                    <div id="bcradio">
+                                        <div class="customize-form-group edit">
+                                            <label>B超：</label>
+                                            <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_mqjjzt')}">
+                                                <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${followUpFeedbackDoctor}"  name="followUpFeedbackDoctor" >
+                                            </div>
+                                            <span class="status"></span>
+                                        </div>
+
+                                        <div class="customize-form-group edit">
+                                            <label>B超文本：</label>
+                                            <div class="input-groups">
+                                                <input name="weight" id="BCtext" placeholder="请输入B超文本" class="styled-input edit_inputs" type="text"  th:value="${weight}">
+                                            </div>
+                                            <span class="status"></span>
+                                        </div>
+                                    </div>
+                                    <div id="HCradio">
+                                        <div class="customize-form-group edit">
+                                            <label>核磁：</label>
+                                            <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_mqjjzt')}">
+                                                <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${followUpFeedbackDoctor}"  name="followUpFeedbackDoctor" >
+                                            </div>
+                                            <span class="status"></span>
+                                        </div>
+
+                                        <div class="customize-form-group edit">
+                                            <label>核磁文本：</label>
+                                            <div class="input-groups">
+                                                <input name="weight" id="HCtext" placeholder="请输入核磁文本它" class="styled-input edit_inputs" type="text"  th:value="${weight}">
+                                            </div>
+                                            <span class="status"></span>
+                                        </div>
+                                    </div>
+                                    <div id="QTradio">
+                                        <div class="customize-form-group edit">
+                                            <label>影像学检查其它：</label>
+                                            <div class="input-groups">
+                                                <input name="weight" id="yxxqtjc" placeholder="请输入影像学检查其它" class="styled-input edit_inputs" type="text"  th:value="${weight}">
+                                            </div>
+                                            <span class="status"></span>
+                                        </div>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label  for="yxxjctpImage">影像学检查图片：</label>
+                                        <div class="custom-file-upload">
+                                            <input type="file" id="yxxjctpImage" name="blfyclfsImage" accept=".jpg,.jpeg,.png,.gif">
+                                            <label for="yxxjctpImage"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#007bff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg></label>
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label  for="zlbjwjcImage">肿瘤物标记检查图片：</label>
+                                        <div class="custom-file-upload">
+                                            <input type="file" id="zlbjwjcImage" name="zlbjwjcImage" accept=".jpg,.jpeg,.png,.gif">
+                                            <label for="zlbjwjcImage"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#007bff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg></label>
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required">肿瘤标记物检查：</label>
+                                        <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_bxlx')}" id="zlbjwjc">
+                                            <input type="checkbox" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"   name="zlbjwjc">
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+
+                                    <div id="zlbjwjcfuji">
+                                        <div class="customize-form-group edit">
+                                            <label>CEA：</label>
+                                            <div class="input-groups">
+                                                <input name="CEA" id="CEA" placeholder="请输入CEA" class="styled-input edit_inputs" type="text"  th:value="${weight}">
+                                            </div>
+                                            <span class="status"></span>
+                                        </div>
+                                    </div>
+
+                                    <div class="customize-form-group edit">
+                                        <label>实验室检查指标：</label>
+                                        <textarea id="sysjczb" name="sysjczb" class="styled-input edit_inputs textareas"
+                                                  style="width: auto;height: 140px ;border: 1px solid ;"
+                                                  th:text="${accompanyingSymptoms}" placeholder="实验室检查指标..." rows="1.9" cols="112" ></textarea>
+
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label>提示</label>
+                                        <input name="tishi" id="tishi" placeholder="可填写中性粒细胞（NEUT）、血小板（PLT）、白蛋白（AIB）、谷丙转氨酶（ALT）、谷草转氨酶（AST）、肌酐（Crea）、总胆红素（T-BIL）" class="styled-input"
+                                               style="border: none" type="text"  value="可填写中性粒细胞（NEUT）、血小板（PLT）、白蛋白（AIB）、谷丙转氨酶（ALT）、谷草转氨酶（AST）、肌酐（Crea）、总胆红素（T-BIL）" readonly>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label  for="sysjctbtp">实验室检查指标图片：</label>
+                                        <div class="custom-file-upload">
+                                            <input type="file" id="sysjctbtp" name="sysjctbtp" accept=".jpg,.jpeg,.png,.gif">
+                                            <label for="sysjctbtp"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#007bff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg></label>
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+
+                                </div>
+
+                            </div>
+
+                            <div id="tab-9" class="tab-pane active">
+                                <div class="customize-search-form">
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required">治疗类型：</label>
+                                        <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_phr')}" id="zhiliaolxDiv">
+                                            <input type="checkbox" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" name="zhiliaolx">
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <div style="display: flex;">
+                                        <label style="width: 100px;">用药前治疗方案:</label>
+                                        <button type="button"  data-toggle="modal" data-target="#myModal1" class="btn-primarys">+新增</button>
+                                        <table id="yyqzlfaTable" style="width: 500px;">
+                                            <thead>
+                                            <tr>
+                                                <th>序号</th>
+                                                <th>治疗方案</th>
+                                                <th>治疗时间</th>
+                                                <th>操作</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody id="yyqzlfaTableBody">
+                                            <!-- 表格行将在这里动态添加 -->
+                                            <tr class="no-data" style="display: none;">
+                                                <td colspan="7">
+                                                    <img th:src="@{/img/locked.png}" alt="暂无数据" style="max-width: 100%;">
+                                                    <p>暂无数据</p>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="modal inmodal" id="myModal1" tabindex="-1" role="dialog" aria-hidden="true">
+                                        <div class="modal-dialog">
+                                            <form class="form-horizontal" id="form-yyqzlfa-add">
+                                                <div class="modal-content animated bounceInRight">
+                                                    <div class="modal-header">
+                                                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
+                                                        </button>
+                                                        <h4 class="modal-title">用药前治疗方案</h4>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >治疗时间</label>
+                                                                <input type="text" name="yyqzltime" placeholder="治疗时间" class="time-input time-input2"  style="width: 200px;" id="yyqzltime">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label>治疗方案</label>
+                                                                <select name="zlfangan" class="styled-input edit_inputs"  style="width: 200px;" th:with="type=${@dict.getType('sys_select_dtp_ysfw_lxryhzgx')}" id="zlfangan">
+                                                                    <option value="">请选择治疗方案</option>
+                                                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                                                            th:selected="${dict.dictLabel}==${member}"></option>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                                                        <button type="button" class="btn btn-primary" onclick="saveRow(1)">保存</button>
+                                                    </div>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="customize-form-group edit">
+                                    <div style="display: flex;">
+                                        <label style="width: 100px;">目前治疗方案:</label>
+                                        <button type="button"  data-toggle="modal" data-target="#myModal1" class="btn-primarys">+新增</button>
+                                        <table id="mqzlfaTable" style="width: 500px;">
+                                            <thead>
+                                            <tr>
+                                                <th>序号</th>
+                                                <th>治疗方案</th>
+                                                <th>治疗时间</th>
+                                                <th>操作</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody id="mqzlfaTableBody">
+                                            <!-- 表格行将在这里动态添加 -->
+                                            <tr class="no-data" style="display: none;">
+                                                <td colspan="7">
+                                                    <img th:src="@{/img/locked.png}" alt="暂无数据" style="max-width: 100%;">
+                                                    <p>暂无数据</p>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
+                                        <div class="modal-dialog">
+                                            <form class="form-horizontal" id="form-mqzlfa-add">
+                                                <div class="modal-content animated bounceInRight">
+                                                    <div class="modal-header">
+                                                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
+                                                        </button>
+                                                        <h4 class="modal-title">目前治疗方案</h4>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >治疗时间</label>
+                                                                <input type="text" name="mqzltime" placeholder="治疗时间" class="time-input time-input2"  style="width: 200px;" id="mqzltime">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label>治疗方案</label>
+                                                                <select name="muqzlfa" class="styled-input edit_inputs"  style="width: 200px;" th:with="type=${@dict.getType('sys_select_dtp_ysfw_lxryhzgx')}" id="muqzlfa">
+                                                                    <option value="">请选择治疗方案</option>
+                                                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                                                            th:selected="${dict.dictLabel}==${member}"></option>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                                                        <button type="button" class="btn btn-primary" onclick="saveRow(2)">保存</button>
+                                                    </div>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <div style="display: flex;">
+                                        <label style="width: 100px;">进展后治疗方案:</label>
+                                        <button type="button"  data-toggle="modal" data-target="#myModal3" class="btn-primarys">+新增</button>
+                                        <table id="jzhzlfaTable" style="width: 500px;">
+                                            <thead>
+                                            <tr>
+                                                <th>序号</th>
+                                                <th>治疗方案</th>
+                                                <th>治疗时间</th>
+                                                <th>操作</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody id="jzhzlfaTableBody">
+                                            <!-- 表格行将在这里动态添加 -->
+                                            <tr class="no-data" style="display: none;">
+                                                <td colspan="7">
+                                                    <img th:src="@{/img/locked.png}" alt="暂无数据" style="max-width: 100%;">
+                                                    <p>暂无数据</p>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="modal inmodal" id="myModal3" tabindex="-1" role="dialog" aria-hidden="true">
+                                        <div class="modal-dialog">
+                                            <form class="form-horizontal" id="form-jzhzlfa-add">
+                                                <div class="modal-content animated bounceInRight">
+                                                    <div class="modal-header">
+                                                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
+                                                        </button>
+                                                        <h4 class="modal-title">进展后治疗方案</h4>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >治疗时间</label>
+                                                                <input type="text" name="jzhzltime" placeholder="治疗时间" class="time-input time-input2"  style="width: 200px;" id="jzhzltime">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label>治疗方案</label>
+                                                                <select name="jzhzlfa" class="styled-input edit_inputs"  style="width: 200px;" th:with="type=${@dict.getType('sys_select_dtp_ysfw_lxryhzgx')}" id="jzhzlfa">
+                                                                    <option value="">请选择治疗方案</option>
+                                                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                                                            th:selected="${dict.dictLabel}==${member}"></option>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                                                        <button type="button" class="btn btn-primary" onclick="saveRow(3)">保存</button>
+                                                    </div>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div id="tab-10" class="tab-pane active">
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">有无药品适应症：</label>
+                                    <select name="patientAwareness" class="select-input" th:with="type=${@dict.getType('sys_yes_no')}" required>
+                                        <option value="">请选择</option>
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                                th:selected="${dict.dictLabel}==${patientAwareness}"></option>
+                                    </select>
+                                    <span class="status"></span>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label  >药物对该疾病是否有效：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_mqjjzt')}">
+                                        <input type="radio" class="form-check-radio"  th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"   th:checked="${dict.dictLabel}==${currentEconomicSituation}" name="currentEconomicSituation" >
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">药物间是否存在临床相互作用：</label>
+                                    <select name="patientAwareness" class="select-input" th:with="type=${@dict.getType('sys_yes_no')}" required>
+                                        <option value="">请选择</option>
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                                th:selected="${dict.dictLabel}==${patientAwareness}"></option>
+                                    </select>
+                                    <span class="status"></span>
+                                </div>
+                                <div id="lcxhzydiv">
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required">请描述临床相互作用：</label>
+                                        <textarea id="ms" name="lcxhzy" class="styled-input edit_inputs textareas"
+                                                  style="width: auto;height: 140px ;border: 1px solid ;"
+                                                  th:text="${accompanyingSymptoms}" placeholder="请描述临床相互作用..." rows="1.9" cols="112" ></textarea>
+
+                                        <span class="status"></span>
+                                    </div>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label>是否有不必要重复用药：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
+                                        <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${followUpFeedbackDoctor}"  name="bbycfyyis" >
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div id="sfybycfyyyes">
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required">重复用药首次使用日期：</label>
+                                        <div class="input-groups select-time">
+                                            <input name="sfybycfyytime" placeholder="确诊后首次用药日期" class="time-input-new styled-input" type="text"  th:value="${timeFirstDiagnosis}">
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required">请描述不必要重复用药：</label>
+                                        <textarea id="bbycfyy" name="bbycfyy" class="styled-input edit_inputs textareas"
+                                                  style="width: auto;height: 140px ;border: 1px solid ;"
+                                                  th:text="${accompanyingSymptoms}" placeholder="请描述不必要重复用药..." rows="1.9" cols="112" ></textarea>
+
+                                        <span class="status"></span>
+                                    </div>
+                                </div>
+
+                                <div class="customize-form-group edit">
+                                    <label>是否出现用药错误：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
+                                        <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${followUpFeedbackDoctor}"  name="yycwis" >
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div id="yycfyes">
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required">用药错误出现时间：</label>
+                                        <div class="input-groups select-time">
+                                            <input name="yycwsj" placeholder="用药错误出现时间" class="time-input-new styled-input" type="text"  th:value="${timeFirstDiagnosis}">
+                                        </div>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required">请描述用药错误：</label>
+                                        <textarea id="yycwms" name="yycwms" class="styled-input edit_inputs textareas"
+                                                  style="width: auto;height: 140px ;border: 1px solid ;"
+                                                  th:text="${accompanyingSymptoms}" placeholder="请描述用药错误..." rows="1.9" cols="112" ></textarea>
+                                        <span class="status"></span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="tab-11" class="tab-pane active">
+                                <div class="customize-form-group edit">
+                                    <div style="display: flex;">
+                                        <label style="width: 100px;">用药记录:</label>
+                                        <button type="button"  data-toggle="modal" data-target="#myModal4" class="btn-primarys">+新增</button>
+                                        <table id="yyjlTable" style="width: 800px;">
+                                            <thead>
+                                            <tr>
+                                                <th>序号</th>
+                                                <th>要命剂量</th>
+                                                <th>用药频率</th>
+                                                <th>开始用药时间</th>
+                                                <th>停药时间</th>
+                                                <th>最后一次用药时间</th>
+                                                <th>注意事项</th>
+                                                <th>操作</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody id="jyyjlTableTableBody">
+                                            <!-- 表格行将在这里动态添加 -->
+                                            <tr class="no-data" style="display: none;">
+                                                <td colspan="7">
+                                                    <img th:src="@{/img/locked.png}" alt="暂无数据" style="max-width: 100%;">
+                                                    <p>暂无数据</p>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="modal inmodal" id="myModal4" tabindex="-1" role="dialog" aria-hidden="true">
+                                        <div class="modal-dialog">
+                                            <form class="form-horizontal" id="form-yyjl-add">
+                                                <div class="modal-content animated bounceInRight">
+                                                    <div class="modal-header">
+                                                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
+                                                        </button>
+                                                        <h4 class="modal-title">用药记录</h4>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >名称</label>
+                                                                <input type="text" name="durgName" placeholder="请输入药品名称" class="styled-input edit_inputs"  style="width: 200px;" id="durgName">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >剂量</label>
+                                                                <input type="text" name="jiliang" placeholder="请输入剂量" class="styled-input edit_inputs"  style="width: 200px;" id="jiliang">
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >开始用药时间</label>
+                                                                <input type="text" name="startyyTime" placeholder="请选择开始用药时间" class="time-input time-input2"  style="width: 200px;" id="startyyTime">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >停药药时间</label>
+                                                                <input type="text" name="tyTime" placeholder="请选择停药药时间" class="time-input time-input2"  style="width: 200px;" id="tyTime">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >最后一次用药时间</label>
+                                                                <input type="text" name="lastsyTime" placeholder="请选择最后一次用药时间" class="time-input time-input2"  style="width: 200px;" id="lastsyTime">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >使用频率</label>
+                                                                <input type="text" name="shiypv" placeholder="请输入使用频率" class="styled-input edit_inputs"  style="width: 200px;" id="shiypv">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >注意事项</label>
+                                                                <input type="text" name="zhuyishix" placeholder="请输入注意事项" class="styled-input edit_inputs"  style="width: 200px;" id="zhuyishix">
+                                                            </div>
+                                                        </div>
+
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                                                        <button type="button" class="btn btn-primary" onclick="saveRow(4)">保存</button>
+                                                    </div>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <div style="display: flex;">
+                                        <label style="width: 100px;">合并用药记录:</label>
+                                        <button type="button"  data-toggle="modal" data-target="#myModal6" class="btn-primarys">+新增</button>
+                                        <table id="hbyyjlTable" style="width: 800px;">
+                                            <thead>
+                                            <tr>
+                                                <th>序号</th>
+                                                <th>要命剂量</th>
+                                                <th>用药频率</th>
+                                                <th>开始用药时间</th>
+                                                <th>停药时间</th>
+                                                <th>最后一次用药时间</th>
+                                                <th>注意事项</th>
+                                                <th>操作</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody id="hbyyjlTableTableBody">
+                                            <!-- 表格行将在这里动态添加 -->
+                                            <!-- 表格行将在这里动态添加 -->
+
+                                            <tr class="no-data" style="display: none;">
+                                                <td colspan="7">
+                                                    <img th:src="@{/img/locked.png}" alt="暂无数据" style="max-width: 100%;">
+                                                    <p>暂无数据</p>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="modal inmodal" id="myModal6" tabindex="-1" role="dialog" aria-hidden="true">
+                                        <div class="modal-dialog">
+                                            <form class="form-horizontal" id="form-hbyyjl-add">
+                                                <div class="modal-content animated bounceInRight">
+                                                    <div class="modal-header">
+                                                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
+                                                        </button>
+                                                        <h4 class="modal-title">合并用药记录</h4>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >名称</label>
+                                                                <input type="text" name="hbdurgName" placeholder="请输入药品名称" class="styled-input edit_inputs"  style="width: 200px;" id="hbdurgName">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >剂量</label>
+                                                                <input type="text" name="hbjiliang" placeholder="请输入剂量" class="styled-input edit_inputs"  style="width: 200px;" id="hbjiliang">
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >开始用药时间</label>
+                                                                <input type="text" name="hbstartyyTime" placeholder="请选择开始用药时间" class="time-input time-input2"  style="width: 200px;" id="hbstartyyTime">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >停药药时间</label>
+                                                                <input type="text" name="hbtyTime" placeholder="请选择停药药时间" class="time-input time-input2"  style="width: 200px;" id="hbtyTime">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >最后一次用药时间</label>
+                                                                <input type="text" name="hblastsyTime" placeholder="请选择最后一次用药时间" class="time-input time-input2"  style="width: 200px;" id="hblastsyTime">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >使用频率</label>
+                                                                <input type="text" name="hbshiypv" placeholder="请输入使用频率" class="styled-input edit_inputs"  style="width: 200px;" id="hbshiypv">
+                                                            </div>
+                                                        </div>
+                                                        <div class="customize-search-form">
+                                                            <div class="customize-form-group edit">
+                                                                <label >注意事项</label>
+                                                                <input type="text" name="hbzhuyishix" placeholder="请输入注意事项" class="styled-input edit_inputs"  style="width: 200px;" id="hbzhuyishix">
+                                                            </div>
+                                                        </div>
+
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                                                        <button type="button" class="btn btn-primary" onclick="saveRow(5)">保存</button>
+                                                    </div>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="tab-12" class="tab-pane active">
+                                <div class="customize-form-group edit">
+                                    <label>疼痛标准评分NRS：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_mqjjzt')}">
+                                        <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${followUpFeedbackDoctor}"  name="NRS" >
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label>体力状况评分：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_ysph')}">
+                                        <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${followUpFeedbackDoctor}"  name="tlzkpf" >
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+
+                            </div>
+                            <div id="tab-13" class="tab-pane active">
+                                <div class="customize-form-group edit">
+                                    <label>本次回访是否咨询：</label>
+                                    <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
+                                        <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${followUpFeedbackDoctor}"  name="bchfsfzx" >
+                                    </div>
+                                    <span class="status"></span>
+                                </div>
+                                <div id="bchfsfzxyes">
+                                    <div class="customize-form-group edit">
+                                        <label class="is-required">咨询问题类型：</label>
+                                        <select name="zxwtlx" class="select-input" th:with="type=${@dict.getType('sys_yes_no')}">
+                                            <option value="">请选择</option>
+                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                                    th:selected="${dict.dictLabel}==${patientAwareness}"></option>
+                                        </select>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label>具体问题：</label>
+                                        <textarea id="jtwt" name="jtwt" class="styled-input edit_inputs textareas"
+                                                  style="width: auto;height: 140px ;border: 1px solid ;"
+                                                  th:text="${accompanyingSymptoms}" placeholder="具体问题..." rows="1.9" cols="112" ></textarea>
+                                        <span class="status"></span>
+                                    </div>
+                                    <div class="customize-form-group edit">
+                                        <label>药师解答：</label>
+                                        <textarea id="ysjd" name="ysjd" class="styled-input edit_inputs textareas"
+                                                  style="width: auto;height: 140px ;border: 1px solid ;"
+                                                  th:text="${accompanyingSymptoms}" placeholder="1-未按随访进度联系上 2-未按时取药 3-减量或停药 4-不良反应不能耐受 5-医生说要调整治疗方案 6-挂不到医生床位/转院 7-医保不够，经济压力 8-情绪不好，生活压力 9-其他" rows="1.9" cols="112" ></textarea>
+                                        <span class="status"></span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="tab-14" class="tab-pane active">
+                                <div class="customize-form-group edit">
+                                    <label class="is-required">患者病情评估：</label>
+                                    <select name="zxwtlx" class="select-input" th:with="type=${@dict.getType('sys_yes_no')}">
+                                        <option value="">请选择</option>
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                                th:selected="${dict.dictLabel}==${patientAwareness}"></option>
+                                    </select>
+                                    <span class="status"></span>
+                                </div>
+                                <div class="customize-form-group edit">
+                                    <label>共建项目描述：</label>
+                                    <textarea id="gjxmu" name="ysjd" class="styled-input edit_inputs textareas"
+                                              style="width: auto;height: 140px ;border: 1px solid ;"
+                                              th:text="${accompanyingSymptoms}" placeholder="请输入共建项目描述" rows="1.9" cols="112" ></textarea>
+                                    <span class="status"></span>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+            <div class="ibox-content" style="background-color: #f5f3f3;">
+                <div class="ibox-title2">
+                    <div class="task-info">
+                        <h4>下次随访时间
+                            <input name="next_follow_time"  id="next_follow_time" placeholder="下次随访时间" class="time-input-new styled-input" type="text"  th:value="${bc_next_follow_time}"/>
+                        </h4>
+                    </div>
+                    <div class="task-details">
+<!--                        <h4> <span>间隔本次任务：<span id="interval_this_time" style="color: #1a7bb9;" th:text="${interval_this_time}"></span >天</span></h4>-->
+                        <span class="status">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <h4> <span>下次任务主题：<span style="color: #1a7bb9;">
+                                    <select name="next_taskTheme" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_sfrw_rwzt')}">
+                                      <option value="">请选择</option>
+                                      <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${bc_next_taskTheme}"></option>
+                                    </select>
+                                </span>
+                                </span></h4>
+                    </div>
+                    <div class="task-buttons">
+                        <div class="ibox-title2">
+                            <button type="button" class="btn btn-warning" style="background-color: #f56666;" onclick="closeItem()">关闭</button>
+                            <div class="task-buttons">
+                                <button type="button" class="btn btn-primary" onclick="submitHandler()">保 存</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+       </div>
+    </div>
+</div>
+
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: select2-js" />
+<th:block th:include="include :: jquery-cxselect-js" />
+<th:block th:include="include :: layout-latest-js" />
+<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
+<th:block th:include="include :: ztree-js" />
+<th:block th:include="include :: bootstrap-table-editable-js" />
+<!--<th:block th:include="include :: select2-css" />
+<th:block th:include="include :: bootstrap-select-css" />
+<th:block th:include="include :: select2-js" />
+<th:block th:include="include :: bootstrap-select-js" />-->
+</body>
+</html>
+
+<script th:inline="javascript">
+    var formSubmitted = true;
+    var prefix = ctx + "dtp/pmService";
+    var prefix_task = ctx + "task/followTask";
+    var  blfyindex=0;
+    //购药记录
+    var recordsData;
+    // 回显数据随访计划
+    var listPlan1;
+    var listPlan2;
+    // 回显数据随访任务
+    var listTask1;
+    var listTask2;
+    function submitHandler() {
+        var selectedValue = $('input[name="returnMethod"]:checked').val();
+        if (!selectedValue) {
+            $.modal.alert('请选择回访方式！');
+            return;
+        }
+        if (selectedValue === '微信' && !$('#returnImgUrl')[0].files.length) {
+            $.modal.alert('微信回访时，回访图片为必填项！');
+            return;
+        }
+        if (selectedValue === '面访' && !$('#InterviewRecord').val()) {
+            $.modal.alert('面访时，面访记录为必填项！');
+            return;
+        }
+        var iscoordinate = $('input[name="iscoordinate"]:checked').val();//是否配合
+        if (!iscoordinate) {
+            $.modal.alert('请选择是否配合！');
+            return;
+        }
+        var returnObject = $("#form-followUp-edit3").serializeArray().find(item => item.name === 'returnObject');
+        if (returnObject.value === '') {
+            $.modal.alertWarning("请选择回访对象");
+            return;
+        }
+
+        var data = $("#form-followUp-edit3").serializeArray();
+        var patientId = $("#patientId").val();
+        var id = $("#id").val();
+        console.log("id=",id);
+        var planId = $("#planId_cg").val();
+
+        // data.push({name:"patientId",value:patientId});
+        // data.push({name:"id",value:id});
+        // data.push({name:"planId",value:planId});
+
+        var is_adverse_reaction = $('input[name="is_adverse_reaction"]:checked').val();
+        if (!is_adverse_reaction) {
+            $.modal.alert('请选择不良反应！');
+            return;
+        }
+        if (is_adverse_reaction === '是') {
+            var adverse_reaction_time = $("#form-followUp-edit3").serializeArray().find(item => item.name === 'adverse_reaction_time');
+            if (adverse_reaction_time.value === '') {
+                $.modal.alertWarning("请选择不良反应时间");
+                return;
+            }
+
+            const blfyTableBody = document.getElementById('blfyTableBody');
+            const rows2 = blfyTableBody.getElementsByTagName('tr');
+            if (rows2.length > 0) {
+                const rowsbyfys = [];//不良反应table
+                $('#blfyTableBody tr').each(function () {
+                    const row = {
+                        id:  $("#id").val(),
+                        byfyData: $(this).find('td:eq(1)').text(),
+                    };
+                    rowsbyfys.push(row);
+                });
+                data.push({name:"adverse_reaction_rows",value:JSON.stringify(rowsbyfys)})
+            }
+            // else{
+            //     $.modal.alertWarning("请选择不良反应症状");
+            //     return;
+            // }
+        }
+
+        $.operate.saveTab(prefix_task + "/followTaskEdit", data);
+
+    }
+
+
+    function deleteRow(button) {
+        const row = button.parentNode.parentNode;
+        row.remove();
+        updateIndices(); // 删除后更新所有行的序号
+    }
+    // 更新所有行的序号
+    function updateIndices() {
+        $('#blfyTableBody tr').each(function(index) {
+            $(this).find('td:first-child').text(index + 1); // 设置序号为当前索引加1
+        });
+    }
+    function selectAdverseReactions() {
+
+        var province = $('.province').val();
+        var city = $('.city').val();
+        var area = $('.area').val();
+        $('.province, .city, .area').val('');
+
+        // 打印不良选择的不良反应
+        console.log('Selected: ' + province + ', ' + city + ', ' + area);
+            var row = '<tr>' +
+                '<td></td>' +
+                '<td>' + province + ', ' + city + ', ' + area + '</td>' +
+                '<td><button class="btn-danger" onclick="deleteRow(this)">删除</button></td>' +
+                '</tr>';
+            $('#blfyTableBody').append(row);
+        blfyindex++; // 增加索引
+        updateIndices(); // 添加后更新所有行的序号
+    };
+
+    //初始化加载
+    $(document).ready(function() {
+        // 通过默认url获取
+        var urlChina = prefix+'/selectAdverseReactions';
+        $.cxSelect.defaults.url = urlChina;
+        $('#element1').cxSelect({
+            selects: ['province', 'city', 'area'],
+            nodata: 'none'
+        });
+        $("#myModal5").hide();
+
+        // 初始化时设置默认显示状态
+        updateVisibility();
+
+        // 监听回访方式的选择变化
+        $('input[name="returnMethod"]').on('change', updateVisibility);
+        // 监听用药状态的选择变化
+        $('input[name="medicationStatus"]').on('change', updateVisibility);
+        // 监听不良反应的选择变化
+        $('input[name="is_adverse_reaction"]').on('change', updateVisibility);
+
+        // 监听点击事件，激活指定的选项卡
+        $('#myUlTabs li a').click(function(e) {
+            // 阻止默认行为
+            //e.preventDefault();
+            // 获取当前点击的选项卡链接
+            var $this = $(this);
+            if($this.attr('href') === '#tab-1'){
+                formSubmitted=true;
+            }
+            if($this.attr('href') === '#tab-2'){
+                formSubmitted=false;
+                // 添加 active 类到当前点击的选项卡
+                $(this).addClass('active');
+                $this.attr('aria-expanded', 'true');
+
+            }
+            // 检查是否为“用药购药”选项卡
+            if ($this.attr('href') === '#tab-2') {
+                // 初始化表格
+                initializeTableForTab('tab-2');
+            }
+            if ($this.attr('href') === '#tab-3') {
+                // 初始化表格
+                initializeTableForTab('tab-3');
+                // 初始化表格
+                initializeTableForTab('tab-4');
+            }
+
+        });
+
+        $('#myTabs2 li a').click(function(e) {
+            // 阻止默认行为
+            e.preventDefault();
+            // 获取当前点击的选项卡链接
+            var $this = $(this);
+            // 移除所有选项卡的 active 类
+            //$('#myTabs li').removeClass('active');
+            //$('.tab-pane').removeClass('active in');
+            $('#myTabs2 li a').addClass('active');
+            // 添加 active 类到当前点击的选项卡
+            $this.parent().addClass('active');
+            // 获取目标选项卡面板的 ID
+            var target = $this.attr('href');
+            // 展示对应的选项卡面板，并更新 aria-expanded
+            $(target).addClass('active in');
+            $this.attr('aria-expanded', 'true');
+            // 执行点击链接对应的动作
+            $this.tab('show');
+            // 移除所有选项卡的激活类
+            //$('.active').removeClass('active');
+            $(this).addClass('active');
+            // 滚动到目标选项卡位置
+            // 将目标内容区滚动到视口中央
+            $('html, body').animate({
+                scrollTop: $(target).offset().top - ($(window).height() / 2)
+            }, 500); // 500毫秒动画时间
+            // scrollToTab($this);
+            // 重新初始化当前选项卡内的表格
+            var tableId = target.replace('#', '');
+           // initializeTableForTab(tableId);
+        });
+
+
+        // 初始化 Select2 插件
+        for (let i = 1; i <= 6; i++) {
+            $(`#category-select${i}`).select2({
+                placeholder: "",
+                allowClear: true
+            });
+        }
+
+        // 获取所有下拉选项的数据
+        $.ajax({
+            url: ctx + 'sp/sp/typeDate',
+            method: 'GET',
+            dataType: 'json',
+            success: function(data) {
+                var selects = [
+                    $('#category-select1'),
+                    $('#category-select2'),
+                    $('#category-select3'),
+                    $('#category-select4'),
+                    $('#category-select5'),
+                    $('#category-select6')
+                ];
+                // 清空已有选项（除了第一个默认选项）
+                selects.forEach(function(select) {
+                    select.find('option').not(':first').remove();
+                });
+                // 添加默认选项到每个下拉列表
+                selects.forEach(function(select) {
+                    if (!select.find('option:first').length) { // 检查是否已经有默认选项
+                        $('<option>', {
+                            value: '',
+                            text : '请选择疾病'
+                        }).prependTo(select); // 使用 prependTo 确保它成为第一个选项
+                    }
+                });
+                // 解析 dl 数据并获取 ID 数组
+                var dl = /*[[${dl}]]*/ '';
+                var dlParsed = JSON.parse(dl);
+                var dlIds = Array.isArray(dlParsed) ? dlParsed.map(item => item.id.toString()) : [];
+                // 遍历返回的数据并添加选项
+                $.each(data.value || [], function(index, item) {
+                    var selectIndex = item.dict_key-1; // 假设 dict_key 是从 1 开始的索引
+                    if (selectIndex >= 0 && selectIndex < selects.length) {
+                        $('<option>', {
+                            value: item.id,
+                            text : item.categoryName
+                        }).appendTo(selects[selectIndex]);
+                        // 设置选中的值（仅当 dlIds 包含该项 id 时）
+                        if (dlIds.includes(item.id.toString())) {
+                            selects[selectIndex].val(item.id).trigger('change');
+                        }
+                    }
+                });
+                // 如果使用 Select2 插件，则初始化或刷新它们
+                selects.forEach(function(select) {
+                    select.trigger('change');
+                });
+            },
+            error: function(xhr, status, error) {
+                console.error("Failed to load disease categories:", error);
+            }
+        });
+        //购药记录
+         recordsData = /*[[${recordsData}]]*/ '';
+        // 回显数据随访计划
+         listPlan1 = /*[[${Plan1}]]*/ '';
+        listPlan2 = /*[[${Plan2}]]*/ '';
+
+        // 回显数据随访计划
+        listTask1 = /*[[${listTask1}]]*/ '';
+        listTask2 = /*[[${listTask2}]]*/ '';
+    });
+    // 默认显示/隐藏逻辑
+    function updateVisibility() {
+        var weixinDiv = $('#weixin');
+        var mianfangDiv = $('#mianfang');
+
+        var selectedValue = $('input[name="returnMethod"]:checked').val();
+        if (selectedValue === '微信') {
+            weixinDiv.removeClass('hidden');
+            mianfangDiv.addClass('hidden');
+        } else if (selectedValue === '电话') {
+            weixinDiv.addClass('hidden');
+            mianfangDiv.addClass('hidden');
+        } else if (selectedValue === '面访') {
+            weixinDiv.addClass('hidden');
+            mianfangDiv.removeClass('hidden');
+        }
+
+        var medicationStatus = $('input[name="medicationStatus"]:checked').val();
+        var csyzyy = $('#csyzyy');//慈善援助用药
+        var yjty = $('#yjty');//永久停药
+        var qtgyqgy = $('#qtgyqgy');//其他渠道购药
+        var ycgyycjy = $('#ycgyycjy');//延迟购药(医嘱建议)
+        var ycgyhzyybgf = $('#ycgyhzyybgf');//延迟购药(患者用药不规范
+        if (medicationStatus === '持续购药') {
+            csyzyy.addClass('hidden');
+            yjty.addClass('hidden');
+            qtgyqgy.addClass('hidden');
+            ycgyycjy.addClass('hidden');
+            ycgyhzyybgf.addClass('hidden');
+        } else if (medicationStatus === '领取慈善赠药') {
+            csyzyy.removeClass('hidden');
+            yjty.addClass('hidden');
+            qtgyqgy.addClass('hidden');
+            ycgyycjy.addClass('hidden');
+            ycgyhzyybgf.addClass('hidden');
+        } else if (medicationStatus === '永久停药') {
+            yjty.removeClass('hidden');
+            csyzyy.addClass('hidden');
+            qtgyqgy.addClass('hidden');
+            ycgyycjy.addClass('hidden');
+            ycgyhzyybgf.addClass('hidden');
+        }else if (medicationStatus === '其他渠道购药') {
+            qtgyqgy.removeClass('hidden');
+            yjty.addClass('hidden');
+            csyzyy.addClass('hidden');
+            ycgyycjy.addClass('hidden');
+            ycgyhzyybgf.addClass('hidden');
+        }
+        else if (medicationStatus === '延迟用药（医嘱建议）') {
+            ycgyycjy.removeClass('hidden');
+            qtgyqgy.addClass('hidden');
+            yjty.addClass('hidden');
+            csyzyy.addClass('hidden');
+            ycgyhzyybgf.addClass('hidden');
+        }
+        else if (medicationStatus === '延迟购药 (患者用药不规范)') {
+            ycgyhzyybgf.removeClass('hidden');
+            qtgyqgy.addClass('hidden');
+            yjty.addClass('hidden');
+            csyzyy.addClass('hidden');
+            ycgyycjy.addClass('hidden');
+        }
+
+        //是否出现不良反应
+        var bulfydiv = $('#bulfydiv');
+        var is_adverse_reaction = $('input[name="is_adverse_reaction"]:checked').val();
+        if (is_adverse_reaction === '是') {
+            bulfydiv.removeClass('hidden');
+        }
+        if (is_adverse_reaction === '否') {
+            bulfydiv.addClass('hidden');
+        }
+    }
+
+    function addblfy() {
+        $('#myModal5').show();
+    }
+    function initializeTableForTab(tabId) {
+
+        var tableId = 'bootstrap-table-' + tabId.substring(4);
+        var tableElement = $('#' + tableId);
+
+        var data = {
+            "patientPhone": $('#phoneNumber').val(),
+            "patientName": $('#name').val(),
+            "id": $('#id').val(),
+            "flag": tabId.substring(4),
+        };
+        console.log("tabId="+tabId.substring(4));
+        if(tabId==='tab-2'){
+            //购药记录
+            var data2=[];
+            data2=recordsData;
+            // 初始化表格 getDrugPurchaseList
+            // $.ajax({
+            //     cache : true,
+            //     type : "POST",
+            //     url : ctx + "dtp/pmService/getDrugPurchaseList",
+            //     data : data,
+            //     async : false,
+            //     error : function(request) {
+            //         $.modal.alertError("系统错误");
+            //     },
+            //     success : function(data) {
+            //         data2=data.rows;
+            //         $.operate.successCallback(data);
+            //     }
+            // });
+
+                var options = {
+                    data: data2,
+                    columns: [
+                            {field: 'id', title: 'ID', visible: false},
+                            {field: 'salesOrderNumber', title: '销售单号'},
+                            {field: 'prescriptionNumber', title: '处方编号'},
+                            {field: 'prescriptionDate', title: '处方日期'},
+                            {field: 'hospital', title: '医院'},
+                            {field: 'prescribingDoctor', title: '处方医生'},
+                            {field: 'department', title: '科室', visible: false},
+                            {field: 'attendingDoctor', title: '主管医生'},  // 注意这里使用的是 "attendingDoctor" 而不是 "attendingPhysician"
+                            {field: 'clinicalDiagnosis', title: '临床诊断'},
+                            {field: 'genericName', title: '药品通用名'},
+                            {field: 'productName', title: '商品名'},
+                            {field: 'specification', title: '规格'},
+                        {
+                            field: 'singleDoseValue',
+                            title: '单次剂量',
+                            editable: {
+                                type: 'text',
+                                title: '单次剂量',
+                                validate: function(value) {
+                                    if ($.trim(value) === '') return '单次剂量不能为空';
+                                }
+                            }
+                        },
+                        {
+                            field: 'singleDoseUnit',
+                            title: '单次剂量单位',
+                            editable: {
+                                type: 'select',
+                                source: [
+                                    "mg",    // 毫克
+                                    "g",     // 克
+                                    "μg",    // 微克
+                                    "L",     // 升
+                                    "ml",    // 毫升
+                                    "μL",    // 微升
+                                    "U",     // 单位（通常用于生物制剂）
+                                    "IU",    // 国际单位
+                                    "T",     // 可能指大写字母T，在特定上下文中有特殊意义
+                                    "S",     // 可能指大写字母S，在特定上下文中有特殊意义
+                                    "片",    // 片剂
+                                    "丸",    // 丸剂
+                                    "粒",    // 小颗粒状药物或物品
+                                    "支",    // 一支，可能指液体或固体的包装单位
+                                    "袋",    // 袋装
+                                    "瓶",    // 瓶装
+                                    "盒",    // 盒装
+                                    "板",    // 板状物，如药板
+                                    "包",    // 包装
+                                    "小盒"   // 小盒子
+                                ], // 示例单位列表
+                                title: '单次剂量单位',
+                                validate: function(value) {
+                                    if ($.trim(value) === '') return '单次剂量单位不能为空';
+                                }
+                            }
+                        },
+                            {field: 'medicationRoute', title: '用药途径'},
+                            {field: 'dosageFrequency', title: '用药频次'},
+                            {field: 'registrant', title: '登记人'},
+                            {field: 'registrationDate', title: '登记日期'},
+                            {field: 'saleDate', title: '销售日期', visible: false},
+                            {field: 'pharmacyName', title: '购药门店名称'},
+                        {
+                            field: 'actions',
+                            title: '操作',
+                            formatter: actionFormatter,
+                            events: window.actionEvents
+                        }
+                        ]
+
+            };
+            tableElement.bootstrapTable(options);
+        }
+        if(tabId==='tab-3'){
+            var tableElement4 = $('#bootstrap-table-4');
+            // 回显数据随访计划
+            var data4=[];
+            var data5=[];
+
+            data4=listTask1;
+            data5=listTask2;
+            // 初始化表格 getDrugPurchaseList
+            // $.ajax({
+            //     cache : true,
+            //     type : "POST",
+            //     url : ctx + "dtp/pmService/getDrugPurchaseList",
+            //     data : data,
+            //     async : false,
+            //     error : function(request) {
+            //         $.modal.alertError("系统错误");
+            //     },
+            //     success : function(data) {
+            //         data4=data.rows;
+            //         data5=data.rows;
+            //         $.operate.successCallback(data);
+            //     }
+            // });
+           var options ={
+                // 配置表格的相关属性
+                // 例如数据源、列定义等
+                // 示例配置
+                data: data4,
+                fitColumns: true,
+                striped: true,
+                autoRowHeight: true,
+                rowNumbers: true,
+                showFooter:true,  //是否显示表格底部区域。
+                clickToSelect: true, //是否启用点击行时选中整行的功能。
+                singleSelect: false, //是否仅允许选择一行
+                fixedColumns: true,
+                //fixedNumber: 3,
+                fixedRightNumber: 1,
+                columns : [
+                        { field: 'id', title: '序号' },
+                        { field: 'taskName', title: '任务名称' },
+                        { field: 'taskTheme', title: '任务类型'},
+                        { field: 'appointmentDate', title: '预约时间' },
+                        { field: 'completionTime', title: '完成时间' },
+                        { field: 'taskFollower', title: '任务跟进人' },
+                        { field: 'taskStatus', title: '任务状态' },
+                        {
+                            title: '操作',
+                            align: 'center',
+                            width: '180px',
+                            formatter: function(value, row, index) {
+                                if (row.id && !['已取消', '已完成'].includes(row.taskStatus)) {
+                                    var actions = [];
+                                    actions.push('<a class="btn-xs" href="javascript:void(0)" onclick="edit(\'' + row.id + '\')">查看</a> ');
+                                    actions.push('<a class="btn-xs" href="javascript:void(0)" onclick="closeTask(\'' + row.id + '\')">关闭任务</a> ');
+                                    return actions.join('');
+                                }
+                                if (row.id && ['已取消', '已完成'].includes(row.taskStatus)) {
+                                    var actions = [];
+                                    actions.push('<a class="btn-xs" href="javascript:void(0)" onclick="edit(\'' + row.id + '\')">查看</a> ');
+                                    return actions.join('');
+                                }else {
+                                    return "";
+                                }
+                            }
+                        }
+                ]
+            };
+            tableElement4.bootstrapTable(options);
+
+           var tableElement5 = $('#bootstrap-table-5');
+                   var options ={
+                        // 配置表格的相关属性
+                        // 例如数据源、列定义等
+                        // 示例配置
+                        data: data5,
+                        fitColumns: true,
+                        striped: true,
+                        autoRowHeight: true,
+                        rowNumbers: true,
+                        showFooter:true,  //是否显示表格底部区域。
+                        clickToSelect: true, //是否启用点击行时选中整行的功能。
+                        singleSelect: false, //是否仅允许选择一行
+                        fixedColumns: true,
+                        //fixedNumber: 3,
+                        fixedRightNumber: 1,
+                        columns : [
+                                { field: 'id', title: '序号' },
+                                { field: 'taskName', title: '任务名称' },
+                                { field: 'taskTheme', title: '任务类型'},
+                                { field: 'appointmentDate', title: '预约时间' },
+                                { field: 'completionTime', title: '完成时间' },
+                                { field: 'taskFollower', title: '任务跟进人' },
+                                { field: 'taskStatus', title: '任务状态' },
+                                {
+                                    title: '操作',
+                                    align: 'center',
+                                    width: '180px',
+                                    formatter: function(value, row, index) {
+                                        if (row.id && !['已取消', '已完成'].includes(row.taskStatus)) {
+                                            var actions = [];
+                                            actions.push('<a class="btn-xs" href="javascript:void(0)" onclick="edit(\'' + row.id + '\')">查看</a> ');
+                                            actions.push('<a class="btn-xs" href="javascript:void(0)" onclick="closeTask(\'' + row.id + '\')">关闭任务</a> ');
+                                            return actions.join('');
+                                        }
+                                        if (row.id && ['已取消', '已完成'].includes(row.taskStatus)) {
+                                            var actions = [];
+                                            actions.push('<a class="btn-xs" href="javascript:void(0)" onclick="edit(\'' + row.id + '\')">查看</a> ');
+                                            return actions.join('');
+                                        }else {
+                                            return "";
+                                        }
+                                    }
+                                }
+                            ]
+                    };
+                   tableElement5.bootstrapTable(options);
+             }
+    }
+    // 定义操作列的事件处理
+    window.actionEvents = {
+        'click .save': function (e, value, row, index) {
+            saveDrug(row);
+        }
+    };
+    // 定义操作列的格式化函数
+    function actionFormatter(value, row, index) {
+        return [
+            '<button class="save ml10 btn btn-success btn-xs" type="button">保存</button>'
+        ].join('');
+    }
+
+    // 定义保存药品记录的方法
+    function saveDrug(row) {
+            // 发送 AJAX 请求更新数据
+            $.ajax({
+                cache: true,
+                type: "POST",
+                url: ctx + "dtp/pmService/updateDrugPurchaseRecord",
+                data: row,
+                async: false,
+                success: function(data) {
+                    $.modal.msg("保存成功");
+                },
+                error: function(error) {
+                    $.modal.msg("更新失败");
+                }
+            });
+    };
+    function editArchives(){
+        var id = $("#patientId").val();
+       // table.set();
+        var prefix = ctx + "dtp/pmService/archivesEdit/{id}";
+        $.modal.openTab("修改档案", prefix.replace("{id}", id));
+    }
+
+
+    // 关闭计划
+    function closePlan(planFlag) {
+        var taskId, planId;
+
+        if (planFlag === 1) {
+            taskId = $("#id").val();
+            planId = $("#planId_cg").val();
+        } else if (planFlag === 2) {
+            taskId = $("#id").val();
+            planId = $("#planId_tl").val();
+        }
+        if (!taskId || !planId) {
+            $.modal.alertError("参数错误");
+            return;
+        }
+        $.modal.confirm("确认要关闭计划吗? 关闭计划后将停止该计划下的所有任务", function() {
+            var formData = new FormData();
+            var taskId, planId;
+
+            if (planFlag === 1) {
+                taskId = $("#id").val();
+                planId = $("#planId_cg").val();
+            } else if (planFlag === 2) {
+                taskId = $("#id").val();
+                planId = $("#planId_tl").val();
+            }
+
+            formData.append('taskId', taskId);
+            formData.append('planId', planId);
+
+            $.ajax({
+                url: prefix_task + "/closePlan",
+                data: formData,
+                method: 'POST',
+                processData: false, // 防止 jQuery 自动转换数据
+                contentType: false, // 不设置内容类型
+                dataType: 'json',
+                error: function(request) {
+                    $.modal.alertError("关闭计划失败");
+                },
+                success: function(data) {
+                    $.modal.alertSuccess("关闭计划成功");
+                    // 更新选项卡状态
+                    updateTabState('#tab-3');
+                    window.location.reload();
+                }
+            });
+        });
+    }
+    // 关闭任务
+    function closeTask(id) {
+        $.modal.confirm("确认要关闭任务吗? 关闭任务后将停止该任务的随访操作", function() {
+            var formData = new FormData();
+            formData.append('id', id);
+
+            $.ajax({
+                url: prefix_task + "/closeTask",
+                data: formData,
+                method: 'POST',
+                processData: false, // 防止 jQuery 自动转换数据
+                contentType: false, // 不设置内容类型
+                success: function(data) {
+                    $.modal.alertSuccess("关闭任务成功");
+                    // $.modal.reload();
+                    window.location.reload();
+                },
+                error: function(xhr, status, error) {
+                    $.modal.alertError("关闭任务失败");
+                }
+            });
+        });
+    }
+
+    // 辅助函数：用于更新选项卡状态
+    function updateTabState(tabId) {
+        // 移除所有 li 的 active 类
+        $('#myUlTabs .nav-item').removeClass('active');
+        // 设置指定 tab 的 li 为 active
+        $(tabId).closest('.nav-tabs').find('a[href="' + tabId + '"]').parent().addClass('active');
+
+        // 更新 a 标签的 aria-expanded 属性
+        $('#myUlTabs a').attr('aria-expanded', 'false');
+        $(tabId).closest('.nav-tabs').find('a[href="' + tabId + '"]').attr('aria-expanded', 'true');
+
+        // 移除所有 tab-pane 的 active 和 in 类
+        $('.tab-pane').removeClass('active in show'); // 注意这里使用了 'show' 类，取决于你使用的 Bootstrap 版本
+        // 为指定 tab-pane 添加 active 和 in 类
+        $(tabId).addClass('active in show'); // 同上，确保与你的 Bootstrap 版本匹配
+    }
+
+    function editSFGenJinRen(){
+        //随访计划跟进人
+        var followUpPersonId = /*[[${followUpPersonId}]]*/ '';
+        var followUpPersonName = /*[[${followUpPersonName}]]*/ '';
+       // $.operate.addSetwht('分配跟进人','dtp/pmService/followUpAssignAdd',800,800)
+        //var followUpPersonId=$('#followUpPersonId').val()
+        //alert("编辑随访跟进人"+followUpPersonId);
+        var options = {
+            title: '分配跟进人',
+            width: 800,
+            height: 600,
+            url: prefix + '/followUpAssignAdd',
+            callBack: doSubmit2
+        };
+        $.modal.openOptions(options);
+    }
+    // callBack获取父窗口方法（方式二）
+    function doSubmit2(index, layero) {
+        var hzparam;
+        var rows = layero.find("iframe")[0].contentWindow.selectTableObject();
+        if (rows.length == 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
+        }
+        var followUpPersonId=$('#followUpPersonId').val();//s_dtp_ysfw_follow_up_assign
+        rows.forEach(function(item) {
+            // 动态选择所有列并映射到更具描述性的名称
+             hzparam = {
+                id: item.id,
+                pharmacistName: item.pharmacistName,
+                position: item.position,
+                storeName: item.storeName,
+                phone: item.phone,
+                storeId: item.storeId,
+                followUpPersonId: followUpPersonId
+            };
+
+        });
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: prefix+'/editFollowUpAssign', // 替换为实际的搜索 URL
+            data: hzparam,
+            async: false,
+            success: function (data) {
+                    $.modal.msg("操作成功");
+                    // 更新 <code> 标签的内容
+                    var followUpPersonName = hzparam.pharmacistName; // 假设需要第一个对象的 pharmacistName
+                    $('#followUpPersonNameCode').text(followUpPersonName);
+                    $('#followUpPersonName').val(followUpPersonName); // 更新输入框的值
+
+            },
+            error: function(error) {
+                $.modal.alertError("失败");
+            }
+        });
+        $.modal.close(index);
+    }
+    function editTaskGenJinRen(){
+        //任务跟进人
+
+        var options = {
+            title: '分配跟进人',
+            width: 800,
+            height: 600,
+            url: prefix + '/followUpAssignAdd',
+            callBack: doSubmit1
+        };
+        $.modal.openOptions(options);
+    }
+    function doSubmit1(index, layero) {
+        var bc_id=$('#bc_id').val()
+        var hzparam;
+        var rows = layero.find("iframe")[0].contentWindow.selectTableObject();
+        if (rows.length == 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
+        }
+        rows.forEach(function(item) {
+            // 动态选择所有列并映射到更具描述性的名称
+            hzparam = {
+                id: item.id,
+                pharmacistName: item.pharmacistName,
+                position: item.position,
+                storeName: item.storeName,
+                phone: item.phone,
+                storeId: item.storeId,
+                taskId: bc_id
+            };
+
+        });
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: prefix+'/editFollowTaskAssignById', // 替换为实际的搜索 URL
+            data: hzparam,
+            async: false,
+            success: function (data) {
+                $.modal.msg("操作成功");
+                // 更新 <code> 标签的内容
+                var followUpPersonName = hzparam.pharmacistName; // 假设需要第一个对象的 pharmacistName
+                $('#bc_taskFollowerCode').text(followUpPersonName);
+                $('#bc_taskFollower').val(followUpPersonName); // 更新输入框的值
+
+            },
+            error: function(error) {
+                $.modal.alertError("失败");
+            }
+        });
+        $.modal.close(index);
+    }
+
+
+    function updateInterval(nextFollowTimeStr) {
+        // 获取当前时间
+        const now = new Date();
+        if (nextFollowTimeStr) {
+            // 将字符串转换为日期对象
+            const nextFollowTime = new Date(nextFollowTimeStr);
+
+            // 计算间隔天数
+            const intervalDays = Math.floor((nextFollowTime - now) / (1000 * 60 * 60 * 24));
+
+            // 显示间隔天数
+            const intervalThisTimeSpan = $('#interval_this_time');
+            if (intervalDays < 0) {
+                intervalThisTimeSpan.css('color', 'red').text(intervalDays);
+            } else {
+                intervalThisTimeSpan.css('color', '#1a7bb9').text(intervalDays);
+            }
+        } else {
+            // 如果没有选择下次随访时间，清除间隔天数显示
+            const intervalThisTimeSpan = $('#interval_this_time');
+            intervalThisTimeSpan.text('');
+        }
+    }
+function  onselectsf(){
+        debugger
+    alert(111)
+        // 初始化时检查是否有预设的下次随访时间
+        const initialNextFollowTime = $('#next_follow_time').val();
+        if (initialNextFollowTime) {
+            $('#next_follow_time').val(initialNextFollowTime);
+            updateInterval(initialNextFollowTime);
+        }
+    }
+</script>

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

@@ -68,10 +68,11 @@
 								<label>随访小结:</label>
 								<select name="followUpSummary" class="styled-input">
 									<option value="">请选择</option>
-									<option value="待处理" >待处理</option>
+									<option value="待执行" >待执行</option>
 									<option value="已完成" >已完成</option>
+									<option value="已取消" >已取消</option>
 									<option value="已过期" >已过期</option>
-									<option value="无" >无</option>
+									<option value="" >无</option>
 								</select>
 							</div>
 							<div class="customize-form-group">
@@ -172,6 +173,7 @@
 		var editFlag = [[${@permission.hasPermi('dtp:pmService:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('dtp:pmService:remove')}]];
 		var prefix = ctx + "task/followTask";
+		var prefix_archives = ctx + "dtp/pmService";
 		$(function() {
 		    var panehHidden = false;
 		    if ($(this).width() < 1590) {
@@ -195,6 +197,7 @@
 		        viewUrl: prefix + "/FollowTaskView/{id}",
 		        createUrl: prefix + "/saveFollowTask",
 		        updateUrl: prefix + "/FollowTaskEdit/{id}",
+				updateHzUrl: prefix_archives + "/archivesEdit/{id}",
 		        removeUrl: prefix + "/removeTask",
 		        /*exportUrl: prefix + "/export",
 		        importUrl: prefix + "/importData",
@@ -215,19 +218,20 @@
 		        columns: [
 				{ field: 'appointmentDate', title: '预约日期', align: 'center' },
 				{ field: 'businessBelonging', title: '业务归属', align: 'center' },
+				{ field: 'useForm', title: '使用表单', align: 'center',visible:false },
+				{ field: 'templeName', title: '模版名称', align: 'center'},
 				{ field: 'taskName', title: '任务名称',width: 170, align: 'center' ,
 					formatter: function(value, row, index) {
 						if (row.id) {
-							return '<a href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.patientId + '\')">' + value + '</a>';
+							return '<a href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')">' + value + '</a>';
 						} else {
 							return "";
 						}
 					}},
-				{ field: 'taskTheme', title: '任务主题', align: 'center' },
 				{ field: 'patientName', title: '患者姓名',width: 200, align: 'center' ,
 					formatter: function(value, row, index) {
 						if (row.id) {
-							return '<a href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')">' + value + '</a>';
+							return '<a href="javascript:void(0)" onclick="$.operate.editTabHz(\'' + row.patientId + '\')">' + value + '</a>';
 						} else {
 							return "";
 						}
@@ -256,6 +260,9 @@
 								case '已下发':
 									return '<span class=\"btn-info">已下发</span>';
 									break;
+								case '未下发':
+									return '<span class=\"btn-warning">未下发</span>';
+									break;
 								case '已取消':
 									return '<span class=\"btn-danger">已取消</span>';
 									break;
@@ -263,6 +270,7 @@
 									return '<span class=\"btn-warning">'-'</span>';
 							}
 						}},
+					{ field: 'taskTheme', title: '任务主题', align: 'center' },
 					{ field: 'genericName', title: '药品通用名', align: 'center' },
 					{ field: 'productName', title: '商品名', align: 'center' },
 					{ field: 'followUpSummary', title: '随访小结',width: 500, align: 'center' },
@@ -291,14 +299,13 @@
 									return '<span class=\"btn-warning">'+value+'</span>';
 									break;
 								default:
-									return '<span class=\"btn-primary">'+value+'</span>';
+									return '<span class=\"btn-primary">'-'</span>';
 							}
 						}},
 				{ field: 'actualFollowUpTime', title: '实际随访时间', align: 'center' },
 				{ field: 'callConnectedCount', title: '接通次数', align: 'center' },
 				{ field: 'outboundCallCount', title: '外呼次数', align: 'center' },
 				{ field: 'nextOutboundCallCount', title: '下次外呼次数', align: 'center' },
-
 				{ field: 'updateTime2', title: '更新时间', align: 'center' },
 		        {
 		            title: '操作',
@@ -306,7 +313,7 @@
 					width: '180px',
 		            formatter: function(value, row, index) {
 						// 根据任务状态决定是否显示操作按钮
-						if (row.id && !['已取消', '已完成'].includes(row.taskStatus)) {
+						if (row.id && !['已取消', '已完成','未下发'].includes(row.taskStatus)) {
 							var actions = [];
 							actions.push('<a class="btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')">去随访</a> ');
 							actions.push('<a class="btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')">查看全部</a> ');

health-admin/src/main/resources/templates/dtp/followUpAssign/followUpAssignAdd.html

@@ -0,0 +1,200 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <meta charset="UTF-8">
+    <th:block th:include="include :: header('跟进人信息')" />
+    <th:block th:include="include :: layout-latest-css" />
+    <th:block th:include="include :: ztree-css" />
+</head>
+
+<body><div class="main-content">
+
+
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <div class="query-condition-container">
+                <h4 class="query-condition-title">查询条件</h4>
+                <div class="query-buttons">
+                    <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                </div>
+            </div>
+            <form id="tag-form" class="customize-search-form">
+                <div class="customize-form-group-container">
+                    <div class="customize-form-group">
+                        <label>姓名:</label>
+                        <input type="text" class="styled-input" placeholder="请输入姓名/手机号" name="query" style="width: 350px;"/>
+                    </div>
+
+<!--                    <div class="customize-form-group">-->
+<!--                        <label>角色:</label>-->
+<!--                        <select name="position" id="position" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yppz_roles')}">-->
+<!--                            <option value="">请选择</option>-->
+<!--                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
+<!--                        </select>-->
+<!--                    </div>-->
+                </div>
+            </form>
+        </div>
+
+    </div>
+    <div class="row">
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var viewFlag = [[${@permission.hasPermi('dtp:configInfo:list')}]];
+    var prefix = ctx + "dtp/pmService";
+
+    $(function() {
+        var panehHidden = false;
+        if ($(this).width() < 1590) {
+            panehHidden = true;
+        }
+        //$('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
+        // 回到顶部绑定
+        // if ($.fn.toTop !== undefined) {
+        // 	var opt = {
+        // 		win:$('.ui-layout-center'),
+        // 		doc:$('.ui-layout-center')
+        // 	};
+        // 	$('#scroll-up').toTop(opt);
+        // }
+        queryUserList();
+    });
+
+    function queryUserList() {
+        var options = {
+            url: prefix + "/selectPharmacistsByStoreId",
+            viewUrl: prefix + "/view/{id}",
+            exportUrl: prefix + "/export",
+            //sortName: "createTime",
+            //sortOrder: "desc",
+            modalName: "任务跟进人",
+            showFooter:true,  //是否显示表格底部区域。
+            clickToSelect: true, //是否启用点击行时选中整行的功能。
+            singleSelect: true, //是否仅允许选择一行
+            fixedColumns: true,
+            //fixedNumber: 3,
+            //fixedRightNumber: 1,
+            columns: [
+                {
+                    checkbox: true // 如果需要复选框列的话保留此项
+                },
+                { field: "id", title: "主键", visible: false }, // 假设你不希望在表格中直接显示主键
+                { field: "pharmacistName", title: "姓名" },
+                { field: "position", title: "职位角色", visible: true }, // 审核药师，任务跟进人
+                { field: "storeName", title: "所属门店名称" },
+                { field: "phone", title: "手机号" },
+                { field: "storeId", title: "所属门店ID", visible: false }, // 根据实际需求决定是否展示
+                { field: "reviewPassword", title: "审核密码", visible: false }, // 敏感信息通常不展示
+                { field: "createTime", title: "创建时间", visible: false },
+                { field: "updateTime", title: "更新时间", visible: false },
+                { field: "createBy", title: "创建人" , visible: false},
+                { field: "updateBy", title: "修改人" , visible: false},
+                { field: "status", title: "员工状态", formatter: function(value, row, index) {
+                        if (value === 0) return '离职';
+                        if (value === 1) return '在职';
+                        if (value === 2) return '请假';
+                        return '未知';
+                    }}
+            ]
+        };
+        $.table.init(options);
+    }
+
+    /* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+    function resetPre() {
+        resetDate();
+        $("#tag-form")[0].reset();
+        $("#deptId").val("");
+        $("#parentId").val("");
+        $(".curSelectedNode").removeClass("curSelectedNode");
+        $.table.search();
+    }
+    /* 添加用户-选择用户-提交(子页面调用父页面形式) */
+    function submitHandler(index, layero) {
+        debugger
+        var rows = $.table.selectFirstColumns();
+
+        if (rows.length == 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
+        }
+        $.modal.close();
+        // 父页面的方法
+        // activeWindow().selectUsers();
+        // 父页面的变量
+        activeWindow().$('#userids').html('我是通过方式一来的：' + rows.join());
+    }
+
+    /* 添加用户-选择用户-提交(回调形式-父页面调用子页面) */
+    function getSelections() {
+        return $.table.selectFirstColumns();
+    }
+
+    function selectTableObject() {
+        // 动态选择所有列并映射到更具描述性的名称
+        var columnsData = {
+            id: $.table.selectColumns('id'),
+            pharmacistName: $.table.selectColumns('pharmacistName'),
+            position: $.table.selectColumns('position'),
+            storeName: $.table.selectColumns('storeName'),
+            phone: $.table.selectColumns('phone'),
+            storeId: $.table.selectColumns('storeId'),
+            reviewPassword: $.table.selectColumns('reviewPassword'),
+            createTime: $.table.selectColumns('createTime'),
+            updateTime: $.table.selectColumns('updateTime'),
+            createBy: $.table.selectColumns('createBy'),
+            updateBy: $.table.selectColumns('updateBy'),
+            status: $.table.selectColumns('status')
+        };
+
+        // 构建返回的对象数组
+        var selectedRows = [];
+
+        // 假设 $.table.selectColumns 返回的是一个数组，我们检查每个字段是否为空或未定义来判断是否有选择
+        for (var i = 0; i < columnsData.id.length; i++) {
+            if (columnsData.id[i]) { // 如果 id 存在，则认为该行被选中
+                var row = {
+                    id: columnsData.id[i],
+                    pharmacistName: columnsData.pharmacistName[i],
+                    position: columnsData.position[i],
+                    storeName: columnsData.storeName[i],
+                    phone: columnsData.phone[i],
+                    storeId: columnsData.storeId[i],
+                    reviewPassword: columnsData.reviewPassword[i],
+                    createTime: columnsData.createTime[i],
+                    updateTime: columnsData.updateTime[i],
+                    createBy: columnsData.createBy[i],
+                    updateBy: columnsData.updateBy[i],
+                    status: function(value) {
+                        if (value === 0) return '离职';
+                        if (value === 1) return '在职';
+                        if (value === 2) return '请假';
+                        return '未知';
+                    }(columnsData.status[i])
+                };
+                selectedRows.push(row);
+            }
+        }
+
+        return selectedRows;
+    }
+    /*回调返回所有的选中行数据*/
+    function selectColumns2() {
+        return $.table.selectColumns2();
+    }
+    $("#bootstrap-table").on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table", function (e, rowsAfter, rowsBefore) {
+        var rows = $.common.equals("uncheck-all", e.type) ? rowsBefore : rowsAfter;
+        var rowIds = $.table.affectedRowIds(rows);
+        $("#rowIds").val(rowIds);
+    });
+</script>
+</body>
+
+</html>

health-admin/src/main/resources/templates/dtp/followUpAssign/followUpAssignEdit.html

@@ -28,7 +28,7 @@
                         <label class="col-sm-1 control-label">患者手机号：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="patientPhone" placeholder="随访小结" class="styled-input" type="text" maxlength="30" th:value="${patientPhone}" required>
+                                <input name="patientPhone" placeholder="患者手机号" class="styled-input" type="text" maxlength="30" th:value="${patientPhone}" required>
                             </div>
                         </div>
                         <label class="col-sm-1 control-label">性别：</label>

health-admin/src/main/resources/templates/dtp/followUpAssign/followUpAssignList.html

@@ -34,11 +34,11 @@
 							</div>
 							<div class="customize-form-group">
 								<label>药品:</label>
-								<input type="text"  class="styled-input" placeholder="商品名,通用名或MDM编码"  name="product"/>
+								<input type="text"  class="styled-input" placeholder="商品名或MDM编码"  name="product"/>
 							</div>
 							<div class="customize-form-group">
 								<label>随访跟进人:</label>
-								<input type="text"  class="styled-input" placeholder="随访跟进人姓名" name="followUpPersonName"/>
+								<input type="text"  class="styled-input" placeholder="随访跟进人姓名" name="follow_up_assign"/>
 							</div>
 						</div>
 					</form>
@@ -150,18 +150,46 @@
 		        columns: [{
 		            checkbox: true
 		        },
-				{ field: 'patientName', title: '患者姓名', align: 'center' },
-				{ field: 'patientPhone', title: '患者手机号', align: 'center' },
-				{ field: 'gender', title: '性别', align: 'center' },
+				{ field: 'name', title: '患者姓名', align: 'center' },
+				{ field: 'phoneNumber', title: '患者手机号', align: 'center' },
+					{field: 'gender', title: '性别', align: 'center',
+						formatter: function(value, row, index) {
+							switch (value) {
+								case 0:
+									return "男";
+									break;
+								case 1:
+									return "女";
+									break;
+								default:
+									return "未知";
+							}
+						}},
 				{ field: 'age', title: '年龄', align: 'center' },
-				{ field: 'disease', title: '疾病', align: 'center' },
-				{ field: 'clinicalDiagnosis', title: '临床诊断', align: 'center' },
-				{ field: 'medicineName', title: '药品名称', align: 'center' },
-				{ field: 'status', title: '跟进人状态', align: 'center' },
-				{ field: 'followUpPersonName', title: '随访跟进人姓名', align: 'center' },
+				{ field: 'dl', title: '疾病', align: 'center',formatter: dlFormatter },
+				{ field: 'disease', title: '临床诊断', align: 'center' },
+				{ field: 'productName', title: '药品名称', align: 'center' },
+				{ field: 'status', title: '跟进人状态', align: 'center',
+					formatter: function(value, row, index) {
+						switch (value) {
+							//0离职，1在职，2请假
+							case 0:
+								return "离职";
+								break;
+							case 1:
+								return "在职";
+								break;
+							case 2:
+								return "请假";
+								break;
+							default:
+								return "-";
+						}
+					} },
+				{ field: 'pharmacistName', title: '随访跟进人姓名', align: 'center' },
 				{ field: 'lastPurchaseDate', title: '最后一次购药', align: 'center' },
-				{ field: 'followUpPersonPhone', title: '跟进人手机号', align: 'center' },
-				{ field: 'filingDate', title: '建档日期', align: 'center' },
+				{ field: 'phone', title: '跟进人手机号', align: 'center' },
+				{ field: 'createTime', title: '建档日期', align: 'center' },
 		        {
 		            title: '操作',
 		            align: 'center',
@@ -210,30 +238,43 @@
 				// 获取当前点击的选项卡链接
 				var $this = $(this);
 				if($this.attr('href') === '#tab-1'){
-					formSubmitted=true;
-				}
-				if($this.attr('href') === '#tab-2'){
-					formSubmitted=false;
-					// 添加 active 类到当前点击的选项卡
 					$(this).addClass('active');
 					$this.attr('aria-expanded', 'true');
+					initializeTableForTab('tab-1');
 				}
 				// 检查是否为“用药购药”选项卡
 				if ($this.attr('href') === '#tab-2') {
-					// 初始化表格
+					// 初始化表格 待分配$(this).addClass('active');
+					$this.attr('aria-expanded', 'true');
 					initializeTableForTab('tab-2');
 				}
 				if ($this.attr('href') === '#tab-3') {
-					// 初始化表格
+					// 初始化表格 已分配
+					$(this).addClass('active');
+					$this.attr('aria-expanded', 'true');
 					initializeTableForTab('tab-3');
 				}
 				if ( $this.attr('href') === '#tab-4') {
-					// 初始化表格
+					// 初始化表格 无效跟进人
+					$(this).addClass('active');
+					$this.attr('aria-expanded', 'true');
 					initializeTableForTab('tab-4');
 				}
 
 			});
 		});
+		//全部分配 huanzhefp
+		 function  huanzhefp(formSubmitted){
+			 if(formSubmitted){
+				//全部分配
+			 }if(!formSubmitted){
+				//待分配
+			 }
+		 }
+		//离职员工
+		function  yuanogngLZJJ(){
+
+		}
 
 		// 分别给每个按钮添加class
 		HZFPButton.onclick = function() {
@@ -263,13 +304,19 @@
     			return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
     		}
 		}
+		function dlFormatter(value, row, index) {
+			if (!value || !Array.isArray(value)) {
+				return ''; // 如果值为空或不是数组，返回空字符串
+			}
+			return value.map(item => item.name).join(', ');
+		}
 		/*员工离职交接初始化*/
 		function initForLZYGJJTab() {
 			var datas=[];
 			var tableId = 'bootstrap-table-5';
 			var tableElement = $('#' + tableId);
 			var data = $("#followUpAssign-form").serializeArray();
-			data.push({name: 'flag', value: 5});
+			data.push({name: 'flag', value: '5'});
 			$.ajax({
 				cache : true,
 				type : "POST",
@@ -301,8 +348,7 @@
 				fixedRightNumber: 1,
 				data: datas,
 				columns: [
-					{ field: 'patientName', title: '患者姓名', align: 'center' },
-					{ field: 'name', title: '离职员工', align: 'center' },
+					{ field: 'pharmacistName', title: '离职员工', align: 'center' },
 					{ field: 'phone', title: '手机号', align: 'center'},
 					{ field: 'storeName', title: '门店', align: 'center'},
 					{
@@ -364,16 +410,59 @@
 				columns: [{
 					checkbox: true
 				},
-					{ field: 'patientName', title: '患者姓名', align: 'center' },
-					{ field: 'gender', title: '性别', align: 'center',width: 30 },
+					{ field: 'name', title: '患者姓名', align: 'center' },
+					{field: 'gender', title: '性别', align: 'center',
+						formatter: function(value, row, index) {
+							switch (value) {
+								case 0:
+									return "男";
+									break;
+								case 1:
+									return "女";
+									break;
+								default:
+									return "-";
+							}
+						}},
 					{ field: 'age', title: '年龄', align: 'center',width: 30, },
-					{ field: 'disease', title: '疾病', align: 'center' },
-					{ field: 'clinicalDiagnosis', title: '临床诊断', align: 'center' },
-					{ field: 'medicineName', title: '药品名称', align: 'center' },
-					{ field: 'status', title: '跟进人状态', align: 'center',width: 50, },
-					{ field: 'followUpPersonName', title: '随访跟进人姓名', align: 'center' },
-					{ field: 'lastPurchaseDate', title: '最后一次购药', align: 'center' },
-					{ field: 'filingDate', title: '建档日期', align: 'center' },
+					{ field: 'dl', title: '疾病', align: 'center',formatter: dlFormatter },
+					{ field: 'disease', title: '临床诊断', align: 'center' },
+					{ field: 'productName', title: '药品名称', align: 'center' },
+					{ field: 'status', title: '跟进人状态', align: 'center',
+						formatter: function(value, row, index) {
+							switch (value) {
+									//0离职，1在职，2请假
+								case 0:
+									return "离职";
+									break;
+								case 1:
+									return "在职";
+									break;
+								case 2:
+									return "请假";
+									break;
+								default:
+									return "-";
+							}
+						} },
+					{ field: 'follow_up_assign', title: '随访跟进人', align: 'center',
+						formatter: function(value, row, index) {
+							switch (value) {
+								case "":
+									return "未分配";
+									break;
+								case undefined:
+									return "未分配";
+									break;
+								case " ":
+									return "未分配";
+									break;
+								default:
+									return value;
+							}
+						}  },
+					{ field: 'updateTime', title: '最后一次购药', align: 'center' },
+					{ field: 'createTime', title: '建档日期', align: 'center' },
 					{
 						title: '操作',
 						align: 'center',

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

@@ -1061,10 +1061,10 @@
 
                 } else {
                     shangciObj = {};
-                    $('#hospital').val('');
-                    $('#prescribingDoctor').val('');
-                    $('#department').val('');
-                    $('#attendingDoctor').val('');
+                    // $('#hospital').val('');
+                    // $('#prescribingDoctor').val('');
+                    // $('#department').val('');
+                    // $('#attendingDoctor').val('');
 
 
                 }
@@ -1287,7 +1287,7 @@
             formData.append('prescriptionNumber', prescriptionNumber);
             formData.append('drugsLinkId', drugsLinkId);
         } else {
-            $.modal.alertError("请联系管理员!");
+            $.modal.alertError("数据异常！请联系管理员!");
             return;
         }
         var reviewingNameInput = $('#reviewingName').val();

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

@@ -839,10 +839,10 @@
 
                 }else {
                     shangciObj={};
-                    $('#hospital').val('');
-                    $('#prescribingDoctor').val('');
-                    $('#department').val('');
-                    $('#attendingDoctor').val('');
+                    // $('#hospital').val('');
+                    // $('#prescribingDoctor').val('');
+                    // $('#department').val('');
+                    // $('#attendingDoctor').val('');
 
                 }
                 $.operate.successCallback(data);

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

@@ -118,6 +118,16 @@
         }
         var prefix = ctx + "dtp/sdtpyypzfollowupsop";
         var data = $("#form-SDtpYypzFollowUpSop-edit").serializeArray();
+        debugger;
+        var nodesDataCheck = [];
+        nodesDataCheck=collectNodesData();
+        if(nodesDataCheck.length==0){
+            $.modal.alertWarning("请添加节点");
+            return;
+        }if(nodesDataCheck.length>=11){
+            $.modal.alertWarning("最多添加 10 个节点");
+            return;
+        }
         data.push({name:"nodesData",value:JSON.stringify(collectNodesData())});
         data.push({name:"applicableDrug",value:JSON.stringify(applicableDrug)});
         console.log("data="+data)
@@ -340,11 +350,9 @@
             if (selectedValue === '最近待执行随访距今天数' ||
                 selectedValue === '最近已完成随访距今天数' ||
                 selectedValue === '最近订单距今天数') {
-                debugger;
                 // 加载数值比较类型的三级选项
                 loadLevelThreeOptionsForNumericComparison();
             } else {
-                debugger;
                 // 加载字符串比较类型的三级选项
                 loadLevelThreeOptionsForStringComparison();
             }
@@ -480,7 +488,6 @@
                 '等于',
                 '不等于'
             ];
-            debugger;
             options.forEach((option, index) => {
                 var newOption = document.createElement('option');
                 if (newOption === '请选择二级分类') {
@@ -575,7 +582,7 @@
     }
     function bindTabEvents(carNum) {
         console.log("carNum"+carNum);
-        var flag = true ;
+        var flag=true;
         var TJ = '';
 
         var  renwdongz='';//任务动作
@@ -588,14 +595,19 @@
         // 绑定 change 事件
         $(document).on('change', '#ts'+carNum, function(e) {
             var selectedValue = $(this).val();
-            if (selectedValue === "周期节点" && flag) {
+            if (selectedValue === "周期节点" && TJ=='事件条件') {
                 flag = false;
                 $('#span'+carNum).remove();
-                var addNodeOne ='<span id="span'+carNum+'"> 每 '+
-                    '<input type="number" name="createTaskEvery" placeholder="请输入" class="styled-input" value="">' +
+                var addNodeOne ='<span id="span'+carNum+'"> 当 '+
+                    '<select name="createTaskWhen" id="scrw-t'+carNum+'" class="styled-input">' +
+                    '<option value="">请选择</option>' +
+                    ' <option value="最近订单D值">最近订单D值(剩余用药天数)</option>' +
+                    '<option value="其他值">其他值</option>' +
+                    '</select>' +
+                    "  为" +
+                    '<input type="number" name="createTaskTriggerValue" placeholder="请输入" class="styled-input" value="">触发动作' +
                     "  天生成任务，共执行  " +
                     '<input type="number" name="createTaskExecutionTimes" placeholder="请输入" class="styled-input" value="">次</span>'
-
                 $('#scrw'+carNum).after(addNodeOne);
             }if (selectedValue === "单次节点" && TJ=='时间条件') {
                 flag = true;
@@ -618,14 +630,16 @@
                     '<input type="number" name="createTaskTriggerValue" placeholder="请输入" class="styled-input" value="">触发动作'
                 $('#scrw'+carNum).after(addNodeOne);
             }
-            if (selectedValue === "单次节点" && TJ=='' ) {
-                flag = true;
+            if (selectedValue === "周期节点" && TJ=='时间条件') {
+                flag = false;
                 $('#span'+carNum).remove();
-                var addNodeOne ="  <span id=\"span"+carNum+"\">第  " +
-                    '<input type="number" id="scrw-t'+carNum+'" name="createTaskDi" placeholder="请输入" class="styled-input" value="">' +
-                    "  天生成任务 </span>" ;
+                var addNodeOne ='<span id="span'+carNum+'"> 每 '+
+                    '<input type="number" name="createTaskEvery" placeholder="请输入" class="styled-input" value="">' +
+                    "  天生成任务，共执行  " +
+                    '<input type="number" name="createTaskExecutionTimes" placeholder="请输入" class="styled-input" value="">次</span>'
                 $('#scrw'+carNum).after(addNodeOne);
             }
+
         });
         // 绑定 change 事件
         $(document).on('change', '#scrw'+carNum, function(e) {
@@ -766,10 +780,10 @@
                 }
 
             }
-            // 将目标内容区滚动到视口中央
-            $('html, body').animate({
-                scrollTop: $(target).offset().top - ($(window).height() / 2)
-            }, 500); // 500毫秒动画时间
+            // // 将目标内容区滚动到视口中央
+            // $('html, body').animate({
+            //     scrollTop: $(target).offset().top - ($(window).height() / 2)
+            // }, 500); // 500毫秒动画时间
         });
         // 初始绑定
         bindTabEvents(carNum);
@@ -838,7 +852,7 @@
             '<p>'+
             '</p>'+
             '<strong>执行任务: </strong>生成后第&nbsp;'+
-            '<input type="number" name="generationDaysAfter" placeholder="请输入" class="styled-input" value="">' +
+            '<input type="number" name="generationDaysAfter" placeholder="请输入" class="styled-input">' +
             '  天  ' +
             '<input type="text" name="generationHMS" placeholder="请输入时间（时分秒）" id="datetimepicker-demo-3"  class="styled-input" value="">' +
             '  执行任务  ' +
@@ -854,7 +868,7 @@
             '<p>'+
             '</p>'+
             '<strong>&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>任务有效期&nbsp;'+
-            '<input type="number" name="taskValidity" placeholder="请输入" class="styled-input" value="">&emsp;天' +
+            '<input type="number" name="taskValidity" placeholder="请输入" class="styled-input">&emsp;天' +
             '<p>'+
             '</p>'+
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>任务素材&nbsp;'+
@@ -867,14 +881,13 @@
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>使用表单&nbsp;'+
             '<select name="useForm" id="2-' + count + '" class="styled-input">' +
             '<option value="">请选择</option>' +
-            '<option value="单任务表单">单任务表单</option>' +
-            '<option value="随访任务表单">随访任务表单</option>' +
-            '<option value="脱落召回随访表单">脱落召回随访表单</option>' +
+            '<option value="精简表单">精简表单</option>' +
+            '<option value="全量表单">全量表单</option>' +
             '</select>' +
             '</div><p>'+
             '</p><div id="rwdzID' + count + '" class="myDivrwdz">'+
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>短信ID&emsp;&nbsp;'+
-            '<input type="text" name="smsId" class="styled-input" placeholder="请输入短信ID" value="">' +
+            '<input type="text" name="smsId" class="styled-input" placeholder="请输入短信ID">' +
             '</div><p>'+
             '</p>'+
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;</strong>下发渠道&nbsp;'+

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

@@ -126,7 +126,6 @@
 
         // 获取 Template.status 的值
         var status = $('#switchFlag').val();
-        debugger;
         // 根据 status 设置开关的状态和样式
         if (status === '启用中') {
             // 设置开关为开启状态
@@ -215,9 +214,17 @@
             $.modal.alertWarning("请添加药品");
             return;
         }
-        debugger;
         var prefix = ctx + "dtp/sdtpyypzfollowupsop";
         var data = $("#form-SDtpYypzFollowUpSop-edit").serializeArray();
+        var nodesDataCheck = [];
+        nodesDataCheck=collectNodesData();
+        if(nodesDataCheck.length==0){
+            $.modal.alertWarning("请添加节点");
+            return;
+        }if(nodesDataCheck.length>=11){
+            $.modal.alertWarning("最多添加 10 个节点");
+            return;
+        }
         data.push({name:"nodesData",value:JSON.stringify(collectNodesData())});
         data.push({name:"applicableDrug",value:JSON.stringify(applicableDrug)});
         data.push({name:"switchFlag",value:switchFlag});
@@ -287,7 +294,6 @@
         row.remove();
     }
     function collectNodesData() {
-        debugger;
         // 获取所有节点
         const nodes = document.querySelectorAll('.tabs-container .tab-pane');
         // 创建一个空数组来保存所有节点的数据
@@ -391,7 +397,6 @@
     function  toTask(){
         selectCount++;
         // 使用 includes 方法检查 carNum 是否已在 carNumFlag2 数组中
-        debugger;
         // 创建并设置 div 的内容
         var filtersContainer = document.getElementById('filtersContainer'+carNum);
         var filterRow = document.createElement('div');
@@ -649,11 +654,9 @@
             if (selectedValue === '最近待执行随访距今天数' ||
                 selectedValue === '最近已完成随访距今天数' ||
                 selectedValue === '最近订单距今天数') {
-                debugger;
                 // 加载数值比较类型的三级选项
                 loadLevelThreeOptionsForNumericComparison();
             } else {
-                debugger;
                 // 加载字符串比较类型的三级选项
                 loadLevelThreeOptionsForStringComparison();
             }
@@ -906,14 +909,19 @@
         // 绑定 change 事件
         $(document).on('change', '#ts'+carNum, function(e) {
             var selectedValue = $(this).val();
-            if (selectedValue === "周期节点" && flag) {
+            if (selectedValue === "周期节点" && TJ=='事件条件') {
                 flag = false;
                 $('#span'+carNum).remove();
-                var addNodeOne ='<span id="span'+carNum+'"> 每 '+
-                    '<input type="number" name="createTaskEvery" placeholder="请输入" class="styled-input" value="">' +
+                var addNodeOne ='<span id="span'+carNum+'"> 当 '+
+                    '<select name="createTaskWhen" id="scrw-t'+carNum+'" class="styled-input">' +
+                    '<option value="">请选择</option>' +
+                    ' <option value="最近订单D值">最近订单D值(剩余用药天数)</option>' +
+                    '<option value="其他值">其他值</option>' +
+                    '</select>' +
+                    "  为" +
+                    '<input type="number" name="createTaskTriggerValue" placeholder="请输入" class="styled-input" value="">触发动作' +
                     "  天生成任务，共执行  " +
                     '<input type="number" name="createTaskExecutionTimes" placeholder="请输入" class="styled-input" value="">次</span>'
-
                 $('#scrw'+carNum).after(addNodeOne);
             }if (selectedValue === "单次节点" && TJ=='时间条件') {
                 flag = true;
@@ -936,14 +944,16 @@
                     '<input type="number" name="createTaskTriggerValue" placeholder="请输入" class="styled-input" value="">触发动作'
                 $('#scrw'+carNum).after(addNodeOne);
             }
-            if (selectedValue === "单次节点" && TJ=='' ) {
-                flag = true;
+            if (selectedValue === "周期节点" && TJ=='时间条件') {
+                flag = false;
                 $('#span'+carNum).remove();
-                var addNodeOne ="  <span id=\"span"+carNum+"\">第  " +
-                    '<input type="number" id="scrw-t'+carNum+'" name="createTaskDi" placeholder="请输入" class="styled-input" value="">' +
-                    "  天生成任务 </span>" ;
+                var addNodeOne ='<span id="span'+carNum+'"> 每 '+
+                    '<input type="number" name="createTaskEvery" placeholder="请输入" class="styled-input" value="">' +
+                    "  天生成任务，共执行  " +
+                    '<input type="number" name="createTaskExecutionTimes" placeholder="请输入" class="styled-input" value="">次</span>'
                 $('#scrw'+carNum).after(addNodeOne);
             }
+
         });
         // 绑定 change 事件
         $(document).on('change', '#scrw'+carNum, function(e) {
@@ -994,7 +1004,6 @@
 
         // 绑定 change 事件
         $(document).on('change', '#rwdz'+carNum, function(e) {
-            debugger;
             var chudaSelect = $(this).val();
             console.log("chudaSelect="+chudaSelect);
             var roleSelect = document.getElementById("js"+carNum);
@@ -1010,6 +1019,10 @@
                 divElement.style.display = "none";
                 var divElementform = document.getElementById("rwdzform"+carNum); // 获取 div 引用
                 divElementform.style.display = "block";
+                // var myDivuseForm = document.getElementsByClassName("myDivuseForm"); // 获取 div 引用
+                // myDivuseForm.style.display = "block";
+                // var myDivsmsId = document.getElementsByClassName("myDivsmsId"); // 获取 div 引用
+                // myDivsmsId.style.display = "none";
                 renwdongz='表单任务';
                 var option = document.createElement("option");
                 option.value = "药师";
@@ -1023,6 +1036,10 @@
                 divElement.style.display = "none";
                 var divElementID = document.getElementById("rwdzID"+carNum); // 获取 div 引用
                 divElementID.style.display = "block";
+                // var myDivuseForm = document.getElementsByClassName("myDivuseForm"); // 获取 div 引用
+                // myDivuseForm.style.display = "none";
+                // var myDivsmsId = document.getElementsByClassName("myDivsmsId"); // 获取 div 引用
+                // myDivsmsId.style.display = "block";
                 renwdongz='触达任务';
                 var option = document.createElement("option");
                 option.value = "系统";
@@ -1143,7 +1160,7 @@
             '<p>'+
             '</p>'+
             '<strong>执行任务: </strong>生成后第&nbsp;'+
-            '<input type="number" name="generationDaysAfter" placeholder="请输入" class="styled-input" value="">' +
+            '<input type="number" name="generationDaysAfter" placeholder="请输入" class="styled-input">' +
             '  天  ' +
             '<input type="text" name="generationHMS" placeholder="请输入时间（时分秒）" id="datetimepicker-demo-3"  class="styled-input" value="">' +
             '  执行任务  ' +
@@ -1159,7 +1176,7 @@
             '<p>'+
             '</p>'+
             '<strong>&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>任务有效期&nbsp;'+
-            '<input type="number" name="taskValidity" placeholder="请输入" class="styled-input" value="">&emsp;天' +
+            '<input type="number" name="taskValidity" placeholder="请输入" class="styled-input">&emsp;天' +
             '<p>'+
             '</p>'+
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>任务素材&nbsp;'+
@@ -1172,14 +1189,13 @@
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>使用表单&nbsp;'+
             '<select name="useForm" id="2-' + count + '" class="styled-input">' +
             '<option value="">请选择</option>' +
-            '<option value="单任务表单">单任务表单</option>' +
-            '<option value="随访任务表单">随访任务表单</option>' +
-            '<option value="脱落召回随访表单">脱落召回随访表单</option>' +
+            '<option value="精简表单">精简表单</option>' +
+            '<option value="全量表单">全量表单</option>' +
             '</select>' +
             '</div><p>'+
             '</p><div id="rwdzID' + count + '" class="myDivrwdz">'+
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>短信ID&emsp;&nbsp;'+
-            '<input type="text" name="smsId" class="styled-input" placeholder="请输入短信ID" value="">' +
+            '<input type="text" name="smsId" class="styled-input" placeholder="请输入短信ID">' +
             '</div><p>'+
             '</p>'+
             '<strong>&emsp;&emsp;&emsp;&emsp;&nbsp;</strong>下发渠道&nbsp;'+
@@ -1428,17 +1444,16 @@
                             <option value="表单" ${node.taskMaterial === '表单' ? 'selected' : ''}>表单</option>
                             <option value="表单2" ${node.taskMaterial === '表单2' ? 'selected' : ''}>表单2</option>
                         </select>
-                        <p></p><div id="rwdzform${count}" class="myDivrwdz">
+                        <p></p><div id="rwdzform${count}" class="myDivuseForm">
                         <strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>使用表单&nbsp;
                         <select name="useForm" id="2-${count}" class="styled-input">
                             <option value="">请选择</option>
-                            <option value="单任务表单" ${node.useForm === '单任务表单' ? 'selected' : ''}>单任务表单</option>
-                            <option value="随访任务表单" ${node.useForm === '随访任务表单' ? 'selected' : ''}>随访任务表单</option>
-                            <option value="脱落召回随访表单" ${node.useForm === '脱落召回随访表单' ? 'selected' : ''}>脱落召回随访表单</option>
+                            <option value="精简表单" ${node.useForm === '精简表单' ? 'selected' : ''}>精简表单</option>
+                            <option value="全量表单" ${node.useForm === '全量表单' ? 'selected' : ''}>全量表单</option>
                         </select>
-                        </div><p></p><div id="rwdzID${count}" class="myDivrwdz">
+                        </div><p></p><div id="rwdzID${count}" class="myDivsmsId">
                         <strong>&emsp;&emsp;&emsp;&emsp;&nbsp;&nbsp;</strong>短信ID&emsp;&nbsp;
-                        <input type="text" name="smsId"  class="styled-input" placeholder="请输入短信ID" value="${node.smsId}">
+                        <input type="text" name="smsId"  class="styled-input" placeholder="请输入短信ID" value="${columnsData.smsId}">
                         </div><p></p>
                         <strong>&emsp;&emsp;&emsp;&emsp;&nbsp;</strong>下发渠道&nbsp;
                          <select name="deliveryChannel" id="xfqd${count}" class="styled-input">
@@ -1471,6 +1486,17 @@
             bindTabEvents(count);
             // 动态加载过滤条件
             loadFilterConditions(count, columnsData.filterCondition);
+            if (columnsData.taskActionTaskType=== '表单任务') {
+                var divElement = document.getElementById("rwdzID"+carNum); // 获取 div 引用
+                divElement.style.display = "none";
+                var divElementform = document.getElementById("rwdzform"+carNum); // 获取 div 引用
+                divElementform.style.display = "block";
+            } else if (columnsData.taskActionTaskType === '触达任务') {
+                var divElement = document.getElementById("rwdzform"+carNum); // 获取 div 引用
+                divElement.style.display = "none";
+                var divElementID = document.getElementById("rwdzID"+carNum); // 获取 div 引用
+                divElementID.style.display = "block";
+            }
         });
 
         // 绑定 onchange 事件监听器以响应用户交互
@@ -1485,21 +1511,44 @@
 
 
     }
+    //激活节点 生成任务监听
     function updateTaskCreationUI(count, node) {
         var activateNodeRule = node.activateNodeRule;
         var createTaskStructures = node.createTaskStructures;
         var spanElement = document.getElementById('span' + count);
-
+        var flage;
+        if (activateNodeRule === '单次节点') {
+            flage=true;
+        }
         if (activateNodeRule === '周期节点') {
-            if (createTaskStructures === '时间条件') {
+            flage=false;
+        }
+        if (activateNodeRule === '周期节点' || activateNodeRule === '单次节点') {
+            if (createTaskStructures === '时间条件' && flage==true) {
+            spanElement.innerHTML = `第
+           <input type="number" name="createTaskDi" placeholder="请输入" class="styled-input" value="${node.createTaskDi}">
+           天生成任务，共执行`;
+            } if (createTaskStructures === '时间条件' && flage==false) {
                 spanElement.innerHTML = `
                 每
-                <input type="number" name="createTaskEvery" placeholder="请输入" class="styled-input" value="${node.createTaskEvery || ''}">
+                <input type="number" name="createTaskEvery" placeholder="请输入" class="styled-input" value="${node.createTaskEvery}">
                 天生成任务，共执行
-                <input type="number" name="createTaskExecutionTimes" placeholder="请输入" class="styled-input" value="${node.createTaskExecutionTimes || ''}">
+                <input type="number" name="createTaskExecutionTimes" placeholder="请输入" class="styled-input" value="${node.createTaskExecutionTimes}">
                 次
             `;
-            } else if (createTaskStructures === '事件条件') {
+            } if (createTaskStructures === '事件条件' && flage==true) {
+                spanElement.innerHTML = `
+                当
+                <select name="createTaskWhen" id="scrw-t${count}" class="styled-input">
+                    <option value="">请选择</option>
+                    <option value="最近订单D值" ${node.createTaskWhen === '最近订单D值' ? 'selected' : ''}>最近订单D值(剩余用药天数)</option>
+                    <option value="其他值" ${node.createTaskWhen === '其他值' ? 'selected' : ''}>其他值</option>
+                </select>
+                为
+                <input type="number" name="createTaskTriggerValue" placeholder="请输入" class="styled-input" value="${node.createTaskTriggerValue}">
+                触发动作
+            `;
+            } if (createTaskStructures === '事件条件' && flage==false) {
                 spanElement.innerHTML = `
                 当
                 <select name="createTaskWhen" id="scrw-t${count}" class="styled-input">
@@ -1508,19 +1557,13 @@
                     <option value="其他值" ${node.createTaskWhen === '其他值' ? 'selected' : ''}>其他值</option>
                 </select>
                 为
-                <input type="number" name="createTaskTriggerValue" placeholder="请输入" class="styled-input" value="${node.createTaskTriggerValue || ''}">
+                <input type="number" name="createTaskTriggerValue" placeholder="请输入" class="styled-input" value="${node.createTaskTriggerValue}">
                 触发动作 &nbsp; &nbsp;
                 共执行
-                <input type="number" name="createTaskExecutionTimes" placeholder="请输入" class="styled-input" value="${node.createTaskExecutionTimes || ''}">
+                <input type="number" name="createTaskExecutionTimes" placeholder="请输入" class="styled-input" value="${node.createTaskExecutionTimes}">
                 次
             `;
             }
-        } else if (activateNodeRule === '单次节点') {
-            spanElement.innerHTML = `
-            第
-            <input type="number" id="createTaskDi${count}" name="createTaskDi" placeholder="请输入" class="styled-input" value="${node.createTaskDi || ''}">
-            天生成任务
-        `;
         }
     }
 
@@ -1598,7 +1641,6 @@
             <!-- 添加更多判断条件选项 -->
         `;
             filterRow.appendChild(levelThreeSelect);
-            debugger;
             // 创建并初始化四级输入框只输入数字
             if (condition.judgingCondition === '等于' || condition.judgingCondition === '不等于') {
                 var levelFourInput = document.createElement('input');
@@ -1753,6 +1795,12 @@
 </script>
 <style>
     .myDivrwdz {
+        display: block; /* 初始状态为不显示 */
+    }
+    .myDivsmsId {
+        display: none; /* 初始状态为不显示 */
+    }
+    .myDivuseForm {
         display: none; /* 初始状态为不显示 */
     }
 

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

@@ -46,98 +46,104 @@
                 <label>厂家简称:</label>
                 <input name="manufacturerShortName" placeholder="请输入厂家简称" id="manufacturerShortName" class="styled-input" type="text">
             </div>
-                <div class=" panel panel-warning" style="width: 90%;margin-left: 8%">
-                    <div class="panel-heading">
-                        <i class="fa fa-info-circle"></i> 以下是选择项的说明
-                    </div>
-                    <div class="panel-body">
-                        <p>1.是否随访管品:指的是药品是否需要进行用药后的跟踪随访。对于一些特定的药物，特别是那些可能有严重副作用或需要监测疗效的药物，医疗机构和药企可能会对使用这些药物的患者进行定期随访，以确保药物的安全性和有效性。</p>
-                        <p>2.分是否冷链管理品:冷链管理指的是在整个供应链过程中，从生产、储存到运输直至最终到达消费者手中的每一个环节都保持在规定的低温环境中。这适用于那些对温度敏感的药品，以保证其品质和效力不受影响。</p>
-                        <p>3.是否登记管理品:登记管理是指药品是否被列入了特定的监管名单中，要求对其销售、使用等情况进行详细记录。这类药品通常是因为它们具有较高的风险性或者特殊的管理需求。</p>
-                        <p>4.是否慈善援助管理品:慈善援助管理涉及药品是否作为慈善项目的一部分提供给经济困难或特定条件下的患者。企业或组织会为符合条件的人群免费提供药物支持，减轻他们的经济负担。</p>
-                    </div>
-                    <div class="customize-form-group">
-                        <label class="is-required">是否随访管理品:</label>
-                        <select name="isFollowUpManaged" id="isFollowUpManaged" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yes_no')}" required>
-                            <option value="">请选择</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                        </select>
+            <div class="panel panel-warning" style="width: 90%; margin-left: 8%;">
+                <div class="panel-heading d-flex justify-content-between align-items-center">
+                    <span><i class="fa fa-info-circle"></i> 以下是选择项的说明</span>
+                    <button type="button" class="btn btn-link" data-toggle="collapse" data-target="#toggleContent" aria-expanded="true" aria-controls="toggleContent">
+                        <i class="fa fa-chevron-down"></i>
+                    </button>
+                </div>
+                <div id="toggleContent" class="panel-body collapse">
+                    <p>1. 是否随访管品: 指的是药品是否需要进行用药后的跟踪随访。对于一些特定的药物，特别是那些可能有严重副作用或需要监测疗效的药物，医疗机构和药企可能会对使用这些药物的患者进行定期随访，以确保药物的安全性和有效性。</p>
+                    <p>2. 分是否冷链管理品: 冷链管理指的是在整个供应链过程中，从生产、储存到运输直至最终到达消费者手中的每一个环节都保持在规定的低温环境中。这适用于那些对温度敏感的药品，以保证其品质和效力不受影响。</p>
+                    <p>3. 是否登记管理品: 登记管理是指药品是否被列入了特定的监管名单中，要求对其销售、使用等情况进行详细记录。这类药品通常是因为它们具有较高的风险性或者特殊的管理需求。</p>
+                    <p>4. 是否慈善援助管理品: 慈善援助管理涉及药品是否作为慈善项目的一部分提供给经济困难或特定条件下的患者。企业或组织会为符合条件的人群免费提供药物支持，减轻他们的经济负担。</p>
+                </div>
+                <div class="customize-form-group">
+                    <label class="is-required">是否随访管理品:</label>
+                    <select name="isFollowUpManaged" id="isFollowUpManaged" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yes_no')}" required>
+                        <option value="">请选择</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
 
-                        <label class="is-required">是否冷链管理品:</label>
-                        <select name="isColdChainManaged" id="isColdChainManaged" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yes_no')}" required>
-                            <option value="">请选择</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                        </select>
-                    </div>
-                    <div class="customize-form-group" id="isRegisteredManagedDiv">
-                        <label>是否登记管理品:</label>
-                        <select name="isRegisteredManaged" id="isRegisteredManaged" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yes_no')}">
-                            <option value="">请选择</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                        </select>
+                    <label class="is-required">是否冷链管理品:</label>
+                    <select name="isColdChainManaged" id="isColdChainManaged" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yes_no')}" required>
+                        <option value="">请选择</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+                <div class="customize-form-group" id="isRegisteredManagedDiv">
+                    <label>是否登记管理品:</label>
+                    <select name="isRegisteredManaged" id="isRegisteredManaged" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yes_no')}">
+                        <option value="">请选择</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
 
-                        <label>是否慈善援助管理品:</label>
-                        <select name="isCharityAidManaged" id="isCharityAidManaged" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yes_no')}">
-                            <option value="">请选择</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                        </select>
-                    </div>
-                    <div class="customize-form-group">
-                        <label class="is-required">给药方式:</label>
-                        <select name="administrationMethod" id="administrationMethod" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_yyff')}" required>
-                            <option value="">请选择</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                        </select>
+                    <label>是否慈善援助管理品:</label>
+                    <select name="isCharityAidManaged" id="isCharityAidManaged" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yes_no')}">
+                        <option value="">请选择</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+                <div class="customize-form-group">
+                    <label class="is-required">给药方式:</label>
+                    <select name="administrationMethod" id="administrationMethod" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_yyff')}" required>
+                        <option value="">请选择</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
 
-                        <label>企业流向管理方式:</label>
-                        <select name="enterpriseFlowManagement" id="enterpriseFlowManagement" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yppz_qylxglfs')}">
-                            <option value="">请选择</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                        </select>
-                    </div>
+                    <label>企业流向管理方式:</label>
+                    <select name="enterpriseFlowManagement" id="enterpriseFlowManagement" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yppz_qylxglfs')}">
+                        <option value="">请选择</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
+            </div>
 
             <div class=" panel panel-warning" style="width: 100%;margin-left: 8%">
-                <div class="panel-heading">
-                    <i class="fa fa-info-circle"></i> 用药规则配置信息
+                <div class="panel-heading d-flex justify-content-between align-items-center">
+                    <span><i class="fa fa-info-circle"></i> 剂量与包装说明</span>
+                    <button type="button" class="btn btn-link" data-toggle="collapse" data-target="#doseAndPackagingContent" aria-expanded="true" aria-controls="doseAndPackagingContent">
+                        <i class="fa fa-chevron-down"></i>
+                    </button>
                 </div>
-                <div class="panel-body">
-                    <p>1:最大剂量数量与单位
-                        最大剂量数量：
-                        定义： 指定患者在一定时间内（通常为一天）可以使用的药物最高限量。
-                        用途： 用于设定安全用药上限，防止过量使用带来的风险。
-                        示例： 如果某种药物的最大日剂量是500毫克，则“最大剂量数量”应设置为500。
-                        最大剂量单位：
-                        定义： 配合“最大剂量数量”使用的计量单位，如毫克(mg)、克(g)或毫升(ml)。
-                        用途： 精确描述药物剂量，确保不同药物之间的比较和管理的一致性。
+                <div id="doseAndPackagingContent" class="panel-body collapse">
+                    <p>1: 最大剂量数量与单位<br>
+                        最大剂量数量：<br>
+                        定义： 指定患者在一定时间内（通常为一天）可以使用的药物最高限量。<br>
+                        用途： 用于设定安全用药上限，防止过量使用带来的风险。<br>
+                        示例： 如果某种药物的最大日剂量是500毫克，则“最大剂量数量”应设置为500。<br>
+                        最大剂量单位：<br>
+                        定义： 配合“最大剂量数量”使用的计量单位，如毫克(mg)、克(g)或毫升(ml)。<br>
+                        用途： 精确描述药物剂量，确保不同药物之间的比较和管理的一致性。<br>
                         选择： 根据具体药品的规格选择合适的单位。</p>
-                    <p>2:常用剂量数量与单位
-                        常用剂量数量：
-                        定义： 指的是医生通常推荐给患者的每日标准用药量。
-                        用途： 提供一个常规参考值，指导患者正确用药。
-                        示例： 对于某些药物，医生可能建议每天服用100毫克作为常规剂量。
-                        常用剂量单位：
-                        定义： 配合“常用剂量数量”使用的计量单位。
-                        用途： 和最大剂量单位一样，用于精确描述药物剂量。
+                    <p>2: 常用剂量数量与单位<br>
+                        常用剂量数量：<br>
+                        定义： 指的是医生通常推荐给患者的每日标准用药量。<br>
+                        用途： 提供一个常规参考值，指导患者正确用药。<br>
+                        示例： 对于某些药物，医生可能建议每天服用100毫克作为常规剂量。<br>
+                        常用剂量单位：<br>
+                        定义： 配合“常用剂量数量”使用的计量单位。<br>
+                        用途： 和最大剂量单位一样，用于精确描述药物剂量。<br>
                         选择： 同样依据药品的具体规格来确定。</p>
-                    <p>3:最小剂量数量与单位
-                        最小剂量数量：
-                        定义： 指定患者在一定时间内（通常为一天）可以使用的药物最低限量。
-                        用途： 确保药物的有效性，避免因剂量不足而影响治疗效果。
-                        示例： 对于某些药物，最小日剂量可能是50毫克。
-                        最小剂量单位：
-                        定义： 配合“最小剂量数量”使用的计量单位。
-                        用途： 确保剂量描述的准确性。
+                    <p>3: 最小剂量数量与单位<br>
+                        最小剂量数量：<br>
+                        定义： 指定患者在一定时间内（通常为一天）可以使用的药物最低限量。<br>
+                        用途： 确保药物的有效性，避免因剂量不足而影响治疗效果。<br>
+                        示例： 对于某些药物，最小日剂量可能是50毫克。<br>
+                        最小剂量单位：<br>
+                        定义： 配合“最小剂量数量”使用的计量单位。<br>
+                        用途： 确保剂量描述的准确性。<br>
                         选择： 根据药品规格选择适当的单位。</p>
-                    <p>4:   购药包装单位数值与单位
-                        购药包装单位数值：
-                        定义： 表示每次购买时，药品的标准包装内含有的药物单元数。这是系统计算D值（例如，药品库存天数等指标）的关键参数之一。
-                        用途： 用于准确统计药品的销售和库存情况，帮助医疗机构和药店合理规划采购计划。
-                        示例： 如果一盒药品含有30片，则“购药包装单位数值”应设置为30。
-                        包装单位：
-                        定义： 描述“购药包装单位数值”的计数单位，如片、粒、瓶、支等。
-                        用途： 明确药品包装内的物品形式，便于用户理解。
-                        选择： 根据药品的实际包装形式来选择</p>
+                    <p>4: 购药包装单位数值与单位<br>
+                        购药包装单位数值：<br>
+                        定义： 表示每次购买时，药品的标准包装内含有的药物单元数。这是系统计算D值（例如，药品库存天数等指标）的关键参数之一。<br>
+                        用途： 用于准确统计药品的销售和库存情况，帮助医疗机构和药店合理规划采购计划。<br>
+                        示例： 如果一盒药品含有30片，则“购药包装单位数值”应设置为30。<br>
+                        包装单位：<br>
+                        定义： 描述“购药包装单位数值”的计数单位，如片、粒、瓶、支等。<br>
+                        用途： 明确药品包装内的物品形式，便于用户理解。<br>
+                        选择： 根据药品的实际包装形式来选择。</p>
                 </div>
                 <div class="customize-form-group">
                     <label class="is-required">最大剂量数量：</label>
@@ -269,6 +275,17 @@
 
 
         $(document).ready(function() {
+
+            // 监听所有面板头部的按钮点击事件
+            $('.panel-heading button').click(function() {
+                var $icon = $(this).find('i');
+                if ($icon.hasClass('fa-chevron-down')) {
+                    $icon.removeClass('fa-chevron-down').addClass('fa-chevron-up');
+                } else {
+                    $icon.removeClass('fa-chevron-up').addClass('fa-chevron-down');
+                }
+            });
+
             // 初始化 Select2
             $('#mdmCode').select2({
                 placeholder: '--药品编码或药品名--',

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

@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('任务跟进人新增')" />
+    <th:block th:include="include :: ztree-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form id="form-SSpglJfspProductinfo-add" class="customize-search-form">
+
+            <div class="customize-form-group-container">
+            <div class="customize-form-group edit">
+                <label>跟进人姓名:</label>
+                <input name="pharmacistName" placeholder="请输入跟进人姓名" id="pharmacistName" class="styled-input" type="text">
+            </div>
+
+            <div class="customize-form-group">
+                <label>手机号:</label>
+                <input name="phone" placeholder="请输入手机号" id="phone" class="styled-input" type="number" maxlength="11">
+            </div>
+            <div class="customize-form-group">
+                <label>角色:</label>
+                <select name="position" id="position" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yppz_roles')}" required>
+                    <option value="">请选择</option>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+                <div class="customize-form-group">
+                    <label>是否默认为任务跟进人:</label>
+                    <select name="default_follow_up" id="default_follow_up" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}" required>
+                        <option value="">请选择</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            <div class="customize-form-group">
+                <label>所属门店:</label>
+                <input name="storeName" placeholder="请输入所属门店" id="storeName" class="styled-input" type="text">
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: ztree-js" />
+<script type="text/javascript">
+
+    function submitHandler() {
+        var selectedValue = $('#default_follow_up').val();
+
+        if (selectedValue === '1') {
+            $.modal.confirm("设置该用户为默认任务跟进人,将替换已有的的默认任务跟进人", function() {
+                add();
+            });
+        } else {
+            add();
+        }
+    }
+
+    function add() {
+        var data = $("#form-SSpglJfspProductinfo-add").serializeArray();
+        $.ajax({
+            cache : true,
+            type : "POST",
+            url : ctx + "gxhpz/pharmacists/savePharmacists",
+            data : data,
+            async : false,
+            error : function(request) {
+                $.modal.alertError("系统错误");
+            },
+            success : function(data) {
+                $.operate.successCallback(data);
+            }
+        });
+    }
+</script>
+</body>
+</html>

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

@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('门店积分商品列表修改')" />
+</head>
+<body>
+<div class="ui-layout-center">
+    <form id="form-SSpglJfspProductinfo-edit" class="customize-search-form">
+
+        <div class="customize-form-group-container">
+            <input type="hidden" id="id" name="id" th:value="${id}">
+            <div class="customize-form-group-container">
+                <div class="customize-form-group-container">
+                    <div class="customize-form-group">
+                        <label>审核药师:</label>
+                        <input name="pharmacistName" placeholder="请输入审核药师" id="pharmacistName" th:value="${pharmacistName}" class="styled-input" type="text">
+                    </div>
+
+                    <div class="customize-form-group">
+                        <label>审核密码:</label>
+                        <input name="reviewPassword" placeholder="请输入审核密码" id="reviewPassword" th:value="${reviewPassword}" class="styled-input" type="text">
+                    </div>
+                    <div class="customize-form-group">
+                        <label>职位:</label>
+                        <input name="position" placeholder="请输入职位" id="position" th:value="${position}" class="styled-input" type="text">
+                    </div>
+                    <div class="customize-form-group">
+                        <label>所属门店:</label>
+                        <input name="storeName" placeholder="请输入所属门店" id="storeName" th:value="${storeName}" class="styled-input" type="text">
+                    </div>
+            </div>
+        </div>
+        </div>
+    </form>
+</div>
+<div class="main-content">
+    <div class="col-sm-offset-5 col-sm-10">
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+</body>
+</html>
+<script>
+    function edit() {
+        var data = $("#form-SSpglJfspProductinfo-edit").serializeArray();
+        $.ajax({
+            cache : true,
+            type : "POST",
+            url : ctx + "gxhpz/pharmacists/pharmacistsEdit",
+            data : data,
+            async : false,
+            error : function(request) {
+                $.modal.alertError("系统错误");
+            },
+            success : function(data) {
+                $.operate.successCallback(data);
+            }
+        });
+    }
+
+    function submitHandler() {
+        var selectedValue = $('#default_follow_up').val();
+
+        if (selectedValue === '1') {
+            $.modal.confirm("设置该用户为默认任务跟进人,将替换已有的的默认任务跟进人", function() {
+                edit();
+            });
+        } else {
+            edit();
+        }
+    }
+</script>

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

@@ -19,7 +19,10 @@
             </div>
             <div class="customize-form-group">
                 <label>职位:</label>
-                <input name="position" placeholder="请输入职位" id="position" class="styled-input" type="text">
+                <select name="position" id="position" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yppz_roles')}" required>
+                    <option value="">请选择</option>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>所属门店:</label>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('门店积分商品列表修改')" />
+    <th:block th:include="include :: header('编辑')" />
 </head>
 <body>
 <div class="ui-layout-center">
@@ -12,17 +12,31 @@
             <div class="customize-form-group-container">
                 <div class="customize-form-group-container">
                     <div class="customize-form-group">
-                        <label>审核药师:</label>
+                        <label id="shys">审核药师:</label>
+                        <label id="task">跟进人姓名:</label>
                         <input name="pharmacistName" placeholder="请输入审核药师" id="pharmacistName" th:value="${pharmacistName}" class="styled-input" type="text">
                     </div>
-
-                    <div class="customize-form-group">
-                        <label>审核密码:</label>
+                    <div class="customize-form-group" id="pwd">
+                        <label >审核密码:</label>
                         <input name="reviewPassword" placeholder="请输入审核密码" id="reviewPassword" th:value="${reviewPassword}" class="styled-input" type="text">
                     </div>
+                    <div class="customize-form-group" id="ssjh">
+                        <label >手机号:</label>
+                        <input name="phone" placeholder="请输入手机号" id="phone" class="styled-input" th:value="${phone}" type="number" maxlength="11">
+                    </div>
                     <div class="customize-form-group">
-                        <label>职位:</label>
-                        <input name="position" placeholder="请输入职位" id="position" th:value="${position}" class="styled-input" type="text">
+                        <label>角色:</label>
+                        <select name="position" id="position" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yppz_roles')}" required>
+                            <option value="">请选择</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${position==dict.dictValue}"></option>
+                        </select>
+                    </div>
+                    <div class="customize-form-group" id="default_follow_upId" >
+                        <label>是否默认为任务跟进人:</label>
+                        <select name="default_follow_up" id="default_follow_up" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}" required>
+                            <option value="">请选择</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${default_follow_up==dict.dictValue}"></option>
+                        </select>
                     </div>
                     <div class="customize-form-group">
                         <label>所属门店:</label>
@@ -30,7 +44,7 @@
                     </div>
             </div>
         </div>
-
+        </div>
     </form>
 </div>
 <div class="main-content">
@@ -40,7 +54,41 @@
 <th:block th:include="include :: footer" />
 </body>
 </html>
-<script>
+<script th:inline="javascript">
+
+    var positionFlag=false;
+    //初始化加载
+    $(document).ready(function() {
+        var id = $("#id").val();
+        var position = $("#position").val();
+        var ssjh = $("#ssjh").val();
+        var pwd = $("#pwd").val();
+        var task = $("#task").val();
+        var shys = $("#shys").val();
+        if(position=="审核药师"){
+            positionFlag=false;
+            $("#ssjh").hide();
+            $("#task").hide();
+            $("#default_follow_upId").hide();
+
+        }else if(position=="任务跟进人"){
+            var selectedValue = $('#default_follow_up').val();
+            if (selectedValue === '1') {
+                positionFlag=true;
+            }
+            $("#pwd").hide();
+            $("#shys").hide();
+        }else {
+            positionFlag=false;
+            $("#ssjh").hide();
+            $("#task").hide();
+            $("#default_follow_upId").hide();
+        }
+
+
+
+
+    });
     function edit() {
         var data = $("#form-SSpglJfspProductinfo-edit").serializeArray();
         $.ajax({
@@ -60,7 +108,23 @@
 
     function submitHandler() {
         if ($.validate.form()) {
-            edit();
+
+            if(positionFlag){
+                var selectedValue = $('#default_follow_up').val();
+                if (selectedValue === '1') {
+                    $.modal.confirm("设置该用户为默认任务跟进人,将替换已有的的默认任务跟进人", function() {
+                        edit();
+                    });
+                } else {
+                    edit();
+                }
+            }else {
+                edit();
+            }
+
         }
     }
+
+
+
 </script>

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

@@ -24,8 +24,8 @@
                 <div class="customize-form-group-container">
 
                 <div class="customize-form-group">
-                    <label>药师姓名:</label>
-                    <input type="text" class="styled-input" placeholder="请输入药师姓名" name="pharmacistName"/>
+                    <label>姓名:</label>
+                    <input type="text" class="styled-input" placeholder="请输入药师或任务跟进人姓名" name="pharmacistName"/>
                 </div>
              </div>
              </form>
@@ -33,10 +33,12 @@
 
             <div class="btn-group-sm" id="toolbar" role="group">
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
+                    <i class="fa fa-plus"></i> 新增药师
+                </a>
+                <a class="btn btn-success" onclick="$.operate.add2()" shiro:hasPermission="system:user:add">
+                    <i class="fa fa-plus"></i> 新增任务跟进人
                 </a>
             </div>
-
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: hidden;">
                 <table id="bootstrap-table" class="fixed-layout-table"></table>
             </div>
@@ -74,6 +76,7 @@
             url: prefix + "/pharmacistsList",
             viewUrl: prefix + "/pharmacistsDetail/{id}",
             createUrl: prefix + "/add",
+            createUrl2: prefix + "/add2",
             updateUrl: prefix + "/edit/{id}",
             removeUrl: prefix + "/remove",
             /*exportUrl: prefix + "/export",
@@ -81,7 +84,7 @@
             importTemplateUrl: prefix + "/importTemplate",*/
             sortName: "id",
             sortOrder: "asc",
-            modalName: "药品",
+            modalName: "操作人员",
             fitColumns: true,
             striped: true,
             autoRowHeight: true,
@@ -94,14 +97,44 @@
             fixedRightNumber: 1,
             columns: [
                 { field: 'id', title: '主键', align: 'center', visible: false },
-                { field: 'pharmacistName', title: '药师姓名', align: 'center' },
+                { field: 'pharmacistName', title: '姓名', align: 'center' },
                 { field: 'position', title: '职位', align: 'center' },
                 { field: 'reviewPassword', title: '审核密码', align: 'center' },
+                { field: 'phone', title: '手机号', align: 'center' },
+                { field: 'default_follow_up', title: '默认跟进人', align: 'center',
+                    formatter: function(value, row, index) {
+                        switch (value) {//是否是该门店的默认跟进人：1是，2否
+                            case 1:
+                                return '是';
+                                break;
+                            case 2:
+                                return '否';
+                                break;
+                            default:
+                                return '其他';
+                        }
+                    } },
                 { field: 'storeName', title: '所属门店', align: 'center' },
                 { field: 'createBy', title: '创建人', align: 'center' },
                 { field: 'createTime', title: '创建时间', align: 'center' },
                 { field: 'updateBy', title: '更新人', align: 'center' },
                 { field: 'updateTime', title: '更新时间', align: 'center' },
+                { field: 'status', title: '状态', align: 'center',
+                    formatter: function(value, row, index) {
+                        switch (value) {//0离职，1在职，2请假
+                            case 0:
+                                return '离职';
+                                break;
+                            case 1:
+                                return '在职';
+                                break;
+                            case 2:
+                                return '请假';
+                                break;
+                            default:
+                                return '其他';
+                        }
+                    } },
                 {
                     title: '操作',
                     align: 'center',

health-admin/src/main/resources/templates/index-topnav.html

@@ -28,7 +28,8 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs">
-				<img th:src="@{/img/log.png}" class="logo-lg" width="100%" height="100%" style="padding-left:0px;">
+				<!--log.png-->
+				<img th:src="@{/imglog.png}" class="logo-lg" width="100%" height="100%" style="padding-left:0px;">
                 <!--<span class="logo-lg">Aa</span>-->
             </li>
          </a>

health-admin/src/main/resources/templates/index.html

@@ -27,6 +27,7 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs">
+				<!--log.png-->
 				<img th:src="@{/img/log.png}" class="logo-lg" width="100%" height="100%" style="padding-left:0px;">
                 <!--&lt;!&ndash;<span class="logo-lg">英招在康</span>&ndash;&gt;-->
             </li>

health-admin/src/main/resources/templates/login.html

@@ -28,6 +28,7 @@
             <div class="col-sm-7">
                 <div class="signin-info">
                     <div class="logopanel m-b">
+                        <!--logo1.png-->
                         <h1><img alt="[ 健康管理 ]" src="../static/img/logo1.png" th:src="@{/img/logo1.png}" width="90%" height="30%"></h1>
                     </div>
                     <div class="m-b"></div>

health-admin/src/main/resources/templates/register.html

@@ -24,6 +24,7 @@
             <div class="col-sm-7">
                 <div class="signin-info">
                     <div class="logopanel m-b">
+                        <!--logo1.png-->
                         <h1><img alt="[ 健康管理 ]" src="../static/img/logo1.png" th:src="@{/img/logo1.png}" width="90%" height="30%"></h1>
                     </div>
                     <div class="m-b"></div>

health-common/src/main/java/com/bzd/common/core/domain/BaseEntity.java

@@ -25,7 +25,7 @@ public class BaseEntity implements Serializable
     private String createBy;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /** 更新者 */

health-common/src/main/java/com/bzd/common/utils/uuid/IdUtils.java

@@ -40,6 +40,10 @@ public class IdUtils
     {
         return UUID.get10randomNumber();
     }
+    public static long get12randomNumber()
+    {
+        return UUID.get12RandomNumber();
+    }
     public static int get7randomNumber()
     {
         return UUID.get7randomNumber();

health-common/src/main/java/com/bzd/common/utils/uuid/UUID.java

@@ -506,6 +506,12 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
 
         return randomNumber;
     }
+    public static long get12RandomNumber() {
+        SecureRandom secureRandom = new SecureRandom();
+
+        // 生成一个12位数的随机数，最小值为10,000,000,000L (12位)，最大值为99,999,999,999L (12位)
+        return 10_000_000_000L + secureRandom.nextLong() % 90_000_000_000L;
+    }
     public static int get7randomNumber()
     { // 创建一个SecureRandom对象
         SecureRandom secureRandom = new SecureRandom();

health-quartz/src/main/java/com/bzd/quartz/domain/SysJob.java

@@ -3,6 +3,8 @@ package com.bzd.quartz.domain;
 import java.io.Serializable;
 import java.util.Date;
 import javax.validation.constraints.*;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.bzd.common.annotation.Excel;
@@ -53,6 +55,45 @@ public class SysJob extends BaseEntity implements Serializable
     @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
     private String status;
 
+    /** 门店id */
+    private String storeId;
+    /** 患者id */
+    private String patientId;
+    /** dtp计划id */
+    private String planId;
+    /** dtp任务id */
+    private String taskId;
+
+    /**新增：最大执行次数 */
+    private Integer maxExecutions;
+
+    /**当前已执行次数 */
+    private Integer currentExecutionCount;
+    /**设置剩余执行次数 */
+    private Integer remainingExecutions;
+
+    /**任务到期时间 有效期 */
+    private Date expiryDate;
+
+    /** 上一个任务执行时间 */
+    private String LastTaskExecutionTime;
+
+    public Integer getRemainingExecutions() {
+        return remainingExecutions;
+    }
+
+    public void setRemainingExecutions(Integer remainingExecutions) {
+        this.remainingExecutions = remainingExecutions;
+    }
+
+    public String getLastTaskExecutionTime() {
+        return LastTaskExecutionTime;
+    }
+
+    public void setLastTaskExecutionTime(String lastTaskExecutionTime) {
+        LastTaskExecutionTime = lastTaskExecutionTime;
+    }
+
     public Long getJobId()
     {
         return jobId;
@@ -148,6 +189,59 @@ public class SysJob extends BaseEntity implements Serializable
         this.status = status;
     }
 
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(String patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(String planId) {
+        this.planId = planId;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+    public Integer getMaxExecutions() {
+        return maxExecutions;
+    }
+
+    public void setMaxExecutions(Integer maxExecutions) {
+        this.maxExecutions = maxExecutions;
+    }
+
+    public Integer getCurrentExecutionCount() {
+        return currentExecutionCount;
+    }
+
+    public void setCurrentExecutionCount(Integer currentExecutionCount) {
+        this.currentExecutionCount = currentExecutionCount;
+    }
+    public Date getExpiryDate() {
+        return expiryDate;
+    }
+
+    public void setExpiryDate(Date expiryDate) {
+        this.expiryDate = expiryDate;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -159,6 +253,10 @@ public class SysJob extends BaseEntity implements Serializable
             .append("misfirePolicy", getMisfirePolicy())
             .append("concurrent", getConcurrent())
             .append("status", getStatus())
+            .append("storeId", getStoreId())
+            .append("patientId", getPatientId())
+            .append("planId", getPlanId())
+            .append("taskId", getTaskId())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

health-quartz/src/main/java/com/bzd/quartz/service/ISysJobService.java

@@ -84,6 +84,7 @@ public interface ISysJobService
      * @return 结果
      */
     public int insertJob(SysJob job) throws SchedulerException, TaskException;
+    public int insertJob2(SysJob job) throws SchedulerException, TaskException;
 
     /**
      * 更新任务

health-quartz/src/main/java/com/bzd/quartz/service/impl/SysJobServiceImpl.java

@@ -211,7 +211,22 @@ public class SysJobServiceImpl implements ISysJobService
         }
         return rows;
     }
-
+    /**
+     * 新增任务
+     *
+     * @param job 调度信息 调度信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertJob2(SysJob job) throws SchedulerException, TaskException
+    {   job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
+        int rows = jobMapper.insertJob(job);
+        if (rows > 0)
+        {
+            ScheduleUtils.createScheduleJob(scheduler, job);
+        }
+        return rows;
+    }
     /**
      * 更新任务的时间表达式
      *

health-quartz/src/main/java/com/bzd/quartz/task/RyTask.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
 import com.bzd.common.utils.StringUtils;
 
 import javax.annotation.Resource;
+import java.sql.Date;
 import java.util.List;
 
 import static com.bzd.common.utils.ShiroUtils.getSysUser;
@@ -44,12 +45,80 @@ public class RyTask
 
     //购药处方登记成功后如果是随访品 触发计划和执行任务
     //触发计划
-    public void triggerPLan(String mdmCode, String storeId , String patientId , String templateId , String planId)throws Exception {
-        System.out.println("执行有参方法:triggerPLan");
+    public void triggerPLan(String action,String mdmCode, String storeId, String patientId, String templateId, Integer planId) throws Exception {
+        // 方法实现
+        System.out.println("触发计划了=========>执行有参方法:triggerPLan with parameters: " + mdmCode + "," + action + ", " + storeId + ", " + patientId + ", " + templateId + ", " + planId);
+        // 这里添加具体的业务逻辑
+        System.out.println("执行时间:"+DateUtils.getTime());
+        PageData plan=new PageData();
+        plan.put("planId",planId);
+        plan.put("storeId",storeId);
+        plan.put("patientId",patientId);
+        plan.put("status",1);//0=关闭 1=开启/进行中，2=默认/已创建待开启
+        plan.put("updatedTime",DateUtils.getTime());
+        plan.put("updatedBy","系统触发");
+        int planResult= daoSupport.update("followTaskMapper.openPlanByPlanId", plan);
+        System.out.println("触发计划:更新方法<openPlanByPlanId(plan)>：plan="+plan+"结果:"+planResult);
     }
     //触发任务
-    public void triggerTask(String mdmCode, String storeId , String patientId , String templateId , String planId)throws Exception {
-        System.out.println("执行有参方法:triggerTask");
+    public void triggerTask(String appointmentDate, String nodeFlag, String action, String mdmCode, String storeId , String patientId , String templateId , Integer planId , Integer taskId)throws Exception {
+        System.out.println("触发任务了=========>执行有参方法:triggerTask parameters"+nodeFlag+action+mdmCode+storeId+patientId+templateId+planId+taskId);
+        System.out.println("执行时间:"+DateUtils.getTime());
+        //        ST 时间条件+单次节点
+        //        PT 时间条件+周期节点
+        //        SE 事件条件+单次节点
+        //        PE 事件条件+周期节点
+        //        生成任务 action=create
+        //        执行任务 action=execute
+        if("create".equals(action)){
+            if("PT".equals(nodeFlag) || "PE".equals(nodeFlag)){
+                updateJobStatusByTaskId(taskId,patientId,storeId);
+            }
+            PageData    task=new PageData();
+            task.put("planId",planId);
+            task.put("taskId",taskId);
+            task.put("storeId",storeId);
+            task.put("patientId",patientId);
+            task.put("taskStatus","待执行");//待执行,已下发，已完成，未完成，未下发，已取消
+            task.put("updatedAt",DateUtils.getTime());
+            task.put("operator","系统触发");
+            task.put("appointmentDate",appointmentDate);//预约日期
+            System.out.println("触发任务:更新方法<openTaskByTaskId(task)>：预约日期="+appointmentDate);
+            int taskResult= daoSupport.update("followTaskMapper.openTaskByTaskId", task);
+            System.out.println("触发任务:更新方法<openTaskByTaskId(task)>：task="+task+"结果:"+taskResult);
+        }if("execute".equals(action)){
+            System.out.println("执行时间:发短信了,你好:小爱同学,需要什么帮助吗,你的药吃完了没?"+DateUtils.getTime()+"古币啊");
+        }
+
     }
+    /**
+     * 更新任务状态并递减剩余执行次数。
+     *
+     * @param taskId 任务ID
+     */
+    public void updateJobStatusByTaskId(Integer taskId, String storeId, String patientId) throws Exception {
+        PageData    task=new PageData();
+        task.put("taskId",taskId);
+        task.put("storeId",storeId);
+        task.put("patientId",patientId);
+
+        PageData    jobResult= (PageData)daoSupport.findForObject("followTaskMapper.getJobByTaskId", task);
 
+        if (StringUtils.isNotNull(jobResult)) {
+         int getRemainingExecutions=(int)   jobResult.get("remainingExecutions");
+         int currentExecutionCount=(int)   jobResult.get("currentExecutionCount");
+            if (getRemainingExecutions>0) {
+                jobResult.put("remainingExecutions",getRemainingExecutions - 1);
+                jobResult.put("currentExecutionCount",currentExecutionCount + 1);
+                jobResult.put("updateTime",DateUtils.getTime());
+                jobResult.put("updateBy","SYSTEM");
+                jobResult.put("taskId",taskId);
+                jobResult.put("storeId",storeId);
+                jobResult.put("patientId",patientId);
+                int ret= daoSupport.update("followTaskMapper.updateJobStatusByTaskId", jobResult);
+                System.out.println("执行更行方法:更新任务状态并递减剩余执行次数<updateJobStatusByTaskId(String taskId)>：taskId="+taskId+"结果:"+ret);
+            }
+        }
+
+    }
 }

health-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml

@@ -18,10 +18,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"       column="update_by"       />
 		<result property="updateTime"     column="update_time"     />
 		<result property="remark"         column="remark"          />
+		<result property="expiryDate"     column="expiry_date"          />
+		<result property="maxExecutions"  column="maxExecutions"          />
+		<result property="currentExecutionCount"       column="currentExecutionCount"/>
+		<result property="remainingExecutions"         column="remainingExecutions"/>
 	</resultMap>
 
 	<sql id="selectJobVo">
-        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark
+        select job_id,
+               job_name,
+               job_group,
+               invoke_target,
+               cron_expression, misfire_policy, concurrent, status,
+               store_id,patient_id,plan_id,task_id,
+               create_by, create_time, remark,remainingExecutions,expiry_date,currentExecutionCount,maxExecutions
 		from sys_job
     </sql>
 
@@ -72,10 +82,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
  			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
  			<if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
+			<if test="storeId != null and storeId != ''">store_id = #{storeId},</if>
+			<if test="patientId != null and patientId != ''">patient_id= #{patientId},</if>
+			<if test="planId != null and planId != ''">plan_id= #{planId},</if>
+			<if test="taskId != null and taskId != ''">task_id}= #{taskId},</if>
  			<if test="status !=null">status = #{status},</if>
  			<if test="remark != null and remark != ''">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
+			<if test="expiryDate != null">expiry_date = #{expiryDate},</if>
+			<if test="remainingExecutions != null">remainingExecutions = #{remainingExecutions},</if>
+			<if test="currentExecutionCount != null and currentExecutionCount != ''">currentExecutionCount = #{currentExecutionCount},</if>
+			<if test="maxExecutions != null and maxExecutions != ''">maxExecutions = #{maxExecutions},</if>
+ 			update_time = sysdate(),
  		</set>
  		where job_id = #{jobId}
 	</update>
@@ -92,6 +110,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+			<if test="storeId != null and storeId != ''">store_id,</if>
+			<if test="patientId != null and patientId != ''">patient_id,</if>
+			<if test="planId != null and planId != ''">plan_id,</if>
+			<if test="taskId != null and taskId != ''">task_id,</if>
+		    <if test="expiryDate != null">expiry_date,</if>
+			<if test="currentExecutionCount != null and currentExecutionCount != ''">currentExecutionCount,</if>
+			<if test="maxExecutions != null and maxExecutions != ''">maxExecutions,</if>
+			<if test="remainingExecutions != null and remainingExecutions != ''">remainingExecutions,</if>
  			create_time
  		)values(
  			<if test="jobId != null and jobId != 0">#{jobId},</if>
@@ -104,6 +130,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+		   <if test="storeId != null and storeId != ''">#{storeId},</if>
+ 		   <if test="patientId != null and patientId != ''">#{patientId},</if>
+ 		   <if test="planId != null and planId != ''">#{planId},</if>
+ 		   <if test="taskId != null and taskId != ''">#{taskId},</if>
+		   <if test="expiryDate != null">#{expiryDate},</if>
+			<if test="currentExecutionCount != null and currentExecutionCount != ''">#{currentExecutionCount},</if>
+			<if test="maxExecutions != null and maxExecutions != ''">#{maxExecutions},</if>
+			<if test="remainingExecutions != null and remainingExecutions != ''">#{remainingExecutions},</if>
  			sysdate()
  		)
 	</insert>

health-system/src/main/java/com/bzd/system/service/DTPService.java

@@ -9,17 +9,17 @@ import com.bzd.common.utils.StringUtils;
 import com.bzd.common.utils.uuid.IdUtils;
 import com.bzd.system.service.dtp.SDtpYypzFollowUpSopService;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
 
 import static com.bzd.common.utils.ShiroUtils.getSysUser;
 
@@ -570,20 +570,28 @@ public class DTPService {
         int resultDrug=0;
         int drugQuantity=0;
 
-        //生成计划ID
-        String planId =  IdUtils.fastSimpleUUID();
+
         String registrant = (String) pd.get("registrant");
         if(StringUtils.isEmpty(registrant)){
             pd.put("registrant", getSysUser().getLoginName());
         }
         try {
             if (StringUtils.isNotNull(drugList)) {
+                // 定义日期时间格式化器
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                 // 将 JSON 字符串转换为 List<Map<String, Object>>
                 ObjectMapper objectMapper = new ObjectMapper();
                 List<Map<String, Object>> rowsdrugList = objectMapper.readValue(drugList.toString(), List.class);
-                drugQuantity = rowsdrugList.size();//处方取药数量
+               // drugQuantity = rowsdrugList.size();//处方取药数量
                 // 遍历列表并调用插入数据接口
                 if (rowsdrugList.size() > 0) {
+                    PageData PS = new PageData();
+                    PS.put("storeId", getSysUser().getDeptId());//门店id
+                    PS.put("position", "任务跟进人");//角色
+                    PS.put("status", 1);//在职状态
+                    PS.put("default_follow_up", 1);//默认的跟进人
+
+                    PageData SPD_EFAULT= (PageData) daoSupport.findForObject("SDtpYypzFollowUpSopMapper.selectDefaultFollowUpByPS", PS);//查询该门店的默认的任务跟进人
                     for (Map<String, Object> lxr : rowsdrugList) {
                         PageData pageData = new PageData();
                         PageData pdPlan = new PageData();
@@ -603,6 +611,7 @@ public class DTPService {
                         pageData.put("manufacturerShortName", lxr.get("manufacturerShortName"));
                         pageData.put("administrationMethod", lxr.get("administrationMethod"));
                         pageData.put("packageQuantity", lxr.get("packageQuantity"));//处方取药数量(包装数)输入框的值
+                        drugQuantity=drugQuantity+Integer.parseInt(lxr.get("packageQuantity").toString());
                         pageData.put("singleDoseValue", lxr.get("singleDoseValue"));//处方单次剂量数值 输入框的值
                         pageData.put("singleDoseUnit", lxr.get("singleDoseUnit"));//处方单次剂量单位
                         pageData.put("dosageFrequency", lxr.get("dosageFrequency"));//规范用药频次
@@ -620,14 +629,12 @@ public class DTPService {
                         pageData.put("drugsLinkId", drugsLinkId);
                         pageData.put("prescriptionDate", DateUtils.getTime());
                         pageData.put("hospital", lxr.get("hospital"));
-
                         pageData.put("prescribingDoctor", lxr.get("prescribingDoctor"));
                         pageData.put("department", lxr.get("department"));
                         pageData.put("attendingPhysician", lxr.get("attendingPhysician"));
                         pageData.put("clinicalDiagnosis", lxr.get("clinicalDiagnosis"));
                         pageData.put("registrant", lxr.get("registrant"));
                         pageData.put("registrationDate", DateUtils.getTime());
-//                        pageData.put("saleDate", lxr.get("saleDate"));
 //                        pageData.put("pharmacyName", lxr.get("pharmacyName"));
 //                        pageData.put("updatedBy", lxr.get("updatedBy"));
 //                        pageData.put("updatedTime", lxr.get("updatedTime"));
@@ -635,89 +642,246 @@ public class DTPService {
 
                        //如果药品是随访管理品 生成随访计划和任务
                         String followUpItem   = (String) lxr.get("followUpItem");//是否是随访品 1是,0否
-                        if( StringUtils.isNotEmpty(followUpItem) && "是".equals(followUpItem) ){
-                            int i=0;
+                      if( StringUtils.isNotEmpty(followUpItem) && "是".equals(followUpItem) ){
+
+                            PageData d_value_code = (PageData) daoSupport.findForObject("drugConfigMapper.selectDvalueCode", pageData);//查询是否是关联的患者管理品 如果有数据就是管理品
+                            if(StringUtils.isNotNull(d_value_code)){
+                                Number oldvalueNumber = (Number) lxr.get("dvalueDays");
+                                int oldvalue = (oldvalueNumber != null) ? oldvalueNumber.intValue() : 0;
+                                pageData.put("dvalueDays", oldvalue);
+
+                                LocalDate currentDate = LocalDate.now();
+
+                                // 使用自定义格式化器解析日期时间字符串
+                                LocalDateTime purchaseDateTime = LocalDateTime.parse((String) pageData.get("registrationDate"), formatter);
+                                LocalDate purchaseDate = purchaseDateTime.toLocalDate();// 将购药日期转换为LocalDate类型
+                               // 计算两个日期间的天数差
+                                int daysDifference = (int) ChronoUnit.DAYS.between(purchaseDate, currentDate);
+                                // 根据天数差更新实际用药天数
+                                int actual_value = oldvalue - daysDifference;//actual_value 实际D值用药天数
+                                pageData.put("dvalueDays", oldvalue);
+
+                                // 查询是否存在关联记录
+                                PageData D3Conditions = (PageData) daoSupport.findForObject("dvalueMapper.selectLinkDValuesBy3Conditions", pageData);
+                                if(StringUtils.isNotNull(D3Conditions)){
+                                    // 已有关联记录，进行更新操作
+                                    Number existingSumTotalNumber = (Number) D3Conditions.get("sum_total");
+                                    int existingSumTotal = (existingSumTotalNumber != null) ? existingSumTotalNumber.intValue() : 0;
+                                    String existingMedicationStatus = (String) D3Conditions.get("medication_status");
+
+                                    // 新购药的天数
+                                    Number new_dvalueNumber = (Number) lxr.get("dvalueDays");
+                                    int new_dvalue = (new_dvalueNumber != null) ? new_dvalueNumber.intValue() : 0;
+                                    int sum_total;
+                                    if(existingSumTotal<=0){
+                                        // 累加新的D值到sum_total
+                                        //如果是之前的D值天数是负数的时候 就重新计算D值
+                                         sum_total = new_dvalue;
+                                    }else{
+                                        // 累加新的D值到sum_total
+                                         sum_total = existingSumTotal + new_dvalue;
+                                    }
+
+
+                                    // 根据算法计算用药状态
+                                    String medication_status;
+                                    if (actual_value >= 0 && new_dvalue > 0) {
+                                        medication_status = "持续购药";
+                                    } else if (sum_total <= -35) {
+                                        medication_status = "流失";
+                                    } else if (sum_total < -7 && sum_total > -35) {
+                                        medication_status = "脱落";
+                                    } else if (sum_total <= -7 && sum_total < 0) {
+                                        medication_status = "待复购";
+                                    } else if (actual_value >= 0) {
+                                        medication_status = "服药中";
+                                    } else {
+                                        medication_status = "未知状态";
+                                    }
+                                    // 更新pageData中的值
+                                    pageData.put("sum_total", sum_total);
+                                    pageData.put("medication_status", medication_status);
+                                    // 执行更新操作
+                                    int up_value = dao.executeBatch("dvalueMapper.updateLinkDValueByMdmCode", pageData);
+                                    System.out.println("执行更新关联数据"+up_value);
+                                }else{
+                                    // 无关联记录，进行插入操作
+                                    int sum_total = oldvalue; // 初次保存时，sum_total等于dvalueDays
+                                    String medication_status = "服药中";
+
+                                    // 更新pageData中的值
+                                    pageData.put("sumTotal", sum_total);
+                                    pageData.put("medicationStatus", medication_status);
+                                    String dValueName =(String) d_value_code.get("dValueName");
+                                    Long dValueCode =(Long) d_value_code.get("d_value_code");
+                                    pageData.put("dValueName", dValueName);
+                                    pageData.put("dValueCode", dValueCode);
+                                    int add_value = dao.executeBatch("dvalueMapper.insertLinkDValue", pageData);//新增D值关关联数据
+                                    System.out.println("插入关联数据"+add_value);
+                                }
+                            }
+
                             PageData   pdCPB=new PageData();
                             if (StringUtils.isNotEmpty(patientId)) {
                                 pdCPB.put("patientId", patientId);
                             }else {
-                                returnPageData.put("msg", "添加败未获取患者信息");
+                                returnPageData.put("msg", "添加败!,未获取患者信息");
                                 returnPageData.put("code", 300);
                                 return returnPageData;
                             }
+                            pdCPB.put("storeId", getSysUser().getDeptId());//门店id
                             pdCPB.put("mdmCode", lxr.get("mdmCode"));//'药品编码'
-                            pdCPB.put("productCode", lxr.get("productCode"));//'药品编码'
-
-                            List<PageData> SOPList= (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectSOPTemplateByProductCode", pdCPB);
-                            if(SOPList.size()>0){//说明是配置品
-                              String businessBelonging = (String) SOPList.get(0).get("businessBelonging");//业务归属
+                            pdCPB.put("productCode", lxr.get("mdmCode"));//'药品编码' s_dtp_review_pharmacists
+
+
+                            List<PageData> SOPList= (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectSOPTemplateByProductCode", pdCPB);//通过药品查询模版信息
+                           if(SOPList.size()>0){
+                            //说明是配置过的药品，需要生成计划和任务
+                               List<PageData> PlanTemplateList = new ArrayList<>();
+                               List<PageData> PlanList = new ArrayList<>();
+                               List<PageData> TaskNodeList = new ArrayList<>();
+                               List<PageData> TaskList = new ArrayList<>();
+                             for (int j = 0; j < SOPList.size(); j++) {
+                                  PageData template = new PageData();
+                                  Integer planId = null;
+                                  //生成计划
+                                  pdCPB.put("productName", lxr.get("productName"));//'药品名称'
+                                  pdCPB.put("specification", lxr.get("specification"));
+                                  pdCPB.put("storeId", getSysUser().getDeptId().toString());
+                                  pdCPB.put("drugsLinkId", drugsLinkId);
+                                  pdCPB.put("storeName", getSysUser().getDept().getDeptName());
+                                  pdCPB.put("templateId", SOPList.get(j).get("templateId"));//'模版ID'  实际是获取模板ID
+                                  pdCPB.put("nodeId", SOPList.get(j).get("templateId"));//'模版ID'  实际是获取模板ID
+                                  pdCPB.put("templeName", SOPList.get(j).get("templateName"));//templateName名称
+                                  String templateId = (String)  SOPList.get(j).get("templateId");
+                                  String productCode  = (String)  SOPList.get(j).get("productCode");
+                                  pdCPB.put("planName", SOPList.get(j).get("templateName")+"计划");//'计划名称' 默认用药品作为名称
+                                  pdCPB.put("businessBelonging", SOPList.get(j).get("businessBelonging"));//'业务归属
+                                  if(StringUtils.isNotNull(SPD_EFAULT)){
+                                      pdCPB.put("follow_up_person", SPD_EFAULT.get("pharmacistName"));//'随访跟进人'
+                                      pdCPB.put("follow_up_person_id", SPD_EFAULT.get("id"));//'随访跟进人id'
+                                  }
+
+                                  pdCPB.put("createdBy", "系统创建");//'创建人'
+                                  pdCPB.put("createdTime", DateUtils.getTime());//'创建时间'
+                                  pdCPB.put("updatedBy", getSysUser().getLoginName());//'创建人'
+                                  pdCPB.put("updatedTime", DateUtils.getTime());//'创建时间'
+
+                                  //先查询该患者购买在这个药品是否已经有计划 mdmCode patientId businessBelonging
+                                  PageData plan = (PageData) daoSupport.findForObject("followPlanMapper.selectPlanByCPB", pdCPB);
+                                  if (StringUtils.isNotNull(plan)) {
+                                      pdCPB.put("planId", plan.get("planId"));
+                                      // 获取 planId 并进行类型转换
+                                      Object planIdObj = plan.get("planId");
+                                       if (planIdObj instanceof String) {
+                                          // 使用 NumberUtils 进行安全转换
+                                          planId = NumberUtils.toInt((String) planIdObj);
+                                        } else if (planIdObj instanceof Integer) {
+                                          planId = (Integer) planIdObj;
+                                         } else if (planIdObj instanceof Long) {
+                                          Long longPlanId = (Long) planIdObj;
+                                          if (longPlanId <= Integer.MAX_VALUE && longPlanId >= Integer.MIN_VALUE) {
+                                              planId = longPlanId.intValue();
+                                          } else {
+                                              throw new IllegalArgumentException("planId exceeds Integer range: " + longPlanId);
+                                            }
+                                         } else {
+                                          throw new IllegalArgumentException("Unsupported type for planId: " + planIdObj.getClass());
+                                         }
+                                      pdCPB.put("businessBelonging", plan.get("businessBelonging"));//'业务归属:常规随访，脱落召回'
+                                    } else {
+                                      //生成计划ID
+                                      planId = (Integer) IdUtils.get10randomNumber();
+                                      //生成任务ID 一个药品 可能一次有两个任务 脱落召回 和常规随访
+                                      pdCPB.put("planId", planId);
+                                      //生成计划
+                                      System.out.println("执行mapper方法:getTemplateNodeByMBS,return:" + template);
+                                      pdCPB.put("status", 2);//'计划状态: 0关闭 1开启/进行中，2默认：2已创建待开启'
+                                      int FollowPlan = dao.executeBatch("followPlanMapper.insertFollowPlan", pdCPB);
+
+                                      System.out.println("FollowPlan.size()=" + FollowPlan);
+                                      pdCPB.put("status", 2);//第二次赋值为 模版 状态: 0已创建 1启用，2禁用 默认为已创建0 这里的查询状态 取的反 不等于2的状态
+                                      template = (PageData) daoSupport.findForObject("SDtpYypzFollowUpSopMapper.getTemplateNodeByMBS", pdCPB);//获取模版和药 查询条件mdmCode businessBelonging storeId
+                                      //生成定时计划任务
+                                      if (StringUtils.isNotNull(template)) {
+                                          pdCPB.put("planId", planId);
+                                          pdCPB.put("PlanProductCode", template.get("productCode"));
+                                          pdCPB.put("PlanTemplateId", template.get("templateId"));
+                                          PlanList.add(pdCPB);
+                                      }
+
+                                  }
+                                  pdCPB.put("templateId", templateId);//'模版ID'
+                                  List<PageData> SOPNodeList= (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectSOPNodeListByTemplateId", pdCPB);//通过模版id查询节点信息
+                                 if(SOPNodeList.size()>0){
+
+                                 for (PageData sopNode : SOPNodeList) {
+                                 int i=0;
+                                  //生成任务ID 一个药品 可能一次有两个任务 脱落召回 和常规随访
+                                  Integer taskId = (Integer) IdUtils.get10randomNumber();
+                                  //生成任务数据
+                                  i++;
+                                  pdCPB.put("mdmCode", lxr.get("mdmCode"));//'药品编码'
+                                  pdCPB.put("taskName", lxr.get("productName") + "-第" + i + "次任务");//'任务名称'
+                                  pdCPB.put("taskTheme", sopNode.get("businessBelonging"));//'任务主题'
+                                  pdCPB.put("templateName", sopNode.get("templateName"));//模版名称
+                                  pdCPB.put("planId", planId);//'计划ID'
+                                  pdCPB.put("taskId", taskId);//'任务ID'
+                                  pdCPB.put("patientId", patientId);//'患者id'
+                                  pdCPB.put("patientName", pd.get("patientName"));//'患者姓名'
+                                  pdCPB.put("gender", pd.get("gender"));//'性别:0男,1女,2未知'
+                                  pdCPB.put("age", pd.get("age"));//'年龄'
+                                  //pdCPB.put("followUpSummary", "无");//'随访小结'
+                                  //pdCPB.put("followUpSummaryid", lxr.get("followUpSummaryid"));//'随访小结id'
+                                  pdCPB.put("disease", pd.get("prescriptionDiagnosis"));//'疾病' 先用处方诊断字段代替
+                                  pdCPB.put("storeName", getSysUser().getDeptId());//'门店'
+                                  pdCPB.put("genericName", lxr.get("genericName"));//'药品通用名'
+                                  pdCPB.put("productName", lxr.get("productName"));//'商品名'
+                                  //pdCPB.put("taskFollower", "周敏");//'任务跟进人'
+                                  if(StringUtils.isNotNull(SPD_EFAULT)){
+                                      pdCPB.put("taskFollower", SPD_EFAULT.get("pharmacistName"));//'随访跟进人'
+                                  }
+                                  pdCPB.put("nutrition_evaluation_id", "11111111");//'营养测评id'
+                                  pdCPB.put("medication_record_id", "22222222");//'用药记录id'
+                                  pdCPB.put("taskStatus", "未下发");//任务状态：\r\n,0待执行,已下发，\r\n1已完成，\r\n2未完成，\r\n3已下发，\r\n4已取消
+                                  pdCPB.put("operator", pd.get("registrant"));//'操作人'
+                                  pdCPB.put("createdAt", DateUtils.getTime());
+                                  pdCPB.put("updatedAt", DateUtils.getTime());
+                                  pdCPB.put("storeId", getSysUser().getDeptId().toString());//返回的 Long类型 怎么转换成 Integer类型
+                                  pdCPB.put("nodeId", sopNode.get("id"));
+                                  pdCPB.put("sopNode", sopNode);
+
+                                  sopNode.put("mdmCode", lxr.get("mdmCode"));//'药品编码'
+                                  sopNode.put("taskName", lxr.get("productName") + "-第" + i + "次任务");//'任务名称'
+                                  sopNode.put("taskTheme", sopNode.get("businessBelonging"));//'任务主题'
+                                  sopNode.put("storeId", getSysUser().getDeptId().toString());
+                                  sopNode.put("taskId", taskId);
+                                  sopNode.put("planId", planId);
+                                  sopNode.put("patientId", patientId);//'患者id' s_gxhpz_follow_task_node
+                                  sopNode.put("productCode", productCode);
+                                  sopNode.put("templateId", templateId);
+                                  sopNode.put("createTime", DateUtils.getTime());
+
+                                  //预存任务
+                                  int FollowTask = dao.executeBatch("followTaskMapper.insertFollowTask", pdCPB);//预存数据任务
+                                  System.out.println("insertFollowTask="+FollowTask);
+                                  int TaskNod = dao.executeBatch("SDtpYypzFollowUpSopMapper.insertFollowTaskNode", sopNode);//把对应任务的节点与Task关联存起来
+                                  System.out.println("insertFollowTaskNode="+TaskNod);
+                                          //生成定时任务任务
+                                          TaskList.add(sopNode);
+                              }
                             }
 
-                            //先查询该患者购买在这个药品是否已经有计划 mdmCode patientId businessBelonging
-                            //List<PageData> planList= (List<PageData>) daoSupport.findForList("followPlanMapper.selectPlanListByCPB", pdCPB);
-                            PageData plan= (PageData) daoSupport.findForObject("followPlanMapper.selectPlanByCPB", pdCPB);
-                            //生成计划
-                            pdCPB.put("productName", lxr.get("productName"));//'药品名称'
-                            pdCPB.put("businessBelonging", "常规随访");//业务归属 先写死 默认这个药品已经配置了业务归属为常规随访的药
-                            pdCPB.put("specification", lxr.get("specification"));
-                            pdCPB.put("storeId", getSysUser().getDeptId());
-                            pdCPB.put("storeName", getSysUser().getDept().getDeptName());
-                            pdCPB.put("templateId", "12345");//'模版ID' 先假设写死 实际是获取模板ID
-                            pdCPB.put("planName", lxr.get("productName")+"-随访");//'计划名称' 默认用药品作为名称
-                            // pdCPB.put("taskId", taskId);
-                            pdCPB.put("follow_up_person", "周敏");//'随访跟进人' 先写死
-                            pdCPB.put("follow_up_person_id", "7");//'随访跟进人id' 先写死
-                            pdCPB.put("createdBy", "系统创建");//'创建人'
-                            pdCPB.put("createdTime", DateUtils.getTime());//'创建时间'
-                            pdCPB.put("updatedBy", getSysUser().getLoginName());//'创建时间'
-                            pdCPB.put("updatedTime", DateUtils.getTime());//'创建时间'
-                            pdCPB.put("status", 1);//'计划状态: 0关闭 1开启/进行中，2默认：2已创建待开启'
-                            if(StringUtils.isNotNull(plan)){
-                                pdCPB.put("planId", plan.get("planId"));
-                                planId= plan.get("planId").toString();
-                            }else {
-                                pdCPB.put("planId", planId);
-                                //生成计划
-                                int FollowPlan = dao.executeBatch("followPlanMapper.insertFollowPlan", pdCPB);
-                                SDtpYypzFollowUpSopService.triggerPLan(pdCPB);
-                                System.out.println("FollowPlan.size()="+FollowPlan);
-                            }
-                               //生成任务数据
-                               pdCPB.put("appointmentDate", DateUtils.getTime());//'预约日期'
-                               pdCPB.put("businessBelonging", "常规随访");//'业务归属:常规随访，脱落召回'
-                                i++;
-                                pdCPB.put("taskName", lxr.get("productName")+"-第"+i+"次任务");//'任务名称'
-                               pdCPB.put("taskTheme", "常规随访");//'任务主题'
-                               pdCPB.put("planId", planId);//'计划ID'
-                               pdCPB.put("patientId", patientId);//'患者id'
-                               pdCPB.put("patientName", pd.get("patientName"));//'患者姓名'
-                               pdCPB.put("gender", pd.get("gender"));//'性别:0男,1女,2未知'
-                               pdCPB.put("age", pd.get("age"));//'年龄'
-                               //pdCPB.put("followUpSummary", "无");//'随访小结'
-                               //pdCPB.put("followUpSummaryid", lxr.get("followUpSummaryid"));//'随访小结id'
-                               pdCPB.put("disease", pd.get("prescriptionDiagnosis"));//'疾病' 先用处方诊断字段代替
-                               pdCPB.put("storeName", getSysUser().getDeptId());//'门店'
-                               pdCPB.put("genericName", lxr.get("genericName"));//'药品通用名'
-                               pdCPB.put("productName", lxr.get("productName"));//'商品名'
-                               pdCPB.put("taskFollower", "周敏");//'任务跟进人'
-                               pdCPB.put("nutrition_evaluation_id", "11111111");//'营养测评id'
-                               pdCPB.put("medication_record_id", "22222222");//'用药记录id'
-                               pdCPB.put("taskStatus", "待执行");//任务状态：\r\n,0待执行，\r\n1已完成，\r\n2未完成，\r\n3已下发
-                               pdCPB.put("operator", pd.get("registrant"));//'操作人'
-                               pdCPB.put("createdAt", DateUtils.getTime());
-                               pdCPB.put("updatedAt", DateUtils.getTime());
-                               pdCPB.put("storeId", getSysUser().getDeptId());
-                               //生成任务
-                               int FollowTask = dao.executeBatch("followTaskMapper.insertFollowTask", pdCPB);
-                               System.out.println("FollowTask.size()="+FollowTask);
-                        }
+                          }
+                               SDtpYypzFollowUpSopService.createTrigger(PlanList,TaskList);//生成定时任务
+                         }
+
+                      }
                         addList.add(pageData);
                         resultDrug = dao.executeBatch("DTPCFDJMapper.batchAddDrugPurchaseRecordNew", pageData);
                         System.out.println("resultDrug.size()="+resultDrug);
                     }
-//                        final HashMap<String, Object> addMap = new HashMap<String, Object>();
-//                        addMap.put("dataList", addList);
-//                        resultDrug = dao.executeBatch("DTPCFDJMapper.batchAddDrugPurchaseRecord", addMap);
+
                 }
             }
 
@@ -743,7 +907,6 @@ public class DTPService {
                 pd.put("registerPharmacistName", getSysUser().getLoginName());
             }
 
-
             int result = daoSupport.save("DTPCFDJMapper.insertPrescriptionRegistration", pd);
             System.out.println("result.size()="+result);
             if(resultDrug>0 && result>0){
@@ -784,8 +947,7 @@ public class DTPService {
         String status = (String) pd.get("status");
         boolean flag = false; // 标志变量
         Integer onlyId=null;
-            //生成计划ID
-            String planId =  IdUtils.fastSimpleUUID();
+
         String prescriptionImageUrl = (String) pd.get("prescriptionImageUrl");
         if (StringUtils.isNull(pd.get("registrant"))){
             pd.put("registrant", getSysUser().getLoginName());
@@ -808,15 +970,24 @@ public class DTPService {
         Object drugList = pd.get("drugData");//获取药品信息列表
         List<PageData> addList = new ArrayList<>();
         int resultDrug=0;
+            // 定义日期时间格式化器
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         int drugQuantity=0;
         if (StringUtils.isNotNull(drugList)) {
                 // 将 JSON 字符串转换为 List<Map<String, Object>>
                 ObjectMapper objectMapper = new ObjectMapper();
                 List<Map<String, Object>> rowsdrugList = objectMapper.readValue(drugList.toString(), List.class);
-                drugQuantity=rowsdrugList.size();//处方取药数量
+                //drugQuantity=rowsdrugList.size();//处方取药数量
                 // 遍历列表并调用插入数据接口
                 if (rowsdrugList.size() > 0) {
                     dao.executeBatch("DTPCFDJMapper.batchDeleteDrugPurchaseRecord", pd);  // 直接删除 所有的药品信息然后新增
+                    PageData PS = new PageData();
+                    PS.put("storeId", getSysUser().getDeptId());//门店id
+                    PS.put("position", "任务跟进人");//角色
+                    PS.put("status", 1);//在职状态
+                    PS.put("default_follow_up", 1);//默认的跟进人
+
+                    PageData SPD_EFAULT= (PageData) daoSupport.findForObject("SDtpYypzFollowUpSopMapper.selectDefaultFollowUpByPS", PS);//查询该门店的默认的任务跟进人
                     for (Map<String, Object> lxr : rowsdrugList) {
                         PageData pageData = new PageData();
                         // 设置固定或默认值
@@ -834,6 +1005,7 @@ public class DTPService {
                         pageData.put("manufacturerShortName", lxr.get("manufacturerShortName"));
                         pageData.put("administrationMethod", lxr.get("administrationMethod"));
                         pageData.put("packageQuantity", lxr.get("packageQuantity"));
+                        drugQuantity=drugQuantity+Integer.parseInt(lxr.get("packageQuantity").toString());
                         pageData.put("singleDoseValue", lxr.get("singleDoseValue"));
                         pageData.put("singleDoseUnit", lxr.get("singleDoseUnit"));
                         pageData.put("dosageFrequency", lxr.get("dosageFrequency"));
@@ -875,71 +1047,247 @@ public class DTPService {
                         if(StringUtils.isNotNull(MdmCode)){
                             int follow_up_item = (int) MdmCode.get("follow_up_item");//随访品 //=1说明是随访品 0不是
                         if(follow_up_item==1){
-                            int i=0;
+
+
+                            PageData d_value_code = (PageData) daoSupport.findForObject("drugConfigMapper.selectDvalueCode", pageData);//查询是否是关联的患者管理品 如果有数据就是管理品
+                            if(StringUtils.isNotNull(d_value_code)){
+                                Number oldvalueNumber = (Number) lxr.get("dvalueDays");
+                                int oldvalue = (oldvalueNumber != null) ? oldvalueNumber.intValue() : 0;
+                                pageData.put("dvalueDays", oldvalue);
+                                LocalDate currentDate = LocalDate.now();
+                                // 使用自定义格式化器解析日期时间字符串
+                                LocalDateTime purchaseDateTime = LocalDateTime.parse((String) pageData.get("registrationDate"), formatter);
+                                LocalDate purchaseDate = purchaseDateTime.toLocalDate();
+
+                                // 计算两个日期间的天数差
+                                int daysDifference = (int) ChronoUnit.DAYS.between(purchaseDate, currentDate);
+                                // 根据天数差更新实际用药天数
+                                int actual_value = oldvalue - daysDifference;//actual_value 实际D值用药天数
+                                pageData.put("dvalueDays", oldvalue);
+
+                                // 查询是否存在关联记录
+                                PageData D3Conditions = (PageData) daoSupport.findForObject("dvalueMapper.selectLinkDValuesBy3Conditions", pageData);
+                                if(StringUtils.isNotNull(D3Conditions)){
+                                    // 已有关联记录，进行更新操作
+                                    Number existingSumTotalNumber = (Number) D3Conditions.get("sum_total");
+                                    int existingSumTotal = (existingSumTotalNumber != null) ? existingSumTotalNumber.intValue() : 0;
+                                    String existingMedicationStatus = (String) D3Conditions.get("medication_status");
+
+                                    // 新购药的天数
+                                    Number new_dvalueNumber = (Number) lxr.get("dvalueDays");
+                                    int new_dvalue = (new_dvalueNumber != null) ? new_dvalueNumber.intValue() : 0;
+                                    int sum_total;
+                                    if(existingSumTotal<=0){
+                                        // 累加新的D值到sum_total
+                                        //如果是之前的D值天数是负数的时候 就重新计算D值
+                                        sum_total = new_dvalue;
+                                    }else{
+                                        // 累加新的D值到sum_total
+                                        sum_total = existingSumTotal + new_dvalue;
+                                    }
+                                    // 根据算法计算用药状态
+                                    String medication_status;
+                                    if (actual_value >= 0 && new_dvalue > 0) {
+                                        medication_status = "持续购药";
+                                    } else if (sum_total <= -35) {
+                                        medication_status = "流失";
+                                    } else if (sum_total < -7 && sum_total > -35) {
+                                        medication_status = "脱落";
+                                    } else if (sum_total <= -7 && sum_total < 0) {
+                                        medication_status = "待复购";
+                                    } else if (actual_value >= 0) {
+                                        medication_status = "服药中";
+                                    } else {
+                                        medication_status = "未知状态";
+                                    }
+                                    // 更新pageData中的值
+                                    pageData.put("sum_total", sum_total);
+                                    pageData.put("medication_status", medication_status);
+                                    // 执行更新操作
+                                    int up_value = dao.executeBatch("dvalueMapper.updateLinkDValueByMdmCode", pageData);
+                                    System.out.println("执行更新关联数据"+up_value);
+                                }else{
+                                    // 无关联记录，进行插入操作
+                                    int sum_total = oldvalue; // 初次保存时，sum_total等于dvalueDays
+                                    String medication_status = "服药中";
+
+                                    // 更新pageData中的值
+                                    pageData.put("sumTotal", sum_total);
+                                    pageData.put("medicationStatus", medication_status);
+                                    String dValueName =(String) d_value_code.get("dValueName");
+                                    Long dValueCode =(Long) d_value_code.get("d_value_code");
+                                    pageData.put("dValueName", dValueName);
+                                    pageData.put("dValueCode", dValueCode);
+                                    int add_value = dao.executeBatch("dvalueMapper.insertLinkDValue", pageData);//新增D值关关联数据
+                                    System.out.println("插入关联数据"+add_value);
+                                }
+                            }
+
+
+                            //生成计划ID
+                            Integer planId =  IdUtils.get10randomNumber();
                             PageData   pdCPB=new PageData();
                             if (StringUtils.isNotEmpty(patientId)) {
                                 pdCPB.put("patientId", patientId);
                             }else {
                                 return -1;
                             }
-                            pdCPB.put("mdmCode", lxr.get("mdmCode"));
-                            pdCPB.put("productCode", lxr.get("mdmCode"));
+                            pdCPB.put("storeId", getSysUser().getDeptId().toString());//门店id
+                            pdCPB.put("mdmCode", lxr.get("mdmCode"));//'药品编码'
+                            pdCPB.put("productCode", lxr.get("productCode"));//'药品编码'
+                            List<PageData> SOPList= (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectSOPTemplateByProductCode", pdCPB);//通过药品查询模版信息
+
+                                if(SOPList.size()>0){ //说明是配置过的药品，需要生成计划和任务
+                                    List<PageData> PlanTemplateList = new ArrayList<>();
+                                    List<PageData> PlanList = new ArrayList<>();
+                                    List<PageData> TaskNodeList = new ArrayList<>();
+                                    List<PageData> TaskList = new ArrayList<>();
+                                    for (int j = 0; j < SOPList.size(); j++) {
+
+                                        pdCPB.put("productName", lxr.get("productName"));//'药品名称'
+                                        pdCPB.put("specification", lxr.get("specification"));
+                                        pdCPB.put("storeId", getSysUser().getDeptId().toString());
+                                        pdCPB.put("storeName", getSysUser().getDept().getDeptName());
+                                        pdCPB.put("nodeId", SOPList.get(j).get("templateId"));//'模版ID'  实际是获取模板ID
+                                        pdCPB.put("templeName", SOPList.get(j).get("templateName"));//templateName名称
+
+                                        String drugsLinkId= (String) pd.get("drugsLinkId");
+                                        String businessBelonging = (String) SOPList.get(j).get("businessBelonging");//业务归属
+                                        String productCode = (String) SOPList.get(j).get("productCode");//药品编码
+                                        String templateId = (String) SOPList.get(j).get("templateId");//模版id
+                                       if(StringUtils.isNotEmpty(drugsLinkId)){
+                                           pdCPB.put("drugsLinkId", drugsLinkId);
+                                           PageData LinkPlanAndTask= (PageData) daoSupport.findForObject("followPlanMapper.selectPlanByDrugsLinkId", pdCPB);//查询当前 创建过计划和任务
+                                           if(StringUtils.isNotNull(LinkPlanAndTask)){//如果有数据 说明创建过计划和任务 需要删除停掉自之前的然后重新生成计划和任务
+                                               PageData   pddel=new PageData();
+                                               pddel.put("drugsLinkId", drugsLinkId);
+                                            int plan= daoSupport.delete("followPlanMapper.deletePlanByDrugsLinkId", pddel);
+                                            int task=  daoSupport.delete("followTaskMapper.deleteTaskByDrugsLinkId", pddel);
+                                               //还要删除job表的数据 根据 planId 和 taskId 删除
+                                               pddel.put("planId", LinkPlanAndTask.get("planId"));
+                                               pddel.put("taskId", LinkPlanAndTask.get("taskId"));
+                                            int job=   daoSupport.delete("followTaskMapper.deleteSysJobByPlanId", pddel);
+
+                                           }
+
+                                       }
+
+                                        PageData template=new PageData();
+                                        //生成计划
+                                        pdCPB.put("businessBelonging", businessBelonging);//'业务属性'
+                                        //先查询该患者购买在这个药品是否已经有计划 mdmCode patientId businessBelonging
+                                        PageData plan= (PageData) daoSupport.findForObject("followPlanMapper.selectPlanByCPB", pdCPB);
+                                        if(StringUtils.isNotNull(plan)){
+                                            pdCPB.put("planId", plan.get("planId"));
+                                            // 获取 planId 并进行类型转换
+                                            Object planIdObj = plan.get("planId");
+                                            if (planIdObj instanceof String) {
+                                                // 使用 NumberUtils 进行安全转换
+                                                planId = NumberUtils.toInt((String) planIdObj);
+                                            } else if (planIdObj instanceof Integer) {
+                                                planId = (Integer) planIdObj;
+                                            } else if (planIdObj instanceof Long) {
+                                                Long longPlanId = (Long) planIdObj;
+                                                if (longPlanId <= Integer.MAX_VALUE && longPlanId >= Integer.MIN_VALUE) {
+                                                    planId = longPlanId.intValue();
+                                                } else {
+                                                    throw new IllegalArgumentException("planId exceeds Integer range: " + longPlanId);
+                                                }
+                                            } else {
+                                                throw new IllegalArgumentException("Unsupported type for planId: " + planIdObj.getClass());
+                                            }
+                                            pdCPB.put("businessBelonging", plan.get("businessBelonging"));//'业务归属:常规随访，脱落召回'
+                                        }else {
+                                            //生成计划ID
+                                            planId = (Integer) IdUtils.get10randomNumber();
+                                            //生成任务ID 一个药品 可能一次有两个任务 脱落召回 和常规随访
+                                            pdCPB.put("planId", planId);
+                                            pdCPB.put("planName", SOPList.get(j).get("templateName")+"计划");//'计划名称' 默认用药品作为名称
+                                            if(StringUtils.isNotNull(SPD_EFAULT)){
+                                                pdCPB.put("follow_up_person", SPD_EFAULT.get("pharmacistName"));//'随访跟进人'
+                                                pdCPB.put("follow_up_person_id", SPD_EFAULT.get("id"));//'随访跟进人id'
+                                            }
+                                            //生成计划
+                                            System.out.println("执行mapper方法:getTemplateNodeByMBS,return:"+template);
+                                            pdCPB.put("status", 2);//'计划状态: 0关闭 1开启/进行中，2默认：2已创建待开启'
+                                            int FollowPlan = dao.executeBatch("followPlanMapper.insertFollowPlan", pdCPB);
+                                            System.out.println("FollowPlan.size()="+FollowPlan);
+                                            pdCPB.put("status", 2);//第二次赋值为 模版 状态: 0已创建 1启用，2禁用 默认为已创建0 这里的查询状态 取的反 不等于2的状态
+                                            template= (PageData) daoSupport.findForObject("SDtpYypzFollowUpSopMapper.getTemplateNodeByMBS", pdCPB);//获取模版和药 查询条件mdmCode businessBelonging storeId
+                                            //生成定时计划任务
+                                            if(StringUtils.isNotNull(template)){
+                                                pdCPB.put("createdTime", DateUtils.getTime());//计划生成时间
+                                                pdCPB.put("planId", planId);//productCode templateId
+                                                pdCPB.put("PlanProductCode", template.get("productCode"));
+                                                pdCPB.put("PlanTemplateId", template.get("templateId"));
+                                                PlanList.add(pdCPB);
+                                            }
+                                        }
+                                        pdCPB.put("templateId", templateId);//'模版ID'
+                                        pdCPB.put("createdTime", DateUtils.getTime());//计划生成时间
+                                        List<PageData> SOPNodeList= (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectSOPNodeListByTemplateId", pdCPB);//通过模版id查询节点信息
+                                        if(SOPNodeList.size()>0){
+                                            int i=0;
+                                            for (PageData sopNode : SOPNodeList) {
+                                                //生成任务数据
+                                                //生成任务ID 一个药品 可能一次有两个任务 脱落召回 和常规随访
+                                                Integer taskId =(Integer)  IdUtils.get10randomNumber();
+                                                //生成任务数据+
+                                                i++;
+                                                pdCPB.put("mdmCode", lxr.get("mdmCode"));//'药品编码'
+                                                pdCPB.put("taskName", lxr.get("productName")+"-第"+i+"次任务");//'任务名称'
+                                                pdCPB.put("taskTheme", sopNode.get("businessBelonging"));//'任务主题'
+                                                pdCPB.put("templeName", sopNode.get("templateName"));//'任务主题'
+                                                pdCPB.put("taskId", taskId);//'任务ID'
+                                                pdCPB.put("patientId", patientId);//'患者id'
+                                                pdCPB.put("patientName", pd.get("patientName"));//'患者姓名'
+                                                pdCPB.put("gender", pd.get("gender"));//'性别:0男,1女,2未知'
+                                                pdCPB.put("age", pd.get("age"));//'年龄'
+                                                //pdCPB.put("followUpSummary", "无");//'随访小结'
+                                                //pdCPB.put("followUpSummaryid", lxr.get("followUpSummaryid"));//'随访小结id'
+                                                pdCPB.put("disease", pd.get("prescriptionDiagnosis"));//'疾病' 先用处方诊断字段代替
+                                                pdCPB.put("storeName", getSysUser().getDeptId());//'门店'
+                                                pdCPB.put("genericName", lxr.get("genericName"));//'药品通用名'
+                                                pdCPB.put("productName", lxr.get("productName"));//'商品名'
+                                                //pdCPB.put("taskFollower", "周敏");//'任务跟进人'
+                                                if(StringUtils.isNotNull(SPD_EFAULT)){
+                                                    pdCPB.put("taskFollower", SPD_EFAULT.get("pharmacistName"));//'随访跟进人'
+                                                }
+                                                pdCPB.put("nutrition_evaluation_id", "11111111");//'营养测评id'
+                                                pdCPB.put("medication_record_id", "22222222");//'用药记录id'
+                                                pdCPB.put("taskStatus", "未下发");//任务状态：\r\n,0待执行,已下发，\r\n1已完成，\r\n2未完成，\r\n3已下发，\r\n4已取消
+                                                pdCPB.put("operator", pd.get("registrant"));//'操作人'
+                                                pdCPB.put("createdAt", DateUtils.getTime());
+                                                pdCPB.put("updatedAt", DateUtils.getTime());
+                                                pdCPB.put("storeId", getSysUser().getDeptId().toString());
+                                                pdCPB.put("nodeId", sopNode.get("id"));
+                                                pdCPB.put("sopNode", sopNode);
+                                                sopNode.put("mdmCode", lxr.get("mdmCode"));//'药品编码'
+                                                sopNode.put("taskName", lxr.get("productName") + "-第" + i + "次任务");//'任务名称'
+                                                sopNode.put("taskTheme", sopNode.get("businessBelonging"));//'任务主题'
+                                                sopNode.put("storeId", getSysUser().getDeptId().toString());
+                                                sopNode.put("taskId", taskId);
+                                                sopNode.put("planId", planId);
+                                                sopNode.put("patientId", patientId);//'患者id' s_gxhpz_follow_task_node
+                                                sopNode.put("productCode", productCode);
+                                                sopNode.put("templateId", templateId);
+                                                sopNode.put("createTime", DateUtils.getTime());
+                                                //生成任务
+                                                int FollowTask = dao.executeBatch("followTaskMapper.insertFollowTask", pdCPB);//预存数据任务
+                                                System.out.println("insertFollowTask="+FollowTask);
+                                                int TaskNod = dao.executeBatch("SDtpYypzFollowUpSopMapper.insertFollowTaskNode", sopNode);//把对应任务的节点与Task关联存起来
+                                                System.out.println("insertFollowTaskNode="+TaskNod);
+                                                //生成定时任务任务
+                                               // SDtpYypzFollowUpSopService.triggerTask(pdCPB,sopNode);//生成定时任务
+                                                TaskList.add(sopNode);
+                                            }
+                                        }
+
+                                    }
+                                     //生成定时任务任务
+                                    SDtpYypzFollowUpSopService.createTrigger(PlanList,TaskList);//生成定时任务
+                                }
 
-                            List<PageData> SOPList= (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectSOPTemplateByProductCode", pdCPB);
-                            if(SOPList.size()>0){//说明是配置品
-                                String businessBelonging = (String) SOPList.get(0).get("businessBelonging");//业务归属
-                            }
-                            //先查询该患者购买在这个药品是否已经有计划 mdmCode patientId businessBelonging
-                            //List<PageData> planList= (List<PageData>) daoSupport.findForList("followPlanMapper.selectPlanListByCPB", pdCPB);
-                            PageData plan= (PageData) daoSupport.findForObject("followPlanMapper.selectPlanByCPB", pdCPB);
-                            //生成计划
-                            pdCPB.put("productName", lxr.get("productName"));//'药品名称'
-                            pdCPB.put("genericName", lxr.get("genericName"));//'药品通用名'
-                            pdCPB.put("businessBelonging", "常规随访");//业务归属 先写死 默认这个药品已经配置了业务归属为常规随访的药
-                            pdCPB.put("specification", lxr.get("specification"));
-                            pdCPB.put("storeId", getSysUser().getDeptId());//'门店id'
-                            pdCPB.put("storeName", getSysUser().getDept().getDeptName());//'门店'
-                            pdCPB.put("templateId", "12345");//'模版ID' 先假设写死 实际是获取模板ID
-                            pdCPB.put("planName", lxr.get("productName")+"-随访");//'计划名称' 默认用药品作为名称
-                            pdCPB.put("follow_up_person", "周敏");//'随访跟进人' 先写死
-                            pdCPB.put("follow_up_person_id", "7");//'随访跟进人id' 先写死
-                            pdCPB.put("createdBy", "系统创建");//'创建人'
-                            pdCPB.put("createdTime", DateUtils.getTime());//'创建时间'
-                            pdCPB.put("updatedBy", getSysUser().getLoginName());//'创建时间'
-                            pdCPB.put("updatedTime", DateUtils.getTime());//'创建时间'
-                            pdCPB.put("status", 1);//'计划状态: 0关闭 1开启/进行中，2默认：2已创建待开启'
-                            if(StringUtils.isNotNull(plan)){
-                                pdCPB.put("planId", plan.get("planId"));
-                                planId= plan.get("planId").toString();
-                            }else {
-                                pdCPB.put("planId", planId);
-                                int FollowPlan = dao.executeBatch("followPlanMapper.insertFollowPlan", pdCPB);
-                                System.out.println("先销售后登记FollowPlan.size()="+FollowPlan);
-                            }
-                            pdCPB.put("appointmentDate", DateUtils.getTime());//'预约日期'
-                            i++;
-                            pdCPB.put("taskName", lxr.get("productName")+"-第"+i+"次任务");//'任务名称'
-                            pdCPB.put("taskTheme", "常规随访");//'任务主题'
-                            pdCPB.put("planId", planId);//'计划ID'
-                            pdCPB.put("patientId", patientId);//'患者id'
-                            pdCPB.put("patientName", pd.get("patientName"));//'患者姓名'
-                            pdCPB.put("gender", pd.get("gender"));//'性别:0男,1女,2未知'
-                            pdCPB.put("age", pd.get("age"));//'年龄'
-                            //pdCPB.put("followUpSummary", "无");//'随访小结'
-                            //pdCPB.put("followUpSummaryid", lxr.get("followUpSummaryid"));//'随访小结id'
-                            pdCPB.put("disease", pd.get("prescriptionDiagnosis"));//'疾病' 先用处方诊断字段代替
-                            pdCPB.put("storeName", getSysUser().getDeptId());//'门店'
-                            //pdCPB.put("mdmCode", lxr.get("mdmCode"));//'药品编码'
-                            pdCPB.put("taskFollower", "周敏");//'任务跟进人'
-                            pdCPB.put("nutrition_evaluation_id", "11111111");//'营养测评id'
-                            pdCPB.put("medication_record_id", "22222222");//'用药记录id'
-                            pdCPB.put("taskStatus", "待执行");//任务状态：\r\n,0待执行，\r\n1已完成，\r\n2未完成，\r\n3已下发
-                            pdCPB.put("operator", pd.get("registrant"));//'操作人'
-                            pdCPB.put("createdAt", DateUtils.getTime());
-                            pdCPB.put("updatedAt", DateUtils.getTime());
-                            int FollowTask = dao.executeBatch("followTaskMapper.insertFollowTask", pdCPB);
-                            System.out.println("先销售后登记FollowTask.size()="+FollowTask);
-                            //生成任务结束
                         }
                         }
                         dao.executeBatch("DTPCFDJMapper.batchAddDrugPurchaseRecordNew", pageData);
@@ -961,41 +1309,38 @@ public class DTPService {
                         pd.put("drug_batch_number", pd1.get("drug_batch_number"));//药品批号
                     }
                 }
-                pd.put("drugQuantity", drugQuantity);
+                  pd.put("drugQuantity", drugQuantity);
 
-            if (StringUtils.isNull(reviewingName) && StringUtils.isEmpty(reviewStatus)){
-                pd.put("reviewingName", "系统审核");
-                pd.put("reviewStatus", 1);//处方审核状态:0:审核不通过;1:审核通过;2: 待审核;默认 1: "审核通过";
-            }
-            if(StringUtils.isEmpty(remarks)){
-                pd.put("remarks", "系统审核");
-            }
-            if(StringUtils.isEmpty(registerPharmacistName)){
-                pd.put("registerPharmacistName", getSysUser().getLoginName());
-            }
-
-            // 患者信息
-                if (StringUtils.isNotNull(pd.get("gender"))){
-                    String gender = pd.get("gender").toString();
-                    if (gender.equals("男")){
-                        pd.put("gender", "0");
-                    }else if(gender.equals("女")){
-                        pd.put("gender", "1");
-                    }else {
-                        if (gender.equals("0")){
-                            pd.put("gender", "0");
-                        }else if(gender.equals("1")){
-                            pd.put("gender", "1");
-                        }else {
-                            pd.put("gender", "3");
-                        }
+                    if (StringUtils.isNull(reviewingName) && StringUtils.isEmpty(reviewStatus)){
+                        pd.put("reviewingName", "系统审核");
+                        pd.put("reviewStatus", 1);//处方审核状态:0:审核不通过;1:审核通过;2: 待审核;默认 1: "审核通过";
                     }
+                    if(StringUtils.isEmpty(remarks)){
+                        pd.put("remarks", "系统审核");
+                    }
+                    if(StringUtils.isEmpty(registerPharmacistName)){
+                        pd.put("registerPharmacistName", getSysUser().getLoginName());
+                    }
+                    // 患者信息
+                        if (StringUtils.isNotNull(pd.get("gender"))){
+                            String gender = pd.get("gender").toString();
+                            if (gender.equals("男")){
+                                pd.put("gender", "0");
+                            }else if(gender.equals("女")){
+                                pd.put("gender", "1");
+                            }else {
+                                if (gender.equals("0")){
+                                    pd.put("gender", "0");
+                                }else if(gender.equals("1")){
+                                    pd.put("gender", "1");
+                                }else {
+                                    pd.put("gender", "3");
+                                }
+                            }
 
-                }
-
-                return daoSupport.save("DTPCFDJMapper.updatePrescriptionRegistration", pd);
-
+                        }
 
+                        return daoSupport.save("DTPCFDJMapper.updatePrescriptionRegistration", pd);
         }
         } catch (Exception e) {
             e.printStackTrace();

health-system/src/main/java/com/bzd/system/service/PharmaceuticalService.java

@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +46,12 @@ public class PharmaceuticalService {
     public List<PageData> getDrugPurchaseList(PageData pd) throws Exception{
         return (List<PageData>) daoSupport.findForList("PharmaceuticalServiceMapper.getDrugPurchaseList", pd);
     }
+    public List<PageData> getFollow_up_assignList(PageData pd) throws Exception{
+        return (List<PageData>) daoSupport.findForList("PharmaceuticalServiceMapper.getFollow_up_assignList", pd);
+    }
+    public List<PageData> getFollow_up_assignLZJJList(PageData pd) throws Exception{
+        return (List<PageData>) daoSupport.findForList("PharmaceuticalServiceMapper.getFollow_up_assignLZJJList", pd);
+    }
 
     public List<PageData> slectPatientByNameOrPhone(PageData pd) throws Exception{
        Object query= pd.get("query");
@@ -160,6 +168,18 @@ public class PharmaceuticalService {
         return (List<PageData>) daoSupport.findForList("PharmaceuticalServiceMapper.selectFollowUpAssignList", pd);
 
     }
+    public List<PageData> selectPharmacistsByStoreId(PageData pd) throws Exception{
+        return (List<PageData>) daoSupport.findForList("PharmaceuticalServiceMapper.selectPharmacistsByStoreId", pd);
+
+    }
+    public int editFollowUpAssignById(PageData pd) throws Exception{
+        return  daoSupport.update("PharmaceuticalServiceMapper.updateFollowUpAssign", pd);
+
+    }
+    public int editFollowTaskAssignById(PageData pd) throws Exception{
+        return  daoSupport.update("PharmaceuticalServiceMapper.editFollowTaskAssignById", pd);
+
+    }
 
     public Integer followUpAssignRemove(PageData pd)throws Exception {
         return daoSupport.delete("PharmaceuticalServiceMapper.followUpAssignRemove", pd);
@@ -251,6 +271,11 @@ public class PharmaceuticalService {
         return Pdo;
 
     }
+    public PageData selectFollowUpPerson(PageData pd) throws Exception{
+        PageData Pdo = (PageData) daoSupport.findForObject("PharmaceuticalServiceMapper.selectFollowUpPerson", pd);
+        return Pdo;
+
+    }
 
     /**
      * 新建患者档案
@@ -277,6 +302,18 @@ public class PharmaceuticalService {
         pd.put("archiveCreator", getSysUser().getLoginName());//档案创建人
         pd.put("archiveCompleteStatus", 0);//档案是否完善 1已完善 0未完善
 
+        PageData PS = new PageData();
+        PS.put("storeId", getSysUser().getDeptId());//门店id
+        PS.put("position", "任务跟进人");//角色
+        PS.put("status", 1);//在职状态
+        PS.put("default_follow_up", 1);//默认的跟进人
+
+        PageData SPD_EFAULT= (PageData) daoSupport.findForObject("SDtpYypzFollowUpSopMapper.selectDefaultFollowUpByPS", PS);//查询该门店的默认的任务跟进人
+        if(StringUtils.isNotNull(SPD_EFAULT)){
+            pd.put("follow_up_person", SPD_EFAULT.get("pharmacistName"));//'随访跟进人'
+            pd.put("follow_up_person_id", SPD_EFAULT.get("id"));//'随访跟进人id'
+        }
+
         return daoSupport.update("PharmaceuticalServiceMapper.insertArchiveRecord", pd);
     }
 
@@ -304,7 +341,19 @@ public class PharmaceuticalService {
         pd.put("createTime", DateUtils.getTime());//创建时间
         pd.put("archiveCreator", getSysUser().getLoginName());//档案创建人
         pd.put("archiveCompleteStatus", 0);//档案是否完善 1已完善 0未完善
-      int result =  daoSupport.update("PharmaceuticalServiceMapper.insertArchiveRecord", pd);
+        PageData PS = new PageData();
+        PS.put("storeId", getSysUser().getDeptId());//门店id
+        PS.put("position", "任务跟进人");//角色
+        PS.put("status", 1);//在职状态
+        PS.put("default_follow_up", 1);//默认的跟进人
+
+        PageData SPD_EFAULT= (PageData) daoSupport.findForObject("SDtpYypzFollowUpSopMapper.selectDefaultFollowUpByPS", PS);//查询该门店的默认的任务跟进人
+        if(StringUtils.isNotNull(SPD_EFAULT)){
+            pd.put("follow_up_person", SPD_EFAULT.get("pharmacistName"));//'随访跟进人'
+            pd.put("follow_up_person_id", SPD_EFAULT.get("id"));//'随访跟进人id'
+        }
+
+        int result =  daoSupport.update("PharmaceuticalServiceMapper.insertArchiveRecord", pd);
 
       if(result>0){
           PageData pageData = (PageData) daoSupport.findForObject("PharmaceuticalServiceMapper.slectPatientByNameAndPhone", pd);
@@ -345,6 +394,63 @@ public class PharmaceuticalService {
         PageData pjd= (PageData) daoSupport.findForObject("PharmaceuticalServiceMapper.statisticsPerfectionDegree", pd);
         return pjd;
     }
+    /**
+     * 查询患者档D值用药天数
+     * @param pd
+     * @return
+     * @throws Exception
+     */
+    public List<PageData> getPatienDvalueList(PageData pd) throws Exception {
+        List<PageData> pdList= (List<PageData>) daoSupport.findForList("dvalueMapper.selectLinkDValuesBy3Conditions", pd);
+        return pdList;
+    }
+    public int updateDrugPurchaseRecord(PageData pd) throws Exception {
+        pd.put("storeId", getSysUser().getDeptId());
+        String dosageFrequencyValueStr = (String) pd.get("dosageFrequencyValue"); // 频次值
+        Integer dosageFrequencyValue = Integer.parseInt(dosageFrequencyValueStr); // 转换为整数
+        String mdmCode = (String) pd.get("mdmCode");//药品编码
+        System.err.println("药品编码:"+mdmCode);
+        PageData resultDrug =(PageData) daoSupport.findForObject("PharmaceuticalServiceMapper.getDrugData", pd);
+       if(StringUtils.isNotNull(dosageFrequencyValue) && StringUtils.isNotNull(resultDrug)){
+           Integer dosageMax =  Integer.parseInt(resultDrug.get("dosage_max").toString());//常规用药最大剂量
+           Integer dosageMin =    Integer.parseInt(resultDrug.get("dosage_min").toString());//常规用药最小剂量
+           Integer dosageNormal = Integer.parseInt(resultDrug.get("dosage_normal").toString());//常见计量数量 默认计量数量
+           Integer dosageFrequencyDays =  Integer.parseInt(resultDrug.get("packing_value").toString()); // 用药频次天数
+           String dvalueDays = (String) pd.get("dvalueDays");//D值品用药天数
+           System.err.println("之前的dvalueDays:"+dvalueDays);
+           String packageQuantityStr = (String) pd.get("packageQuantity");//处方取药数量
+           Integer packageQuantity = Integer.parseInt(packageQuantityStr); // 转换为整数
+           String singleDoseValueStr = (String) pd.get("singleDoseValue");//处方单次剂量数值
+           Integer singleDoseValue = Integer.parseInt(singleDoseValueStr); // 转换为整数
+           // 计算出新的 D 值 替换掉旧的 D 值天数 dvalueDays
+           Double calculatedDValueDays;
+           if (singleDoseValue * dosageFrequencyValue > dosageMax) {
+               if (dosageNormal == null || dosageNormal == 0) {
+                   calculatedDValueDays = (packageQuantity * dosageFrequencyDays.doubleValue()) / dosageMax.doubleValue();
+               } else {
+                   calculatedDValueDays = (packageQuantity * dosageFrequencyDays.doubleValue()) / dosageNormal.doubleValue();
+               }
+           } else if (singleDoseValue * dosageFrequencyValue < dosageMin) {
+               if (dosageNormal == null || dosageNormal == 0) {
+                   calculatedDValueDays = (packageQuantity * dosageFrequencyDays.doubleValue()) / dosageMin.doubleValue();
+               } else {
+                   calculatedDValueDays = (packageQuantity * dosageFrequencyDays.doubleValue()) / dosageNormal.doubleValue();
+               }
+           } else {
+               calculatedDValueDays = (packageQuantity * dosageFrequencyDays.doubleValue()) / (singleDoseValue * dosageFrequencyValue);
+           }
+
+        // 使用 BigDecimal 来保留两位小数，并四舍五入
+                   BigDecimal bd = new BigDecimal(calculatedDValueDays);
+                   bd = bd.setScale(2, RoundingMode.HALF_UP); // 四舍五入到小数点后两位
+
+        // 将处理后的值放回 pd 中
+                   pd.put("dvalueDays",calculatedDValueDays);
+                   //pd.put("dvalueDays", bd.doubleValue());
 
+       }
+        int result = daoSupport.update("PharmaceuticalServiceMapper.updateDrugPurchaseRecord", pd);
+        return result;
+    }
 
 }

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

@@ -5,6 +5,7 @@ import com.bzd.common.config.dao.DaoBase;
 import com.bzd.common.config.dao.DaoSupport;
 import com.bzd.common.config.dao.PageData;
 import com.bzd.common.constant.ScheduleConstants;
+import com.bzd.common.exception.job.TaskException;
 import com.bzd.common.utils.DateUtils;
 import com.bzd.common.utils.StringUtils;
 import com.bzd.common.utils.uuid.IdUtils;
@@ -14,6 +15,9 @@ import com.bzd.quartz.mapper.SysJobMapper;
 import com.bzd.quartz.service.ISysJobService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.quartz.CronExpression;
+import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,10 +27,13 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.sql.Blob;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.bzd.common.utils.ShiroUtils.getSysUser;
 
@@ -48,122 +55,136 @@ public class SDtpYypzFollowUpSopService {
 
     @Resource(name = "daoSupport")
     private DaoSupport daoSupport;
+
+    @Autowired
+    private SysJobMapper jobMapper;
     @Transactional(rollbackFor = Exception.class)
     public Integer addSDtpYypzFollowUpSop(PageData pd) throws Exception {
-        //Long templateId = SnowflakeIdGenerator.newId();弃用
-        Integer templateId = IdUtils.get7randomNumber();//生成7位随机数
+        Integer templateId = IdUtils.get10randomNumber(); // 生成7位随机数
         Object nodesDataList = pd.get("nodesData");
         List<PageData> nodeList = new ArrayList<>();
         List<PageData> addList = new ArrayList<>();
-        Object drugList = pd.get("applicableDrug");//获取药品信息列表
+        Object drugListObj = pd.get("applicableDrug"); // 获取药品信息列表
+        String storeId = getSysUser().getDeptId().toString(); // 门店id
+        String businessBelonging = (String) pd.get("businessBelonging");
 
-        if (StringUtils.isNotNull(drugList)) {
-            try {
-                // 将 JSON 字符串转换为 List<Map<String, Object>>
-                ObjectMapper objectMapper = new ObjectMapper();
-                List<Map<String, Object>> rowsdrugList = objectMapper.readValue(drugList.toString(), List.class);
-                // 遍历列表并调用插入数据接口
-                if (rowsdrugList.size() > 0) {
-                    for (Map<String, Object> lxr : rowsdrugList) {
-                        PageData pageData = new PageData();
-                        pageData.put("storeId", getSysUser().getDeptId());
-                        pageData.put("createTime", DateUtils.getTime());
-                        pageData.put("productName", lxr.get("productName"));
-                        pageData.put("productCode", lxr.get("productCode"));
-                        pageData.put("specification", lxr.get("specification"));
-                        pageData.put("templateId", templateId);
-                        pageData.put("templateName", pd.get("templateName"));
-                        addList.add(pageData);
-                    }
-                    final HashMap<String, Object> addMap = new HashMap<String, Object>();
-                    addMap.put("dataList", addList);
-                    int resultDrug= dao.executeBatch("SDtpYypzFollowUpSopMapper.batchAddTemplateDrugDynamic", addMap);
-                    if (resultDrug <= 0) {
-                        throw new RuntimeException("药品信息插入失败");
+        // 收集所有药品编码
+        List<String> productCodes = new ArrayList<>();
+        if (StringUtils.isNotNull(drugListObj)) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            List<Map<String, Object>> rowsdrugList = objectMapper.readValue(drugListObj.toString(), List.class);
+
+            // 将药品编码加入集合
+            for (Map<String, Object> lxr : rowsdrugList) {
+                productCodes.add((String) lxr.get("productCode"));
+            }
+
+            // 如果有药品编码，进行批量查询校验
+            if (!productCodes.isEmpty()) {
+                PageData queryPd = new PageData();
+                queryPd.put("storeId", storeId);
+                queryPd.put("businessBelonging", businessBelonging);
+                queryPd.put("productCodes", productCodes); // 设置药品编码列表
+                queryPd.put("status", 2); // 模版状态 不等于2 的 不是禁用状态的
+
+                List<PageData> existingTemplates = (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.getTemplateNodesByMBSIn", queryPd);
+                Set<String> existingProductCodes = existingTemplates.stream()
+                        .map(pdItem -> (String) pdItem.get("productCode"))
+                        .collect(Collectors.toSet());
+
+                // 检查是否有重复项
+                for (Map<String, Object> lxr : rowsdrugList) {
+                    String productCode = (String) lxr.get("productCode");
+                    if (existingProductCodes.contains(productCode)) {
+                        throw new RuntimeException("药品:" + lxr.get("productName") + "-" + productCode + " 已经存在模板，请先禁用该模板");
                     }
                 }
 
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+                // 构建要添加的数据列表
+                for (Map<String, Object> lxr : rowsdrugList) {
+                    PageData pageData = new PageData();
+                    pageData.put("storeId", getSysUser().getDeptId());
+                    pageData.put("createTime", DateUtils.getTime());
+                    pageData.put("productName", lxr.get("productName"));
+                    pageData.put("productCode", lxr.get("productCode"));
+                    pageData.put("specification", lxr.get("specification"));
+                    pageData.put("templateId", templateId);
+                    pageData.put("templateName", pd.get("templateName"));
+                    addList.add(pageData);
+                }
 
+                final HashMap<String, Object> addMap = new HashMap<>();
+                addMap.put("dataList", addList);
+                int resultDrug = dao.executeBatch("SDtpYypzFollowUpSopMapper.batchAddTemplateDrugDynamic", addMap);
+                if (resultDrug <= 0) {
+                    throw new RuntimeException("药品信息插入失败");
+                }
+            }
         }
-       if (StringUtils.isNotNull(nodesDataList)) {
-        try {
-            // 将 JSON 字符串转换为 List<Map<String, Object>>
+
+        // 处理节点数据部分
+        if (StringUtils.isNotNull(nodesDataList)) {
             ObjectMapper objectMapper = new ObjectMapper();
             List<Map<String, Object>> nodesList = objectMapper.readValue(nodesDataList.toString(), List.class);
-            // 遍历列表并调用插入数据接口
-            if (nodesList.size() > 0) {
-                for (int i = 0; i < nodesList.size(); i++) {
-                    Map<String, Object> lxr = nodesList.get(i);
-                    PageData pageData = new PageData();
+            for (int i = 0; i < nodesList.size(); i++) {
+                Map<String, Object> lxr = nodesList.get(i);
+                PageData pageData = new PageData();
 
-                // 自动生成节点名称和编码
                 String nodeName = "节点" + (i + 1); // 节点名称从节点1开始
                 String nodeCode = String.valueOf(i + 1); // 编码从1开始
-                    pageData.put("creator", getSysUser().getLoginName());
-                    pageData.put("createTime", DateUtils.getTime());
-                    pageData.put("templateId", templateId);
-                    pageData.put("nodeName", nodeName);
-                    pageData.put("nodeCode", nodeCode);
-                    pageData.put("activateStructures", lxr.get("activateStructures"));
-                    pageData.put("activateWhichDay", lxr.get("activateWhichDay"));
-                    pageData.put("activateNodeRule", lxr.get("activateNodeRule"));
-                    pageData.put("createTaskStructures", lxr.get("createTaskStructures"));
-                    pageData.put("createTaskWhen", lxr.get("createTaskWhen"));
-                    pageData.put("createTaskEvery", lxr.get("createTaskEvery"));
-                    pageData.put("createTaskDi", lxr.get("createTaskDi"));
-                    pageData.put("createTaskTriggerValue", lxr.get("createTaskTriggerValue"));
-                    pageData.put("createTaskExecutionTimes", lxr.get("createTaskExecutionTimes"));
-                    pageData.put("taskActionMode", lxr.get("taskActionMode"));
-                    pageData.put("taskActionTaskType", lxr.get("taskActionTaskType"));
-                    pageData.put("taskActionRole", lxr.get("taskActionRole"));
-                    pageData.put("generationDaysAfter", lxr.get("generationDaysAfter"));
-                    pageData.put("generationHMS", lxr.get("generationHMS"));
-                    pageData.put("followUpSubject", lxr.get("followUpSubject"));
-                    pageData.put("taskValidity", lxr.get("taskValidity"));
-                    pageData.put("taskMaterial", lxr.get("taskMaterial"));
-                    pageData.put("deliveryChannel", lxr.get("deliveryChannel"));
-                    pageData.put("smsId",lxr.get("smsId"));
-                    pageData.put("useForm",lxr.get("useForm"));
-                    pageData.put("status",0);//状态: 0已创建 1启用，2禁用 默认为已创建0
-                    // 处理 过滤条件 filtersData
-                    @SuppressWarnings("unchecked")
-                    List<Map<String, Object>> filtersData = (List<Map<String, Object>>) lxr.get("filtersData");
-                    if (filtersData != null && !filtersData.isEmpty()) {
-                        String filtersDataJson = objectMapper.writeValueAsString(filtersData);
-                        pageData.put("filterCondition", filtersDataJson);
-                    }
-                    System.out.println("pageData:"+pageData);
-                    int node1= dao.executeBatch("SDtpYypzFollowUpSopMapper.insertNodeConfig", pageData);
-                    nodeList.add(pageData);
-                    if (node1 <= 0) {
-                        throw new RuntimeException("节点配置插入失败");
-                    }
+                pageData.put("creator", getSysUser().getLoginName());
+                pageData.put("createTime", DateUtils.getTime());
+                pageData.put("templateId", templateId);
+                pageData.put("nodeName", nodeName);
+                pageData.put("nodeCode", nodeCode);
+                pageData.put("activateStructures", lxr.get("activateStructures"));
+                pageData.put("activateWhichDay", lxr.get("activateWhichDay"));
+                pageData.put("activateNodeRule", lxr.get("activateNodeRule"));
+                pageData.put("createTaskStructures", lxr.get("createTaskStructures"));
+                pageData.put("createTaskWhen", lxr.get("createTaskWhen"));
+                pageData.put("createTaskEvery", lxr.get("createTaskEvery"));
+                pageData.put("createTaskDi", lxr.get("createTaskDi"));
+                pageData.put("createTaskTriggerValue", lxr.get("createTaskTriggerValue"));
+                pageData.put("createTaskExecutionTimes", lxr.get("createTaskExecutionTimes"));
+                pageData.put("taskActionMode", lxr.get("taskActionMode"));
+                pageData.put("taskActionTaskType", lxr.get("taskActionTaskType"));
+                pageData.put("taskActionRole", lxr.get("taskActionRole"));
+                pageData.put("generationDaysAfter", lxr.get("generationDaysAfter"));
+                pageData.put("generationHMS", lxr.get("generationHMS"));
+                pageData.put("followUpSubject", lxr.get("followUpSubject"));
+                pageData.put("taskValidity", lxr.get("taskValidity"));
+                pageData.put("taskMaterial", lxr.get("taskMaterial"));
+                pageData.put("deliveryChannel", lxr.get("deliveryChannel"));
+                String smsId= (String) lxr.get("smsId");
+                String useForm= (String)  lxr.get("useForm");
+                if(StringUtils.isNotEmpty(smsId)){
+                    pageData.put("smsId", lxr.get("smsId"));
+                }
+                if(StringUtils.isNotEmpty(useForm)){
+                    pageData.put("useForm", lxr.get("useForm"));
+                }
+                pageData.put("status", 0); // 状态: 0已创建 1启用，2禁用 默认为已创建0
+                @SuppressWarnings("unchecked")
+                List<Map<String, Object>> filtersData = (List<Map<String, Object>>) lxr.get("filtersData");
+                if (filtersData != null && !filtersData.isEmpty()) {
+                    String filtersDataJson = objectMapper.writeValueAsString(filtersData);
+                    pageData.put("filterCondition", filtersDataJson);
                 }
-        //                final HashMap<String, Object> addMap = new HashMap<String, Object>();
-        //                addMap.put("dataList", nodeList);
-                          //批量插入暂时不用
-        //                int node= dao.executeBatch("SDtpYypzFollowUpSopMapper.batchAddNodeConfig", addMap);
-        //                if (node <= 0) {
-        //                    throw new RuntimeException("节点配置插入失败");
-        //                }
-            }
 
-        } catch (Exception e) {
-            e.printStackTrace();
+                int node1 = dao.executeBatch("SDtpYypzFollowUpSopMapper.insertNodeConfig", pageData);
+                nodeList.add(pageData);
+                if (node1 <= 0) {
+                    throw new RuntimeException("节点配置插入失败");
+                }
+            }
         }
 
-    }
-        System.out.println("getSysUser().getDeptId():"+getSysUser().getDeptId());
-        pd.put("createdTime", DateUtils.getTime());//创建时间
-        pd.put("createdBy", getSysUser().getLoginName());//'创建人
-        pd.put("storeId",getSysUser().getDeptId().toString());//门店id
-        pd.put("storeName",getSysUser().getDept().getDeptName());//门店名称
-        pd.put("status",0);//状态: 0已创建 1启用，2禁用 默认为已创建0
+        pd.put("createdTime", DateUtils.getTime()); // 创建时间
+        pd.put("createdBy", getSysUser().getLoginName()); // 创建人
+        pd.put("storeName", getSysUser().getDept().getDeptName()); // 门店名称
+        pd.put("status", 0); // 状态: 0已创建 1启用，2禁用 默认为已创建0
         pd.put("templateId", templateId);
-        int result =  daoSupport.update("SDtpYypzFollowUpSopMapper.addSDtpYypzFollowUpSop", pd);
+        int result = daoSupport.update("SDtpYypzFollowUpSopMapper.addSDtpYypzFollowUpSop", pd);
         if (result <= 0) {
             throw new RuntimeException("主记录插入失败");
         }
@@ -223,7 +244,24 @@ public class SDtpYypzFollowUpSopService {
             }
         }
         Object nodesDataList = pd.get("nodesData");
-        String templateId = (String) pd.get("templateId");
+        Integer templateId =null;
+        // 获取 templateId 并进行类型转换
+        Object planIdObj = pd.get("templateId");
+        if (planIdObj instanceof String) {
+            // 使用 NumberUtils 进行安全转换
+            templateId = NumberUtils.toInt((String) planIdObj);
+        } else if (planIdObj instanceof Integer) {
+            templateId = (Integer) planIdObj;
+        } else if (planIdObj instanceof Long) {
+            Long longtemplateId = (Long) planIdObj;
+            if (longtemplateId <= Integer.MAX_VALUE && longtemplateId >= Integer.MIN_VALUE) {
+                templateId = longtemplateId.intValue();
+            } else {
+                throw new IllegalArgumentException("templateId exceeds Integer range: " + longtemplateId);
+            }
+        } else {
+            throw new IllegalArgumentException("Unsupported type for templateId: " + planIdObj.getClass());
+        }
         if (StringUtils.isNotNull(templateId)) {
             pda.put("templateId", templateId);
         }else {
@@ -232,41 +270,46 @@ public class SDtpYypzFollowUpSopService {
         List<PageData> nodeList = new ArrayList<>();
         List<PageData> addList = new ArrayList<>();
         Object drugList = pd.get("applicableDrug");//获取药品信息列表
+        String storeId = getSysUser().getDeptId().toString(); // 门店id
+        String businessBelonging = (String) pd.get("businessBelonging");
         try {
             //更新药品信息
         if (StringUtils.isNotNull(drugList)) {
+            // 将 JSON 字符串转换为 List<Map<String, Object>>
+            ObjectMapper objectMapper = new ObjectMapper();
+            List<Map<String, Object>> rowsdrugList = objectMapper.readValue(drugList.toString(), List.class);
+          // 将药品编码加入集合
             List<PageData> ylist= (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectDrugsByTemplateId", pda);
             if (ylist.size() > 0) {
                 int a=  daoSupport.update("SDtpYypzFollowUpSopMapper.deleteTemplateDrugByTemplateId", pda);
                 if (a <= 0) {
                     throw new RuntimeException("药品更新删除失败");
                 }
-             }
-                // 将 JSON 字符串转换为 List<Map<String, Object>>
-                ObjectMapper objectMapper = new ObjectMapper();
-                List<Map<String, Object>> rowsdrugList = objectMapper.readValue(drugList.toString(), List.class);
-                // 遍历列表并调用插入数据接口
-                if (rowsdrugList.size() > 0) {
-                    for (Map<String, Object> lxr : rowsdrugList) {
-                        PageData pageData = new PageData();
-                        pageData.put("storeId", getSysUser().getDeptId());
-                        pageData.put("createTime", DateUtils.getTime());
-                        pageData.put("productName", lxr.get("productName"));
-                        pageData.put("productCode", lxr.get("productCode"));
-                        pageData.put("specification", lxr.get("specification"));
-                        pageData.put("templateId", templateId);
-                        pageData.put("templateName", pd.get("templateName"));
-                        addList.add(pageData);
-                    }
-                    final HashMap<String, Object> addMap = new HashMap<String, Object>();
-                    addMap.put("dataList", addList);
-                    int resultDrug= dao.executeBatch("SDtpYypzFollowUpSopMapper.batchAddTemplateDrugDynamic", addMap);
-                    if (resultDrug <= 0) {
-                        throw new RuntimeException("药品信息插入失败");
-                    }
+            }
+
+            // 遍历列表并调用插入数据接口
+            if (rowsdrugList.size() > 0) {
+                for (Map<String, Object> lxr : rowsdrugList) {
+                    PageData pageData = new PageData();
+                    pageData.put("storeId", getSysUser().getDeptId());
+                    pageData.put("createTime", DateUtils.getTime());
+                    pageData.put("productName", lxr.get("productName"));
+                    pageData.put("productCode", lxr.get("productCode"));
+                    pageData.put("specification", lxr.get("specification"));
+                    pageData.put("templateId", templateId);
+                    pageData.put("templateName", pd.get("templateName"));
+                    addList.add(pageData);
+                }
+                final HashMap<String, Object> addMap = new HashMap<String, Object>();
+                addMap.put("dataList", addList);
+                int resultDrug= dao.executeBatch("SDtpYypzFollowUpSopMapper.batchAddTemplateDrugDynamic", addMap);
+                if (resultDrug <= 0) {
+                    throw new RuntimeException("药品信息插入失败");
                 }
+            }
+            }
+
 
-        }
             //修改节点信息
         if (StringUtils.isNotNull(nodesDataList)) {
                 List<PageData> ylist= (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectNodeConfigByTemplateId", pda);
@@ -309,8 +352,14 @@ public class SDtpYypzFollowUpSopService {
                         pageData.put("taskValidity", lxr.get("taskValidity"));
                         pageData.put("taskMaterial", lxr.get("taskMaterial"));
                         pageData.put("deliveryChannel", lxr.get("deliveryChannel"));
-                        pageData.put("smsId",lxr.get("smsId"));
-                        pageData.put("useForm",lxr.get("useForm"));
+                        String smsId= (String) lxr.get("smsId");
+                        String useForm= (String)  lxr.get("useForm");
+                        if(StringUtils.isNotEmpty(smsId)){
+                            pageData.put("smsId", lxr.get("smsId"));
+                        }
+                        if(StringUtils.isNotEmpty(useForm)){
+                            pageData.put("useForm", lxr.get("useForm"));
+                        }
                         if(StringUtils.isNotEmpty(switchFlag)){
                             pageData.put("status",statusFla);//状态: 0已创建 1启用，2禁用 默认为已创建0
                         }else{
@@ -344,7 +393,7 @@ public class SDtpYypzFollowUpSopService {
 
         } catch (Exception e) {
         e.printStackTrace();
-    }   //修改模版信息
+        }   //修改模版信息
         pd.put("updatedBy",getSysUser().getLoginName());
         pd.put("updatedTime",DateUtils.getTime());
         pd.put("storeId",getSysUser().getDeptId().toString());//门店id
@@ -363,6 +412,7 @@ public class SDtpYypzFollowUpSopService {
     }
 
     public Integer updateSopStatusByTemplateId(PageData pd)throws Exception {
+
         pd.put("updatedBy",getSysUser().getLoginName());
         pd.put("updatedTime",DateUtils.getTime());
         int b=0;
@@ -377,90 +427,654 @@ public class SDtpYypzFollowUpSopService {
            return 0;
        }
    }
+    /**
+     * 根据创建时间和激活天数生成 Cron 表达式。
+     *
+     * @param createdTime   创建计划的时间字符串，格式为 "yyyy-MM-dd HH:mm:ss"
+     * @param activateWhichDay 激活节点在创建后的第几天
+     * @return 生成的 Cron 表达式
+     */
+    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");
+    /**1触发任务主入口*/
+    public void createTrigger(List<PageData> PlanList,List<PageData> TaskList) throws Exception {
+    for (PageData pd : PlanList) {
+        PageData pd1 = new PageData();
+        pd1.put("templateId", pd.get("PlanTemplateId"));
+        List<PageData> nodeList = (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectNodeConfigByTemplateId", pd1); // 根据模版id 获取节点配置 templateId
+        System.out.println("执行mapper方法:selectNodeConfigByTemplateId,return:" + nodeList.size());
+        if (nodeList.size() > 0) {
+            for (PageData node : nodeList) {
+                String activateStructures = (String) node.get("activateStructures"); // 激活节点 激活节点(按) 创建计划 其他方式
+                int activateWhichDay = (int) node.get("activateWhichDay"); // 第几天激活
+                String activateNodeRule = (String) node.get("activateNodeRule"); // 单次节点：只执行一次 周期节点：按周期规则执行
+                String createdTime = DateUtils.getTime(); // 计划创建时间 为当前时间
+                System.out.println("计划创建时间createdTime==:" + createdTime);
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date createdDate;
+                try {
+                    createdDate = sdf.parse(createdTime);
+                    // 确保所有参数都是正确的类型，并且进行必要的转换 productCode templateId
+                    String mdmCode = (String) pd.get("PlanProductCode");
+                    String storeId = (String) pd.get("storeId");
+                    String patientId = (String) pd.get("patientId");
+                    String templateId =(String) node.get("templateId");
+                    Integer planId = (Integer) pd.get("planId");
 
-    @Autowired
-    private SysJobMapper jobMapper;
-   //购药处方登记成功后如果是随访品 触发计划和执行任务
-    //触发计划
-   public void triggerPLan(PageData pd)throws Exception {
-       System.out.println("生成定计划定时任务-执行有参方法:triggerPLan"+pd);
-       pd.put("updatedBy",getSysUser().getLoginName());
-       pd.put("updatedTime",DateUtils.getTime());
-       pd.put("status",1);//状态: 0已创建 1启用，2禁用 默认为已创建0
-       String mdmCode="";
-       String storeId="";
-       String patientId="";
-       String templateId="";
-       String planId="";
-
-       List<PageData> templateList= (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.getTemplateNodeByMBS", pd);//获取获取模版和药 查询条件mdmCode businessBelonging storeId
-       System.out.println("执行mapper方法:getTemplateNodeByMBS,return:"+templateList.size());
-       if(templateList.size()>0){
-           for (PageData pageData : templateList) {
-               PageData    pd1=new PageData();
-               pd1.put("templateId",pageData.get("templateId"));
-
-               List<PageData> NodeList= (List<PageData>)  daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectNodeConfigByTemplateId", pd1);//根据模版id 获取节点配置 templateId
-               System.out.println("执行mapper方法:selectNodeConfigByTemplateId,return:"+NodeList.size());
-               if(templateList.size()>0){
-                   for (PageData Node : NodeList) {
-                  String activateStructures= (String) Node.get("activateStructures");//激活节点 激活节点(按) 创建计划 其他方式
-                  int activateWhichDay= (int) Node.get("activateWhichDay");//(第几天激活)
-                  String   activateNodeRule= (String) Node.get("activateNodeRule");//单次节点：只执行一次 周期节点：按周期规则执行
-                  String createdTime= (String) pd.get("createdTime");//计划创建时间
-                  if(activateStructures.equals("创建计划") && activateNodeRule.equals("单次节点")){
-                      mdmCode=pageData.get("productCode").toString();
-                      storeId=pd.get("storeId").toString();
-                      patientId=pd.get("patientId").toString();
-                      templateId=pageData.get("templateId").toString();
-                      planId=pd.get("planId").toString();
-                     //新增定时任务
-                      SysJob job=new SysJob();
-                      job.setJobGroup(pd.get("planName").toString()+pd.get("mdmCode").toString());//任务组名
-                      job.setJobName(pd.get("planName").toString());//任务名称
-                      job.setInvokeTarget("ryTask.triggerPLan("+ mdmCode+","+ storeId+","+ patientId+","+templateId+","+planId+")");//调用目标字符串 ryTask.ryMultipleParams('ry', true, 2000L, 316.50D, 100) mdmCode storeId patientId templateId planId
-                      job.setCronExpression("0 0 "+activateWhichDay+" * * ?");//cron执行表达式
-                      job.setMisfirePolicy(ScheduleConstants.MISFIRE_DEFAULT);//cron计划策略  默认MISFIRE_DEFAULT
-                      job.setConcurrent("1");//是否并发执行（0允许 1禁止）
-                      job.setStatus("0");//任务状态（0正常 1暂停）
-
-                      jobMapper.insertJob(job);
-
-                  }
-
-                   }
-               }
-           }
+                    if ("创建计划".equals(activateStructures)) {
+                        // 计算激活计划的时间
+                        Calendar calendar = Calendar.getInstance();
+                        calendar.setTime(createdDate);
+                        calendar.add(Calendar.DAY_OF_MONTH, activateWhichDay); // 根据 activateWhichDay 来决定激活计划的时间
+                        Date generateTaskTime = calendar.getTime();
+                        // 创建生成激活计划的任务
+                        pd.put("action", "execute");
+                        SysJob job2 = createSysJobPlan(pd, mdmCode, storeId, patientId, templateId, planId,activateWhichDay,generateTaskTime);
+                       int jb=   jobService.insertJob2(job2);
+                        for (PageData task : TaskList) {
+                            task.put("JHTime",job2.getLastTaskExecutionTime());
+                            task.put("businessBelonging",pd.get("taskTheme"));
+                            task.put("jobGroup",pd.get("taskTheme"));
+                            task.put("jobName",pd.get("taskName"));
+                            triggerTask(task);
+                        }
+                    }
+                } catch (NumberFormatException e) {
+                    // 处理转换失败的情况
+                    System.err.println("转换 storeId, templateId 或 planId 时发生错误: " + e.getMessage());
+                    // 可能需要采取进一步措施，如记录日志、通知管理员等
+                }
+            }
+        }
+    }
+    }
+    /**2 创建计划*/
+    private SysJob createSysJobPlan(PageData pd, String mdmCode, String storeId, String patientId, String templateId, Integer planId,  int activateWhichDay, Date generateTaskTime) throws ParseException {
+       String action = (String) pd.get("action");
+        SysJob job = new SysJob();
+        job.setJobGroup(pd.get("businessBelonging").toString()); // 任务组名
+        job.setJobName(pd.get("planName").toString()); // 计划名称
+        //triggerPLan(String mdmCode, String storeId, String patientId, String templateId, Integer planId)
+        //triggerTask(String mdmCode, String storeId , String patientId , String templateId ,Integer planId ,Integer taskId)
+        String invokeTarget = String.format("ryTask.triggerPLan('%s','%s', '%s', '%s', '%s', %d)",
+                action,mdmCode, storeId, patientId, templateId, planId);
+        job.setInvokeTarget(invokeTarget); // 设置调用目标字符串
 
-       }
-   }
-    //触发任务
-    public Integer triggerTask(PageData pd)throws Exception {
-// `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-//  `appointmentDate` date DEFAULT NULL COMMENT '预约日期',
-//  `businessBelonging` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '业务归属:常规随访，脱落召回',
-//  `taskName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务名称',
-//  `taskTheme` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '任务主题',
-//  `planId` varchar(255) DEFAULT NULL COMMENT '计划ID',
-//  `patientId` varchar(300) DEFAULT NULL COMMENT '患者id',
-//  `patientName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '患者姓名',
-//        pd.put("updatedBy",getSysUser().getLoginName());
-//          `storeId` varchar(255) DEFAULT NULL COMMENT '门店id',
-//  `storeName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '门店',
-//  `mdmCode` varchar(255) DEFAULT NULL COMMENT '药品编码',
-//  `genericName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '药品通用名',
-//  `productName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '商品名'
-//        pd.put("updatedTime",DateUtils.getTime());
-        int b=0;
-        int a=  daoSupport.update("SDtpYypzFollowUpSopMapper.updateSopStatusByTemplateId", pd);
-        if(a>0){
-            b=  daoSupport.update("SDtpYypzFollowUpSopMapper.updateNodeconfigStatusByTemplateId", pd);
+        // 获取当前时间并加100秒
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime later = now.plusSeconds(100);
+        // 定义日期时间格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+        // 将时间格式化为字符串
+        String generationHMS = later.format(formatter);
+
+        // 设置 Cron 表达式
+        String cronExpression = generateCronExpression4(generateTaskTime.toString(), activateWhichDay,generationHMS, false);
+        String LastTaskTime=  zhuanhuaDirectly(cronExpression);
+        job.setLastTaskExecutionTime(LastTaskTime);
+        job.setCronExpression(cronExpression); // 设置 Cron 表达式
+        job.setMisfirePolicy(ScheduleConstants.MISFIRE_FIRE_AND_PROCEED); // Cron 计划策略
+        job.setConcurrent("1"); // 是否并发执行（0允许 1禁止）
+        job.setStatus("0");
+        job.setPlanId(planId.toString());
+        job.setStoreId(storeId);
+        job.setPatientId(patientId);
+        return job;
+    }
+    /**3 创建任务*/
+    private SysJob createSysJob(PageData pd, String mdmCode, String storeId, String patientId, String templateId, Integer planId, Integer taskId, int daysOffset, String generationHMS,String time) throws ParseException {
+        SysJob job = new SysJob();
+        job.setJobGroup(pd.get("jobGroup").toString()); //任务组名
+        job.setJobName(pd.get("jobName").toString()); // 任务名称
+        String action = (String) pd.get("action");
+        String nodeFlag = (String) pd.get("nodeFlag");
+
+        // 设置 Cron 表达式
+        String cronExpression = generateCronExpression4(time, daysOffset, generationHMS,false);
+        System.out.println("计划激活时间表达式cronExpression:"+cronExpression);
+        String LastTaskTime=  zhuanhuaDirectly(cronExpression);
+        // 把 lastTaskTimeStr 转成 Date 类型
+        Date lastTaskTimeDate = SDF.parse(LastTaskTime);
+        // 使用 SDF_DATE_ONLY 格式化 Date 对象，得到仅包含年月日的字符串
+        String formattedDate = SDF_DATE_ONLY.format(lastTaskTimeDate);
+        System.out.println("Formatted Date: " + formattedDate);
+        String invokeTarget = String.format("ryTask.triggerTask('%s','%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
+                formattedDate, nodeFlag, action, mdmCode, storeId, patientId, templateId, planId, taskId);
+        job.setInvokeTarget(invokeTarget); // 设置调用目标字符串
+        job.setLastTaskExecutionTime(LastTaskTime);
+        job.setCronExpression(cronExpression); // 设置 Cron 表达式
+        job.setMisfirePolicy(ScheduleConstants.MISFIRE_FIRE_AND_PROCEED); // Cron 计划策略
+        job.setConcurrent("1"); // 是否并发执行（0允许 1禁止）
+        job.setStatus("0");
+        job.setPlanId(planId.toString());
+        job.setStoreId(storeId);
+        job.setPatientId(patientId);
+        job.setTaskId(taskId.toString());
+        return job;
+    }
+
+    /**1.2 创建任务生成定时任务分支*/
+    public void triggerTask(PageData node) throws Exception {
+        System.out.println("生成定时任务-执行定时任务有参方法:triggerTask" + node);
+
+        try {
+            String createTaskStructures = (String) node.get("createTaskStructures"); // 生成任务(按)
+            String activateNodeRule = (String) node.get("activateNodeRule"); // 单次节点或周期节点
+            LocalDateTime createdTime = (LocalDateTime) node.get("createdTime");
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            String formattedCreatedTime = createdTime.format(formatter);
+            String mdmCode = (String) node.get("productCode");
+            String patientId = (String) node.get("patientId");
+            String templateId = (String) node.get("templateId");
+            Integer planId = (Integer) node.get("planId");
+            Integer taskId = (Integer) node.get("taskId");
+            String storeId = (String) node.get("storeId");
+            // 根据不同的生成任务条件和节点规则调用相应的处理方法
+            if ("时间条件".equals(createTaskStructures)) {
+                if ("单次节点".equals(activateNodeRule)) {
+                    handleSingleTimeNode(node, mdmCode, storeId, patientId, templateId, planId, taskId);
+                } else if ("周期节点".equals(activateNodeRule)) {
+                    handlePeriodicTimeNode(node, mdmCode, storeId, patientId, templateId, planId, taskId);
+                }
+            } else if ("事件条件".equals(createTaskStructures)) {
+                if ("单次节点".equals(activateNodeRule)) {
+                    handleSingleEventNode(node, mdmCode, storeId, patientId, templateId, planId, taskId);
+                } else if ("周期节点".equals(activateNodeRule)) {
+                    handlePeriodicEventNode(node, mdmCode, storeId, patientId, templateId, planId, taskId);
+                }
+            }
+        } catch (NumberFormatException e) {
+            System.err.println("转换 storeId, templateId 或 planId 时发生错误: " + e.getMessage());
+        } catch (Exception e) {
+            System.err.println("处理节点配置时发生错误: " + e.getMessage());
+            e.printStackTrace();
         }
-        System.out.println("a:"+a+"b:"+b);
-        if(a>0 && b>0){
-            return 2;
-        }else{
-            return 0;
+    }
+    /**1.2.1 时间条件+ 单次节点 ST ok*/
+    private void handleSingleTimeNode(PageData node, String mdmCode, String storeId, String patientId, String templateId, Integer planId, Integer taskId) {
+        node.put("nodeFlag", "ST");// 设置节点标志为ST 时间条件+单次节点
+        int createTaskDi = (int) node.get("createTaskDi"); // 第几天生成任务
+        int generationDaysAfter = (int) node.get("generationDaysAfter"); // 执行任务(生成后第几天执行任务)
+        String generationHMS = (String) node.get("generationHMS"); // 执行任务时分秒 16:40:00
+        int taskValidity = (int) node.get("taskValidity"); // 任务有效期天数 20
+        Date createdDate;
+        try {
+            createdDate = SDF.parse(node.get("JHTime").toString());//获取激活计划的时间日期 作为第几天生成任务的基准时间
+            // 通过计划激活时间 计算生成任务的时间
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(createdDate);
+            calendar.add(Calendar.DAY_OF_MONTH, createTaskDi); // 根据 createTaskDi 来决定生成任务的时间
+            // 增加5秒
+            calendar.add(Calendar.SECOND, 5);
+            Date generateTaskTime = calendar.getTime();
+            System.out.println("生成任务日期是：" + generateTaskTime);
+            // 提取生成任务时间的时分秒部分
+            String generationHMSSCRW = TIME_FORMAT.format(generateTaskTime);
+            // 打印或使用生成的时分秒字符串
+            System.out.println("Generated Time (HH:mm:ss): " + generationHMSSCRW);
+
+            // 生成任务 定时器
+            node.put("action", "create");
+            SysJob job2 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, createTaskDi, generationHMSSCRW,generateTaskTime.toString());
+            System.out.println("生成任务时间是：" + job2.getLastTaskExecutionTime());
+            Date generateAdjustedDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
+            job2.setExpiryDate(calculateExpiryDate(generateAdjustedDate, taskValidity));
+            int STC=  jobService.insertJob2(job2);
+
+
+            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);
+        }
+    }
+    /**1.2.2 时间条件+ 周期节点 PT ok*/
+    private void handlePeriodicTimeNode(PageData node, String mdmCode, String storeId, String patientId, String templateId, Integer planId, Integer taskId) {
+        node.put("nodeFlag", "PT");// 设置节点标志为PT 时间条件+周期节点
+        int createTaskEvery = (int) node.get("createTaskEvery"); // 每几天生成任务 假如每 2 天生成一次任务
+        int createTaskExecutionTimes = (int) node.get("createTaskExecutionTimes"); // 共执行几次任务 9999次
+        int generationDaysAfter = (int) node.get("generationDaysAfter"); // 执行任务(生成后第几天执行任务) 生成后第 1 天执行任务
+        String generationHMS = (String) node.get("generationHMS"); // 执行任务时分秒 18:30:00
+        int taskValidity = (int) node.get("taskValidity"); // 任务有效期天数 30天
+        Date startDate;
+        try {
+            startDate = SDF.parse(node.get("JHTime").toString()); // 获取激活计划的时间日期作为第几天生成任务的基准时间
+
+            // 初始化生成任务的时间
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(startDate);
+            calendar.add(Calendar.DAY_OF_MONTH, createTaskEvery); // 根据 createTaskEvery 来决定生成任务的时间
+            // 增加5秒
+            calendar.add(Calendar.SECOND, 5);
+            Date generateTaskTime = calendar.getTime();
+            // 提取生成任务时间的时分秒部分
+            String generationHMSSCRW = TIME_FORMAT.format(generateTaskTime);
+            // 打印或使用生成的时分秒字符串
+            System.out.println("Generated Time (HH:mm:ss): " + generationHMSSCRW);
+            // 生成任务 定时器
+            node.put("action", "create");
+            SysJob job2 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, createTaskEvery, generationHMSSCRW, generateTaskTime.toString());
+            Date generateAdjustedDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
+            job2.setExpiryDate(calculateExpiryDate(generateAdjustedDate, taskValidity));
+            job2.setRemainingExecutions(createTaskExecutionTimes); // 设置剩余执行次数
+            int PTC= jobService.insertJob2(job2);
+
+            // 通过生成任务的时间计算执行任务的时间
+            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);
+        }
+    }
+    /**1.2.3 事件条件+ 单次节点 SE*/
+    private void handleSingleEventNode(PageData node, String mdmCode, String storeId, String patientId, String templateId, Integer planId, Integer taskId) throws Exception {
+        node.put("nodeFlag", "SE");// 设置节点标志为SE 事件条件+单次节点
+        String createTaskWhen = (String) node.get("createTaskWhen"); // 生成任务(当)
+        int createTaskTriggerValue = (int) node.get("createTaskTriggerValue"); // 剩余用药天数
+        int generationDaysAfter = (int) node.get("generationDaysAfter"); // 执行任务(生成后第几天执行任务)
+        String generationHMS = (String) node.get("generationHMS"); // 执行任务时分秒
+        int taskValidity = (int) node.get("taskValidity"); // 任务有效期天数
+        if ("最近订单D值".equals(createTaskWhen)) {
+            // 查询关联的D值购药用药天数
+            PageData pd1 = new PageData();
+            pd1.put("patientId", patientId);
+            pd1.put("mdmCode", mdmCode);
+            pd1.put("storeId", storeId);
+            try {
+                Date startDate;
+                PageData D3Conditions = (PageData) daoSupport.findForObject("dvalueMapper.selectLinkDValuesBy3Conditions", pd1);
+                int sum_total = Optional.ofNullable(D3Conditions).map(data -> (int) data.get("sum_total")).orElse(0); // 如果是空的 没有数据 就默认为0
+
+                // 计算间隔天数
+                int intervalTime = sum_total - createTaskTriggerValue;
+
+                startDate = SDF.parse(node.get("JHTime").toString()); // 获取激活计划的时间日期作为第几天生成任务的基准时间
+
+                // 初始化生成任务的时间
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(startDate);
+                calendar.add(Calendar.DAY_OF_MONTH, intervalTime); // 根据 intervalTime 来决定生成任务的时间
+                // 增加5秒
+                calendar.add(Calendar.SECOND, 5);
+                Date generateTaskTime = calendar.getTime();
+                // 提取生成任务时间的时分秒部分
+                String generationHMSSCRW = TIME_FORMAT.format(generateTaskTime);
+                // 打印或使用生成的时分秒字符串
+                System.out.println("Generated Time (HH:mm:ss): " + generationHMSSCRW);
+                // 生成任务 定时器
+                node.put("action", "create");
+                SysJob job2 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, intervalTime, generationHMSSCRW, generateTaskTime.toString());
+                Date generateAdjustedDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
+                job2.setExpiryDate(calculateExpiryDate(generateAdjustedDate, taskValidity));
+                int SEC= jobService.insertJob2(job2);
+
+                // 通过生成任务的时间计算执行任务的时间
+                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();
+            }
+
+        } else {
+            System.out.println("暂不支持该类型");
+        }
+        }
+    /**1.2.4 事件条件+ 周期节点 PE*/
+    public void handlePeriodicEventNode(PageData node, String mdmCode, String storeId, String patientId, String templateId, Integer planId, Integer taskId) throws Exception {
+        node.put("nodeFlag", "PE");// 设置节点标志为PE 事件条件+周期节点
+        // 事件条件 周期节点
+        String createTaskWhen = (String) node.get("createTaskWhen"); // 生成任务(当)
+        int createTaskTriggerValue = (int) node.get("createTaskTriggerValue"); // 剩余用药天数
+        int createTaskExecutionTimes = (int) node.get("createTaskExecutionTimes"); // 共执行几次任务
+        int generationDaysAfter = (int) node.get("generationDaysAfter"); // 执行任务(生成后第几天执行任务)
+        String generationHMS = (String) node.get("generationHMS"); // 执行任务时分秒
+        int taskValidity = (int) node.get("taskValidity"); // 任务有效期天数
+
+        if ("最近订单D值".equals(createTaskWhen)) {
+            // 查询关联的D值购药用药天数
+            PageData pd1 = new PageData();
+            pd1.put("patientId", patientId);
+            pd1.put("mdmCode", mdmCode);
+            pd1.put("storeId", storeId);
+            Date startDate;
+            try {
+            PageData D3Conditions = (PageData) daoSupport.findForObject("dvalueMapper.selectLinkDValuesBy3Conditions", pd1);
+            int sum_total = Optional.ofNullable(D3Conditions).map(data -> (int) data.get("sum_total")).orElse(0); // 如果是空的 没有数据 就默认为0
+            // 计算间隔天数
+            int intervalTime = sum_total - createTaskTriggerValue;
+            startDate = SDF.parse(node.get("JHTime").toString()); // 获取激活计划的时间日期作为第几天生成任务的基准时间
+            // 初始化生成任务的时间
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(startDate);
+            calendar.add(Calendar.DAY_OF_MONTH, intervalTime); // 根据 createTaskEvery 来决定生成任务的时间
+            // 增加5秒
+            calendar.add(Calendar.SECOND, 5);
+            Date generateTaskTime = calendar.getTime();
+                // 提取生成任务时间的时分秒部分
+                String generationHMSSCRW = TIME_FORMAT.format(generateTaskTime);
+                // 打印或使用生成的时分秒字符串
+                System.out.println("Generated Time (HH:mm:ss): " + generationHMSSCRW);
+            // 生成任务 定时器
+            node.put("action", "create");
+            SysJob job2 = createSysJob(node, mdmCode, storeId, patientId, templateId, planId, taskId, intervalTime, generationHMSSCRW, generateTaskTime.toString());
+            Date generateAdjustedDate = parseStringToDateWithMultipleFormats(job2.getLastTaskExecutionTime());
+            job2.setExpiryDate(calculateExpiryDate(generateAdjustedDate, taskValidity));
+            job2.setRemainingExecutions(createTaskExecutionTimes); // 设置剩余执行次数
+            int PEC=    jobService.insertJob2(job2);
+
+            // 通过生成任务的时间计算执行任务的时间
+            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();
+        }
+        } else {
+            System.out.println("暂不支持该类型");
+        }
+    }
+
+    /**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 * * ? *"; // 默认每天午夜执行的任务，并且包含年份占位符
         }
     }
+
+    /**4 将字符串格式的时间转换为Date类型。*/
+    public static Date parseStringToDateWithMultipleFormats(String time) throws ParseException {
+        if (time == null || time.trim().isEmpty()) {
+            throw new IllegalArgumentException("Time string cannot be null or empty.");
+        }
+
+        // 定义多个可能的时间格式
+        String[] formats = {
+                "yyyy-MM-dd HH:mm:ss",
+                "yyyy/MM/dd HH:mm:ss",
+                "dd-MM-yyyy HH:mm:ss",
+                "MM/dd/yyyy HH:mm:ss"
+        };
+
+        // 尝试每种格式进行解析
+        for (String format : formats) {
+            SimpleDateFormat sdf = new SimpleDateFormat(format);
+            try {
+                return sdf.parse(time);
+            } catch (ParseException e) {
+                // 继续尝试下一个格式
+            }
+        }
+
+        // 如果所有格式都无法解析，则抛出异常
+        throw new ParseException("Unable to parse the date string with any of the provided formats.", 0);
+    }
+
+    /**6 任务有效期转换*/
+    private Date calculateExpiryDate(Date startDate, int taskValidity) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startDate);
+        calendar.add(Calendar.DAY_OF_MONTH, taskValidity);
+        return calendar.getTime();
+    }
+
+    /**购药处方登记成功后如果是随访品 触发计划和执行任务 暂时不用*/
+    public String triggerPLan(PageData pd) throws Exception {
+        System.out.println("生成定计划定时任务-执行有参方法:triggerPLan" + pd);
+        PageData pd1 = new PageData();
+        pd1.put("templateId", pd.get("PlanTemplateId"));
+        List<PageData> nodeList = (List<PageData>) daoSupport.findForList("SDtpYypzFollowUpSopMapper.selectNodeConfigByTemplateId", pd1); // 根据模版id 获取节点配置 templateId
+        System.out.println("执行mapper方法:selectNodeConfigByTemplateId,return:" + nodeList.size());
+        if (nodeList.size() > 0) {
+            for (PageData node : nodeList) {
+                String activateStructures = (String) node.get("activateStructures"); // 激活节点 激活节点(按) 创建计划 其他方式
+                int activateWhichDay = (int) node.get("activateWhichDay"); // 第几天激活
+                String activateNodeRule = (String) node.get("activateNodeRule"); // 单次节点：只执行一次 周期节点：按周期规则执行
+                String createdTime = DateUtils.getTime(); // 计划创建时间 为当前时间
+                System.out.println("计划创建时间createdTime==:" + createdTime);
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date createdDate;
+                try {
+                    createdDate = sdf.parse(createdTime);
+                    // 确保所有参数都是正确的类型，并且进行必要的转换 productCode templateId
+                    String mdmCode = (String) pd.get("PlanProductCode");
+                    String storeId = (String) pd.get("storeId");
+                    String patientId = (String) pd.get("patientId");
+                    String templateId =(String) node.get("templateId");
+                    Integer planId = (Integer) pd.get("planId");
+
+                    if ("创建计划".equals(activateStructures)) {
+                        // 计算激活计划的时间
+                        Calendar calendar = Calendar.getInstance();
+                        calendar.setTime(createdDate);
+                        calendar.add(Calendar.DAY_OF_MONTH, activateWhichDay); // 根据 activateWhichDay 来决定激活计划的时间
+                        Date generateTaskTime = calendar.getTime();
+                        // 创建生成激活计划的任务
+                        SysJob job2 = createSysJobPlan(pd, mdmCode, storeId, patientId, templateId, planId,activateWhichDay,generateTaskTime);
+                        jobService.insertJob2(job2);
+                    }
+                } catch (NumberFormatException e) {
+                    // 处理转换失败的情况
+                    System.err.println("转换 storeId, templateId 或 planId 时发生错误: " + e.getMessage());
+                    // 可能需要采取进一步措施，如记录日志、通知管理员等
+                }
+            }
+        }
+        return "2025-02-25 25:30:00";
+    }
+
+    /**5 Cron表达式转化为时间字符串*/
+    public static String zhuanhuaDirectly(String cronExpression) throws ParseException {
+        try {
+            // 分割 Cron 表达式
+            String[] parts = cronExpression.split(" ");
+            if (parts.length != 7) {
+                throw new ParseException("Invalid Cron expression format. Expected 7 fields.", 0);
+            }
+
+            // 提取各部分
+            String second = parts[0];
+            String minute = parts[1];
+            String hour = parts[2];
+            String dayOfMonth = parts[3];
+            String month = parts[4];
+            String dayOfWeek = parts[5]; // 这里我们忽略 dayOfWeek 字段
+            String year = parts[6];
+
+            // 构建 Calendar 对象并设置各字段
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.YEAR, Integer.parseInt(year));
+            calendar.set(Calendar.MONTH, parseMonth(month) - 1); // Calendar.MONTH 是从 0 开始的
+            calendar.set(Calendar.DAY_OF_MONTH, parseDayOfMonth(dayOfMonth));
+            calendar.set(Calendar.HOUR_OF_DAY, parseHour(hour));
+            calendar.set(Calendar.MINUTE, parseMinute(minute));
+            calendar.set(Calendar.SECOND, parseSecond(second));
+
+            // 格式化时间为字符串
+            return SDF.format(calendar.getTime());
+        } catch (ParseException e) {
+            // 打印或记录异常信息
+            System.err.println("Error parsing Cron expression: " + e.getMessage());
+            throw e; // 或者你可以选择返回一个错误消息而不是重新抛出异常
+        }
+    }
+
+    /**
+     * 解析月份字段。
+     *
+     * @param monthStr 月份字段字符串
+     * @return 月份值
+     * @throws ParseException 如果解析失败
+     */
+    private static int parseMonth(String monthStr) throws ParseException {
+        switch (monthStr.toLowerCase()) {
+            case "1": case "jan": return 1;
+            case "2": case "feb": return 2;
+            case "3": case "mar": return 3;
+            case "4": case "apr": return 4;
+            case "5": case "may": return 5;
+            case "6": case "jun": return 6;
+            case "7": case "jul": return 7;
+            case "8": case "aug": return 8;
+            case "9": case "sep": return 9;
+            case "10": case "oct": return 10;
+            case "11": case "nov": return 11;
+            case "12": case "dec": return 12;
+            default: throw new ParseException("Invalid month value: " + monthStr, 0);
+        }
+    }
+
+    /**
+     * 解析日字段。
+     *
+     * @param dayOfMonthStr 日字段字符串
+     * @return 日值
+     * @throws ParseException 如果解析失败
+     */
+    private static int parseDayOfMonth(String dayOfMonthStr) throws ParseException {
+        try {
+            return Integer.parseInt(dayOfMonthStr);
+        } catch (NumberFormatException e) {
+            throw new ParseException("Invalid day of month value: " + dayOfMonthStr, 0);
+        }
+    }
+
+    /**
+     * 解析小时字段。
+     *
+     * @param hourStr 小时字段字符串
+     * @return 小时值
+     * @throws ParseException 如果解析失败
+     */
+    private static int parseHour(String hourStr) throws ParseException {
+        try {
+            return Integer.parseInt(hourStr);
+        } catch (NumberFormatException e) {
+            throw new ParseException("Invalid hour value: " + hourStr, 0);
+        }
+    }
+
+    /**
+     * 解析分钟字段。
+     *
+     * @param minuteStr 分钟字段字符串
+     * @return 分钟值
+     * @throws ParseException 如果解析失败
+     */
+    private static int parseMinute(String minuteStr) throws ParseException {
+        try {
+            return Integer.parseInt(minuteStr);
+        } catch (NumberFormatException e) {
+            throw new ParseException("Invalid minute value: " + minuteStr, 0);
+        }
+    }
+
+    /**
+     * 解析秒字段。
+     *
+     * @param secondStr 秒字段字符串
+     * @return 秒值
+     * @throws ParseException 如果解析失败
+     */
+    private static int parseSecond(String secondStr) throws ParseException {
+        try {
+            return Integer.parseInt(secondStr);
+        } catch (NumberFormatException e) {
+            throw new ParseException("Invalid second value: " + secondStr, 0);
+        }
+    }
+
+
 }

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

@@ -102,16 +102,174 @@ public class FollowPlanService {
      */
     public Integer closePlan(PageData pd) throws Exception {
         pd.put("status", 0);
+        pd.put("taskStatus", "已取消");
+        pd.put("updatedAt", DateUtils.getTime());
+        pd.put("updatedTime", DateUtils.getTime());
+        pd.put("updatedBy", getSysUser().getLoginName());
+        pd.put("closePlanTime", DateUtils.getTime());
+        pd.put("storeId", getSysUser().getDeptId());
+        pd.put("operator", getSysUser().getLoginName());
+        pd.put("createdAt", DateUtils.getTime());
+
+
+        //关闭原因: 1 计划错误 2 用药状态调整 3 随访不配合 4 电话号码错  5 误患者换药 6 其他
+        //用药状态调整为: 1永久停药 2无需购药永久领取援助用药 3回到地级市医院购药
+        //随访不配合原因: 1患者周期观念不强 2因不良反应患者自主决定延迟用药 3因经济原因患者延迟用药
+        //关闭范围: 1仅关闭当前计划 2关闭当前药品的全部计划 3关闭患者当前的全部计划
+        //永久停药类型: 1离世 2已结束该药治疗疗程 3疾病康复好转 4经济原因无购买可能 5不良反应严重 6疾病进展（耐药、效果不明显）更换治疗用药
+        //是否禁用此品的计划: 1是 2否 (选择是，购买相同D值品不会自动触发新计划)
+        //关闭类型: 1全部类型 2指定类型
+        //指定类型: 1常规随访 2脱落召回
+        String reason = pd.getString("reason");
+        String drugsStatus = pd.getString("drugsStatus");
+        String closeType = pd.getString("closeType");
+        String drugsStop = pd.getString("drugsStop");
+        String specifiedType = pd.getString("specifiedType");
+
+        // 根据条件判断执行关闭逻辑
+        if ("计划错误".equals(reason) || "电话号码错".equals(reason) || "误患者换药".equals(reason) || "其他".equals(reason)) {
+          int closeCurrentPlan =  closeCurrentPlan(pd);
+          if(closeCurrentPlan>0){
+              int closeReason = daoSupport.update("closePlanReasonMapper.insertCloseplanReason", pd);
+              System.out.println("添加原因：" + closeReason);
+          }
+            return closeCurrentPlan;
+        } else if ("全部类型".equals(closeType)) {
+            int closePatientCurrentPlan =  closePatientCurrentPlan(pd);
+            if(closePatientCurrentPlan>0){
+                int closeReason = daoSupport.update("closePlanReasonMapper.insertCloseplanReason", pd);
+                System.out.println("添加原因：" + closeReason);
+            }
+            return closePatientCurrentPlan;
+        } else if ("指定类型".equals(closeType)) {
+            // 处理指定类型，拆分为列表后调用
+            String[] types = specifiedType.split(",");
+            for (String type : types) {
+                pd.put("specifiedType", type.trim());
+                pd.put("businessBelonging", type.trim());
+                int closeByTypePlan =  closeByTypePlan(pd);
+                if(closeByTypePlan>0){
+                    int closeReason = daoSupport.update("closePlanReasonMapper.insertCloseplanReason", pd);
+                    System.out.println("添加原因：" + closeReason);
+                }
+            }
+        } else if ("永久停药".equals(drugsStatus)) { // 永久停药
+            int closeCurrentDrugsPlan =  closeCurrentDrugsPlan(pd);
+            if(closeCurrentDrugsPlan>0){
+                int closeReason = daoSupport.update("closePlanReasonMapper.insertCloseplanReason", pd);
+                System.out.println("添加原因：" + closeReason);
+            }
+            return closeCurrentDrugsPlan;
+        } else if ("无需购药永久领取援助用药".equals(drugsStatus)) { // 无需购药
+            int closeCurrentPlan =  closeCurrentPlan(pd);
+            if(closeCurrentPlan>0){
+                int closeReason = daoSupport.update("closePlanReasonMapper.insertCloseplanReason", pd);
+                System.out.println("添加原因：" + closeReason);
+            }
+            return closeCurrentPlan;
+        } else if ("离世".equals(drugsStop)) { // 离世
+            int closePatientCurrentPlan =  closePatientCurrentPlan(pd);
+            if(closePatientCurrentPlan>0){
+                int closeReason = daoSupport.update("closePlanReasonMapper.insertCloseplanReason", pd);
+                System.out.println("添加原因：" + closeReason);
+            }
+            return closePatientCurrentPlan;
+        } else {
+            int closeCurrentPlan =  closeCurrentPlan(pd);
+            if(closeCurrentPlan>0){
+                int closeReason = daoSupport.update("closePlanReasonMapper.insertCloseplanReason", pd);
+                System.out.println("添加原因：" + closeReason);
+            }
+            return closeCurrentPlan;
+        }
+        return null;
+    }
+
+    // 示例关闭方法（需根据实际Mapper实现）
+    private Integer closeCurrentPlan(PageData pd) throws Exception {
+        // 更新计划、任务和定时任务状态
+        int plan = daoSupport.update("followPlanMapper.closeFollowPlan", pd);
+        int task = daoSupport.update("followTaskMapper.stopFollowTask", pd);
+        PageData pdJob = new PageData();
+        pdJob.put("planId", pd.get("planId"));
+        pdJob.put("status", 1);
+        pdJob.put("updateBy", getSysUser().getLoginName());
+        pdJob.put("remark", "按指定类型关闭计划");
+        int job = daoSupport.update("followTaskMapper.updateJobByPlanId", pdJob);
+        return job;
+    }
+
+    private Integer closePatientCurrentPlan(PageData pd) throws Exception {
+        daoSupport.update("followTaskMapper.closePatientCurrentTask", pd);
+        daoSupport.update("followTaskMapper.closePatientCurrentPLan", pd);
+       return daoSupport.update("followTaskMapper.updateJobByPatientId", pd);
+    }
+
+    private Integer closeCurrentDrugsPlan(PageData pd) throws Exception {
+        int b =  daoSupport.update("followTaskMapper.closeTaskCurrentDrugsPlan", pd);
+        int a =  daoSupport.update("followTaskMapper.closePLanCurrentDrugsPlan", pd);
+        List<PageData> pdList= (List<PageData>) daoSupport.findForList("followTaskMapper.getPlanByMdmCode", pd);
+        for(PageData list: pdList){
+            PageData pdJob = new PageData();
+            pdJob.put("planId", list.get("planId"));
+            pdJob.put("status", 1);
+            pdJob.put("updateBy", getSysUser().getLoginName());
+            pdJob.put("remark", "计划关闭更据药品查询到的");
+            daoSupport.update("followTaskMapper.updateJobByPlanId", pdJob);
+        }
+        return a;
+    }
+
+    private Integer closeByTypePlan(PageData pd) throws Exception {
+
+        List<PageData> TaskList= (List<PageData>)  daoSupport.findForList("followTaskMapper.getTaskByPlanId", pd);
+        for(PageData list: TaskList){
+            PageData pdJob = new PageData();
+            pd.put("taskStatus", "已取消");
+            pdJob.put("updatedAt", DateUtils.getTime());
+            pdJob.put("updatedTime", DateUtils.getTime());
+            pdJob.put("storeId", getSysUser().getDeptId());
+            pdJob.put("operator", getSysUser().getLoginName());
+            pdJob.put("createdAt", DateUtils.getTime());
+            pdJob.put("planId", list.get("planId"));
+            pdJob.put("taskId", list.get("taskId"));
+            pdJob.put("status", 1);
+            pdJob.put("updateBy", getSysUser().getLoginName());
+            pdJob.put("remark", "计划关闭更据根据类型关闭");
+            daoSupport.update("followTaskMapper.updateJobByTaskId", pdJob);
+            daoSupport.update("followTaskMapper.closeTaskByTaskId", pdJob);
+
+        }
+        int a=  daoSupport.update("followTaskMapper.closeByPlanTypePlan", pd);
+        return a;
+    }
+
+    /**
+     * 关闭该患者的所有计划
+     * @param pd
+     * @return
+     * @throws Exception
+     */
+    public Integer closeAllPlan(PageData pd) throws Exception {
+        pd.put("status", 0);
+        pd.put("storeId", getSysUser().getDeptId());
         pd.put("taskStatus", "已取消");//0待执行，\r\n1已完成，\r\n2未完成，\r\n3已下发，\r\n4已取消
         pd.put("updatedAt", DateUtils.getTime());//'更新时间'
         pd.put("operator", getSysUser().getLoginName());//'操作人'
         pd.put("updatedTime", DateUtils.getTime());//'更新时间'
         pd.put("updatedBy", getSysUser().getLoginName());//更新人
-        int plan = daoSupport.update("followPlanMapper.closeFollowPlan", pd);
+        int plan = daoSupport.update("followTaskMapper.closeFollowPlanByPatientId", pd);
         //pd.put("id", pd.get("taskId"));//设置真确的任务计划id
-        int task = daoSupport.update("followTaskMapper.stopFollowTask", pd);
-
-        if (task > 0 && plan > 0) {
+        int task = daoSupport.update("followTaskMapper.stopFollowTaskByPatientId", pd);
+        PageData pd1 = new PageData();
+        pd1.put("patientId", pd.get("patientId"));
+        pd1.put("storeId", getSysUser().getDeptId());
+        pd1.put("status", 1);//暂停任务
+        pd1.put("updateBy", getSysUser().getLoginName());
+        pd1.put("remark", "所有该患者的计划关闭");
+        //更改job表状态
+        int job = daoSupport.update("followTaskMapper.updateJobByPatientId", pd1);
+        if (task > 0 && plan > 0 || job > 0) {
             return 1;
         } else {
             return -1;

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

@@ -3,11 +3,22 @@ package com.bzd.system.service.gxhpz;
 import com.bzd.common.config.dao.DaoBase;
 import com.bzd.common.config.dao.DaoSupport;
 import com.bzd.common.config.dao.PageData;
+import com.bzd.common.constant.ScheduleConstants;
 import com.bzd.common.utils.DateUtils;
+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.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.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
 import java.util.List;
 
 import static com.bzd.common.utils.ShiroUtils.getSysUser;
@@ -18,6 +29,11 @@ public class FollowTaskService {
     private DaoBase dao;
     @Resource(name = "daoSupport")
     private DaoSupport daoSupport;
+    @Autowired
+    private com.bzd.system.service.dtp.SDtpYypzFollowUpSopService SDtpYypzFollowUpSopService;
+
+    @Autowired
+    private SysJobMapper jobMapper;
 
     /**
      * 查询列表 
@@ -41,6 +57,127 @@ public class FollowTaskService {
     }
 
     /**
+     * 根据下次随访时间添加新任务 随访途中 结束随访 中断随访的情况
+     * @param pd
+     * @return
+     * @throws Exception
+     */
+    @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 转换为 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());
+        String mdmCode = (String) pdnew.get("mdmCode");
+        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);
+        if (StringUtils.isNotNull(jobp)) {
+            jobp.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); // 设置任务有效期
+
+            // 生成 Cron 表达式
+            String cronExpression = generateCronExpression(nextFollowTime);
+            jobp.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);
+            // 设置其他任务属性
+            jobp.setMisfirePolicy(ScheduleConstants.MISFIRE_FIRE_AND_PROCEED); // Cron 计划策略 执行一次
+
+            // 插入新任务
+            jobMapper.insertJob(jobp);
+        }
+
+        return daoSupport.save("followTaskMapper.insertFollowTask", pd);
+    }
+
+    /**
+     * 根据给定的下次随访时间生成 Cron 表达式
+     *
+     * @param nextFollowTime 下次随访时间
+     * @return Cron 表达式
+     */
+    private String generateCronExpression(LocalDateTime nextFollowTime) {
+        int minute = nextFollowTime.getMinute();
+        int hour = nextFollowTime.getHour();
+        int dayOfMonth = nextFollowTime.getDayOfMonth();
+        int month = nextFollowTime.getMonthValue();
+        int year = nextFollowTime.getYear();
+
+        // 构建 Cron 表达式（假设使用的是标准的五字段 Cron 表达式）
+        return String.format("%d %d %d %d %d ? %d",
+                0, // 秒
+                minute,
+                hour,
+                dayOfMonth,
+                month,
+                year);
+    }
+    /**
+     * 将 PageData 转换为 SysJob 对象
+     *
+     * @param pageData PageData 对象
+     * @return SysJob 对象
+     */
+    private SysJob convertPageDataToSysJob(PageData pageData) {
+        SysJob sysJob = new SysJob();
+        sysJob.setJobName((String) pageData.get("job_name"));
+        sysJob.setJobGroup((String) pageData.get("job_group"));
+        sysJob.setConcurrent((String) pageData.get("concurrent"));
+        sysJob.setPatientId((String) pageData.get("patient_id"));
+        sysJob.setMisfirePolicy((String) pageData.get("misfirePolicy"));
+        sysJob.setPlanId((String) pageData.get("plan_id"));
+        sysJob.setStatus("0");
+        // 根据实际情况添加其他字段的转换
+        return sysJob;
+    }
+    /**
      * 添加
      * @param pd
      * @return
@@ -84,7 +221,14 @@ public class FollowTaskService {
         pd.put("updatedAt", DateUtils.getTime());//'更新时间'
         pd.put("operator", getSysUser().getLoginName());//'操作人'
         int task = daoSupport.update("followTaskMapper.closeTask", pd);
-        if (task > 0) {
+        PageData pd1 = new PageData();
+        pd1.put("taskId", pd.get("taskId"));
+        pd1.put("status", 1);//暂停任务
+        pd1.put("updateBy", getSysUser().getLoginName());
+        pd1.put("remark", "任务关闭");
+        //更改job表状态
+        int job = daoSupport.update("followTaskMapper.updateJobByTaskId", pd1);
+        if (task > 0 || job > 0) {
             return 1;
         } else {
             return -1;

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

@@ -4,6 +4,7 @@ import com.bzd.common.config.dao.DaoBase;
 import com.bzd.common.config.dao.DaoSupport;
 import com.bzd.common.config.dao.PageData;
 import com.bzd.common.utils.DateUtils;
+import com.bzd.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +41,20 @@ public class PharmacistsService {
     public int save(final PageData pd) throws Exception {
         pd.put("createTime", DateUtils.getTime());
         pd.put("createBy", getSysUser().getUserName());
+        String default_follow_up = (String) pd.get("default_follow_up");
+        String storeIdPage = (String) pd.get("storeId");
+        String position = (String) pd.get("position");
+        if (StringUtils.isEmpty(storeIdPage)) {
+            pd.put("storeId", getSysUser().getDeptId());
+        }
+        if (StringUtils.isNotEmpty(default_follow_up)) {
+            if(default_follow_up.equals("1") && position.equals("任务跟进人")){
+                pd.put("default_follow_up", 2);//否
+                daoSupport.save("pharmacistsMapper.updateDefaultFollowUpByStoreId", pd);
+                pd.put("default_follow_up", 1);//是
+            }
+        }
+
         return  daoSupport.save("pharmacistsMapper.insertPharmacists", pd);
     }
 
@@ -62,6 +77,19 @@ public class PharmacistsService {
     public Integer update(PageData pd) throws Exception {
         pd.put("updateTime", DateUtils.getTime());
         pd.put("updateBy", getSysUser().getUserName());
+        String default_follow_up = (String) pd.get("default_follow_up");
+        String storeIdPage = (String) pd.get("storeId");
+        String position = (String) pd.get("position");
+        if (StringUtils.isEmpty(storeIdPage)) {
+            pd.put("storeId", getSysUser().getDeptId());
+        }
+        if (StringUtils.isNotEmpty(default_follow_up)) {
+            if(default_follow_up.equals("1") && position.equals("任务跟进人")){
+                pd.put("default_follow_up", 2);//否
+                daoSupport.save("pharmacistsMapper.updateDefaultFollowUpByStoreId", pd);
+                pd.put("default_follow_up", 1);//是
+            }
+        }
         return daoSupport.update("pharmacistsMapper.updatePharmacists", pd);
     }
 }

health-system/src/main/java/com/bzd/system/service/spgl/SPProductinfoService.java

@@ -32,6 +32,7 @@ public class SPProductinfoService {
 
     @Transactional
     public Integer productAdd(PageData pd)throws Exception {
+        pd.put("storeId", getSysUser().getDeptId());
         Integer i = productAdd2(pd);
         Integer i3 = productAdd3(pd);
         Integer i4 = productAdd4(pd);
@@ -82,6 +83,7 @@ public class SPProductinfoService {
         //这里同步修改管理品的数据
         PageData pdConfig=new PageData();
         //更新患者管理品
+
         pdConfig.put("updatedBy", getSysUser().getUserId());
         pdConfig.put("updatedTime", DateUtils.getTime());
         pdConfig.put("mdmCode",pd.get("product_code"));
@@ -108,24 +110,29 @@ public class SPProductinfoService {
         return daoSupport.update("SPProductinfoMapper.productUpdate", pd);
     }
     public Integer productAdd2(PageData pd)throws Exception {
+        pd.put("storeId",getSysUser().getDeptId());
         return daoSupport.update("SPProductinfoMapper.addProductAdd2", pd);
     }
     public Integer productAdd3(PageData pd)throws Exception {
+        pd.put("storeId",getSysUser().getDeptId());
         return daoSupport.update("SPProductinfoMapper.addProductAdd3", pd);
     }
     public Integer productAdd4(PageData pd)throws Exception {
+        pd.put("storeId",getSysUser().getDeptId());
         return daoSupport.update("SPProductinfoMapper.addProductAdd4", pd);
     }
     public Integer productAdd5(PageData pd)throws Exception {
+        pd.put("storeId",getSysUser().getDeptId());
         return daoSupport.update("SPProductinfoMapper.addProductAdd5", pd);
     }
     public Integer productAdd6(PageData pd)throws Exception {
+        pd.put("storeId",getSysUser().getDeptId());
         return daoSupport.update("SPProductinfoMapper.addProductAdd6", pd);
     }
 
     public Integer productAdd12(PageData pd)throws Exception {
 
-
+        pd.put("storeId",getSysUser().getDeptId());
         return daoSupport.update("SPProductinfoMapper.addProductAdd12", pd);
     }
 

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

@@ -2,7 +2,63 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="SDtpYypzFollowUpSopMapper" >
 
+    <sql id="selectJobVo">
+        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, store_id,patient_id,plan_id,task_id, create_by, create_time, remark
+        from sys_job
+    </sql>
+
+    <select id="selectDtpJobList" parameterType="pd" resultType="pd">
+        <include refid="selectJobVo"/>
+        <where>
+            <if test="jobName != null and jobName != ''">
+                AND job_name like concat('%', #{jobName}, '%')
+            </if>
+            <if test="jobGroup != null and jobGroup != ''">
+                AND job_group = #{jobGroup}
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+            <if test="storeId != null and storeId != ''">
+                AND store_id =#{storeId}
+            </if>
+            <if test="patientId != null and patientId != ''">
+                AND patient_id =#{patientId}
+            </if>
+             <if test="planId != null and planId != ''">
+                AND plan_id =#{planId}
+            </if>
+            <if test="taskId != null and taskId != ''">
+                AND task_id =#{taskId}
+            </if>
+            <if test="invokeTarget != null and invokeTarget != ''">
+                AND invoke_target like concat('%', #{invokeTarget}, '%')
+            </if>
+        </where>
+    </select>
 
+    <!-- 批量获取节点配置 -->
+    <select id="getTemplateNodesByMBSIn" parameterType="pd" resultType="pd">
+        SELECT up.*, dr.productName, dr.productCode, dr.specification
+        FROM s_dtp_yypz_follow_up_sop up
+        LEFT JOIN s_dtp_yypz_template_drug dr ON up.templateId = dr.templateId
+        WHERE 1=1
+        <if test="productCodes != null and productCodes.size() > 0">
+            AND dr.productCode IN
+            <foreach item="item" index="index" collection="productCodes" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="businessBelonging != null and businessBelonging != ''">
+            AND up.businessBelonging = #{businessBelonging}
+        </if>
+        <if test="storeId != null and storeId != ''">
+            AND up.storeId = #{storeId}
+        </if>
+        <if test="status != null and status != ''">
+            AND up.status != #{status}
+        </if>
+    </select>
 
     <!-- 获取节点配置-->
     <select id="getTemplateNodeByMBS" parameterType="pd" resultType="pd">
@@ -17,7 +73,7 @@
             and up.storeId = #{storeId}
         </if>
         <if test="status !=null and status !='' ">
-        and up.status = #{status}
+        and up.status != #{status}
        </if>
     </select>
 
@@ -27,8 +83,37 @@
         <if test="productCode !=null and productCode !='' ">
             and dr.productCode = #{productCode}
         </if>
+        <if test="storeId !=null and storeId !='' ">
+            and up.storeId = #{storeId}
+        </if>
+    </select>
+
+    <!-- 通过患者id和门店id 查询该门店的默认的任务跟进人 -->
+    <select id="selectDefaultFollowUpByPS" parameterType="pd" resultType="pd">
+        select up.* from s_dtp_review_pharmacists up  where 1=1
+        <if test="position !=null and position !='' ">
+            and up.position = #{position}
+        </if>
+        <if test="storeId !=null and storeId !='' ">
+            and up.storeId = #{storeId}
+        </if>
+        <if test="status !=null and status !='' ">
+            and up.status = #{status}
+        </if>
+        <if test="default_follow_up !=null and default_follow_up !='' ">
+            and up.default_follow_up = #{default_follow_up}
+        </if>
 
     </select>
+
+    <!-- 通过模版id查询节点信息 -->
+    <select id="selectSOPNodeListByTemplateId" parameterType="pd" resultType="pd">
+        select up.*,dr.* from s_dtp_yypz_nodeconfig up  left join s_dtp_yypz_follow_up_sop dr on up.templateId=dr.templateId where 1=1
+        <if test="templateId !=null and templateId !='' ">
+            and up.templateId = #{templateId}
+        </if>
+    </select>
+
     <!-- 通用查询映射结果 -->
 
     <select id="selectSDtpYypzFollowUpSopList" parameterType="pd" resultType="pd">
@@ -347,6 +432,9 @@
         </set>
         WHERE id = #{id}
     </update>
+
+
+
     <delete id="deleteNodeConfigByIds" parameterType="pd">
         delete from s_dtp_yypz_nodeconfig where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
@@ -716,4 +804,79 @@
             </trim>
         </foreach>
     </insert>
+
+
+
+    <insert id="insertFollowTaskNode" parameterType="pd">
+        INSERT INTO s_gxhpz_follow_task_node
+        <trim prefix="(" suffix=")" prefixOverrides="," suffixOverrides=",">
+            <if test="taskId != null and taskId != ''">taskId,</if>
+            <if test="planId != null and planId != ''">planId,</if>
+            <if test="patientId != null and patientId != ''">patientId,</if>
+            <if test="templateId != null and templateId != ''">templateId,</if>
+            <if test="activateStructures != null and activateStructures != ''">activateStructures,</if>
+            <if test="activateWhichDay != null and activateWhichDay != ''">activateWhichDay,</if>
+            <if test="activateNodeRule != null and activateNodeRule != ''">activateNodeRule,</if>
+            <if test="createTaskStructures != null and createTaskStructures != ''">createTaskStructures,</if>
+            <if test="createTaskWhen != null and createTaskWhen != ''">createTaskWhen,</if>
+            <if test="createTaskEvery != null and createTaskEvery != ''">createTaskEvery,</if>
+            <if test="createTaskDi != null and createTaskDi != ''">createTaskDi,</if>
+            <if test="createTaskTriggerValue != null and createTaskTriggerValue != ''">createTaskTriggerValue,</if>
+            <if test="createTaskExecutionTimes != null and createTaskExecutionTimes != ''">createTaskExecutionTimes,</if>
+            <if test="filterCondition != null">filterCondition,</if>
+            <if test="trait != null and trait != ''">trait,</if>
+            <if test="traitValue != null and traitValue != ''">traitValue,</if>
+            <if test="judgingCondition != null and judgingCondition != ''">judgingCondition,</if>
+            <if test="judgmentValue != null and judgmentValue != ''">judgmentValue,</if>
+            <if test="taskActionMode != null and taskActionMode != ''">taskActionMode,</if>
+            <if test="taskActionTaskType != null and taskActionTaskType != ''">taskActionTaskType,</if>
+            <if test="taskActionRole != null and taskActionRole != ''">taskActionRole,</if>
+            <if test="generationDaysAfter != null and generationDaysAfter != ''">generationDaysAfter,</if>
+            <if test="generationHMS != null and generationHMS != ''">generationHMS,</if>
+            <if test="followUpSubject != null and followUpSubject != ''">followUpSubject,</if>
+            <if test="taskValidity != null">taskValidity,</if>
+            <if test="taskMaterial != null and taskMaterial != ''">taskMaterial,</if>
+            <if test="deliveryChannel != null and deliveryChannel != ''">deliveryChannel,</if>
+            <if test="smsId != null and smsId != ''">smsId,</if>
+            <if test="useForm != null and useForm != ''">useForm,</if>
+            <if test="creator != null and creator != ''">creator,</if>
+            <if test="createTime != null and createTime != ''">createTime,</if>
+            <if test="status != null and status != ''">status</if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" prefixOverrides="," suffixOverrides=",">
+            <if test="taskId != null and taskId != ''">#{taskId},</if>
+            <if test="planId != null and planId != ''">#{planId},</if>
+            <if test="patientId != null and patientId != ''">#{patientId},</if>
+            <if test="templateId != null and templateId != ''">#{templateId},</if>
+            <if test="activateStructures != null and activateStructures != ''">#{activateStructures},</if>
+            <if test="activateWhichDay != null and activateWhichDay != ''">#{activateWhichDay},</if>
+            <if test="activateNodeRule != null and activateNodeRule != ''">#{activateNodeRule},</if>
+            <if test="createTaskStructures != null and createTaskStructures != ''">#{createTaskStructures},</if>
+            <if test="createTaskWhen != null and createTaskWhen != ''">#{createTaskWhen},</if>
+            <if test="createTaskEvery != null and createTaskEvery != ''">#{createTaskEvery},</if>
+            <if test="createTaskDi != null and createTaskDi != ''">#{createTaskDi},</if>
+            <if test="createTaskTriggerValue != null and createTaskTriggerValue != ''">#{createTaskTriggerValue},</if>
+            <if test="createTaskExecutionTimes != null and createTaskExecutionTimes != ''">#{createTaskExecutionTimes},</if>
+            <if test="filterCondition != null">#{filterCondition},</if>
+            <if test="trait != null and trait != ''">#{trait},</if>
+            <if test="traitValue != null and traitValue != ''">#{traitValue},</if>
+            <if test="judgingCondition != null and judgingCondition != ''">#{judgingCondition},</if>
+            <if test="judgmentValue != null and judgmentValue != ''">#{judgmentValue},</if>
+            <if test="taskActionMode != null and taskActionMode != ''">#{taskActionMode},</if>
+            <if test="taskActionTaskType != null and taskActionTaskType != ''">#{taskActionTaskType},</if>
+            <if test="taskActionRole != null and taskActionRole != ''">#{taskActionRole},</if>
+            <if test="generationDaysAfter != null and generationDaysAfter != ''">#{generationDaysAfter},</if>
+            <if test="generationHMS != null and generationHMS != ''">#{generationHMS},</if>
+            <if test="followUpSubject != null and followUpSubject != ''">#{followUpSubject},</if>
+            <if test="taskValidity != null">#{taskValidity},</if>
+            <if test="taskMaterial != null and taskMaterial != ''">#{taskMaterial},</if>
+            <if test="deliveryChannel != null and deliveryChannel != ''">#{deliveryChannel},</if>
+            <if test="smsId != null and smsId != ''">#{smsId},</if>
+            <if test="useForm != null and useForm != ''">#{useForm},</if>
+            <if test="creator != null and creator != ''">#{creator},</if>
+            <if test="createTime != null and createTime != ''">#{createTime},</if>
+            <if test="status != null and status != ''">#{status}</if>
+        </trim>
+    </insert>
+
 </mapper>

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="closePlanReasonMapper">
+
+    <!-- 插入关闭计划原因 -->
+    <insert id="insertCloseplanReason" parameterType="pd">
+        insert into s_gxhpz_closeplan_reason
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="reason != null and reason != ''">reason,</if>
+            <if test="drugsStatus != null and drugsStatus != ''">drugsStatus,</if>
+            <if test="flowNo != null and flowNo != ''">flowNo,</if>
+            <if test="otherReason != null and otherReason != ''">otherReason,</if>
+            <if test="closePlanScope != null and closePlanScope != ''">closePlanScope,</if>
+            <if test="drugsStop != null and drugsStop != ''">drugsStop,</if>
+            <if test="specifiedType != null and specifiedType != ''">specifiedType,</if>
+            <if test="disableProduct != null and disableProduct != ''">disableProduct,</if>
+            <if test="closeType != null and closeType != ''">closeType,</if>
+            <if test="planId != null and planId != ''">planId,</if>
+            <if test="taskId != null and taskId != ''">taskId,</if>
+            <if test="patientId != null and patientId != ''">patientId,</if>
+            <if test="closePlanTime != null">closePlanTime,</if>
+            <if test="storeId != null and storeId != ''">storeId,</if>
+            <if test="operator != null and operator != ''">operator,</if>
+            <if test="createdAt != null">created_at,</if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="reason != null and reason != ''">#{reason},</if>
+            <if test="drugsStatus != null and drugsStatus != ''">#{drugsStatus},</if>
+            <if test="flowNo != null and flowNo != ''">#{flowNo},</if>
+            <if test="otherReason != null and otherReason != ''">#{otherReason},</if>
+            <if test="closePlanScope != null and closePlanScope != ''">#{closePlanScope},</if>
+            <if test="drugsStop != null and drugsStop != ''">#{drugsStop},</if>
+            <if test="specifiedType != null and specifiedType != ''">#{specifiedType},</if>
+            <if test="disableProduct != null and disableProduct != ''">#{disableProduct},</if>
+            <if test="closeType != null and closeType != ''">#{closeType},</if>
+            <if test="planId != null and planId != ''">#{planId},</if>
+            <if test="taskId != null and taskId != ''">#{taskId},</if>
+            <if test="patientId != null and patientId != ''">#{patientId},</if>
+            <if test="closePlanTime != null">#{closePlanTime},</if>
+            <if test="storeId != null and storeId != ''">#{storeId},</if>
+            <if test="operator != null and operator != ''">#{operator},</if>
+            <if test="createdAt != null">#{createdAt},</if>
+        </trim>
+    </insert>
+
+    <!-- 更新关闭计划原因 -->
+    <update id="updateCloseplanReason" parameterType="pd">
+        update s_gxhpz_closeplan_reason
+        <set>
+            <if test="reason != null and reason != ''">reason = #{reason},</if>
+            <if test="drugsStatus != null and drugsStatus != ''">drugsStatus = #{drugsStatus},</if>
+            <if test="flowNo != null and flowNo != ''">flowNo = #{flowNo},</if>
+            <if test="otherReason != null and otherReason != ''">otherReason = #{otherReason},</if>
+            <if test="closePlanScope != null and closePlanScope != ''">closePlanScope = #{closePlanScope},</if>
+            <if test="drugsStop != null and drugsStop != ''">drugsStop = #{drugsStop},</if>
+            <if test="specifiedType != null and specifiedType != ''">specifiedType = #{specifiedType},</if>
+            <if test="disableProduct != null and disableProduct != ''">disableProduct = #{disableProduct},</if>
+            <if test="closeType != null and closeType != ''">closeType = #{closeType},</if>
+            <if test="planId != null and planId != ''">planId = #{planId},</if>
+            <if test="taskId != null and taskId != ''">taskId = #{taskId},</if>
+            <if test="patientId != null and patientId != ''">patientId = #{patientId},</if>
+            <if test="closePlanTime != null">closePlanTime = #{closePlanTime},</if>
+            <if test="storeId != null and storeId != ''">storeId = #{storeId},</if>
+            <if test="operator != null and operator != ''">operator = #{operator},</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!-- 根据ID删除 -->
+    <delete id="deleteCloseplanReasonById" parameterType="pd">
+        delete from s_gxhpz_closeplan_reason
+        where id = #{id}
+    </delete>
+
+    <!-- 根据ID查询 -->
+    <select id="selectCloseplanReasonById" parameterType="pd" resultType="pd">
+        select
+            id, reason, drugsStatus, flowNo, otherReason,
+            closePlanScope, drugsStop, specifiedType,disableProduct, closeType,
+            planId, taskId, patientId, closePlanTime, storeId,
+            operator, created_at as createdAt, updated_at as updatedAt
+        from s_gxhpz_closeplan_reason
+        where id = #{id}
+    </select>
+</mapper>

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

@@ -143,6 +143,26 @@
         <if test="id != null and id != ''">
             and id = #{id}
         </if>
+        <if test="isdvalue != null and isdvalue != ''">
+            <choose>
+                <when test="isdvalue == 1 ">
+                    and dvalueStatus = 1
+                </when>
+                <when test="isdvalue == 0 ">
+                    and d_value_code =0 or d_value_code is null
+                </when>
+            </choose>
+        </if>
+
+        ORDER BY d_value_code ASC
+    </select>
+
+    <select id="selectDvalueCode" parameterType="pd" resultType="pd">
+        select * from s_gxhpz_drugconfig where 1=1
+        <if test="mdmCode != null and mdmCode != ''">
+            and mdmCode = #{mdmCode}
+        </if>
+        and dvalueStatus = 1
          ORDER BY d_value_code ASC
     </select>
 

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

@@ -181,4 +181,254 @@
     <update id="changeStatus" parameterType="pd">
         update s_gxhpz_dvalue set  status = #{status}, updatedBy = #{updatedBy},updatedTime = #{updatedTime} where   id = #{id}
     </update>
+
+
+
+
+
+    <insert id="insertLinkDValue" parameterType="pd">
+        INSERT INTO s_gxhpz_patient_d_value
+        <trim prefix="(" suffix=")" prefixOverrides="," suffixOverrides=",">
+            <if test="dValueCode != null">
+                dValueCode,
+            </if>
+            <if test="mdmCode != null and mdmCode != ''">
+                mdmCode,
+            </if>
+            <if test="productName != null and productName != ''">
+                productName,
+            </if>
+            <if test="genericName != null and genericName != ''">
+                genericName,
+            </if>
+            <if test="dValueName != null and dValueName != ''">
+                dValueName,
+            </if>
+            <if test="patientId != null">
+                patientId,
+            </if>
+            <if test="patientName != null and patientName != ''">
+                patientName,
+            </if>
+            <if test="storeId != null">
+                storeId,
+            </if>
+            <if test="sumTotal != null">
+                sum_total,
+            </if>
+            <if test="drugsLinkId != null">
+                drugsLinkId,
+            </if>
+            <if test="medicationStatus != null and medicationStatus != ''">
+                medication_status,
+            </if>
+            <if test="createdTime != null">
+                createdTime,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" prefixOverrides="," suffixOverrides=",">
+            <if test="dValueCode != null">
+                #{dValueCode},
+            </if>
+            <if test="mdmCode != null and mdmCode != ''">
+                #{mdmCode},
+            </if>
+            <if test="productName != null and productName != ''">
+                #{productName},
+            </if>
+            <if test="genericName != null and genericName != ''">
+                #{genericName},
+            </if>
+            <if test="dValueName != null and dValueName != ''">
+                #{dValueName},
+            </if>
+            <if test="patientId != null">
+                #{patientId},
+            </if>
+            <if test="patientName != null and patientName != ''">
+                #{patientName},
+            </if>
+            <if test="storeId != null">
+                #{storeId},
+            </if>
+            <if test="sumTotal != null">
+                #{sumTotal},
+            </if>
+            <if test="drugsLinkId != null">
+                #{drugsLinkId},
+            </if>
+            <if test="medicationStatus != null and medicationStatus != ''">
+                #{medicationStatus},
+            </if>
+            <if test="createdTime != null">
+                #{createdTime},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateLinkDValue" parameterType="pd">
+        UPDATE s_gxhpz_patient_d_value
+        <trim prefix="SET " suffix="" prefixOverrides="," suffixOverrides=",">
+            <if test="dValueCode != null">
+                dValueCode = #{dValueCode},
+            </if>
+            <if test="mdmCode != null and mdmCode != ''">
+                mdmCode = #{mdmCode},
+            </if>
+            <if test="productName != null and productName != ''">
+                productName = #{productName},
+            </if>
+            <if test="genericName != null and genericName != ''">
+                genericName = #{genericName},
+            </if>
+            <if test="dValueName != null and dValueName != ''">
+                dValueName = #{dValueName},
+            </if>
+            <if test="patientId != null">
+                patientId = #{patientId},
+            </if>
+            <if test="patientName != null and patientName != ''">
+                patientName = #{patientName},
+            </if>
+            <if test="storeId != null">
+                storeId = #{storeId},
+            </if>
+            <if test="sumTotal != null">
+                sum_total = #{sumTotal},
+            </if>
+            <if test="drugsLinkId != null">
+                drugsLinkId = #{drugsLinkId},
+            </if>
+            <if test="medicationStatus != null and medicationStatus != ''">
+                medication_status = #{medicationStatus},
+            </if>
+            <if test="createdTime != null">
+                createdTime = #{createdTime},
+            </if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+    <update id="updateLinkDValueByMdmCode" parameterType="pd">
+        UPDATE s_gxhpz_patient_d_value
+        <trim prefix="SET " suffix="" prefixOverrides="," suffixOverrides=",">
+            <if test="productName != null and productName != ''">
+                productName = #{productName},
+            </if>
+            <if test="genericName != null and genericName != ''">
+                genericName = #{genericName},
+            </if>
+            <if test="sumTotal != null">
+                sum_total = #{sumTotal},
+            </if>
+            <if test="medicationStatus != null and medicationStatus != ''">
+                medication_status = #{medicationStatus},
+            </if>
+        </trim>
+        WHERE 1=1
+        <if test="mdmCode != null and mdmCode != ''">
+            AND mdmCode = #{mdmCode}
+        </if>
+        <if test="patientId != null">
+            AND patientId = #{patientId}
+        </if>
+        <if test="storeId != null">
+            AND storeId = #{storeId}
+        </if>
+    </update>
+
+    <select id="selectDValueById" parameterType="long" resultType="pd">
+        SELECT
+            id,
+            dValueCode,
+            mdmCode,
+            productName,
+            genericName,
+            dValueName,
+            patientId,
+            patientName,
+            storeId,
+            sum_total,
+            drugsLinkId,
+            medication_status,
+            createdTime
+        FROM
+            s_gxhpz_patient_d_value
+        WHERE
+            id = #{id}
+    </select>
+
+    <select id="selectDValuesByConditions" parameterType="pd" resultType="pd">
+        SELECT
+        id,
+        dValueCode,
+        mdmCode,
+        productName,
+        genericName,
+        dValueName,
+        patientId,
+        patientName,
+        storeId,
+        sum_total,
+        drugsLinkId,
+        medication_status,
+        createdTime
+        FROM
+        s_gxhpz_patient_d_value
+        WHERE
+        1=1
+        <if test="dValueCode != null">
+            AND dValueCode = #{dValueCode}
+        </if>
+        <if test="mdmCode != null and mdmCode != ''">
+            AND mdmCode = #{mdmCode}
+        </if>
+        <if test="patientId != null">
+            AND patientId = #{patientId}
+        </if>
+        <if test="storeId != null">
+            AND storeId = #{storeId}
+        </if>
+        <if test="medicationStatus != null and medicationStatus != ''">
+            AND medication_status = #{medicationStatus}
+        </if>
+        <if test="createdTime != null">
+            AND createdTime = #{createdTime}
+        </if>
+    </select>
+
+
+
+    <select id="selectLinkDValuesBy3Conditions" parameterType="pd" resultType="pd">
+        SELECT
+        id,
+        dValueCode,
+        mdmCode,
+        productName,
+        genericName,
+        dValueName,
+        patientId,
+        patientName,
+        storeId,
+        sum_total,
+        drugsLinkId,
+        medication_status,
+        createdTime
+        FROM
+        s_gxhpz_patient_d_value
+        WHERE
+        1=1
+
+        <if test="mdmCode != null and mdmCode != ''">
+            AND mdmCode = #{mdmCode}
+        </if>
+        <if test="patientId != null">
+            AND patientId = #{patientId}
+        </if>
+        <if test="storeId != null and storeId != ''">
+            AND storeId = #{storeId}
+        </if>
+    </select>
+
+
+
 </mapper>

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

@@ -31,12 +31,29 @@
         <if test="planName != null and planName != ''">
             and planName = #{planName}
         </if>
-        <if test="storeId != null and storeId != ''">
+        <if test="storeId != null">
             and storeId = #{storeId}
         </if>
         <!-- 省略其他字段条件... -->
     </select>
 
+
+    <!-- 通过selectPlanByDrugsLinkId查询计划信息 -->
+    <select id="selectPlanByDrugsLinkId" parameterType="pd" resultType="pd">
+        select up.planId,up.specification,dr.productName,dr.mdmCode,dr.taskId from s_gxhpz_follow_plan up  left join s_gxhpz_follow_task dr on up.planId=dr.planId where 1=1
+        <if test="drugsLinkId !=null and drugsLinkId !='' ">
+            and dr.drugsLinkId = #{drugsLinkId}
+        </if>
+        <if test="storeId !=null">
+            and up.storeId = #{storeId}
+        </if>
+        <if test="patientId !=null and patientId !='' ">
+            and up.patientId = #{patientId}
+        </if>
+
+    </select>
+
+
     <!-- 根据药品编码和患者id查询计划 只能出现一条数据 -->
     <select id="selectPlanByCPB" parameterType="pd" resultType="pd">
         select p.*,DATE_FORMAT(p.updatedTime, '%Y-%m-%d %H:%i:%s')
@@ -51,7 +68,6 @@
         <if test="businessBelonging != null and businessBelonging != ''">
             and p.businessBelonging=#{businessBelonging}
         </if>
-
     </select>
     <!-- 根据药品编码和患者id查询计划 多条数据-->
     <select id="selectPlanListByCPB" parameterType="pd" resultType="pd">
@@ -90,6 +106,7 @@
         </set>
         where planId = #{planId}
     </update>
+
     <!-- 插入新计划 -->
     <insert id="insertFollowPlan" parameterType="pd">
         insert into s_gxhpz_follow_plan
@@ -112,9 +129,12 @@
             <if test="planName != null and planName != ''">
                 planName,
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 storeId,
             </if>
+            <if test="drugsLinkId != null and drugsLinkId != ''">
+                drugsLinkId,
+            </if>
             <if test="storeName != null and storeName != ''">
                 storeName,
             </if>
@@ -169,9 +189,12 @@
             <if test="planName != null and planName != ''">
                 #{planName},
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 #{storeId},
             </if>
+            <if test="drugsLinkId != null and drugsLinkId != ''">
+                #{drugsLinkId},
+            </if>
             <if test="storeName != null and storeName != ''">
                 #{storeName},
             </if>
@@ -230,9 +253,12 @@
             <if test="planName != null and planName != ''">
                 planName = #{planName},
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 storeId = #{storeId},
             </if>
+            <if test="drugsLinkId != null and drugsLinkId != ''">
+                drugsLinkId = #{drugsLinkId},
+            </if>
             <if test="storeName != null and storeName != ''">
                 storeName = #{storeName},
             </if>
@@ -277,4 +303,8 @@
             </foreach>
         </if>
     </delete>
+    <!-- 更据drugsLinkId删除任务 -->
+    <delete id="deletePlanByDrugsLinkId" parameterType="pd">
+        delete from s_gxhpz_follow_plan where drugsLinkId =#{drugsLinkId}
+    </delete>
 </mapper>

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

@@ -3,42 +3,97 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="followTaskMapper">
+
+
+
     <!-- 查询任务 -->
     <select id="selectFollowTasks" parameterType="pd" resultType="pd">
-        select * from s_gxhpz_follow_task where 1=1
+        select t.*,n.useForm ,n.followUpSubject,n.taskMaterial,n.taskActionTaskType from s_gxhpz_follow_task t left join s_gxhpz_follow_task_node n on t.taskId = n.taskId where 1=1
         <if test="id != null">
-            and id = #{id}
+            and t.id = #{id}
+        </if>
+        <if test="taskActionTaskType != null and taskActionTaskType!=''">
+            and n.taskActionTaskType = #{taskActionTaskType}
         </if>
         <if test="appointmentDate != null">
-            and appointmentDate = #{appointmentDate}
+            and t.appointmentDate = #{appointmentDate}
+        </if>
+        <if test="subscribebeginTime != null and subscribebeginTime!='' and  subscribeendTime != null and subscribeendTime!=''">
+            and t.appointmentDate between #{subscribebeginTime} and #{subscribeendTime}
         </if>
         <if test="businessBelonging != null and businessBelonging != ''">
-            and businessBelonging = #{businessBelonging}
+            and t.businessBelonging = #{businessBelonging}
         </if>
         <if test="taskName != null and taskName != ''">
-            and taskName = #{taskName}
+            and t.taskName = #{taskName}
         </if>
         <if test="patientId != null and patientId != ''">
-            and patientId = #{patientId}
+            and t.patientId = #{patientId}
+        </if>
+        <if test="taskTheme != null and taskTheme != ''">
+            and t.taskTheme = #{taskTheme}
+        </if>
+        <if test="taskFollower != null and taskFollower != ''">
+            and t.taskFollower = #{taskFollower}
+        </if>
+        <if test="templeName != null and templeName != ''">
+            and t.templeName = #{templeName}
         </if>
         <if test="planId != null and planId != ''">
-            and planId = #{planId}
+            and t.planId = #{planId}
+        </if>
+        <if test="drugsLinkId != null and drugsLinkId != ''">
+            and t.drugsLinkId = #{drugsLinkId}
         </if>
         <if test="patientName != null and patientName != ''">
-            and patientName = #{patientName}
+            and t.patientName = #{patientName}
+        </if>
+        <if test="mdmCode != null and mdmCode != '' ">
+            and t.mdmCode = #{mdmCode}
+        </if>
+        <if test="taskStatus != null and taskStatus != ''">
+            and t.taskStatus = #{taskStatus}
         </if>
-        <if test="gender != null">
-            and gender = #{gender}
+        <if test="query != null and query != ''">
+            AND  (t.patientName LIKE CONCAT('%', #{query}, '%') OR t.patientId =#{query})
         </if>
-        <if test="age != null">
-            and age = #{age}
+        <if test="product != null and product != ''">
+            AND (t.genericName LIKE CONCAT('%', #{product}, '%') OR t.productName LIKE CONCAT('%', #{product}, '%') OR t.mdmCode LIKE CONCAT('%', #{product}, '%'))
         </if>
+
+        and t.taskStatus != '未下发'
         <!-- 省略其他字段条件... -->
     </select>
 
     <!-- 根据ID查询单个任务 -->
     <select id="selectOneById" parameterType="pd" resultType="pd">
-        select t.*,DATE_FORMAT(t.appointmentDate, '%Y-%m-%d %H:%i:%s') AS appointmentDate1 from s_gxhpz_follow_task t  where t.id = #{id}
+        select t.*,p.name,
+               p.dateBirth,
+               p.age,
+               p.gender,
+               p.realNameStatus,
+               p.id as patientId,
+               p.phoneNumber,
+               p.address,p.idCardImg,
+               p.documentNumber,
+               p.documentType,
+               p.contactPhone,
+               p.contactName,
+               p.addr,
+               p.dl,
+               n.useForm ,
+               n.templateId ,
+               n.followUpSubject,
+               n.taskMaterial,
+               n.taskValidity,
+               DATE_FORMAT(t.appointmentDate, '%Y-%m-%d %H:%i:%s') AS appointmentDate1,
+               DATE_FORMAT(t.next_follow_time, '%Y-%m-%d %H:%i:%s') AS next_follow_time2,
+            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_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}
     </select>
 
 
@@ -79,6 +134,9 @@
     <insert id="insertFollowTask" parameterType="pd">
         insert into s_gxhpz_follow_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="templeName != null and templeName != ''">
+                 templeName,
+            </if>
             <if test="appointmentDate != null">
                 appointmentDate,
             </if>
@@ -94,6 +152,9 @@
             <if test="planId != null and planId != ''">
                 planId,
             </if>
+            <if test="taskId != null and taskId != ''">
+                taskId,
+            </if>
             <if test="patientId != null and patientId != ''">
                 patientId,
             </if>
@@ -120,15 +181,24 @@
             <if test="storeName != null and storeName != ''">
                 storeName,
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 storeId,
             </if>
+            <if test="drugsLinkId != null and drugsLinkId != ''">
+                 drugsLinkId,
+            </if>
+            <if test="nodeId != null and nodeId != ''">
+                nodeId,
+            </if>
             <if test="genericName != null and genericName != ''">
                 genericName,
             </if>
             <if test="productName != null and productName != ''">
                 productName,
             </if>
+            <if test="mdmCode != null and mdmCode != ''">
+                mdmCode,
+            </if>
             <if test="taskFollower != null and taskFollower != ''">
                 taskFollower,
             </if>
@@ -144,7 +214,7 @@
             <if test="timeFirstDiagnosis != null and timeFirstDiagnosis != ''">
                 timeFirstDiagnosis,
             </if>
-            <if test="permanentStopTime != null and permanentStopTime != ''">
+            <if test="permanentStopTime != null">
                 permanentStopTime,
             </if>
             <if test="returnObject != null and returnObject != ''">
@@ -177,7 +247,7 @@
             <if test="is_adverse_reaction != null and is_adverse_reaction != ''">
                 is_adverse_reaction,
             </if>
-            <if test="adverse_reaction_time != null and adverse_reaction_time != ''">
+            <if test="adverse_reaction_time != null">
                 adverse_reaction_time,
             </if>
             <if test="good_response_symptom_id != null and good_response_symptom_id != ''">
@@ -222,10 +292,26 @@
             <if test="operator != null and operator != ''">
                 operator,
             </if>
+            <if test="interval_this_time != null">
+                interval_this_time,
+            </if>
+
+            <if test="next_taskTheme != null and next_taskTheme != ''">
+                next_taskTheme,
+            </if>
+            <if test="next_follow_time != null">
+                next_follow_time,
+            </if>
+            <if test="createdAt != null">
+                createdAt,
+            </if>
         </trim>
         values
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <!-- 基础字段 -->
+            <if test="templeName != null and templeName != ''">
+                #{templeName},
+            </if>
             <if test="appointmentDate != null">
                 #{appointmentDate},
             </if>
@@ -241,6 +327,9 @@
             <if test="planId != null and planId != ''">
                 #{planId},
             </if>
+            <if test="taskId != null and taskId != ''">
+                #{taskId},
+            </if>
             <if test="patientId != null and patientId != ''">
                 #{patientId},
             </if>
@@ -267,15 +356,24 @@
             <if test="storeName != null and storeName != ''">
                 #{storeName},
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 #{storeId},
             </if>
+            <if test="drugsLinkId != null and drugsLinkId != ''">
+                #{drugsLinkId},
+            </if>
+            <if test="nodeId != null and nodeId != ''">
+                #{nodeId},
+            </if>
             <if test="genericName != null and genericName != ''">
                 #{genericName},
             </if>
             <if test="productName != null and productName != ''">
                 #{productName},
             </if>
+            <if test="mdmCode != null and mdmCode != ''">
+                #{mdmCode},
+            </if>
             <if test="taskFollower != null and taskFollower != ''">
                 #{taskFollower},
             </if>
@@ -291,7 +389,7 @@
             <if test="timeFirstDiagnosis != null and timeFirstDiagnosis != ''">
                 #{timeFirstDiagnosis},
             </if>
-            <if test="permanentStopTime != null and permanentStopTime != ''">
+            <if test="permanentStopTime != null">
                 #{permanentStopTime},
             </if>
 
@@ -325,7 +423,7 @@
             <if test="is_adverse_reaction != null and is_adverse_reaction != ''">
                 #{is_adverse_reaction},
             </if>
-            <if test="adverse_reaction_time != null and adverse_reaction_time != ''">
+            <if test="adverse_reaction_time != null">
                 #{adverse_reaction_time},
             </if>
             <if test="good_response_symptom_id != null and good_response_symptom_id != ''">
@@ -370,6 +468,18 @@
             <if test="operator != null and operator != ''">
                 #{operator},
             </if>
+            <if test="interval_this_time != null">
+                #{interval_this_time},
+            </if>
+            <if test="next_taskTheme != null and next_taskTheme != ''">
+                #{next_taskTheme},
+            </if>
+            <if test="next_follow_time != null">
+                #{next_follow_time},
+            </if>
+            <if test="createdAt != null">
+                #{createdAt},
+            </if>
 
         </trim>
     </insert>
@@ -379,6 +489,9 @@
     <update id="updateFollowTask" parameterType="pd">
         update s_gxhpz_follow_task
         <set>
+            <if test="templeName != null and templeName != ''">
+                templeName = #{templeName},
+            </if>
             <if test="appointmentDate != null">
                 appointmentDate = #{appointmentDate},
             </if>
@@ -394,6 +507,12 @@
             <if test="planId != null and planId != ''">
                 planId = #{planId},
             </if>
+            <if test="taskId != null and taskId != ''">
+                taskId = #{taskId},
+            </if>
+            <if test="nodeId != null and nodeId != ''">
+                nodeId = #{nodeId},
+            </if>
             <if test="patientId != null and patientId != ''">
                 patientId = #{patientId},
             </if>
@@ -420,15 +539,21 @@
             <if test="storeName != null and storeName != ''">
                 storeName = #{storeName},
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 storeId = #{storeId},
             </if>
+            <if test="drugsLinkId != null and drugsLinkId != ''">
+                drugsLinkId = #{drugsLinkId},
+            </if>
             <if test="genericName != null and genericName != ''">
                 genericName = #{genericName},
             </if>
             <if test="productName != null and productName != ''">
                 productName = #{productName},
             </if>
+            <if test="mdmCode != null and mdmCode != ''">
+                mdmCode = #{mdmCode},
+            </if>
             <if test="taskFollower != null and taskFollower != ''">
                 taskFollower = #{taskFollower},
             </if>
@@ -495,6 +620,16 @@
             <if test="actualFollowUpTime != null">
                 actualFollowUpTime = #{actualFollowUpTime},
             </if>
+            <if test="interval_this_time != null and interval_this_time != ''">
+                interval_this_time = #{interval_this_time},
+            </if>
+
+            <if test="next_taskTheme != null and next_taskTheme != ''">
+                next_taskTheme = #{next_taskTheme},
+            </if>
+            <if test="next_follow_time != null and next_follow_time != ''">
+                next_follow_time = #{next_follow_time},
+            </if>
             <if test="callConnectedCount != null">
                 callConnectedCount = #{callConnectedCount},
             </if>
@@ -539,4 +674,260 @@
             </foreach>
         </if>
     </delete>
+
+
+    <!-- 更据drugsLinkId删除任务 -->
+    <delete id="deleteTaskByDrugsLinkId" parameterType="pd">
+        delete from s_gxhpz_follow_task where drugsLinkId =#{drugsLinkId}
+    </delete>
+
+    <!-- 更据计划planId 任务taskId 删除job任务 -->
+    <delete id="deleteSysJobByPlanId" parameterType="pd">
+        delete from sys_job where plan_id =#{plan_id}
+    </delete>
+    <!--查询定时任务-->
+    <select id="getJobByTaskId" parameterType="pd" resultType="pd">
+        select  * from sys_job where task_id = #{taskId}
+    </select>
+    <!--查询模版节点配置的任务的有效期天数-->
+    <select id="getNodeConfigByNodeId" parameterType="pd" resultType="pd">
+        select  * from s_dtp_yypz_nodeconfig where id = #{nodeId}
+    </select>
+    <!--根据患者id和药查询计划-->
+    <select id="getPlanByMdmCode" parameterType="pd" resultType="pd">
+        select  * from s_gxhpz_follow_plan where mdmCode = #{mdmCode} and storeId = #{storeId} and patientId= #{patientId}
+    </select>
+    <!--根据计划id查询下面的所有任务-->
+    <select id="getTaskByPlanId" parameterType="pd" resultType="pd">
+        select  * from s_gxhpz_follow_task where planId = #{planId} and storeId = #{storeId} and patientId= #{patientId}
+    </select>
+    <!--关闭任务-->
+    <update id="updateJobByTaskId" parameterType="SysJob">
+        update sys_job
+        <set>
+            <if test="status !=null">status = #{status},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate(),
+        </set>
+        where task_id = #{taskId}
+    </update>
+    <!--关闭患者当前所有计划-->
+    <update id="closePatientCurrentPlan" parameterType="SysJob">
+        update s_gxhpz_follow_plan
+        <set>
+            <if test="status !=null">status = #{status},</if>
+            <if test="updateBy != null and updateBy != ''">updatedBy = #{updateBy},</if>
+            updatedTime = sysdate(),
+        </set>
+        where   patientId= #{patientId}  and storeId= #{storeId}
+    </update>
+    <!--关闭患者当前所有计划-->
+    <update id="closePatientCurrentTask" parameterType="SysJob">
+        update s_gxhpz_follow_task
+        <set>
+            <if test="taskStatus !=null">taskStatus = #{taskStatus},</if>
+            <if test="operator != null and operator != ''">operator = #{operator},</if>
+            updatedAt = sysdate(),
+        </set>
+        where   patientId= #{patientId}  and storeId= #{storeId}
+    </update>
+
+    <!--关闭计划更据类型z-->
+    <update id="closeByPlanTypePlan" parameterType="SysJob">
+        update s_gxhpz_follow_plan
+        <set>
+            <if test="status !=null">status = #{status},</if>
+            <if test="updateBy != null and updateBy != ''">updatedBy = #{updateBy},</if>
+            updatedTime = sysdate(),
+        </set>
+        where   patientId= #{patientId} and businessBelonging= #{businessBelonging} and storeId= #{storeId}
+    </update>
+    <!--关闭任务根类型z-->
+    <update id="closeTaskByTypePlan" parameterType="SysJob">
+        update s_gxhpz_follow_task
+        <set>
+            <if test="taskStatus !=null">taskStatus = #{taskStatus},</if>
+            <if test="operator != null and operator != ''">operator = #{operator},</if>
+            updatedAt = sysdate(),
+        </set>
+        where   patientId= #{patientId} and businessBelonging= #{businessBelonging} and storeId= #{storeId}
+    </update>
+
+
+    <!--关闭计划根据药z-->
+    <update id="closePLanCurrentDrugsPlan" parameterType="SysJob">
+        update s_gxhpz_follow_plan
+        <set>
+            <if test="status !=null">status = #{status},</if>
+            <if test="updateBy != null and updateBy != ''">updatedBy = #{updateBy},</if>
+            updatedTime = sysdate(),
+        </set>
+        where  mdmCode = #{mdmCode} and patientId= #{patientId}  and storeId= #{storeId}
+    </update>
+    <!--关闭任务根据药z-->
+    <update id="closeTaskCurrentDrugsPlan" parameterType="SysJob">
+        update s_gxhpz_follow_task
+        <set>
+            <if test="taskStatus !=null">taskStatus = #{taskStatus},</if>
+            <if test="operator != null and operator != ''">operator = #{operator},</if>
+            updatedAt = sysdate(),
+        </set>
+        where mdmCode = #{mdmCode} and patientId= #{patientId}  and storeId= #{storeId}
+    </update>
+
+    <!--关闭定时任务表的计划根据指定药查询出来的计划z-->
+    <update id="updateJobByDrugsClosePlanId" parameterType="SysJob">
+        update sys_job
+        <set>
+            <if test="status !=null">status = #{status},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate(),
+        </set>
+        where plan_id = #{planId}
+    </update>
+
+    <!--关闭定时任务计划-->
+    <update id="updateJobByPlanId" parameterType="SysJob">
+        update sys_job
+            <set>
+                <if test="status !=null">status = #{status},</if>
+                <if test="remark != null and remark != ''">remark = #{remark},</if>
+                <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+                update_time = sysdate(),
+            </set>
+        where plan_id = #{planId}
+    </update>
+    <!--关闭该患者的所有定时任务-->
+    <update id="updateJobByPatientId" parameterType="SysJob">
+        update sys_job
+        <set>
+            <if test="status !=null">status = #{status},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate(),
+        </set>
+        where store_id = #{storeId} and patient_id = #{patientId}
+    </update>
+    <!-- 关闭该患者的所有计划 -->
+    <update id="closeFollowPlanByPatientId" parameterType="pd">
+        update s_gxhpz_follow_plan
+        <set>
+            <if test="status != null">
+                status = #{status},
+            </if>
+            <if test="updatedBy != null and updatedBy != ''">
+                updatedBy = #{updatedBy},
+            </if>
+            <if test="updatedTime != null and updatedTime != ''">
+                updatedTime = #{updatedTime},
+            </if>
+        </set>
+        where storeId = #{storeId} and patientId = #{patientId}
+
+    </update>
+
+    <!-- 关闭该患者的所有任务 -->
+    <update id="stopFollowTaskByPatientId" parameterType="pd">
+        update s_gxhpz_follow_task
+        <set>
+            <if test="taskStatus != null">
+                taskStatus = #{taskStatus},
+            </if>
+            <if test="updatedAt != null and updatedAt != ''">
+                updatedAt = #{updatedAt},
+            </if>
+            <if test="operator != null and operator != ''">
+                operator = #{operator},
+            </if>
+        </set>
+        where storeId = #{storeId} and patientId = #{patientId}
+
+    </update>
+    <!-- 关闭任务taskid -->
+    <update id="closeTaskByTaskId" parameterType="pd">
+        update s_gxhpz_follow_task
+        <set>
+            <if test="taskStatus != null">
+                taskStatus = #{taskStatus},
+            </if>
+            <if test="updatedAt != null and updatedAt != ''">
+                updatedAt = #{updatedAt},
+            </if>
+            <if test="operator != null and operator != ''">
+                operator = #{operator},
+            </if>
+        </set>
+        where storeId = #{storeId} and patientId = #{patientId} and taskId=#{taskId}
+
+    </update>
+
+
+
+
+
+    <!-- 开启生成的任务 -->
+    <update id="openTaskByTaskId" parameterType="pd">
+        update s_gxhpz_follow_task
+        <set>
+            <if test="taskStatus != null">
+                taskStatus = #{taskStatus},
+            </if>
+            <if test="updatedAt != null and updatedAt != ''">
+                updatedAt = #{updatedAt},
+            </if>
+            <if test="operator != null and operator != ''">
+                operator = #{operator},
+            </if>
+            <if test="appointmentDate != null and appointmentDate != ''">
+                appointmentDate = #{appointmentDate},
+            </if>
+
+        </set>
+        where storeId = #{storeId} and patientId = #{patientId} and taskId=#{taskId}
+
+    </update>
+    <!-- 激活创建的计划 -->
+    <update id="openPlanByPlanId" parameterType="pd">
+        update s_gxhpz_follow_plan
+        <set>
+            <if test="status != null">
+                status = #{status},
+            </if>
+            <if test="updatedTime != null and updatedTime != ''">
+                updatedTime = #{updatedTime},
+            </if>
+            <if test="updatedBy != null and updatedBy   != ''">
+                updatedBy = #{updatedBy},
+            </if>
+        </set>
+        where storeId = #{storeId} and patientId = #{patientId} and planId=#{planId}
+
+    </update>
+
+    <!-- 更新job表的任务执行次数 -->
+    <update id="updateJobStatusByTaskId" parameterType="pd">
+        update sys_job
+        <set>
+            <if test="status != null">
+                status = #{status},
+            </if>
+            <if test="currentExecutionCount != null">
+                currentExecutionCount = #{currentExecutionCount},
+            </if>
+            <if test="remainingExecutions != null">
+                remainingExecutions = #{remainingExecutions},
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                update_time = #{updateTime},
+            </if>
+
+            <if test="updateBy != null and updateBy != ''">
+                update_by = #{updateBy},
+            </if>
+        </set>
+        where store_id = #{storeId} and patient_id = #{patientId} and task_id=#{taskId}
+
+    </update>
 </mapper>

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

@@ -37,12 +37,21 @@
             <if test="position != null and position !=''">
                 position = #{position},
             </if>
+            <if test="default_follow_up != null and default_follow_up !=''">
+                default_follow_up =  #{default_follow_up},
+            </if>
             <if test="storeName != null and storeName != ''">
                 storeName = #{storeName},
             </if>
             <if test="reviewPassword != null and reviewPassword != ''">
                 reviewPassword = #{reviewPassword},
             </if>
+            <if test="phone != null and phone != ''">
+                phone = #{phone},
+            </if>
+            <if test="status != null and status != ''">
+                status =  #{status},
+            </if>
         </trim>
         <if test="id != null">
             where id = #{id}
@@ -80,12 +89,21 @@
             <if test="position != null and position !=''">
                 position,
             </if>
+            <if test="default_follow_up != null and default_follow_up !=''">
+                default_follow_up,
+            </if>
             <if test="storeName != null and storeName != ''">
                 storeName,
             </if>
             <if test="reviewPassword != null and reviewPassword != ''">
                 reviewPassword,
             </if>
+            <if test="phone != null and phone != ''">
+                phone,
+            </if>
+            <if test="status != null and status != ''">
+                status,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" prefixOverrides="," suffixOverrides=",">
 
@@ -107,13 +125,45 @@
             <if test="position != null and position !=''">
                 #{position},
             </if>
+            <if test="default_follow_up != null and default_follow_up !=''">
+                #{default_follow_up},
+            </if>
             <if test="storeName != null and storeName != ''">
                 #{storeName},
             </if>
             <if test="reviewPassword != null and reviewPassword != ''">
                 #{reviewPassword},
             </if>
+            <if test="phone != null and phone != ''">
+                #{phone},
+            </if>
+            <if test="status != null and status != ''">
+                #{status},
+            </if>
         </trim>
     </insert>
 
+
+    <!-- 更新默认的任务跟进人 -->
+    <update id="updateDefaultFollowUpByStoreId" parameterType="pd">
+        update s_dtp_review_pharmacists
+        <trim prefix="SET " suffix="" prefixOverrides="," suffixOverrides=",">
+            <if test="updateBy != null and updateBy != ''">
+                updateBy = #{updateBy},
+            </if>
+            <if test="updateTime != null">
+                updateTime = #{updateTime},
+            </if>
+            <if test="default_follow_up != null">
+                default_follow_up =  #{default_follow_up},
+            </if>
+        </trim>
+        where
+        <if test="storeId != null and storeId !=''">
+            where storeId = #{storeId}
+        </if>
+        <if test="position != null and position !=''">
+            and position = #{position}
+        </if>
+    </update>
 </mapper>

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

@@ -16,7 +16,7 @@
         <if test="storeName != null and storeName != ''">
             AND storeName = #{storeName}
         </if>
-        <if test="storeId != null and storeId != ''">
+        <if test="storeId != null">
             AND storeId = #{storeId}
         </if>
         <if test="createdTime != null">
@@ -52,7 +52,7 @@
             <if test="storeName != null and storeName != ''">
                 storeName = #{storeName},
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 storeId = #{storeId},
             </if>
             <if test="reviewPassword != null and reviewPassword != ''">
@@ -87,7 +87,7 @@
                 updatedTime = #{updatedTime},
             </if>
         </trim>
-        <if test="storeId != null and storeId != ''">
+        <if test="storeId != null">
             WHERE storeId = #{storeId}
         </if>
     </update>
@@ -116,7 +116,7 @@
             <if test="storeName != null and storeName != ''">
                 storeName,
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 storeId,
             </if>
             <if test="reviewPassword != null and reviewPassword != ''">
@@ -137,7 +137,7 @@
             <if test="storeName != null and storeName != ''">
                 #{storeName},
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 #{storeId},
             </if>
             <if test="reviewPassword != null and reviewPassword != ''">

health-system/src/main/resources/mapper/mdyy/DTPCFDJMapper.xml

@@ -138,7 +138,7 @@
         <if test="drugRoute != null and drugRoute != ''">
             and sdpr.drugRoute = #{drugRoute}
         </if>
-        <if test="storeId != null and storeId != ''">
+        <if test="storeId != null">
             and sdpr.storeId = #{storeId}
         </if>
         <if test="storeName != null and storeName != ''">
@@ -342,7 +342,7 @@
             <if test="drugRoute != null and drugRoute != ''">
                 drugRoute,
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 storeId,
             </if>
             <if test="storeName != null and storeName != ''">
@@ -458,7 +458,7 @@
             <if test="drugRoute != null and drugRoute != ''">
                 #{drugRoute},
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 #{storeId},
             </if>
             <if test="storeName != null and storeName != ''">
@@ -592,7 +592,7 @@
             <if test="drugRoute != null and drugRoute != ''">
                 drugRoute = #{drugRoute},
             </if>
-            <if test="storeId != null and storeId != ''">
+            <if test="storeId != null">
                 storeId = #{storeId},
             </if>
             <if test="storeName != null and storeName != ''">

health-system/src/main/resources/mapper/pmServiceMapper/PharmaceuticalServiceMapper.xml

@@ -311,6 +311,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateTime != null and updateTime != ''">updateTime,</if>
 			<if test="dl != null and dl != ''">dl,</if>
 			<if test="xl != null and xl != ''">xl,</if>
+			<if test="follow_up_assign != null and follow_up_assign != ''">follow_up_assign,</if>
+			<if test="follow_up_assign_id != null and follow_up_assign_id != ''">follow_up_assign_id,</if>
 			<if test="addr != null and addr != ''">addr</if>
 		</trim>
 
@@ -362,6 +364,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateTime != null and updateTime != ''">#{updateTime},</if>
 			<if test="dl != null and dl != ''">#{dl},</if>
 			<if test="xl != null and xl != ''">#{xl},</if>
+			<if test="follow_up_assign != null and follow_up_assign != ''">>#{follow_up_assign},</if>
+			<if test="follow_up_assign_id != null and follow_up_assign_id != ''">#{follow_up_assign_id},</if>
 			<if test="addr != null and addr != ''">#{addr}</if>
 		</trim>
 
@@ -410,6 +414,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="noFlipCause != null and noFlipCause != ''">noFlipCause = #{noFlipCause},</if>
 		<if test="followUpStatus != null and followUpStatus != ''">followUpStatus = #{followUpStatus},</if>
 		<if test="genericName != null and genericName != ''">genericName = #{genericName},</if>
+		<if test="follow_up_assign != null and follow_up_assign != ''">>follow_up_assign = #{follow_up_assign},</if>
+		<if test="follow_up_assign_id != null and follow_up_assign_id != ''">follow_up_assign_id = #{follow_up_assign_id},</if>
 		updateTime = #{updateTime}
 		WHERE id = #{id}
 	</update>
@@ -841,7 +847,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</delete>
 
 
+	<!--随访跟进人离职人员 查询-->
+	<select id="getFollow_up_assignLZJJList" parameterType="pd" resultType="pd">
+		select * from s_dtp_review_pharmacists where 1=1
+
+		<if test="position != null and position != ''">
+			and position=#{position}
+		</if>
+		<if test="default_follow_up != null and default_follow_up != ''">
+			and default_follow_up =#{default_follow_up}
+		</if>
+		<if test="status != null and status != ''">
+			and status =#{status}
+		</if>
+		<if test="storeId != null and storeId != ''">
+			and storeId=#{storeId}
+		</if>
+	</select>
 	<!--随访跟进人分配 查询-->
+	<select id="getFollow_up_assignList" parameterType="pd" resultType="pd">
+		select a.*,b.status,DATE_FORMAT(a.createTime, '%Y-%m-%d %H:%i:%s') AS createTime
+		from s_dtp_ysfw_archive_management a left join s_dtp_review_pharmacists b on a.follow_up_assign_id=b.id where 1=1
+			<if test="query != null and query != ''">
+				AND (a.name LIKE CONCAT('%', #{query}, '%')
+				OR a.phoneNumber = #{query})
+			</if>
+		<if test="follow_up_assign != null and follow_up_assign != ''">
+			and a.follow_up_assign=#{follow_up_assign}
+		</if>
+		<if test="yesAssign != null and yesAssign != ''">
+			and a.follow_up_assign is not null
+		</if>
+		<if test="noAssign != null and noAssign != ''">
+			and a.follow_up_assign is  null
+		</if>
+		<if test="status != null and status != ''">
+			and b.status =#{status}
+		</if>
+
+		<if test="storeId != null and storeId != ''">
+			and a.storeId=#{storeId}
+		</if>
+		<if test="product != null and product != ''">
+			AND (a.productName LIKE CONCAT('%', #{product}, '%')
+			OR a.mdmCode = #{product})
+		</if>
+	</select>
+	<!--随访跟进人分配作废 查询-->
 	<select id="selectFollowUpAssignList" parameterType="pd" resultType="pd">
 		select *,DATE_FORMAT(updatedAt, '%Y-%m-%d %H:%i:%s') AS updateTime2 from s_dtp_ysfw_follow_up_assign where 1=1
 		<if test="id != null and id != ''">
@@ -906,6 +958,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 
 	</select>
+	<select id="selectFollowUpPerson" parameterType="pd" resultType="pd">
+		select * from s_dtp_ysfw_follow_up_assign where 1=1
+		<if test="patientId != null and patientId != ''">
+			and patientId=#{patientId}
+		</if>
+		<if test="storeId != null and storeId != ''">
+			and storeId=#{storeId}
+		</if>
+		and patientAssignmentStatus='已分配'
+	</select>
+	<select id="selectPharmacistsByStoreId" parameterType="pd" resultType="pd">
+		select * from s_dtp_review_pharmacists where 1=1
+		<if test="position != null and position != ''">
+			and position=#{position}
+		</if>
+		<if test="storeId != null and storeId != ''">
+			and position=#{storeId}
+		</if>
+		<if test="query != null and query != ''">
+			AND (pharmacistName LIKE CONCAT('%', #{query}, '%')
+			OR phone = #{query})
+		</if>
+		<if test="status != null and status != ''">
+			and status=#{status}
+		</if>
+	</select>
 
 	<!--随访跟进人分配 修改-->
 	<update id="updateFollowUpAssign" parameterType="pd" >
@@ -978,6 +1056,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</if>
 		</if>
 	</update>
+	<!--任务跟进人 修改-->
+	<update id="editFollowTaskAssignById" parameterType="pd" >
+		<if test="up != null and up!=''">
+			update s_gxhpz_follow_task
+		</if>
+		<trim prefix=" SET " suffix="" prefixOverrides="," suffixOverrides=",">
+			<if test="taskFollower != null and taskFollower != ''">
+				taskFollower=#{taskFollower},
+			</if>
+		</trim>
+		<if test="up != null and up!=''">
+			<if test="id!= null and id!=''">
+				where id=#{id}
+			</if>
+		</if>
+	</update>
 
 	<!--随访跟进人分配 删除-->
 	<delete id="followUpAssignRemove" parameterType="pd">
@@ -1861,29 +1955,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="DeleteMedicationRecord" parameterType="pd">
 		DELETE FROM s_dtp_ysfw_medication_records WHERE archiveId = #{archiveId}
 	</update>
-
+	<update id="updateDrugPurchaseRecord" parameterType="pd">
+		UPDATE s_dtp_drug_purchase_record SET
+		<trim prefix="" suffixOverrides="," prefixOverrides=",">
+			<if test="singleDoseUnit != null and singleDoseUnit != ''">
+				singleDoseUnit = #{singleDoseUnit},
+			</if>
+			<if test="singleDoseValue != null and singleDoseValue != ''">
+				singleDoseValue = #{singleDoseValue},
+			</if>
+			<if test="dosageFrequency != null and dosageFrequency != ''">
+				dosageFrequency = #{dosageFrequency},
+			</if>
+			<if test="dvalueDays != null and dvalueDays != ''">
+				dvalueDays = #{dvalueDays},
+			</if>
+			<if test="updatedTime != null and updatedTime != ''">
+				updatedTime = #{updatedTime},
+			</if>
+			<if test="updatedBy != null and updatedBy != ''">
+				updatedBy = #{updatedBy}
+			</if>
+		</trim>
+		WHERE id = #{id}
+	</update>
 	<!--查询对应患者的用药购药信息-->
 	<select id="getDrugPurchaseList" parameterType="pd" resultType="pd">
 		select
-			sddpr.prescriptionNumber , -- 销售
-			sdpr.salesOrderNumber, -- 处方编号
-			sddpr.prescriptionDate, -- 处方日期
 			sdpr.hospital, -- 医院
 			sdpr.prescribingDoctor, -- 处方医生
 			sdpr.department, -- 科室
 			sdpr.attendingDoctor, -- 主管医生
 			sdpr.clinicalDiagnosis, --  临床诊断
-			sddpr.genericName,-- 	药品通用名
-			sddpr.productName,-- 	商品名
-			sddpr.medicationRoute,-- 	用药途径
-			sddpr.dosageFrequency,-- 	用药频次
-			sddpr.singleDoseUnit,-- 	单次剂量
+			sdpr.prescriptionDiagnosis,-- 处方诊断
+			sdpr.dl, -- 大类
+			drug.prescriptionNumber, -- 处方编号
+			drug.salesOrderNumber, --  销售订单编号
+			drug.prescriptionDate, -- 处方日期
+			drug.genericName,-- 	药品通用名
+			drug.productName,-- 	商品名
+			drug.medicationRoute,-- 	用药途径
+			drug.specification,-- 规格
+			drug.id ,-- 	ID
+			drug.mdmCode,
+			drug.dosageFrequency,-- 	用药频次
+			drug.dvalueDays,-- 	D值品用药天数
+			drug.packageQuantity,-- 	处方取药数量
+			drug.singleDoseUnit,-- 	单次剂量单位
+			drug.singleDoseValue,-- 	单次剂量值
+			drug.pharmacyName,  -- 购药门店名称
 			sdpr.registrant,-- 	登记人
 			sdpr.registrationDate,-- 登记日期
-			sdpr.saleDate,-- 销售日期
-			sddpr.pharmacyName  -- 购药门店名称
-		from s_dtp_drug_purchase_record  sddpr
-		left join s_dtp_prescription_registration sdpr on sddpr.drugsLinkId=sdpr.drugsLinkId
+			sdpr.saleDate  -- 销售日期
+		from s_dtp_drug_purchase_record  drug
+		left join s_dtp_prescription_registration sdpr on drug.drugsLinkId=sdpr.drugsLinkId
 		where sdpr.patientId=#{id}
 
 	</select>
@@ -1998,4 +2123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		FROM
 			s_dtp_ysfw_archive_management where id=#{patientId};
 	</select>
+
+	<select id="getDrugData" parameterType="pd" resultType="pd">
+		select * from s_gxhpz_product_dtpinfo where 1=1 and  product_code = #{mdmCode} and storeId = #{storeId}
+	</select>
 </mapper>

health-system/src/main/resources/mapper/spgl/SPProductinfoMapper.xml

@@ -268,6 +268,7 @@
         insert into s_gxhpz_product_info
         <trim prefix="(" suffix=")" prefixOverrides="," suffixOverrides=",">
             <if test="product_code != null and product_code != ''">product_code,</if>
+            <if test="storeId != null and storeId != ''">storeId,</if>
             <if test="product_name != null and product_name != ''">product_name,</if>
             <if test="mnemonic_code != null and mnemonic_code != ''">mnemonic_code,</if>
             <if test="product_description != null and product_description != ''">product_description,</if>
@@ -322,6 +323,7 @@
         </trim>
         <trim prefix=" VALUES (" suffix=")" prefixOverrides="," suffixOverrides=",">
             <if test="product_code != null and product_code != ''">#{product_code},</if>
+            <if test="storeId != null and storeId != ''">#{storeId},</if>
             <if test="product_name != null and product_name != ''">#{product_name},</if>
             <if test="mnemonic_code != null and mnemonic_code != ''">#{mnemonic_code},</if>
             <if test="product_description != null and product_description != ''">#{product_description},</if>
@@ -383,6 +385,7 @@
             <if test="product_code != null and product_code != ''">
                 product_code,
             </if>
+            <if test="storeId != null and storeId != ''">storeId,</if>
             <if test="reference_purchase_price != null and reference_purchase_price != ''">
                 reference_purchase_price,
             </if>
@@ -505,6 +508,7 @@
             <if test="product_code != null and product_code != ''">
                 #{product_code},
             </if>
+            <if test="storeId != null and storeId != ''">#{storeId},</if>
             <if test="reference_purchase_price != null and reference_purchase_price != ''">
                 #{reference_purchase_price},
             </if>
@@ -632,6 +636,7 @@
             <if test="product_code != null and product_code != ''">
                 product_code,
             </if>
+            <if test="storeId != null and storeId != ''">storeId,</if>
             <if test="storage_category != null and storage_category != ''">
                 storage_category,
             </if>
@@ -673,6 +678,7 @@
             <if test="product_code != null and product_code != ''">
                 #{product_code},
             </if>
+            <if test="storeId != null and storeId != ''">#{storeId},</if>
             <if test="storage_category != null and storage_category != ''">
                 #{storage_category},
             </if>
@@ -719,6 +725,7 @@
             <if test="product_code != null and product_code != ''">
                 product_code,
             </if>
+            <if test="storeId != null and storeId != ''">storeId,</if>
             <if test="is_production_batch_management != null and is_production_batch_management != ''">
                 is_production_batch_management,
             </if>
@@ -844,6 +851,7 @@
             <if test="product_code != null and product_code != ''">
                 #{product_code},
             </if>
+            <if test="storeId != null and storeId != ''"> #{storeId},</if>
             <if test="is_production_batch_management != null and is_production_batch_management != ''">
                 #{is_production_batch_management},
             </if>
@@ -973,6 +981,7 @@
             <if test="product_code != null and product_code != ''">
                 product_code,
             </if>
+            <if test="storeId != null and storeId != ''">storeId,</if>
             <if test="reference_retail_price != null and reference_retail_price != ''">
                 reference_retail_price,
             </if>
@@ -1050,6 +1059,7 @@
             <if test="product_code != null and product_code != ''">
                 #{product_code},
             </if>
+            <if test="storeId != null and storeId != ''"> #{storeId},</if>
             <if test="reference_retail_price != null and reference_retail_price != ''">
                 #{reference_retail_price},
             </if>
@@ -1132,6 +1142,7 @@
             <if test="product_code != null and product_code != ''">
                 product_code,
             </if>
+            <if test="storeId != null and storeId != ''">storeId,</if>
             <if test="platform_property != null and platform_property != ''">
                 platform_property,
             </if>
@@ -1146,6 +1157,7 @@
             <if test="product_code != null and product_code != ''">
                 #{product_code},
             </if>
+            <if test="storeId != null and storeId != ''"> #{storeId},</if>
             <if test="platform_property != null and platform_property != ''">
                 #{platform_property},
             </if>
@@ -1165,6 +1177,9 @@
             <if test="product_code != null and product_code != ''">
                 product_code,
             </if>
+            <if test="storeId != null and storeId != ''">
+                storeId,
+            </if>
             <if test="is_insurance_drug != null and is_insurance_drug != ''">
                 is_insurance_drug,
             </if>
@@ -1230,6 +1245,9 @@
             <if test="product_code != null and product_code != ''">
                 #{product_code},
             </if>
+            <if test="storeId != null and storeId != ''">
+                #{storeId},
+            </if>
             <if test="is_insurance_drug != null and is_insurance_drug != ''">
                 #{is_insurance_drug},
             </if>