Merge remote-tracking branch 'origin/master'

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

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.dto.QueryDto;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
-import com.hungraim.ltc.pojo.entity.assessment.ChAprReport;
-import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
-import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
+import com.hungraim.ltc.pojo.entity.assessment.*;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.vo.ReportUpdateVO;
 import com.hungraim.ltc.pojo.vo.assessment.*;
@@ -154,6 +152,8 @@ public class TaskController {
         String polNo = reportDetailVo.getPolNo();
         String remark = reportDetailVo.getRemark();
         List<ChFndAttach> fileDataList = reportDetailVo.getFileDataList();
+        List<ChAprReportFraction> chTaskReportFractionDtls = reportDetailVo.getChAprReportFractions();
+
         if (person1 == null) {
             return Result.failed("鉴定人员1不能为空!");
         }
@@ -173,7 +173,7 @@ public class TaskController {
         } catch (ParseException e) {
             return Result.failed("评估时间格式不正确!");
         }
-        Result<Object> objectResult = taskService.addReport(taskId, person1, person2, person3, evaluateDate, disableLevelId, polNo, remark, fileDataList);
+        Result<Object> objectResult = taskService.addReport(taskId, person1, person2, person3, evaluateDate, disableLevelId, polNo, remark, fileDataList,chTaskReportFractionDtls);
         if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
             //失败
             return Result.failed(objectResult.getMsg());
@@ -182,6 +182,20 @@ public class TaskController {
     }
 
     /**
+     * 评估录入查看/修改
+     * @param reportId
+     * @return
+     */
+    @RequestMapping("/getReportById")
+    public Result<TaskReportVO> getReportById(String reportId) {
+        if (StringUtils.isBlank(reportId) && StringUtils.isBlank(reportId)) {
+            return Result.failed("reportId不能为空!");
+        }
+        TaskReportVO taskReportVO = taskService.getReportById(reportId);
+        return Result.success(taskReportVO);
+    }
+
+    /**
      * 评定报告修改
      *
      * @param reportId       评定报告id
@@ -213,7 +227,7 @@ public class TaskController {
         } catch (ParseException e) {
             return Result.failed("评估时间格式不正确!");
         }
-        taskService.updateReport(vo.getReportId(), vo.getPerson1(), vo.getPerson2(), vo.getPerson3(), evaluateDate, vo.getDisableLevelId(), vo.getPolNo(), vo.getRemark(), vo.getFileDataList());
+        taskService.updateReport(vo.getReportId(), vo.getPerson1(), vo.getPerson2(), vo.getPerson3(), evaluateDate, vo.getDisableLevelId(), vo.getPolNo(), vo.getRemark(), vo.getFileDataList(),vo.getChAprReportFractions());
         return Result.success();
     }
 
@@ -625,4 +639,19 @@ public class TaskController {
         }
         return resultList;
     }
+
+    /**
+     * 日常生活活动能力获取数据
+     * @return
+     * @author mq
+     */
+    @RequestMapping(value= "/chIpad/taskReportFractionDtlQueryList")
+    @ResponseBody
+    public Result taskReportFractionDtlQueryList() throws Exception {
+        Map map= taskService.taskReportFractionDtlQueryList();
+        if (map.size() >0) {
+            return Result.success(map);
+        }
+        return Result.failed("没有查到日常生活活动能力数据");
+    }
 }

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprReportFraction;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author mq
+ */
+@Mapper
+@Repository
+public interface ChAprReportFractionMapper extends BaseMapper<ChAprReportFraction> {
+}

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChTaskReportFractionDtl;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChTaskReportFractionDtlMapper extends BaseMapper<ChTaskReportFractionDtl> {
+}

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

@@ -44,6 +44,8 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
      */
     List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
 
+    TaskReportVO getReportById(String reportId);
+
     List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);
 
     List<AprEmpVO> aprEmpList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader);

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

+package com.hungraim.ltc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprReportFraction;
+
+import java.util.List;
+
+/**
+ * @author mq
+ */
+public interface ChAprReportFractionService extends IService<ChAprReportFraction> {
+    /**
+     * 批量修改
+     * @return
+     */
+     void  updateChAprReportFraction(List<ChAprReportFraction> chAprReportFractions);
+
+    /**
+     * 批量新增
+     * @param chAprReportFractions
+     */
+    void  insertChAprReportFraction(List<ChAprReportFraction> chAprReportFractions);
+}

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

