解决冲突

apply/apply-service/src/main/java/com/hungraim/ism/controller/DisableController.java

@@ -211,4 +211,5 @@ public class DisableController {
         return Result.success();
     }
 
+
 }

apply/apply-service/src/main/java/com/hungraim/ism/dao/SrvOrganMapper.java

@@ -3,6 +3,7 @@ package com.hungraim.ism.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -13,4 +14,5 @@ import org.springframework.stereotype.Repository;
 @Mapper
 @Repository
 public interface SrvOrganMapper extends BaseMapper<ChSrvOrgan> {
+
 }

apply/apply-service/src/main/java/com/hungraim/ism/service/DisableService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
 import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.disable.*;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -116,6 +116,7 @@
         from CH_DISABLE_APPLY a
                  LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID
         where a.APPLY_ID = #{applyId}
+        order by APPLY_ID desc
     </select>
 
     <select id="listExamineRecordByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.ExamineRecord">

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

 package com.hungraim.ltc.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
+import com.hungraim.ltc.pojo.entity.eval.ChAprReport;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
 import com.hungraim.ltc.service.TaskService;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -63,4 +67,23 @@ public class TaskController {
         return Result.success(taskReportList);
     }
 
+    /**
+     * 查询失能人员列表
+     */
+    @RequestMapping("/aprEmpList")
+    public Result<List<ChAprEmp>> aprEmpList() {
+        List<ChAprEmp> chAprEmps = taskService.aprEmpList();
+        return Result.success(chAprEmps);
+    }
+
+    /**
+     * 评定报告新增
+     */
+    @RequestMapping("/addReport")
+    public Result addReport(@RequestBody ChAprReport chAprReport) {
+        chAprReport.setEffTime(new Date());
+        taskService.addReport(chAprReport);
+        return Result.success();
+    }
+
 }

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/AprEmpMapper.java

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 失能评定人员Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface AprEmpMapper extends BaseMapper<ChAprEmp> {
+}

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/AprReportMapper.java

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.eval.ChAprReport;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 失能评定报告Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface AprReportMapper extends BaseMapper<ChAprReport> {
+}

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

 package com.hungraim.ltc.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
+import com.hungraim.ltc.pojo.entity.eval.ChAprReport;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
 import org.springframework.stereotype.Service;
@@ -42,4 +44,8 @@ public interface TaskService {
      * 评定报告录入列表
      */
     List<TaskReportVO> taskReportList();
+
+    List<ChAprEmp> aprEmpList();
+
+    void addReport(ChAprReport chAprReport);
 }

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

 package com.hungraim.ltc.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.dao.AprEmpMapper;
+import com.hungraim.ltc.dao.AprReportMapper;
 import com.hungraim.ltc.dao.TaskMapper;
+import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
+import com.hungraim.ltc.pojo.entity.eval.ChAprReport;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
 import com.hungraim.ltc.service.TaskService;
