diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index fff691b..38b7729 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -5804,19 +5804,21 @@ public class AntenatalExaminationFacade { map.put("id", model.getId()); Patients pat = patientsService.findOnePatientById(model.getPatientId()); - map.put("pid", pat.getPid()); - map.put("name", pat.getUsername()); - map.put("cardNo", pat.getCardNo()); - map.put("phone", pat.getPhone()); - map.put("autoTime", DateUtil.getyyyy_MM_dd(model.getCreated())); - map.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated())); - map.put("riskLevel", commonService.findRiskLevel(model.gethLevel())); - String risk = commonService.resloveFactor(model.gethRisk()); - - map.put("risk", risk); - map.put("score", model.gethScore()); - map.put("status", model.getStatus() == 0 ? "未确诊" : "已确诊"); - riskList.add(map); + if(pat!=null ){ + map.put("pid", pat.getPid()); + map.put("name", pat.getUsername()); + map.put("cardNo", pat.getCardNo()); + map.put("phone", pat.getPhone()); + map.put("autoTime", DateUtil.getyyyy_MM_dd(model.getCreated())); + map.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated())); + map.put("riskLevel", commonService.findRiskLevel(model.gethLevel())); + String risk = commonService.resloveFactor(model.gethRisk()); + + map.put("risk", risk); + map.put("score", model.gethScore()); + map.put("status", model.getStatus() == 0 ? "未确诊" : "已确诊"); + riskList.add(map); + } } } return new BaseListResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo());