From 306d3f3ef6c6a9abe2046a75d9ccd25f64f492e3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 8 Jan 2025 20:38:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E5=84=BF=E7=AB=A5?= =?UTF-8?q?=E3=80=81=E4=BA=A7=E5=A6=87=E8=BD=AC=E8=AF=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ApplyScreeningFacade.java | 4 ++-- .../platform/operate/web/facade/LhBabyEyeCheckFacade.java | 1 - .../lyms/platform/operate/web/facade/PatientFacade.java | 4 +++- .../operate/web/request/ApplyScreeningQueryRequest.java | 2 +- .../lyms/platform/operate/web/worker/InfectiousWorker.java | 14 ++++++++++---- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java index 4d5384a..2d67165 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java @@ -135,7 +135,7 @@ public class ApplyScreeningFacade { } } String id = ""; - if (2 == type) { + if (2 == type || type==3) { //查询产妇信息 List patientses = patientsService.queryPatient(patientsQuery); Patients patients = null; @@ -659,7 +659,7 @@ public class ApplyScreeningFacade { ReferralApplyScreeningModel referralApplyScreeningModel = applyScreeningService.findByIdReferralApplyOrder(id); ReferralApplyScreeningModel archiveModel = new ReferralApplyScreeningModel(); - String hospital = autoMatchFacade.getHospitalId(userId); + // String hospital = autoMatchFacade.getHospitalId(userId); if (null != referralApplyScreeningModel) { ReferralApplyScreeningQuery referralApplyScreeningQuery = new ReferralApplyScreeningQuery(); //如果是接受修改建立档案 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java index efdc9db..ef1b867 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java @@ -20,7 +20,6 @@ import com.lyms.platform.pojo.LhBabyEyeCheck; import com.lyms.platform.query.BabyCheckModelQuery; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.LhBabyEyelCheckQuery; -import com.sun.tools.javac.util.Convert; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; 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 4ee3a96..b90c00e 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 @@ -1724,8 +1724,10 @@ public class PatientFacade extends BaseServiceImpl { Criteria criteria10 = Criteria.where("name").is("丙肝阳性"); Criteria criteria11 = Criteria.where("name").is("乙肝大三阳"); Criteria criteria12 = Criteria.where("name").is("乙肝小三阳"); + Criteria criteria14 = Criteria.where("name").is("大三阳"); + Criteria criteria15 = Criteria.where("name").is("小三阳"); Criteria criteria13=Criteria.where("name").is("所有妊娠合井传染性疾病--如病毒性肝炎、梅毒、HV感染及艾滋病、结核病、重症盛染性肺炎、特殊病毒感染(H1N7、寨卡等)"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4,criteria5,criteria6,criteria7,criteria8,criteria9,criteria10,criteria11,criteria12,criteria13)); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4,criteria5,criteria6,criteria7,criteria8,criteria9,criteria10,criteria11,criteria12,criteria13,criteria14,criteria15)); } List models = mongoTemplate.find(yn, BasicConfig.class); List rFactorList = new ArrayList <>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyScreeningQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyScreeningQueryRequest.java index 341c926..d358094 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyScreeningQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyScreeningQueryRequest.java @@ -47,7 +47,7 @@ public class ApplyScreeningQueryRequest extends BasePageQueryRequest { */ private String action; /** - * 1 儿童 2 孕妇 + * 1 儿童 2 孕妇 3产妇 */ private Integer type; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/InfectiousWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/InfectiousWorker.java index c2feafa..0dc49e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/InfectiousWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/InfectiousWorker.java @@ -272,7 +272,9 @@ public class InfectiousWorker implements Callable> { basicConfig.getName().contains("淋病")|| basicConfig.getName().contains("丙肝阳性")|| basicConfig.getName().contains("乙肝大三阳")|| - basicConfig.getName().contains("乙肝小三阳")){ + basicConfig.getName().contains("乙肝小三阳")|| + basicConfig.getName().contains("大三阳")|| + basicConfig.getName().contains("小三阳")){ sb.append(basicConfig.getName()).append(','); } } @@ -363,11 +365,13 @@ public class InfectiousWorker implements Callable> { data.add(twinsPatientsResult); } }else if ("11".equals(twinsType)) { - if (twinsPatientsResult.getrFactor().contains("乙肝大三阳")) { + if (twinsPatientsResult.getrFactor().contains("乙肝大三阳")|| + twinsPatientsResult.getrFactor().contains("大三阳")) { data.add(twinsPatientsResult); } }else if ("12".equals(twinsType)) { - if (twinsPatientsResult.getrFactor().contains("乙肝小三阳")) { + if (twinsPatientsResult.getrFactor().contains("乙肝小三阳")|| + twinsPatientsResult.getrFactor().contains("小三阳")) { data.add(twinsPatientsResult); } }else if (twinsPatientsResult.getrFactor().contains("梅毒") || @@ -381,7 +385,9 @@ public class InfectiousWorker implements Callable> { twinsPatientsResult.getrFactor().contains("淋病")|| twinsPatientsResult.getrFactor().contains("丙肝阳性")|| twinsPatientsResult.getrFactor().contains("乙肝大三阳")|| - twinsPatientsResult.getrFactor().contains("乙肝小三阳")) { + twinsPatientsResult.getrFactor().contains("乙肝小三阳")|| + twinsPatientsResult.getrFactor().contains("大三阳")|| + twinsPatientsResult.getrFactor().contains("小三阳")) { data.add(twinsPatientsResult); } } -- 1.8.3.1