Commit 31c316a62e40b21bb18460d38d15066d165980d8
1 parent
bf764c7670
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 7 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
31c316a
... | ... | @@ -950,7 +950,7 @@ |
950 | 950 | Criteria criteria4 = Criteria.where("name").is("宫角妊娠1次"); |
951 | 951 | yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4)); |
952 | 952 | }else if ("5".equals(riskPatientsQueryRequest.getTwinsType())) { |
953 | - Criteria criteria5 = Criteria.where("name").is("瘢痕子宫(距 末次子宫手术间隔<18月)"); | |
953 | + Criteria criteria5 = Criteria.where("name").is("瘢痕子宫(距末次子宫手术间隔<18月)"); | |
954 | 954 | yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria5)); |
955 | 955 | }else if ("6".equals(riskPatientsQueryRequest.getTwinsType())) { |
956 | 956 | Criteria criteria6 = Criteria.where("name").is("疤痕子宫伴中央性前置胎盘或伴有可疑胎盘植入"); |
... | ... | @@ -988,10 +988,10 @@ |
988 | 988 | Criteria criteria7 = Criteria.where("name").is("瘢痕子宫伴中央性前置胎盘"); |
989 | 989 | Criteria criteria8 = Criteria.where("name").is("瘢痕子宫伴有可疑胎盘植入"); |
990 | 990 | Criteria criteria9 = Criteria.where("name").is("各类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥2次"); |
991 | - Criteria criteria10 = Criteria.where("name").is("宫角妊娠≥2次"); | |
992 | - Criteria criteria11 = Criteria.where("name").is("子宫肌瘤挖出术≥2次"); | |
993 | - Criteria criteria12 = Criteria.where("name").is("各类子宫手术史≥2次"); | |
994 | - Criteria criteria13 = Criteria.where("name").is("剖宫产≥2次"); | |
991 | + Criteria criteria10 = Criteria.where("name").is("剖宫产≥2次"); | |
992 | + Criteria criteria11 = Criteria.where("name").is("宫角妊娠≥2次"); | |
993 | + Criteria criteria12 = Criteria.where("name").is("子宫肌瘤挖出术≥2次"); | |
994 | + Criteria criteria13 = Criteria.where("name").is("各类子宫手术史≥2次"); | |
995 | 995 | |
996 | 996 | yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3,criteria4,criteria5,criteria6,criteria7,criteria8,criteria9,criteria10,criteria11,criteria12,criteria13)); |
997 | 997 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ScarUterusPatientWorker.java
View file @
31c316a
... | ... | @@ -274,9 +274,11 @@ |
274 | 274 | ||"瘢痕子宫伴中央性前置胎盘".equals(basicConfig.getName()) |
275 | 275 | ||"瘢痕子宫伴有可疑胎盘植入".equals(basicConfig.getName()) |
276 | 276 | ||"各类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥2次".equals(basicConfig.getName()) |
277 | + ||"剖宫产≥2次".equals(basicConfig.getName()) | |
277 | 278 | ||"宫角妊娠≥2次".equals(basicConfig.getName()) |
278 | 279 | ||"子宫肌瘤挖出术≥2次".equals(basicConfig.getName()) |
279 | 280 | ||"各类子宫手术史≥2次".equals(basicConfig.getName()) |
281 | + | |
280 | 282 | ){ |
281 | 283 | sb.append(basicConfig.getName()).append(','); |
282 | 284 | } |