From 95179c35a35bac5f33777ae125c8deb780c58d6b Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 12 Jan 2017 17:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BookbuildingFacade.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 351075f..d44b4b6 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 @@ -526,14 +526,8 @@ public class BookbuildingFacade { //查询主档案 patientsQuery.setExtEnable(false); - //如果身份证号码不为空就以身份证号码查询 if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) { - - /* if(StringUtils.isNotEmpty(group)){ - //区域模式 - patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false)); - }*/ patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo()); patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); } @@ -590,10 +584,18 @@ public class BookbuildingFacade { } } + String group = groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)); + if(StringUtils.isNotEmpty(group)){ + //区域模式 + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false)); + } + int count = patientsService.queryPatientCount(patientsQuery); + //历史建档记录 List list = new ArrayList<>(); List results = new ArrayList<>(); if (CollectionUtils.isNotEmpty(patients)) { + for (Patients pat : patients) { if (pat != null) { BookbuildingRecordResult result = new BookbuildingRecordResult(); @@ -655,6 +657,8 @@ public class BookbuildingFacade { Map mapData = new HashMap<>(); mapData.put("data", results); +// 是否在本医院所在区域建档 + mapData.put("rBType",count>0); mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); list.add(mapData); -- 1.8.3.1