Merge remote-tracking branch 'origin/dev_20230214fwcs_huli_xuhd' into dev_ch_master

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -14,6 +14,8 @@
         disable.real_name realName,
         task.fcd fcd,
         disable.certi_code certiCode,
+        disable.disease_desc diseaseDesc,
+        disable.adress_detail operAddress,
         report.pol_no polNo,
         report.remark remark,
         disable.BIRTHDAY birthday,

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/disable/ChFndDiseaseType.java

 package com.hungraim.ltc.pojo.entity.disable;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -8,7 +11,9 @@ import lombok.Data;
  */
 @Data
 @TableName("CH_FND_DISEASE_TYPE")
+@KeySequence("SEQ_CH_FND_DISEASE_TYPE")
 public class ChFndDiseaseType {
+    @TableId(type = IdType.INPUT)
     private Integer diseTypeId;
     private String diseTypeCode;
     private Integer parDiseTypeId;

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/ChFndDiseaseTypeListVO.java

+package com.hungraim.ltc.pojo.vo;
+
+import com.hungraim.ltc.pojo.entity.disable.ChFndDiseaseType;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ChFndDiseaseTypeListVO {
+    private List<ChFndDiseaseType> chFndDiseaseTypes;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskDistributionVO.java

@@ -91,4 +91,8 @@ public class TaskDistributionVO {
     private String refuseReason;
     //备注
     private String refuseRemark;
+    //诊断详情
+    private String diseaseDesc;
+    //现住地址详细地址
+    private String operAddress;
 }

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/controller/NursingServiceItemsController.java

 package com.hungraim.ltc.governance.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.governance.dao.FndDiseaseTypeMapper;
 import com.hungraim.ltc.governance.service.NursingServiceItemsService;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
+import com.hungraim.ltc.pojo.entity.disable.ChFndDiseaseType;
 import com.hungraim.ltc.pojo.entity.disable.ChServiceType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvOrganProject;
+import com.hungraim.ltc.pojo.vo.ChFndDiseaseTypeListVO;
 import com.hungraim.ltc.pojo.vo.disable.ChServiceTypeVo;
 import com.hungraim.ltc.pojo.vo.disable.SrvModeVo;
 import com.hungraim.ltc.pojo.vo.governance.OrganProjectVO;
@@ -164,4 +168,44 @@ public class NursingServiceItemsController {
         return Result.success(list);
     }
 
+
+    /**
+     * 查询疾病类型
+     *
+     * @param parDiseTypeId 父疾病类型id 不传值默认查询所有一级疾病类型
+     */
+    @RequestMapping("/fndDiseaseList")
+    public Result<List<ChFndDiseaseType>> fndDiseaseList(String parDiseTypeId) {
+        List<ChFndDiseaseType> chFndDiseaseTypes = nursingServiceItemsService.fndDiseaseList(parDiseTypeId);
+        return Result.success(chFndDiseaseTypes);
+    }
+
+    /**
+     * 查询所有疾病数据
+     */
+    @RequestMapping("/fndAllDisease")
+    public Result<List<ChFndDiseaseType>> fndAllDisease() {
+        List<ChFndDiseaseType> chFndDiseaseTypes = nursingServiceItemsService.fndAllDisease();
+        return Result.success(chFndDiseaseTypes);
+    }
+
+
+    /**
+     * 修改疾病数据
+     *
+     * @param chFndDiseaseTypes 疾病修改的信息
+     * @return 返回执行结果
+     */
+    @PostMapping("/saveDisease")
+    public Result saveDisease( ChFndDiseaseTypeListVO chFndDiseaseTypes) {
+        log.info("saveDisease");
+        log.info(JSONObject.toJSONString(chFndDiseaseTypes.getChFndDiseaseTypes()));
+        if (chFndDiseaseTypes.getChFndDiseaseTypes() == null || chFndDiseaseTypes.getChFndDiseaseTypes().size() <= 0) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        nursingServiceItemsService.saveDisease(chFndDiseaseTypes.getChFndDiseaseTypes());
+        return Result.success();
+    }
+
+
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/FndDiseaseTypeMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChFndDiseaseType;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 疾病类型Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface FndDiseaseTypeMapper extends BaseMapper<ChFndDiseaseType> {
+}

governance/src/main/java/com/hungraim/ltc/governance/service/NursingServiceItemsService.java

@@ -2,6 +2,7 @@ package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
+import com.hungraim.ltc.pojo.entity.disable.ChFndDiseaseType;
 import com.hungraim.ltc.pojo.entity.disable.ChServiceType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvOrganProject;
 import com.hungraim.ltc.pojo.vo.disable.ChServiceTypeVo;
@@ -42,4 +43,24 @@ public interface NursingServiceItemsService {
     void deleteSrvModel(Long modeId);
 
     List<ChServiceTypeVo> queryServiceTypeList();
+
+    /**
+     * 查询疾病类型
+     *
+     * @param parDiseTypeId 父疾病类型id
+     */
+    List<ChFndDiseaseType> fndDiseaseList(String parDiseTypeId);
+
+    /**
+     * 查询所有疾病数据
+     */
+    List<ChFndDiseaseType> fndAllDisease();
+
+    /**
+     * 修改疾病数据
+     *
+     * @param chFndDiseaseTypes
+     * @return 返回执行结果
+     */
+    void saveDisease(List<ChFndDiseaseType> chFndDiseaseTypes);
 }

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

@@ -2,12 +2,14 @@ package com.hungraim.ltc.governance.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 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.SrvModeFeignService;
 import com.hungraim.ltc.governance.dao.*;
 import com.hungraim.ltc.governance.service.NursingServiceItemsService;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChCfgSrvMode;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
+import com.hungraim.ltc.pojo.entity.disable.ChFndDiseaseType;
 import com.hungraim.ltc.pojo.entity.disable.ChServiceType;
 import com.hungraim.ltc.pojo.entity.disable.ChServiceTypeDetailed;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvOrganProject;
@@ -18,6 +20,7 @@ import com.hungraim.ltc.util.Result;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,6 +37,7 @@ public class NursingServiceItemsServiceImpl implements NursingServiceItemsServic
     private final SrvModeFeignService srvModeFeignService;
     private final ServiceTypeMapper serviceTypeMapper;
     private final ServiceTypeDetailedMapper serviceTypeDetailedMapper;
+    private final FndDiseaseTypeMapper fndDiseaseTypeMapper;
 
     @Override
     public Page<OrganProjectVO> organProjectList(Page<OrganProjectVO> page, String organIds, String name, String status) {
@@ -130,4 +134,39 @@ public class NursingServiceItemsServiceImpl implements NursingServiceItemsServic
         }
         return chServiceTypeVoList;
     }
+
+    @Override
+    public List<ChFndDiseaseType> fndAllDisease() {
+        QueryWrapper<ChFndDiseaseType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("IS_VALID", "0");
+        queryWrapper.orderByAsc("DISE_TYPE_ID");
+        return fndDiseaseTypeMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<ChFndDiseaseType> fndDiseaseList(String parDiseTypeId) {
+        QueryWrapper<ChFndDiseaseType> queryWrapper = new QueryWrapper<>();
+        //queryWrapper.eq("IS_VALID", "0");
+        if (StringUtils.isNotBlank(parDiseTypeId)) {
+            queryWrapper.eq("PAR_DISE_TYPE_ID", parDiseTypeId);
+        } else {
+            queryWrapper.and(wrapper -> wrapper.isNull("PAR_DISE_TYPE_ID").or().eq("PAR_DISE_TYPE_ID", ""));
+        }
+        return fndDiseaseTypeMapper.selectList(queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveDisease(List<ChFndDiseaseType> chFndDiseaseTypes){
+        //遍历修改的列表
+        chFndDiseaseTypes.stream().forEach(e->{
+            if(e.getDiseTypeId() == null){
+                fndDiseaseTypeMapper.insert(e);
+            }else{
+                fndDiseaseTypeMapper.updateById(e);
+            }
+        });
+
+    }
+
 }

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--护理人员资质