Commit 1a004c2608b2972f0d62e63809a1cc276db0f9fe
1 parent
150fa42b4d
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 10 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
1a004c2
| ... | ... | @@ -3776,19 +3776,23 @@ |
| 3776 | 3776 | //本院 |
| 3777 | 3777 | if("隆化县妇幼保健院".equals(strMap.get("hospitalName"))){ |
| 3778 | 3778 | by++; |
| 3779 | + strMap.put("yn", "1");//标记本院数据 | |
| 3779 | 3780 | }else { |
| 3780 | 3781 | wy++; |
| 3782 | + strMap.put("yn", "2");//标记外院数据 | |
| 3781 | 3783 | } |
| 3782 | 3784 | } |
| 3783 | - mapCount.put("by",String.valueOf(by)); | |
| 3784 | - mapCount.put("wy",String.valueOf(wy)); | |
| 3785 | - mapCount.put("total",String.valueOf(by+wy)); | |
| 3786 | - mapCount.put("ratio",(by+wy)==0?"0%":String.valueOf(by/(by+wy)*100)+"%"); | |
| 3787 | - list.add(mapCount); | |
| 3785 | + mapCount.put("by",String.valueOf(by));//本院数 | |
| 3786 | + mapCount.put("wy",String.valueOf(wy));//外院数 | |
| 3787 | + mapCount.put("total",String.valueOf(by+wy));//总数 | |
| 3788 | + mapCount.put("ratio",(by+wy)==0?"0%":String.valueOf(by/(by+wy)*100)+"%");//分娩率 | |
| 3789 | + Map<String,Object> dataMap=new HashMap<>(); | |
| 3790 | + dataMap.put("data", list); | |
| 3791 | + dataMap.put("dataCount", mapCount); | |
| 3788 | 3792 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 3789 | 3793 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 3790 | 3794 | objectResponse.setErrormsg("成功"); |
| 3791 | - objectResponse.setData(list); | |
| 3795 | + objectResponse.setData(dataMap); | |
| 3792 | 3796 | return objectResponse; |
| 3793 | 3797 | } |
| 3794 | 3798 |