From d0bc187f18b04419f00dbd7f784ff57c8a76ca97 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 8 Oct 2016 10:35:35 +0800 Subject: [PATCH] code update --- .../platform/operate/web/facade/BookbuildingFacade.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 445d50e..51d52e8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -529,10 +529,18 @@ public class BookbuildingFacade { List patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patientsVc)) { - patientsQuery.setHospitalId(null); - patientsQuery.setVcCardNo(null); - patientsQuery.setCardNo(patientsVc.get(0).getCardNo()); - patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC); + if (patientsVc.get(0) == null || StringUtils.isEmpty(patientsVc.get(0).getCardNo())) + { + patients = patientsVc; + } + else + { + patientsQuery.setHospitalId(null); + patientsQuery.setVcCardNo(null); + patientsQuery.setCardNo(patientsVc.get(0).getCardNo()); + patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC); + } + } // 如果为空，初次建档，根据就诊卡号从HIS库取患者信息 else { -- 1.8.3.1