@@ -3,9 +3,7 @@ package com.hungraim.ltc.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
-import com.hungraim.ltc.pojo.entity.assessment.ChAprReport;
-import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
-import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
+import com.hungraim.ltc.pojo.entity.assessment.*;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.util.Result;
@@ -31,9 +29,11 @@ public interface TaskService {
 
     List<AprEmpVO> aprEmpList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader);
 
-    Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList);
+    Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList,List<ChAprReportFraction> chAprReportFractions);
 
-    void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList);
+    void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList,List<ChAprReportFraction> chAprReportFractions);
+
+    TaskReportVO getReportById(String reportId);
 
     Result<Object> allotTask(String taskId, String empId);
 
@@ -82,4 +82,6 @@ public interface TaskService {
     ChAprReport queryAprReportForWUXI(String taskId) throws TppesApiException;
 
     IPage<ChAprTask> apprTaskDetailInfo(String appointStartTime, String appointEndTime, String status, String taskGroupNo, Integer pageNo, Integer pageSize) throws TppesApiException;
+
+    Map taskReportFractionDtlQueryList();
 }

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

+package com.hungraim.ltc.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltc.dao.ChAprReportFractionMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprReportFraction;
+import com.hungraim.ltc.service.ChAprReportFractionService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * @author mq
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+public class ChAprReportFractionServiceImpl extends ServiceImpl<ChAprReportFractionMapper, ChAprReportFraction> implements ChAprReportFractionService  {
+
+    @Autowired
+    ChAprReportFractionMapper chAprReportFractionMapper;
+
+
+    @Override
+    public void updateChAprReportFraction(List<ChAprReportFraction> chAprReportFractions) {
+        this.updateBatchById(chAprReportFractions);
+    }
+
+    @Override
+    public void insertChAprReportFraction(List<ChAprReportFraction> chAprReportFractions) {
+        this.saveBatch(chAprReportFractions,chAprReportFractions.size());
+    }
+}
+

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hungraim.ltc.api.AttachFeignService;
 import com.hungraim.ltc.dao.*;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
@@ -14,6 +15,7 @@ import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
+import com.hungraim.ltc.service.ChAprReportFractionService;
 import com.hungraim.ltc.service.TaskService;
 import com.hungraim.ltc.service.TppesApiException;
 import com.hungraim.ltc.util.AttachType;
@@ -27,7 +29,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.awt.*;
 import java.util.*;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author czz
