diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 3296a50..a5ae8bc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -4780,7 +4780,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public BaseResponse getFmAfterEvaluate(String hospitalId,String startDate,String endDate) { BaseResponse br = new BaseResponse(); - List > listMap=new ArrayList<>(); + List > listMap=new ArrayList<>(); Criteria criteria11 = Criteria.where("dueDate") .gte(startDate).lte(endDate) .and("hospitalId").is(hospitalId) @@ -4788,14 +4788,31 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List mDlList = mongoTemplate.find(Query.query(criteria11), MaternalDeliverModel.class); int alreadyTotal=0,shouldTotal=0; for(int i=1;i<=5;i++){ - Map map=new HashedMap(); - map.put("already"+i,0); - map.put("should"+i,0); + Map map=new HashedMap(); + switch (i){ + case 1: + map.put("name", "出院前评估"); + break; + case 4: + map.put("name", "产后3天评估"); + break; + case 2: + map.put("name", "产后7天评估"); + break; + case 3: + map.put("name", "产后14天评估"); + break; + case 5: + map.put("name", "产后28天评估、产后42天评估"); + break; + } + map.put("already",0); + map.put("should",0); for (MaternalDeliverModel deliverModel : mDlList) { //已评估 if(CollectionUtils.isNotEmpty(deliverModel.getStatus())) { if (deliverModel.getStatus().contains(i)) { - map.put("already" + i, map.get("already"+i)+1); + map.put("already" , (Integer)map.get("already")+1); } } //应评估 @@ -4819,16 +4836,17 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } Date date = DateUtil.addDay(new Date(),-days); if(CollectionUtils.isEmpty(deliverModel.getStatus())||(!deliverModel.getStatus().contains(i)&&deliverModel.getDueDate1().before(date))){ - map.put("should"+i,map.get("should"+i)+1); + map.put("should",(Integer)map.get("should")+1); } } - alreadyTotal+=map.get("already"+i); - shouldTotal+=map.get("should"+i); + alreadyTotal+=(Integer)map.get("already"); + shouldTotal+=(Integer)map.get("should"); listMap.add(map); if(i==5){ - Map map2=new HashedMap(); - map2.put("alreadyTotal",alreadyTotal); - map2.put("shouldTotal",shouldTotal); + Map map2=new HashedMap(); + map2.put("name","合计"); + map2.put("already",alreadyTotal); + map2.put("should",shouldTotal); listMap.add(map2); } }