1、添加失能人员是否首次申请

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableApply.java

@@ -117,6 +117,10 @@ public class ChDisableApply extends PageInfo implements Serializable {
     private Long srvOrganId;
 
     /**
+     * 是否首次申请 初次申请，争议复评，定期复评，变更评定
+     */
+    private Long reviewFrequency;
+    /**
      * 代办人姓名
      */
     private String operName;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvTask.java

@@ -103,5 +103,10 @@ public class ChSrvTask implements Serializable {
      */
     private Long webEndEmp;
 
+    /**
+     * 终止计划原因
+     */
+    private String endReason;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoVO.java

@@ -51,6 +51,11 @@ public class SrvTaskInfoVO implements Serializable {
      */
     private String taskStatus;
 
+    /**
+     * 终止计划原因
+     */
+    private String endReason;
+
 //    /**
 //     * 服务计划附件
 //     */

governance/src/main/java/com/hungraim/ltc/governance/service/impl/NursingServiceItemsServiceImpl.java

@@ -138,7 +138,8 @@ public class NursingServiceItemsServiceImpl implements NursingServiceItemsServic
     @Override
     public List<ChFndDiseaseType> fndAllDisease() {
         QueryWrapper<ChFndDiseaseType> queryWrapper = new QueryWrapper<>();
-        //queryWrapper.eq("IS_VALID", "0");
+        queryWrapper.eq("IS_VALID", "0");
+        queryWrapper.orderByAsc("DISE_TYPE_ID");
         return fndDiseaseTypeMapper.selectList(queryWrapper);
     }
 

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

 package com.hungraim.ltc.governance.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.api.AccountFeignService;
 import com.hungraim.ltc.api.AttachFeignService;
@@ -124,6 +126,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void addOrUpdateSrvTask(SrvTaskInfoListVO param) {
+        log.info("制定服务信息:" + JSONObject.toJSON(param));
         String programId = param.getProgramId();
         String disabInfoId = param.getDisabInfoId();
         List<SrvTaskInfoVO> taskList = param.getTaskList();
@@ -149,6 +152,15 @@ public class SrvTaskServiceImpl implements SrvTaskService {
                 // 修改服务计划
                 chSrvTaskDetailMapper.delete(new QueryWrapper<ChSrvTaskDetail>().eq("srv_task_id", Long.parseLong(srvTaskId)));//删除原来的计划详情
                 this.insertTaskDetail(Long.parseLong(srvTaskId), taskDetails);
+                //修改服务计划
+                ChSrvTask chSrvTask = new ChSrvTask();
+                UpdateWrapper updateWrapper = new UpdateWrapper();
+                updateWrapper.eq("SRV_TASK_ID",srvTaskId);
+                //状态 未分配：0；已分配：1;已终止2
+                updateWrapper.set("STATUS",srvTaskInfoVO.getTaskStatus());
+                updateWrapper.set("END_REASON",srvTaskInfoVO.getEndReason());
+
+                srvTaskMapper.update(null,updateWrapper);
                 //修改附件
 //                this.updateAttachs(srvTaskInfoVO.getListAttach(), Long.parseLong(srvTaskId));
             }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvTaskMapper.xml

@@ -162,7 +162,9 @@
                --服务人员资质名称
                empType.TYPE_NAME    empTypeName,
                --服务人员资质名称
-               task.STATUS           taskStatus
+               task.STATUS           taskStatus,
+               --终止计划原因
+               task.END_REASON           endReason
         from ch_srv_task task--服务计划
                  left join ch_srv_organ_emp emp on task.srv_emp_id = emp.emp_id--护理人员
                  left join CH_CFG_SRV_EMP_TYPE empType on emp.emp_type_id = empType.EMP_TYPE_ID--护理人员资质