Commit 5ba7471185d2e9fc0cd998fe23d0c63cadb05c05
1 parent
41b77c51b3
Exists in
master
and in
1 other branch
追访根据高危查询
Showing 1 changed file with 10 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
5ba7471
| ... | ... | @@ -166,7 +166,7 @@ |
| 166 | 166 | patientsQuery.setNotoRiskFactor("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"); |
| 167 | 167 | patientsQuery.setIsHighRisk(Boolean.TRUE); |
| 168 | 168 | isPatient = true; |
| 169 | - } else if (downQueryRequest.getIsHightRisk() == 1) {//否 | |
| 169 | + } else if (downQueryRequest.getIsHightRisk() == 2) {//否 | |
| 170 | 170 | patientsQuery.setrFactor("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"); |
| 171 | 171 | isPatient = true; |
| 172 | 172 | } |
| ... | ... | @@ -414,11 +414,6 @@ |
| 414 | 414 | data.add(map); |
| 415 | 415 | } |
| 416 | 416 | } |
| 417 | - | |
| 418 | - | |
| 419 | - | |
| 420 | - | |
| 421 | - | |
| 422 | 417 | PageResult pageResult = new PageResult(); |
| 423 | 418 | pageResult.setCount(downRecordQuery.getPageInfo().getCount()); |
| 424 | 419 | pageResult.setPage(downRecordQuery.getPageInfo().getPage()); |
| ... | ... | @@ -455,6 +450,10 @@ |
| 455 | 450 | |
| 456 | 451 | |
| 457 | 452 | Patients patients = patientsService.findOnePatientById(downRecord.getParentId()); |
| 453 | + if(patients==null){ | |
| 454 | + System.out.println("产后复查未找到parent:"+downRecord.getParentId()); | |
| 455 | + return temp; | |
| 456 | + } | |
| 458 | 457 | //分娩时间 |
| 459 | 458 | temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate())); |
| 460 | 459 | temp.put("scType", "--"); |
| 461 | 460 | |
| ... | ... | @@ -615,7 +614,12 @@ |
| 615 | 614 | String parentId = downRecord.getParentId(); |
| 616 | 615 | String hospitalId = downRecord.getHospitalId(); |
| 617 | 616 | Patients patients = patientsService.findOnePatientById(downRecord.getParentId()); |
| 617 | + | |
| 618 | 618 | Map<String, Object> temp = new HashMap<>(); |
| 619 | + if(patients==null){ | |
| 620 | + System.out.println("产检追访未找到parent:"+downRecord.getParentId()); | |
| 621 | + return temp; | |
| 622 | + } | |
| 619 | 623 | //完善高危数据 |
| 620 | 624 | handHightRisk(patients,temp); |
| 621 | 625 | temp.put("username", downRecord.getUsername()); |