diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 1a21da8..97d8ef2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -3776,19 +3776,23 @@ public class MatDeliverFacade { //本院 if("隆化县妇幼保健院".equals(strMap.get("hospitalName"))){ by++; + strMap.put("yn", "1");//标记本院数据 }else { wy++; + strMap.put("yn", "2");//标记外院数据 } } - mapCount.put("by",String.valueOf(by)); - mapCount.put("wy",String.valueOf(wy)); - mapCount.put("total",String.valueOf(by+wy)); - mapCount.put("ratio",(by+wy)==0?"0%":String.valueOf(by/(by+wy)*100)+"%"); - list.add(mapCount); + mapCount.put("by",String.valueOf(by));//本院数 + mapCount.put("wy",String.valueOf(wy));//外院数 + mapCount.put("total",String.valueOf(by+wy));//总数 + mapCount.put("ratio",(by+wy)==0?"0%":String.valueOf(by/(by+wy)*100)+"%");//分娩率 + Map dataMap=new HashMap<>(); + dataMap.put("data", list); + dataMap.put("dataCount", mapCount); BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); - objectResponse.setData(list); + objectResponse.setData(dataMap); return objectResponse; }