From 5ba7471185d2e9fc0cd998fe23d0c63cadb05c05 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 23 Apr 2018 14:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=A0=B9=E6=8D=AE=E9=AB=98?= =?UTF-8?q?=E5=8D=B1=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/TrackDownFacade.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index f40fa5c..01cd9b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -166,7 +166,7 @@ public class TrackDownFacade { patientsQuery.setNotoRiskFactor("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"); patientsQuery.setIsHighRisk(Boolean.TRUE); isPatient = true; - } else if (downQueryRequest.getIsHightRisk() == 1) {//否 + } else if (downQueryRequest.getIsHightRisk() == 2) {//否 patientsQuery.setrFactor("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"); isPatient = true; } @@ -414,11 +414,6 @@ public class TrackDownFacade { data.add(map); } } - - - - - PageResult pageResult = new PageResult(); pageResult.setCount(downRecordQuery.getPageInfo().getCount()); pageResult.setPage(downRecordQuery.getPageInfo().getPage()); @@ -455,6 +450,10 @@ public class TrackDownFacade { Patients patients = patientsService.findOnePatientById(downRecord.getParentId()); + if(patients==null){ + System.out.println("产后复查未找到parent:"+downRecord.getParentId()); + return temp; + } //分娩时间 temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate())); temp.put("scType", "--"); @@ -615,7 +614,12 @@ public class TrackDownFacade { String parentId = downRecord.getParentId(); String hospitalId = downRecord.getHospitalId(); Patients patients = patientsService.findOnePatientById(downRecord.getParentId()); + Map temp = new HashMap<>(); + if(patients==null){ + System.out.println("产检追访未找到parent:"+downRecord.getParentId()); + return temp; + } //完善高危数据 handHightRisk(patients,temp); temp.put("username", downRecord.getUsername()); -- 1.8.3.1