From dfa146e08a5e376faed6d941753cad3bd4d3b75c Mon Sep 17 00:00:00 2001 From: zhangchao Date: Mon, 27 May 2024 15:58:59 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 1 + .../com/lyms/platform/operate/web/facade/PatientFacade.java | 11 +++++------ 2 files changed, 6 insertions(+), 6 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 4725254..763f8dc 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 @@ -4130,6 +4130,7 @@ public class AntenatalExaminationFacade { antexListResult.setSieveStatus(sieveFacade.getSieveStatus(patients.getId(), hospitalId)); DiagnoseConfigQuery diagnoseConfigQuery = new DiagnoseConfigQuery(); diagnoseConfigQuery.setHospitalId(hospitalId); + diagnoseConfigQuery.setEnable(1); List configModels = diagnoseConfigService.queryDiagnoseConfigs(diagnoseConfigQuery); if (CollectionUtils.isNotEmpty(configModels) && StringUtils.isNotEmpty(configModels.get(0).getEnable())) { antexListResult.setEnableConfig(configModels.get(0).getEnable()); 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 d10d568..16eeaf7 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 @@ -1300,10 +1300,7 @@ public class PatientFacade extends BaseServiceImpl { Query yn = null; - if (hospital.equals("2100002419")){ - Criteria criteria4 = Criteria.where("name").is("双胎妊娠"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4)); - }else { + //双绒双羊、单绒单羊、单绒双羊 if ("1".equals(riskPatientsQueryRequest.getTwinsType())) { Criteria criteria2 = Criteria.where("name").is("双胎妊娠（双绒双羊）"); @@ -1320,9 +1317,11 @@ public class PatientFacade extends BaseServiceImpl { Criteria criteria1 = Criteria.where("name").is("双胎妊娠（双绒双羊）"); Criteria criteria2 = Criteria.where("name").is("双胎妊娠（单绒双羊）"); Criteria criteria3 = Criteria.where("name").is("双胎妊娠（单绒单羊）"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3)); + Criteria criteria4 = Criteria.where("name").is("双胎妊娠"); + //yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4)); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3,criteria4)); } - } + List models = mongoTemplate.find(yn, BasicConfig.class); List rFactorList = new ArrayList <>(); -- 1.8.3.1