日常生活活动能力查询

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

@@ -214,7 +214,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.getChTaskReportFractionDtl());
         return Result.success();
     }
 

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

@@ -34,7 +34,7 @@ public interface TaskService {
 
     Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, 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);
+    void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList,List<ChTaskReportFractionDtl> chTaskReportFractionDtls);
 
     Result<Object> allotTask(String taskId, String empId);
 

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

@@ -27,7 +27,9 @@ 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;
 
 /**
@@ -195,7 +197,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<ChTaskReportFractionDtl> chTaskReportFractionDtls) {
         //update鉴定报告
         ChAprReport chAprReport = aprReportMapper.selectById(reportId);
         chAprReport.setDisableLevelId(disableLevelId);
@@ -246,6 +248,7 @@ public class TaskServiceImpl implements TaskService {
                 personInfoMapper.insert(personInfo);
             }
         }
+
     }
 
     /**
@@ -635,15 +638,23 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public Map taskReportFractionDtlQueryList() {
         List<ChTaskReportFractionDtl> chTaskReportFractionDtls = chTaskReportFractionDtlMapper.selectList(null);
-        Map<String, List<ChTaskReportFractionDtl>> hashMap = new HashMap<>();
+
+        Map<String, Object> typeHashMap = new HashMap<>();
         for (ChTaskReportFractionDtl chTaskReportFractionDtl : chTaskReportFractionDtls) {
-            String taskReportProxy = chTaskReportFractionDtl.getTaskReportProxy();
+            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 = chTaskReportFractionDtls.stream().filter(c->c.getTaskReportProxy().equals(taskReportProxy)).collect(Collectors.toList());
+                        List<ChTaskReportFractionDtl> collect = typeList.stream().filter(c->c.getTaskReportProxy().equals(taskReportProxy)).collect(Collectors.toList());
                         hashMap.put(taskReportProxy,collect);
                     }
-
+                }
+                typeHashMap.put(taskReportType,hashMap);
+            }
         };
-        return hashMap;
+        return typeHashMap;
     }
 }

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 String reportId;
+    /**
+     * 评定报告序号
+     */
+    private String taskReportNum;
+    /**
+     * 评定报告指标
+     */
+    private String taskReportProxy;
+    /**
+     * 标准
+     */
+    private String taskReportEvaluation;
+}

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

@@ -56,5 +56,10 @@ public class ChTaskReportFractionDtl {
      */
     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.ChTaskReportFractionDtl;
 import lombok.Data;
 
 import java.util.List;
@@ -21,4 +22,5 @@ public class ReportUpdateVO {
     String polNo;
     String remark;
     List<ChFndAttach> fileDataList;
+    List<ChTaskReportFractionDtl> chTaskReportFractionDtl;
 }