Commit a4e9c536c0fde709cfb18e25bb249d82b7939364
1 parent
c16991ee1e
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 5 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
a4e9c53
| ... | ... | @@ -4570,6 +4570,10 @@ |
| 4570 | 4570 | .and("yn").is(YnEnums.YES.getId()); |
| 4571 | 4571 | List<Patients> patientsList = mongoTemplate.find(Query.query(criteria), Patients.class); |
| 4572 | 4572 | for (Patients patients : patientsList) { |
| 4573 | + //避免末次月经字段空。但是这样统计结果不准确。前端该字段是必填。但是历史数据不保证。 | |
| 4574 | + if(null==patients.getLastMenses()||null==patients.getBookbuildingDate()){ | |
| 4575 | + continue; | |
| 4576 | + } | |
| 4573 | 4577 | int dueWeek=DateUtil.getWeek2(patients.getLastMenses(),patients.getBookbuildingDate()); |
| 4574 | 4578 | if(dueWeek<=12){ |
| 4575 | 4579 | dueWeek12++; |
| ... | ... | @@ -4692,7 +4696,7 @@ |
| 4692 | 4696 | StringBuffer bf=new StringBuffer(); |
| 4693 | 4697 | for (Map<String, Object> stringObjectMap : risk) { |
| 4694 | 4698 | if(stringObjectMap.get("color").equals(riskType)){ |
| 4695 | - bf.append(stringObjectMap.get("name")); | |
| 4699 | + bf.append(stringObjectMap.get("name")+"; "); | |
| 4696 | 4700 | } |
| 4697 | 4701 | } |
| 4698 | 4702 | map.put("highRiskResult", bf); |