Commit c16991ee1ec8ce6ee89920cc0cd79c1c9cb38432
1 parent
57d367e18c
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 22 additions and 25 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
c16991e
| ... | ... | @@ -4608,31 +4608,26 @@ |
| 4608 | 4608 | //绿,黄,橙，红，紫 |
| 4609 | 4609 | int risk_green=0,risk_yellow=0,risk_orange=0,risk_red=0,risk_purple=0; |
| 4610 | 4610 | //初诊 |
| 4611 | - Criteria criteria = Criteria.where("checkTime").gte(startDate).lte(endDate) | |
| 4612 | - .and("hospitalId").is(hospitalId) | |
| 4613 | - .and("yn").is(YnEnums.YES.getId()); | |
| 4614 | - List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(criteria), AntExChuModel.class); | |
| 4615 | - for (AntExChuModel antExChuModel : antExChuModels) { | |
| 4616 | - //解析高危 | |
| 4617 | - List <Map <String, Object>> mapList=getRisk(antExChuModel.getHighrisk()); | |
| 4611 | + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); | |
| 4612 | + antExRecordQuery.setType(2); | |
| 4613 | + antExRecordQuery.setCheckTimeStart(startDate); | |
| 4614 | + antExRecordQuery.setCheckTimeEnd(endDate); | |
| 4615 | + antExRecordQuery.setHospitalId(hospitalId); | |
| 4616 | + List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery); | |
| 4617 | + | |
| 4618 | + for (AntExRecordModel antExRecordModel : antExRecordModelList) { | |
| 4618 | 4619 | //获取高危人数 |
| 4619 | - for (Map<String, Object> stringObjectMap : mapList) { | |
| 4620 | - switch (stringObjectMap.get("color").toString()){ | |
| 4621 | - case "risk_green": | |
| 4622 | - risk_green++; | |
| 4623 | - break; | |
| 4624 | - case "risk_yellow": | |
| 4625 | - risk_yellow++; | |
| 4626 | - break; | |
| 4627 | - case "risk_orange": | |
| 4628 | - risk_orange++; | |
| 4629 | - break; | |
| 4630 | - case "risk_red": | |
| 4631 | - risk_red++; | |
| 4632 | - break; | |
| 4633 | - case "risk_purple": | |
| 4634 | - risk_purple++; | |
| 4635 | - break; | |
| 4620 | + for (Object o : antExRecordModel.gethLevel()) { | |
| 4621 | + if(o.toString().contains("e637b361-99cf-41eb-84f2-f0dab596e928")){ | |
| 4622 | + risk_green++; | |
| 4623 | + }else if(o.toString().contains("315107bd-91fe-42a1-9237-752f3c046a40")){ | |
| 4624 | + risk_yellow++; | |
| 4625 | + }else if(o.toString().contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")){ | |
| 4626 | + risk_orange++; | |
| 4627 | + }else if(o.toString().contains("eb146c03-b19f-4e28-b85f-fda574b2283b")){ | |
| 4628 | + risk_red++; | |
| 4629 | + }else if(o.toString().contains("224b2329-cb82-4da3-a071-8527f8283aab")){ | |
| 4630 | + risk_purple++; | |
| 4636 | 4631 | } |
| 4637 | 4632 | } |
| 4638 | 4633 | } |
| 4639 | 4634 | |
| 4640 | 4635 | |
| ... | ... | @@ -4694,11 +4689,13 @@ |
| 4694 | 4689 | map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getNextCheckTime())); |
| 4695 | 4690 | //高危因素 |
| 4696 | 4691 | List<Map<String, Object>> risk = getRisk(antExRecordModel.gethRisk()); |
| 4692 | + StringBuffer bf=new StringBuffer(); | |
| 4697 | 4693 | for (Map<String, Object> stringObjectMap : risk) { |
| 4698 | 4694 | if(stringObjectMap.get("color").equals(riskType)){ |
| 4699 | - map.put("highRiskResult", stringObjectMap.get("name")); | |
| 4695 | + bf.append(stringObjectMap.get("name")); | |
| 4700 | 4696 | } |
| 4701 | 4697 | } |
| 4698 | + map.put("highRiskResult", bf); | |
| 4702 | 4699 | antExRecordResult.add(map); |
| 4703 | 4700 | } |
| 4704 | 4701 |