From 79bad1a11f795a8e1961a5b3e4b9e49ed19a7073 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 16 Oct 2020 14:27:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93=E5=92=8C?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AF=8A=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 3 +++ .../operate/web/facade/DischargeAbstractFacade.java | 9 ++++++--- .../lyms/platform/operate/web/facade/ViewFacade.java | 18 +++++++++--------- 3 files changed, 18 insertions(+), 12 deletions(-) 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 289bb84..cddf909 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 @@ -5862,6 +5862,9 @@ public class AntenatalExaminationFacade { map.put("name", pat.getUsername()); map.put("cardNo", pat.getCardNo()); map.put("phone", pat.getPhone()); + + map.put("fid", model.getFid() == null ? "" : model.getFid()); + 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())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 2ae20c2..739f8b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -400,9 +400,12 @@ public class DischargeAbstractFacade extends BaseServiceImpl { } public BaseResponse list(Integer page, Integer limit, Integer userId, String leaveHospitalDate, Integer postpartumDays, Integer endPostpartumDays, String fmDate, String queryNo) { - 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); +// Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); +// Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); + String hospitalId = autoMatchFacade.getHospitalId(userId); + Criteria criteria = Criteria.where("yn").is("1").and("hospitalId").is(hospitalId); + Criteria pCriteria = Criteria.where("yn").is("1"); boolean flag = false; if (StringUtils.isNotEmpty(queryNo)) { pCriteria.orOperator(Criteria.where("cardNo").regex(queryNo), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 9a96f29..a578be8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4988,15 +4988,15 @@ public class ViewFacade { if (temp.getpId() == null) { continue; } - BabyModelQuery babyModelQuery = new BabyModelQuery(); - babyModelQuery.setDataStatus(false); - //babyModelQuery.setYn(YnEnums.YES.getId()); - babyModelQuery.setPid(temp.getpId()); - babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); - List babyModels = babyService.queryBabyWithQuery(babyModelQuery); - if (CollectionUtils.isEmpty(babyModels)) { - continue; - } +// BabyModelQuery babyModelQuery = new BabyModelQuery(); +// babyModelQuery.setDataStatus(false); +// //babyModelQuery.setYn(YnEnums.YES.getId()); +// babyModelQuery.setPid(temp.getpId()); +// babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); +// List babyModels = babyService.queryBabyWithQuery(babyModelQuery); +// if (CollectionUtils.isEmpty(babyModels)) { +// continue; +// } Map babyMap = new HashMap <>(); -- 1.8.3.1