Commit 2f2bcb35d16241fc5b53f7737a6fdc7ace8f405a
1 parent
bc9ca2eb3b
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 29 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
2f2bcb3
| ... | ... | @@ -4780,7 +4780,7 @@ |
| 4780 | 4780 | @Override |
| 4781 | 4781 | public BaseResponse getFmAfterEvaluate(String hospitalId,String startDate,String endDate) { |
| 4782 | 4782 | BaseResponse br = new BaseResponse(); |
| 4783 | - List <Map <String, Integer>> listMap=new ArrayList<>(); | |
| 4783 | + List <Map <String, Object>> listMap=new ArrayList<>(); | |
| 4784 | 4784 | Criteria criteria11 = Criteria.where("dueDate") |
| 4785 | 4785 | .gte(startDate).lte(endDate) |
| 4786 | 4786 | .and("hospitalId").is(hospitalId) |
| 4787 | 4787 | |
| ... | ... | @@ -4788,14 +4788,31 @@ |
| 4788 | 4788 | List<MaternalDeliverModel> mDlList = mongoTemplate.find(Query.query(criteria11), MaternalDeliverModel.class); |
| 4789 | 4789 | int alreadyTotal=0,shouldTotal=0; |
| 4790 | 4790 | for(int i=1;i<=5;i++){ |
| 4791 | - Map <String, Integer>map=new HashedMap(); | |
| 4792 | - map.put("already"+i,0); | |
| 4793 | - map.put("should"+i,0); | |
| 4791 | + Map <String, Object>map=new HashedMap(); | |
| 4792 | + switch (i){ | |
| 4793 | + case 1: | |
| 4794 | + map.put("name", "出院前评估"); | |
| 4795 | + break; | |
| 4796 | + case 4: | |
| 4797 | + map.put("name", "产后3天评估"); | |
| 4798 | + break; | |
| 4799 | + case 2: | |
| 4800 | + map.put("name", "产后7天评估"); | |
| 4801 | + break; | |
| 4802 | + case 3: | |
| 4803 | + map.put("name", "产后14天评估"); | |
| 4804 | + break; | |
| 4805 | + case 5: | |
| 4806 | + map.put("name", "产后28天评估、产后42天评估"); | |
| 4807 | + break; | |
| 4808 | + } | |
| 4809 | + map.put("already",0); | |
| 4810 | + map.put("should",0); | |
| 4794 | 4811 | for (MaternalDeliverModel deliverModel : mDlList) { |
| 4795 | 4812 | //已评估 |
| 4796 | 4813 | if(CollectionUtils.isNotEmpty(deliverModel.getStatus())) { |
| 4797 | 4814 | if (deliverModel.getStatus().contains(i)) { |
| 4798 | - map.put("already" + i, map.get("already"+i)+1); | |
| 4815 | + map.put("already" , (Integer)map.get("already")+1); | |
| 4799 | 4816 | } |
| 4800 | 4817 | } |
| 4801 | 4818 | //应评估 |
| 4802 | 4819 | |
| 4803 | 4820 | |
| ... | ... | @@ -4819,16 +4836,17 @@ |
| 4819 | 4836 | } |
| 4820 | 4837 | Date date = DateUtil.addDay(new Date(),-days); |
| 4821 | 4838 | if(CollectionUtils.isEmpty(deliverModel.getStatus())||(!deliverModel.getStatus().contains(i)&&deliverModel.getDueDate1().before(date))){ |
| 4822 | - map.put("should"+i,map.get("should"+i)+1); | |
| 4839 | + map.put("should",(Integer)map.get("should")+1); | |
| 4823 | 4840 | } |
| 4824 | 4841 | } |
| 4825 | - alreadyTotal+=map.get("already"+i); | |
| 4826 | - shouldTotal+=map.get("should"+i); | |
| 4842 | + alreadyTotal+=(Integer)map.get("already"); | |
| 4843 | + shouldTotal+=(Integer)map.get("should"); | |
| 4827 | 4844 | listMap.add(map); |
| 4828 | 4845 | if(i==5){ |
| 4829 | - Map <String, Integer>map2=new HashedMap(); | |
| 4830 | - map2.put("alreadyTotal",alreadyTotal); | |
| 4831 | - map2.put("shouldTotal",shouldTotal); | |
| 4846 | + Map <String, Object>map2=new HashedMap(); | |
| 4847 | + map2.put("name","合计"); | |
| 4848 | + map2.put("already",alreadyTotal); | |
| 4849 | + map2.put("should",shouldTotal); | |
| 4832 | 4850 | listMap.add(map2); |
| 4833 | 4851 | } |
| 4834 | 4852 | } |