Commit e3d360bbe51a1c54b41d79186aa95cbde1307675
1 parent
9a8ee91f6c
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 15 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
e3d360b
| ... | ... | @@ -5804,19 +5804,21 @@ |
| 5804 | 5804 | map.put("id", model.getId()); |
| 5805 | 5805 | |
| 5806 | 5806 | Patients pat = patientsService.findOnePatientById(model.getPatientId()); |
| 5807 | - map.put("pid", pat.getPid()); | |
| 5808 | - map.put("name", pat.getUsername()); | |
| 5809 | - map.put("cardNo", pat.getCardNo()); | |
| 5810 | - map.put("phone", pat.getPhone()); | |
| 5811 | - map.put("autoTime", DateUtil.getyyyy_MM_dd(model.getCreated())); | |
| 5812 | - map.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated())); | |
| 5813 | - map.put("riskLevel", commonService.findRiskLevel(model.gethLevel())); | |
| 5814 | - String risk = commonService.resloveFactor(model.gethRisk()); | |
| 5807 | + if(pat!=null ){ | |
| 5808 | + map.put("pid", pat.getPid()); | |
| 5809 | + map.put("name", pat.getUsername()); | |
| 5810 | + map.put("cardNo", pat.getCardNo()); | |
| 5811 | + map.put("phone", pat.getPhone()); | |
| 5812 | + map.put("autoTime", DateUtil.getyyyy_MM_dd(model.getCreated())); | |
| 5813 | + map.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated())); | |
| 5814 | + map.put("riskLevel", commonService.findRiskLevel(model.gethLevel())); | |
| 5815 | + String risk = commonService.resloveFactor(model.gethRisk()); | |
| 5815 | 5816 | |
| 5816 | - map.put("risk", risk); | |
| 5817 | - map.put("score", model.gethScore()); | |
| 5818 | - map.put("status", model.getStatus() == 0 ? "未确诊" : "已确诊"); | |
| 5819 | - riskList.add(map); | |
| 5817 | + map.put("risk", risk); | |
| 5818 | + map.put("score", model.gethScore()); | |
| 5819 | + map.put("status", model.getStatus() == 0 ? "未确诊" : "已确诊"); | |
| 5820 | + riskList.add(map); | |
| 5821 | + } | |
| 5820 | 5822 | } |
| 5821 | 5823 | } |
| 5822 | 5824 | return new BaseListResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo()); |