Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

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

@@ -63,7 +63,7 @@ public class ReTaskController {
     /**
      * 复评申请-历史评定信息
      */
-    @GetMapping("/retask-hisinfo-list")
+    @GetMapping("/hisinfo-list")
     public Result<List<ChAprTaskVo>> getRetaskHisList(){
         List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList();
         return Result.success(chAprTaskVos);

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

@@ -57,6 +57,22 @@ public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implem
     @Override
     public List<ChAprTaskVo> geReTaskHisInfoList() {
         // 历史评定信息列表
-        return null;
+        List<ChAprTaskVo> reTaskHisInfoList = reTaskMapper.getReTaskHisInfoList();
+        if (reTaskHisInfoList.size()!=0){
+            reTaskHisInfoList.stream().forEach(item-> {
+                        String provincialCityArea = item.getProvincialCityArea();
+                        provincialCityArea=item.getDistrictProvincial()+item.getDistrictCity()+item.getDistrictArea();
+                        item.setProvincialCityArea(provincialCityArea);
+                try {
+                    item.setAge(DateUtils.getAge(item.getBirthDay()));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                String pcasd = item.getPcasd();
+                pcasd=item.getAcptProvincial()+item.getAcptCity()+item.getAcptArea()+item.getAcptStreet()+item.getAcptAddress();
+                item.setPcasd(pcasd);
+            });
+        }
+        return reTaskHisInfoList;
     }
 }
\ No newline at end of file