@@ -13,11 +18,18 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * @author czz
+ */
 @Service
 public class TaskServiceImpl implements TaskService {
 
     @Autowired
     private TaskMapper taskMapper;
+    @Autowired
+    private AprEmpMapper aprEmpMapper;
+    @Autowired
+    private AprReportMapper aprReportMapper;
 
     @Override
     public IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city,
@@ -36,4 +48,14 @@ public class TaskServiceImpl implements TaskService {
     public List<TaskReportVO> taskReportList() {
         return taskMapper.taskReportList();
     }
+
+    @Override
+    public List<ChAprEmp> aprEmpList() {
+        return aprEmpMapper.selectList(new QueryWrapper<ChAprEmp>().eq("IS_LOCK", 0));
+    }
+
+    @Override
+    public void addReport(ChAprReport chAprReport) {
+        aprReportMapper.insert(chAprReport);
+    }
 }
\ No newline at end of file

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

@@ -14,6 +14,7 @@
         disable.real_name realName,
         task.fcd fcd,
         disable.certi_code certiCode,
+        disable.BIRTHDAY birthday,
         (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
         (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
         disable.tel tel,

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableEvaluateInfoVO.java

 package com.hungraim.ism.pojo.vo.disable;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * 失能审核信息详情VO
  */
+@Data
 public class DisableEvaluateInfoVO {
     //***失能人员个人信息
     //机构

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableEvaluateVO.java

 package com.hungraim.ism.pojo.vo.disable;
 
+import com.hungraim.ltc.pojo.entity.PageInfo;
+
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 失能评定列表VO
  */
-public class DisableEvaluateVO {
+public class DisableEvaluateVO extends PageInfo implements Serializable {
     //id
     private String evaluateId;
     //适用机构

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableVO.java

 package com.hungraim.ism.pojo.vo.disable;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 失能人员信息列表VO
  */
 @Data
-public class DisableVO {
+@TableName("")
+public class DisableVO implements Serializable {
     //id
     private String applyId;
     //适用机构
     private String organName;
     //机构代码
-    private String organId;
+    private String organiId;
     //所在省市
     private String provincial;
     private String city;
@@ -27,27 +30,27 @@ public class DisableVO {
     //待遇类型
     private String treatmentTyte;
     //联系人姓名
-    private String operName;
+    private String opername;
     //年龄
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
     //性别
     private String gender;
     //失能人员身份证号码
-    private String operCertiCode;
+    private String opercertiCode;
     //失能人员手机号
     private String tel;
     //失能人员固话
-    private String fixedTel;
+    private String fixedtel;
     //申请服务方式
-    private String srvModeName;
+    private String srvmodeName;
     //诊断疾病
     private String disease;
     //申请时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date effTime;
+    private Date efftime;
     //申请来源 网厅：0，核心：1，手机端:2,待遇申请:3
-    private String dataFrom;
+    private String datafrom;
     //审核状态
     private String applyStatus;
 }

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

+package com.hungraim.ltc.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+import java.io.Serializable;
+
+@Data
+public class PageInfo implements Serializable {
+
+    @TableField(exist = false)
+    private int current;
+    @TableField(exist = false)
+    private int limit;
+}

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

@@ -4,6 +4,7 @@ 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 com.hungraim.ltc.pojo.entity.PageInfo;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -17,7 +18,7 @@ import java.util.Date;
 @Data
 @TableName("CH_DISABLE_APPLY")
 @KeySequence(value = "SEQ_CH_DISABLE_APPLY")
-public class ChDisableApply implements Serializable {
+public class ChDisableApply extends PageInfo implements Serializable {
 
     /**
      * 失能申请id

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

 package com.hungraim.ltc.pojo.entity.disable;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.hungraim.ltc.pojo.entity.PageInfo;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 护理机构表
  */
 @Data
 @TableName("CH_SRV_ORGAN")
-public class ChSrvOrgan {
+public class ChSrvOrgan extends PageInfo implements Serializable {
+    @TableId("srv_organ_id")
     private Integer srvOrganId;
     private String acptRoadDetail;
     private String acptLongitude;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprEmp.java

+package com.hungraim.ltc.pojo.entity.eval;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("CH_APR_EMP")
+public class ChAprEmp {
+    private Integer empId;
+    private Integer eduId;
+    private String aprempTypeNameF;
+    private String certiCode;
+    private Integer isLock;
+    private String certifTypeCode;
+    private String eduCode;
+    private Integer basicEmpId;
+    private java.util.Date endTime;
+    private String gender;
+    private Integer defineEmp;
+    private Integer cfgModeId;
+    private Integer age;
+    private Integer aprempTypeIdF;
+    private java.util.Date fcd;
+    private Integer empType;
+    private java.util.Date lcd;
+    private String realName;
+    private Integer aprempTypeIdS;
+    private String aprempTypeNameS;
+    private Integer dataFrom;
+    private Integer endEmp;
+    private String address;
+    private Integer fcu;
+    private String tel;
+    private String certifTypeId;
+    private Integer groupLeader;
+    private java.util.Date effTime;
+    private Integer aprOrganId;
+    private Integer lcu;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprReport.java

+package com.hungraim.ltc.pojo.entity.eval;
+
+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;
+
+@Data
+@TableName("CH_APR_REPORT")
+@KeySequence(value = "SEQ_CH_APR_REPORT")
+public class ChAprReport {
+    @TableId(value = "REPORT_ID", type = IdType.INPUT)
+    private Integer reportId;
+    private Integer checkName;
+    private Integer evaluateRatingType;
+    private Integer status;
+    private java.util.Date endTime;
+    private String polNo;
+    private Integer disableLevelId;
+    private String evaluationRemark;
+    private Integer defineEmp;
+    private Integer cfgModeId;
+    private java.util.Date evaluateTime;
+    private String remark;
+    private java.util.Date publicityStartTime;
+    private java.util.Date evaluationTime;
+    private java.util.Date publicityEndTime;
+    private java.util.Date fcd;
+    private Integer srvModeId;
+    private java.util.Date lcd;
+    private Integer simpleIntelligentScore;
+    private Integer treatmentType;
+    private String srvModeName;
+    private Integer endEmp;
+    private String publicityRemark;
+    private Integer fcu;
+    private Integer cfgAprId;
+    private String evaluateRating;
+    private Integer evaluationEmp;
+    private java.util.Date effTime;
+    private Integer aprTotalScore;
+    private String checkRemark;
+    private Integer taskId;
+    private Integer lcu;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprTask.java

@@ -20,7 +20,7 @@ public class ChAprTask {
     private java.util.Date taskAppointmentDate;
     private Integer defineEmp;
     private Integer finishEmp;
-    private java.util.Date fCD;
+    private java.util.Date fcd;
     private Integer acceptEmp;
     private java.util.Date acceptTime;
     private java.util.Date lcd;

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

@@ -27,6 +27,8 @@ public class TaskDistributionVO {
     //失能人员身份证号码
     private String certiCode;
     //年龄
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;//出生年月
     //诊断疾病 CH_FND_DISEASE_TYPE
     private String diseTypeF;//大类
     private String diseTypeS;//小类

governance/src/main/java/com/hungraim/ltc/governance/controller/BuildBedController.java

 package com.hungraim.ltc.governance.controller;
 
-import com.hungraim.ltc.governance.service.IBuildBedService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.governance.service.*;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author jiaguokai
@@ -18,6 +30,15 @@ import javax.annotation.Resource;
 public class BuildBedController {
     @Resource
     private IBuildBedService buildBedService;
+    @Resource
+    private ApplyService applyService;
+    @Resource
+    private CrvService crvService;
+
+    @Resource
+    private DisableEvaluateService disableEvaluateService;
+
+
 
     @PostMapping("/searchOrgBed")
     public Result searchOrgBed(@RequestBody BuildBedSearchReq req) {
@@ -25,8 +46,175 @@ public class BuildBedController {
     }
 
     @PostMapping("/addBuild")
-    public Result buildBed(ChSrvBuildBed buildBed) {
+    public Result<Boolean> buildBed(ChSrvBuildBed buildBed) {
         boolean b = buildBedService.save(buildBed);
         return Result.success(b);
     }
+
+    /**
+     * 功能描述: 服务分配信息检索条件查询
+     */
+    @GetMapping("/pageFuwuCondition")
+    public Result pageFuwuCondition(HttpServletRequest request,
+                                    @RequestBody(required = false) ChDisableApply disableApply) {
+
+        // 创建一个page对象
+        Page<ChDisableApply> disableApplyPage = new Page<ChDisableApply>(disableApply.getCurrent(), disableApply.getLimit());
+        // 构建条件
+        QueryWrapper<ChDisableApply> queryWrapper = new QueryWrapper<>();
+        // 多条件组合查询
+        // 机构id
+        String organid = disableApply.getOrganId();
+        // 失能人员姓名
+        String name = disableApply.getRealName();
+        // 失能人员手机号码
+        String tel = disableApply.getTel();
+        // 省
+        String provincial = disableApply.getDistrictProvincial();
+        //　市
+        String city = disableApply.getDistrictCity();
+        //　县
+        String area = disableApply.getDistrictArea();
+        // 失能人员身份证号码
+        String certiCode = disableApply.getCertiCode();
+        // 意向护理机构
+        Long srvOrganId = disableApply.getSrvOrganId();
+        // 服务方式
+        Long srvModeId = disableApply.getSrvModeId();
+        // 状态
+        Short applyStatus = disableApply.getApplyStatus();
+
+        if (!StrUtil.isEmpty(organid)) {
+            queryWrapper.like("organ_id", organid);
+        }
+        if (!StrUtil.isEmpty(name)) {
+            queryWrapper.like("real_name", name);
+        }
+        if (!StrUtil.isEmpty(tel)) {
+            queryWrapper.like("tel", tel);
+        }
+        if (!StrUtil.isEmpty(city)) {
+            queryWrapper.like("district_City", city);
+        }
+        if (!StrUtil.isEmpty(provincial)) {
+            queryWrapper.like("district_Provincial", provincial);
+        }
+        if (!StrUtil.isEmpty(area)) {
+            queryWrapper.like("district_Area", area);
+        }
+        if (!StrUtil.isEmpty(certiCode)) {
+            queryWrapper.like("certi_Code", certiCode);
+        }
+        if (srvOrganId != null) {
+            queryWrapper.like("srv_Organ_Id", srvOrganId);
+        }
+        if (srvModeId != null) {
+            queryWrapper.like("srv_Mode_Id", srvModeId);
+        }
+        if (applyStatus != null) {
+            queryWrapper.like("apply_Status", applyStatus);
+        }
+        // 调用方法实现分页查询
+        Page<ChDisableApply> page = applyService.seletPage(disableApplyPage, queryWrapper);
+        //buildBedService.
+        // 总记录数
+        long total = disableApplyPage.getTotal();
+        List<ChDisableApply> records = disableApplyPage.getRecords();
+        Map map = new HashMap<>();
+        map.put("total", total);
+        map.put("recors", records);
+        return Result.success(map);
+    }
+
+    /**
+     * 根据id查询失能人员的评定信息
+     */
+    @GetMapping("/queryEvaluateById")
+    public Result queryEvaluateById (@ModelAttribute ChDisableApply chDisableApply){
+
+        String organId = chDisableApply.getOrganId();
+        Long srvOrganId = chDisableApply.getSrvOrganId();
+        String realName = chDisableApply.getRealName();
+        String certiCode = chDisableApply.getCertiCode();
+
+        IPage<DisableEvaluateVO> disableEvaluateVOIPage = disableEvaluateService.disableEvaluateList(organId, srvOrganId, realName, certiCode, chDisableApply.getCurrent(), chDisableApply.getLimit());
+
+        ChDisableApply page = applyService.selectById(chDisableApply.getApplyId());
+        // 查询是能人员最新评定信息
+
+        Map map = new HashMap<>();
+        map.put("disableEvaluate", disableEvaluateVOIPage.getRecords());
+        map.put("chDisableApply", page);
+        return Result.success(map);
+    }
+    /**
+     *护理机构及服务方式檢索
+     */
+    @GetMapping("/PageCrv")
+    public Result PageCrv(HttpServletRequest request,
+                          @RequestBody(required = false) ChSrvOrgan chSrvOrgan){
+
+        // 创建一个page对象
+        Page<ChSrvOrgan> chSrvOrganPage = new Page<ChSrvOrgan>(chSrvOrgan.getCurrent(), chSrvOrgan.getLimit());
+        // 构建条件
+        QueryWrapper<ChSrvOrgan> queryWrapper = new QueryWrapper<>();
+        // 多条件组合查询
+        // 机构id
+        String srvid = chSrvOrgan.getOrganId();
+        // 机构名称
+        String srvOrganName = chSrvOrgan.getSrvOrganName();
+        // 社会信用代码
+        String code = chSrvOrgan.getUnifiedSocialCreditCode();
+
+        if (!StrUtil.isEmpty(srvid)) {
+            queryWrapper.like("organ_id", srvid);
+        }
+        if (!StrUtil.isEmpty(srvOrganName)) {
+            queryWrapper.like("srv_Organ_Name", srvOrganName);
+        }
+        if (!StrUtil.isEmpty(code)) {
+            queryWrapper.like("unified_social_credit_code", code);
+        }
+        // 调用方法实现分页查询
+        Page<ChSrvOrgan> page = crvService.seletPage(chSrvOrganPage, queryWrapper);
+        //buildBedService.
+        // 总记录数
+        long total = chSrvOrganPage.getTotal();
+        List<ChSrvOrgan> records = chSrvOrganPage.getRecords();
+        Map map = new HashMap<>();
+        map.put("total", total);
+        map.put("recors", records);
+        return Result.success(map);
+    }
+
+    /**
+     *提交分配机构
+     */
+    @PostMapping("/submit")
+    public Result submit(@RequestBody(required = false) ChDisableApply  chDisableApply){
+        // 判斷參數是否存在
+           if (chDisableApply.getApplyId()==null){
+               return Result.failed("机构id無效");
+           }
+       //  查出失能人員相關信息
+        ChDisableApply apply = applyService.selectById(chDisableApply.getApplyId());
+        ChSrvOrgan chSrvOrgan = new ChSrvOrgan();
+        apply.setOrganId(chDisableApply.getOrganId());
+        apply.setDistrictProvincial(chDisableApply.getDistrictProvincial());
+        apply.setDistrictCity(chDisableApply.getDistrictCity());
+        apply.setDistrictArea(chDisableApply.getDistrictArea());
+        apply.setSrvModeId(chDisableApply.getSrvModeId());
+//        apply.setSrvOrganName(chDisableApply.getSrvOrganName());
+//        apply.setOrganTypeId(chSrvOrgan.getOrganTypeId());
+//        apply.setUnifiedSocialCreditCode(chSrvOrgan.getUnifiedSocialCreditCode());
+//        apply.setSrvType(chSrvOrgan.getSrvType());
+        apply.setEndTime(chDisableApply.getEndTime());
+        apply.setAcptRoadDetail(chDisableApply.getAcptRoadDetail());
+//        apply.setAcptRoadType(chSrvOrgan.getAcptRoadType());
+//        crvService.updateById(apply);
+        applyService.updateById(apply);
+        return Result.success(apply);
+    }
+
 }
+

governance/src/main/java/com/hungraim/ltc/governance/controller/RemoveBedController.java

@@ -32,4 +32,6 @@ public class RemoveBedController {
 
         return Result.success(removeBedService.removeOne(removeBed));
     }
+
+
 }

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

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ApplyMapper extends BaseMapper<ChDisableApply> {
+
+}

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

 package com.hungraim.ltc.governance.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchRsp;
@@ -18,4 +20,9 @@ import org.springframework.stereotype.Repository;
 public interface BuildBedMapper extends BaseMapper<ChSrvBuildBed> {
 
     Page<BuildBedSearchRsp> searchOrgBed(Page<BuildBedSearchRsp> page, @Param("req") BuildBedSearchReq req);
+
+    IPage<DisableVO> disableList(String organId, String organname, String tel,
+                                 String srvmodename, String area, String city,
+                                 String certicode, String applystatus, int pageNum, int pageSize);
+
 }

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

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface CrvMapper extends BaseMapper<ChSrvOrgan> {
+
+}

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

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 失能人员申请历史Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface DisableEvaluateMapper extends BaseMapper<ChDisableEvaluate> {
+    /**
+     * 查询失能评定列表
+     *
+     * @param organId    适用机构代码
+     * @param srvOrganId 护理机构
+     * @param realName   失能人员姓名
+     * @param certiCode  失能人员身份证号码
+     */
+    Page<DisableEvaluateVO> disableEvaluateList(Page<DisableVO> page, String organId, Long srvOrganId, String realName, String certiCode);
+
+
+    DisableEvaluateInfoVO selectDisableEvaluateInfoByEvaluateId(String evaluateId);
+
+}

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

+package com.hungraim.ltc.governance.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+public interface ApplyService extends IService<ChDisableApply> {
+
+
+    Page<ChDisableApply> seletPage(Page<ChDisableApply> disableApplyPage, QueryWrapper<ChDisableApply> queryWrapper);
+
+    ChDisableApply selectById(Long applyId);
+}

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

+package com.hungraim.ltc.governance.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
+
+public interface CrvService extends IService<ChSrvOrgan> {
+
+
+    Page<ChSrvOrgan> seletPage(Page<ChSrvOrgan> chSrvOrganPage, QueryWrapper<ChSrvOrgan> queryWrapper);
+
+    ChSrvOrgan selectById(long applyId);
+
+}

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

+package com.hungraim.ltc.governance.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
+import org.springframework.stereotype.Service;
+
+/**
+ * 失能申请Service
+ *
+ * @author czz
+ */
+@Service
+public interface DisableEvaluateService {
+
+    /**
+     * 失能评定列表
+     *
+     * @param organId    适用机构代码
+     * @param srvOrganId 护理机构
+     * @param realName   失能人员姓名
+     * @param certiCode  失能人员身份证号码
+     * @param pageNum    当前页
+     * @param pageSize   每页几条数据
+     * @return
+     */
+    IPage<DisableEvaluateVO> disableEvaluateList(String organId, Long srvOrganId, String realName, String certiCode, int pageNum, int pageSize);
+
+    /**
+     * 失能评定详情
+     *
+     * @param evaluateId 评定id
+     * @return 失能评定详情
+     */
+    DisableEvaluateInfoVO disableEvaluateInfo(String evaluateId);
+
+    void addEvaluate(ChDisableEvaluate disableEvaluate);
+
+    void disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark);
+}

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

 package com.hungraim.ltc.governance.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.governance.dao.BuildBedMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDepositAcct;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author jiaguokai
  */
 public interface IBuildBedService extends IService<ChSrvBuildBed> {
     Result searchOrgBed(BuildBedSearchReq req);
+
+
+
+
+
+
 }

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

+package com.hungraim.ltc.governance.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltc.governance.dao.ApplyMapper;
+import com.hungraim.ltc.governance.service.ApplyService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+@Service
+public class ApplyServiceImpl extends ServiceImpl<ApplyMapper, ChDisableApply> implements ApplyService {
+
+    @Resource
+    private ApplyMapper applyMapper;
+
+    @Override
+    public Page<ChDisableApply> seletPage(Page<ChDisableApply> disableApplyPage, QueryWrapper<ChDisableApply> queryWrapper) {
+        return applyMapper.selectPage(disableApplyPage, queryWrapper);
+    }
+
+    @Override
+    public ChDisableApply selectById(Long applyId) {
+        return applyMapper.selectById(applyId);
+    }
+}

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

@@ -2,8 +2,11 @@ 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.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.governance.dao.BuildBedMapper;
 import com.hungraim.ltc.governance.service.IBuildBedService;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
@@ -15,6 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author jiaguokai
@@ -46,4 +53,6 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
         Page page = buildBedMapper.searchOrgBed(new Page<>(req.getPageNum(), req.getPageSize()), req);
         return Result.success(page);
     }
+
+
 }

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

+package com.hungraim.ltc.governance.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltc.governance.dao.CrvMapper;
+import com.hungraim.ltc.governance.service.CrvService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+@Service
+public class CrvServiceImpl extends ServiceImpl<CrvMapper, ChSrvOrgan> implements CrvService {
+
+    @Resource
+    private CrvMapper crvMapper;
+
+    @Override
+    public Page<ChSrvOrgan> seletPage(Page<ChSrvOrgan> chSrvOrganPage, QueryWrapper<ChSrvOrgan> queryWrapper) {
+        return crvMapper.selectPage(chSrvOrganPage,queryWrapper);
+    }
+
+    @Override
+    public ChSrvOrgan selectById(long applyId) {
+
+        return crvMapper.selectById(applyId);
+    }
+
+
+}

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

+package com.hungraim.ltc.governance.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.governance.dao.DisableEvaluateMapper;
+import com.hungraim.ltc.governance.service.DisableEvaluateService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DisableEvaluateServiceImpl implements DisableEvaluateService {
+
+    @Autowired
+    private DisableEvaluateMapper disableEvaluateList;
+
+    @Override
+    public IPage<DisableEvaluateVO> disableEvaluateList(String organId, Long srvOrganId, String realName, String certiCode, int pageNum, int pageSize) {
+        return disableEvaluateList.disableEvaluateList(new Page(pageNum, pageSize), organId, srvOrganId,realName, certiCode );
+    }
+
+    @Override
+    public DisableEvaluateInfoVO disableEvaluateInfo(String evaluateId) {
+        return disableEvaluateList.selectDisableEvaluateInfoByEvaluateId(evaluateId);
+    }
+
+    @Override
+    public void addEvaluate(ChDisableEvaluate disableEvaluate) {
+        disableEvaluateList.insert(disableEvaluate);
+    }
+
+    @Override
+    public void disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark) {
+        /*ChDisableApply chDisableApply = disableEvaluateList.selectById(applyId);
+        chDisableApply.setCheckName(checkName);
+        chDisableApply.setApplyStatus(applyStatus);
+        chDisableApply.setCheckRemark(checkRemark);*/
+    }
+
+}
\ No newline at end of file

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

+<?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="com.hungraim.ltc.governance.dao.DisableEvaluateMapper">
+
+    <select id="disableEvaluateList" resultType="com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO">
+        select e.evaluate_id evaluateId,
+        o.ORGAN_NAME organName,
+        e.organ_id organId,
+        e.PROVINCE_CODE provincial,
+        e.CITY_CODE city,
+        e.AREA_CODE area,
+        e.REAL_NAME realName,
+        e.CERTI_CODE certiCode,
+        e.DISEASE_DESC diseaseDesc,
+        e.TEL tel,
+        e.SRV_ORGEN_ID srvOrgenId,
+        e.MODE_ID modeId,
+        e.EVALUATE_TIME evaluateTime
+        from CH_DISABLE_EVALUATE e,CH_FND_ORGAN o
+        where e.organ_id = o.ORGAN_ID
+        <if test="organId != null">
+            and e.organ_Id = #{organId}
+        </if>
+        <if test="srvOrganId != null">
+            and e.srv_Organ_Id = #{srvOrganId}
+        </if>
+        <if test="realName != null">
+            and e.real_Name like '%'#{realName}'%'
+        </if>
+        <if test="certiCode != null">
+            and e.certi_Code = #{certiCode}
+        </if>
+    </select>
+
+    <select id="selectDisableEvaluateInfoByEvaluateId" resultType="com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO">
+        select a.organ_id                                                                 organId,
+               (select o1.organ_name from CH_FND_ORGAN o1 where a.organ_id = o1.organ_id) organName,
+               a.DISTRICT_PROVINCIAL                                                      provincial,
+               a.DISTRICT_CITY                                                            city,
+               a.DISTRICT_AREA                                                            area,
+               a.REAL_NAME                                                                name,
+               a.CERTI_CODE                                                               certiCode,
+               a.BIRTHDAY                                                                 birthday,
+               a.GENDER                                                                   gender,
+               a.TEL                                                                      tel,
+               a.REGIST                                                                   regist,
+               a.FIXED_TEL                                                                fixedTel,
+               a.TREATMENT_TYPE                                                           treatmentType,
+               a.ACPT_PROVINCIAL                                                          acptProvincial,
+               a.ACPT_CITY                                                                acptCity,
+               a.ACPT_AREA                                                                acptArea,
+               a.ACPT_STREET                                                              acptStreet,
+               a.ACPT_ADDRESS                                                             acptAddress,
+               a.ACPT_SRV_PROVINCIAL                                                      acptSrvProvincial,
+               a.ACPT_SRV_CITY                                                            acptSrvCity,
+               a.ACPT_SRV_AREA                                                            acptSrvArea,
+               a.ACPT_SRV_STREET                                                          acptSrvStreet,
+               a.ACPT_SRV_ROAD_DETAIL                                                       acptSrvRoadDetail,
+               a.ADRESS_DISTRICT_PROVINCIAL                                                 adressDistrictProvincial,
+               a.ADRESS_DISTRICT_CITY                                                       adressDistrictCity,
+               a.ADRESS_DISTRICT_CODE                                                       adressDistrictCode,
+               a.ADDRESS_ROAD_DETAIL                                                        addressRoadDetail,
+               a.ADDRESS_NUMBER_DETAIL                                                      addressNumberDetail,
+
+               a.DISEASE                                                                    disease,
+               a.APPLY_METHOD                                                               applyMethod,
+               a.DISEASE_DESC                                                             diseaseDesc,
+               a.MEDICAL_CARD                                                             medicalCard,
+               a.MEDICAL_TYPE                                                             medicalType,
+               a.SRV_ORGAN_ID                                                             srvOrganId,
+               o.PERMIT_ID                                                                permitId,
+
+               a.OPER_NAME                                                                operName,
+               a.OPER_CERTI_CODE                                                          operCertiCode,
+               a.OPER_TEL                                                                 operTel,
+               a.OPER_RELATION                                                            operRelation,
+               a.OPER_FIXED_TEL                                                           operFixedTel,
+               a.OPER_DISTRICT_PROVINCE                                                   operDistrictProvince,
+               a.OPER_DISTRICT_CITY                                                       operDistrictCity,
+               a.OPER_DISTRICT_CODE                                                       operDistrictCode,
+               a.OPER_STREET                                                              operStreet,
+               a.OPER_ADDRESS                                                             operAddress,
+
+               a.CHECK_NAME                                                               checkName,
+               a.APPLY_STATUS                                                             applyStatus,
+               a.CHECK_REMARK                                                             checkRemark
+        from ch_disable_evaluate a,
+             CH_SRV_ORGAN o
+        where a.EVALUATE_ID = #{evaluateId}
+          and a.SRV_ORGAN_ID = o.organ_code
+    </select>
+
+</mapper>
\ No newline at end of file

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java

@@ -197,7 +197,7 @@ public class UserController {
 
 
     /**
-     * 新增用户
+     * 修改用户
      */ @PostMapping("/updateUser")
     public Result updateUser(ReqUserInfo reqUserInfo) {
         if (reqUserInfo.getId() == null || reqUserInfo.getId() == 0) {
@@ -216,10 +216,6 @@ public class UserController {
             systemUser.setAccount(reqUserInfo.getAccount());
             flag = true;
         }
-//        if (!reqUserInfo.getAvatar().equals(systemUser.getAvatar())) {
-//            systemUser.setAvatar(reqUserInfo.getAvatar());
-//            flag = true;
-//        }
         if (!reqUserInfo.getGender().equals(systemUser.getGender())) {
             systemUser.setGender(reqUserInfo.getGender());
             flag = true;
@@ -228,12 +224,10 @@ public class UserController {
             systemUser.setUserId(reqUserInfo.getId());
             flag = true;
         }
-
         if (flag) {
             systemUser.setUpdatedTime(new Date());
             userInfoService.save(systemUser);
         }
-
         //查询该角色下所有的资源数据
         List<SystemUserRole> roleResources = userRoleService.list(new LambdaQueryWrapper<SystemUserRole>().eq(SystemUserRole::getUserId, reqUserInfo.getId()));
 
@@ -255,7 +249,6 @@ public class UserController {
                 return systemRoleResource;
             }).collect(Collectors.toList());
         userRoleService.saveBatch(newRoleResources);
-
         List<Long> deleteRoleResources = roleResources.stream()
             .map(SystemUserRole::getRoleId).filter(id -> !reqUserInfo.getRoleIds().contains(id))
             .collect(Collectors.toList());