From 31c316a62e40b21bb18460d38d15066d165980d8 Mon Sep 17 00:00:00 2001 From: wtt Date: Wed, 6 May 2020 16:01:54 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 10 +++++----- .../platform/operate/web/worker/ScarUterusPatientWorker.java | 2 ++ 2 files changed, 7 insertions(+), 5 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 7b7f789..b486f67 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 @@ -950,7 +950,7 @@ public class PatientFacade { Criteria criteria4 = Criteria.where("name").is("宫角妊娠1次"); yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4)); }else if ("5".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria5 = Criteria.where("name").is("瘢痕子宫（距 末次子宫手术间隔＜18月）"); + Criteria criteria5 = Criteria.where("name").is("瘢痕子宫（距末次子宫手术间隔＜18月）"); yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria5)); }else if ("6".equals(riskPatientsQueryRequest.getTwinsType())) { Criteria criteria6 = Criteria.where("name").is("疤痕子宫伴中央性前置胎盘或伴有可疑胎盘植入"); @@ -988,10 +988,10 @@ public class PatientFacade { Criteria criteria7 = Criteria.where("name").is("瘢痕子宫伴中央性前置胎盘"); Criteria criteria8 = Criteria.where("name").is("瘢痕子宫伴有可疑胎盘植入"); Criteria criteria9 = Criteria.where("name").is("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次"); - Criteria criteria10 = Criteria.where("name").is("宫角妊娠≥2次"); - Criteria criteria11 = Criteria.where("name").is("子宫肌瘤挖出术≥2次"); - Criteria criteria12 = Criteria.where("name").is("各类子宫手术史≥2次"); - Criteria criteria13 = Criteria.where("name").is("剖宫产≥2次"); + Criteria criteria10 = Criteria.where("name").is("剖宫产≥2次"); + Criteria criteria11 = Criteria.where("name").is("宫角妊娠≥2次"); + Criteria criteria12 = Criteria.where("name").is("子宫肌瘤挖出术≥2次"); + Criteria criteria13 = Criteria.where("name").is("各类子宫手术史≥2次"); yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3,criteria4,criteria5,criteria6,criteria7,criteria8,criteria9,criteria10,criteria11,criteria12,criteria13)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ScarUterusPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ScarUterusPatientWorker.java index ea34861..badbc3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ScarUterusPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ScarUterusPatientWorker.java @@ -274,9 +274,11 @@ public class ScarUterusPatientWorker implements Callable