日常生活活动能力查询

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

@@ -635,9 +635,9 @@ public class TaskController {
     @RequestMapping(value= "/chIpad/taskReportFractionDtlQueryList")
     @ResponseBody
     public Result taskReportFractionDtlQueryList() throws Exception {
-        List<ChTaskReportFractionDtl> resultList= taskService.taskReportFractionDtlQueryList();
-        if (resultList.size() >0) {
-            return Result.success(resultList);
+        Map map= taskService.taskReportFractionDtlQueryList();
+        if (map.size() >0) {
+            return Result.success(map);
         }
         return Result.failed("没有查到日常生活活动能力数据");
     }

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

@@ -84,5 +84,5 @@ public interface TaskService {
 
     IPage<ChAprTask> apprTaskDetailInfo(String appointStartTime, String appointEndTime, String status, String taskGroupNo, Integer pageNo, Integer pageSize) throws TppesApiException;
 
-    List<ChTaskReportFractionDtl> taskReportFractionDtlQueryList();
+    Map taskReportFractionDtlQueryList();
 }

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

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author czz
@@ -632,7 +633,17 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public List<ChTaskReportFractionDtl> taskReportFractionDtlQueryList() {
-        return chTaskReportFractionDtlMapper.selectList(null);
+    public Map taskReportFractionDtlQueryList() {
+        List<ChTaskReportFractionDtl> chTaskReportFractionDtls = chTaskReportFractionDtlMapper.selectList(null);
+        Map<String, List<ChTaskReportFractionDtl>> hashMap = new HashMap<>();
+        for (ChTaskReportFractionDtl chTaskReportFractionDtl : chTaskReportFractionDtls) {
+            String taskReportProxy = chTaskReportFractionDtl.getTaskReportProxy();
+            if(!hashMap.containsKey(taskReportProxy)){
+                List<ChTaskReportFractionDtl> collect = chTaskReportFractionDtls.stream().filter(c->c.getTaskReportProxy().equals(taskReportProxy)).collect(Collectors.toList());
+                hashMap.put(taskReportProxy,collect);
+            }
+
+        };
+        return hashMap;
     }
 }