From af15b1eaad28b49a5981241053defc6bc7ae52ce Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 27 Aug 2020 10:48:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E5=A4=9A=E4=BA=A7=E7=A8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PatientFacade.java | 3 ++- .../web/service/impl/PatientWeightServiceImpl.java | 30 +++++++++++----------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index f64fd0b..3766653 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -2156,7 +2156,8 @@ public class PatientFacade { patientsQuery.setCardNo(patientQueryRequest.getCardNo()); patientsQuery.setVcCardNo(patientQueryRequest.getVcCardNo()); - Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false); + Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), + patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), 1, false, patientQueryRequest.getPid(), false); PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != patients) { patientBaseResult.convert(patients); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 46e79f2..3ace485 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -251,7 +251,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient 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); + Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospital).and("type").is(1); if (StringUtils.isNotBlank(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); flag = true; @@ -290,20 +290,20 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient for (PatientWeight patientWeight : patientWeights) { Patients p = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); if (p != null) { - - if (p.getType() == 3) { - - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setExtSource(false); - patientsQuery.setType(1); - patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setSort("created"); - patientsQuery.setPid(p.getPid()); - List patients = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isNotEmpty(patients)) { - p = patients.get(0); - } - } +// +// if (p.getType() == 3) { +// +// PatientsQuery patientsQuery = new PatientsQuery(); +// patientsQuery.setExtSource(false); +// patientsQuery.setType(1); +// patientsQuery.setYn(YnEnums.YES.getId()); +// patientsQuery.setSort("created"); +// patientsQuery.setPid(p.getPid()); +// List patients = patientsService.queryPatient(patientsQuery); +// if (CollectionUtils.isNotEmpty(patients)) { +// p = patients.get(0); +// } +// } Map temp = new LinkedHashMap<>(); temp.put("id", patientWeight.getId()); -- 1.8.3.1