From 0b2a7ca287e53cf2ab6e6727c16b3bce6338051f Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Sat, 29 Jun 2019 10:53:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=84=BF=E4=BF=9D=E6=A3=80?= =?UTF-8?q?=E6=9F=A5bug1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 1 + .../java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index 0eeda1e..7c1d7ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -79,6 +79,7 @@ public class QhdJbgwInterface { patientsQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); List list = patientsService.queryPatient(patientsQuery); if(list != null && list.size() > 0){ + for(Patients patients : list){ try{ patients = getMainPatient(patients.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index ede5d66..c84acb4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -757,9 +757,10 @@ public class BabyCheckFacade extends BaseServiceImpl { public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, Integer highRisk, Integer waskSon, Integer page, Integer limit, Integer userId) { boolean flag = false; - List hospital = groupsFacade.findGroupHospital(userId, false); - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); + // List hospital = groupsFacade.findGroupHospital(userId, false); + String hospitalId = autoMatchFacade.getHospitalId(userId); + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo)); -- 1.8.3.1