@@ -48,6 +53,12 @@ public class TaskServiceImpl implements TaskService {
     private final RefuseReasonMapper refuseReasonMapper;
     private final AttachFeignService attachFeignService;
 
+    private final ChAprReportFractionService chAprReportFractionService;
+
+    private final ChAprReportFractionMapper chAprReportFractionMapper;
+
+    private final ChTaskReportFractionDtlMapper chTaskReportFractionDtlMapper;
+
     /**
      * 评定任务分配列表
      *
@@ -128,7 +139,7 @@ public class TaskServiceImpl implements TaskService {
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList) {
+    public Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList,List<ChAprReportFraction> chAprReportFractions) {
         List<ChAprReport> chAprReports = aprReportMapper.selectList(new LambdaQueryWrapper<ChAprReport>().eq(ChAprReport::getStatus, 4).eq(ChAprReport::getTaskId, taskId));
         if (chAprReports != null && chAprReports.size() > 0) {
             return Result.failed("已存在的评定任务报告!");
@@ -168,6 +179,12 @@ public class TaskServiceImpl implements TaskService {
             personInfo.setFcd(new Date());
             personInfoMapper.insert(personInfo);
         }
+        if(!chAprReportFractions.isEmpty() && chAprReportFractions.size()>0){
+            for (ChAprReportFraction chAprReportFraction: chAprReportFractions) {
+                chAprReportFraction.setReportId(report.getReportId());
+            }
+            chAprReportFractionService.insertChAprReportFraction(chAprReportFractions);
+        }
         // 更新评定任务状态为已完成，并记录完成时间
         ChAprTask task = new ChAprTask();
         task.setTaskId(taskId);
@@ -177,6 +194,34 @@ public class TaskServiceImpl implements TaskService {
         return Result.success();
     }
 
+    @Override
+    public TaskReportVO getReportById(String reportId) {
+        TaskReportVO reportById = taskMapper.getReportById(reportId);
+        List<ChAprReportFraction> chAprReportFractions = chAprReportFractionMapper.selectList(new LambdaQueryWrapper<ChAprReportFraction>().eq(ChAprReportFraction::getReportId, reportId));
+        if(chAprReportFractions.isEmpty()|| chAprReportFractions.size()==0){
+            return reportById;
+        }
+        Map<String, Object> typeHashMap = new HashMap<>();
+        for (ChAprReportFraction chAprReportFraction: chAprReportFractions) {
+            String taskReportType = chAprReportFraction.getTaskReportType();
+            if(!typeHashMap.containsKey(taskReportType)){
+                List<ChAprReportFraction> typeList =  chAprReportFractions.stream().filter(c-> c.getTaskReportType().equals(taskReportType)).collect(Collectors.toList());
+                Map<String, Object> hashMap = new HashMap<>();
+                for (ChAprReportFraction chTaskReportFraction:typeList) {
+                    String taskReportProxy = chTaskReportFraction.getTaskReportProxy();
+                    if(!hashMap.containsKey(taskReportProxy)){
+                        List<ChAprReportFraction> collect = typeList.stream().filter(c->c.getTaskReportProxy().equals(taskReportProxy)).collect(Collectors.toList());
+                        hashMap.put(taskReportProxy,collect);
+                    }
+                }
+                typeHashMap.put(taskReportType,hashMap);
+                reportById.setChAprReportFractions(typeHashMap);
+
+            }
+
+        }
+        return reportById;
+    }
     /**
      * 评定报告修改
      *
@@ -192,7 +237,7 @@ public class TaskServiceImpl implements TaskService {
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList) {
+    public void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList,List<ChAprReportFraction> chAprReportFractions) {
         //update鉴定报告
         ChAprReport chAprReport = aprReportMapper.selectById(reportId);
         chAprReport.setDisableLevelId(disableLevelId);
@@ -243,6 +288,18 @@ public class TaskServiceImpl implements TaskService {
                 personInfoMapper.insert(personInfo);
             }
         }
+        if(!chAprReportFractions.isEmpty() && chAprReportFractions.size()>0){
+            for (ChAprReportFraction chAprReportFraction: chAprReportFractions) {
+                chAprReportFraction.setReportId(chAprReport.getReportId());
+                if(chAprReportFraction.getChAprReportFractionId()==null){
+                    chAprReportFractionMapper.insert(chAprReportFraction);
+                }else {
+                    chAprReportFractionMapper.updateById(chAprReportFraction);
+                }
+            }
+        }
+
+
     }
 
     /**
@@ -628,4 +685,27 @@ public class TaskServiceImpl implements TaskService {
         return chAprTaskPage;
 
     }
+
+    @Override
+    public Map taskReportFractionDtlQueryList() {
+        List<ChTaskReportFractionDtl> chTaskReportFractionDtls = chTaskReportFractionDtlMapper.selectList(null);
+
+        Map<String, Object> typeHashMap = new HashMap<>();
+        for (ChTaskReportFractionDtl chTaskReportFractionDtl : chTaskReportFractionDtls) {
+            String taskReportType = chTaskReportFractionDtl.getTaskReportType();
+            if(!typeHashMap.containsKey(taskReportType)){
+                List<ChTaskReportFractionDtl> typeList =  chTaskReportFractionDtls.stream().filter(c-> c.getTaskReportType().equals(taskReportType)).collect(Collectors.toList());
+                Map<String, Object> hashMap = new HashMap<>();
+                for (ChTaskReportFractionDtl chTaskReportFraction:typeList) {
+                    String taskReportProxy = chTaskReportFraction.getTaskReportProxy();
+                    if(!hashMap.containsKey(taskReportProxy)){
+                        List<ChTaskReportFractionDtl> collect = typeList.stream().filter(c->c.getTaskReportProxy().equals(taskReportProxy)).collect(Collectors.toList());
+                        hashMap.put(taskReportProxy,collect);
+                    }
+                }
+                typeHashMap.put(taskReportType,hashMap);
+            }
+        };
+        return typeHashMap;
+    }
 }

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

@@ -102,6 +102,53 @@
         </where>
     </select>
 
+    <select id="getReportById" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskReportVO">
+        SELECT report.REPORT_ID reportId,
+        report.evaluate_time evaluateTime,
+        task.ORGAN_ID organId,
+        fndOrgan.ORGAN_NAME organName,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
+        report.disable_level_id disableLevelId,
+        info.REAL_NAME realName,
+        info.CERTI_CODE certiCode,
+        report.pol_no polNo,
+        report.remark remark,
+        info.birthday birthday,
+        (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
+        (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
+        info.tel tel,
+        info.gender gender,
+        info.disease_desc diseaseDesc,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) disDistrictProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.district_city = dis.DISTRICT_CODE) disDistrictCity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.district_area = dis.DISTRICT_CODE) disDistrictArea,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.adress_district_provincial = dis.DISTRICT_CODE) adressDistrictProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.adress_district_city = dis.DISTRICT_CODE) adressDistrictCity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.Adress_district_code = dis.DISTRICT_CODE) adressDistrictCode,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_PROVINCIAL = dis.DISTRICT_CODE) acptProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_CITY = dis.DISTRICT_CODE) acptCity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_AREA = dis.DISTRICT_CODE) acptArea,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_provincial = dis.DISTRICT_CODE) acptSrvProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_city = dis.DISTRICT_CODE) acptSrvCity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_area = dis.DISTRICT_CODE) acptSrvArea,
+        lev.DISABLE_LEVEL_NAME riskLevel,
+        report.EFF_TIME effTime
+        FROM ch_apr_report report
+        LEFT JOIN CH_APR_TASK task ON report.TASK_ID = task.TASK_ID
+        LEFT JOIN CH_DISABLE_INFO info ON task.disable_info_id = info.disab_info_id
+        left join ch_apr_organ aprOrgan on task.apr_organ_id = aprOrgan.apr_organ_id
+        --left join ch_srv_organ organ on aprOrgan.organ_id = organ.organ_id
+        LEFT JOIN CH_CFG_SRV_DISABLE_LEVEL lev ON report.DISABLE_LEVEL_ID = lev.DISABLE_LEVEL_ID
+        left join CH_FND_ORGAN fndOrgan on task.ORGAN_ID = fndOrgan.ORGAN_ID
+        <where>
+            <if test="reportId != null and reportId != ''">
+                and report.REPORT_ID = #{reportId}
+            </if>
+        </where>
+    </select>
+
     <select id="taskReportList" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskReportVO">
         SELECT report.REPORT_ID reportId,
         report.evaluate_time evaluateTime,
@@ -133,14 +180,14 @@
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_provincial = dis.DISTRICT_CODE) acptSrvProvincial,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_city = dis.DISTRICT_CODE) acptSrvCity,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_area = dis.DISTRICT_CODE) acptSrvArea,
-        lev.RISK_LEVEL riskLevel,
+        lev.DISABLE_LEVEL_NAME riskLevel,
         report.EFF_TIME effTime
         FROM ch_apr_report report
         LEFT JOIN CH_APR_TASK task ON report.TASK_ID = task.TASK_ID
         LEFT JOIN CH_DISABLE_INFO info ON task.disable_info_id = info.disab_info_id
         left join ch_apr_organ aprOrgan on task.apr_organ_id = aprOrgan.apr_organ_id
-        left join ch_srv_organ organ on aprOrgan.organ_id = organ.organ_id
-        LEFT JOIN CH_DISABLE_RISK_LEVEL lev ON report.DISABLE_LEVEL_ID = lev.DISA_RISK_LEVEL_ID
+        --left join ch_srv_organ organ on aprOrgan.organ_id = organ.organ_id
+        LEFT JOIN CH_CFG_SRV_DISABLE_LEVEL lev ON report.DISABLE_LEVEL_ID = lev.DISABLE_LEVEL_ID
         left join CH_FND_ORGAN fndOrgan on task.ORGAN_ID = fndOrgan.ORGAN_ID
         <where>
             <if test="name != null and name != ''">

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

+package com.hungraim.ltc.pojo.entity.assessment;
+
+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;
+
+/**
+ *  评定报告录入评定量表-CH_APR_REPORT_FRACTION
+ * @author MQ
+ */
+@Data
+@TableName("CH_APR_REPORT_FRACTION")
+@KeySequence(value = "SEQ_CH_APR_REPORT_FRACTION")
+public class ChAprReportFraction {
+    /**
+     * 评定报告录入评定量表ID
+     */
+    @TableId(value = "CH_APR_REPORT_FRACTION_ID", type = IdType.INPUT)
+    private Integer chAprReportFractionId;
+
+    /**
+     * CH_APR_REPORT.ID
+     */
+    private Integer reportId;
+    /**
+     * 评定报告序号
+     */
+    private String taskReportNum;
+    /**
+     * 评定报告指标
+     */
+    private String taskReportProxy;
+    /**
+     * 标准
+     */
+    private String taskReportEvaluation;
+    /**
+     * c1(日常生活活动能力),c2(认知能力),c3(感知觉与沟通能力)分类
+     */
+    private String taskReportType;
+}

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

+package com.hungraim.ltc.pojo.entity.assessment;
+
+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;
+
+import java.util.Date;
+
+/**
+ *  日常生活活动能力-CH_TASK_REPORT_FRACTION_Dtl表
+ * @author MQ
+ */
+@Data
+@TableName("CH_TASK_REPORT_FRACTION_DTL")
+@KeySequence("SEQ_CH_TASK_REPORT_FRACTION_DTL")
+public class ChTaskReportFractionDtl {
+    /**
+     * ID
+     */
+    @TableId(value = "TASK_REPORT_FRACTION_ID", type = IdType.INPUT)
+    private Integer taskReportFractionId;
+
+    /**
+     * 评定报告序号
+     */
+    private String taskReportNum;
+    /**
+     * 评定报告指标
+     */
+    private String taskReportProxy;
+    /**
+     * 分数
+     */
+    private String taskReportFraction;
+    /**
+     * 标准
+     */
+    private String taskReportEvaluation;
+    /**
+     * 首次创建时间
+     */
+    private Date fcd;
+    /**
+     * 首次创建人
+     */
+
+    private String fcu;
+    /**
+     * 最后修改时间
+     */
+    private String lcd;
+    /**
+     * 最后修改人
+     */
+    private Integer lcu;
+
+    /**
+     * c1(日常生活活动能力),c2(认知能力),c3(感知觉与沟通能力)分类
+     */
+    private String taskReportType;
+
+
+}

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

 package com.hungraim.ltc.pojo.vo;
 
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprReportFraction;
+import com.hungraim.ltc.pojo.entity.assessment.ChTaskReportFractionDtl;
 import lombok.Data;
 
 import java.util.List;
@@ -21,4 +23,5 @@ public class ReportUpdateVO {
     String polNo;
     String remark;
     List<ChFndAttach> fileDataList;
+    List<ChAprReportFraction> chAprReportFractions;
 }

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

 package com.hungraim.ltc.pojo.vo.assessment;
 
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprReportFraction;
+import com.hungraim.ltc.pojo.entity.assessment.ChTaskReportFractionDtl;
 import lombok.Data;
 
 import java.util.List;
@@ -16,4 +18,5 @@ public class ReportDetailVO {
     String polNo;
     String remark;
     List<ChFndAttach> fileDataList;
+    List<ChAprReportFraction> chAprReportFractions;
 }

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

 package com.hungraim.ltc.pojo.vo.assessment;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprReportFraction;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 评定报告录入列表
@@ -63,6 +66,9 @@ public class TaskReportVO {
     private String acptSrvArea;
     //评定结果
     private String riskLevel;
+
+    private Map<String,Object> chAprReportFractions;
+
     //录入时间
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date effTime;