diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index b2a9ffa..0a0d260 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -1315,6 +1315,7 @@ public class CourseFacade { String format = df.format(day); reviewModel.setCreateDate(format); reviewModel.setYn(YnEnums.YES.getId()); + reviewModel.setParentId("0"); reviewModel.setState(0); courseEvalService.reviewAdd(reviewModel); @@ -1346,7 +1347,7 @@ public class CourseFacade { reviewQuery.setYn(YnEnums.YES.getId()); reviewQuery.setNeed("true"); reviewQuery.setCouresId(couresId); - reviewQuery.setCouresId(reviewId); + reviewQuery.setParentId(reviewId); BaseListResponse objectResponse = new BaseListResponse(); List models = courseEvalService.reviewList(reviewQuery); 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 b1407bd..6f141b7 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 @@ -1528,20 +1528,16 @@ public class PatientFacade extends BaseServiceImpl { Criteria criteria1 = Criteria.where("name").is("各类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥2次"); yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1)); } else if ("2".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria2 = Criteria.where("name").is("瘢痕子宫(距前次剖宫产不足2年)"); + Criteria criteria2 = Criteria.where("name").is("剖宫产1次"); yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2)); } else if ("3".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria3 = Criteria.where("name").is("剖宫产1次"); + Criteria criteria3 = Criteria.where("name").is("剖宫产≥2次"); yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3)); - } else if ("4".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria4 = Criteria.where("name").is("剖宫产≥2次"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4)); } else { Criteria criteria1 = Criteria.where("name").is("各类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥2次"); - Criteria criteria2 = Criteria.where("name").is("瘢痕子宫(距前次剖宫产不足2年)"); - Criteria criteria3 = Criteria.where("name").is("剖宫产1次"); - Criteria criteria4 = Criteria.where("name").is("剖宫产≥2次"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4)); + Criteria criteria2 = Criteria.where("name").is("剖宫产1次"); + Criteria criteria3 = Criteria.where("name").is("剖宫产≥2次"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3)); } List models = mongoTemplate.find(yn, BasicConfig.class); List rFactorList = new ArrayList <>(); @@ -1766,22 +1762,14 @@ public class PatientFacade extends BaseServiceImpl { Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍,基础代谢率小于-50%"); yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3)); } else if ("4".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria4 = Criteria.where("name").is("甲状腺功能亢进症"); + Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低(无需药物治疗"); yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4)); - }else if ("5".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria5 = Criteria.where("name").is("甲状腺功能减退症"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria5)); - }else if ("6".equals(riskPatientsQueryRequest.getTwinsType())) { - Criteria criteria6 = Criteria.where("name").is("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria6)); }else { Criteria criteria1 = Criteria.where("name").is("亚临床甲减"); Criteria criteria2 = Criteria.where("name").is("甲减(需药物治疗)"); Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍,基础代谢率小于-50%"); - Criteria criteria4 = Criteria.where("name").is("甲状腺功能亢进症"); - Criteria criteria5 = Criteria.where("name").is("甲状腺功能减退症"); - Criteria criteria6 = Criteria.where("name").is("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6)); + Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低(无需药物治疗"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4)); } 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/CourseRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java index 5197e4f..b2bbbe6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java @@ -41,6 +41,16 @@ public class CourseRequest { private String hospitalId; private String courseEndTime; + private String courseVideo; + + public String getCourseVideo() { + return courseVideo; + } + + public void setCourseVideo(String courseVideo) { + this.courseVideo = courseVideo; + } + public Integer getCourseObjId() { return courseObjId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CesareanWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CesareanWorker.java index 83a61bf..2b41dc9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CesareanWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CesareanWorker.java @@ -263,8 +263,7 @@ public class CesareanWorker implements Callable> { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { if(basicConfig.getName().contains("各类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥2次") || - basicConfig.getName().contains("瘢痕子宫(距前次剖宫产不足2年)") || - basicConfig.getName().contains("剖宫产1次")|| + basicConfig.getName().contains("剖宫产1次") || basicConfig.getName().contains("剖宫产≥2次")){ sb.append(basicConfig.getName()).append(','); } @@ -319,20 +318,15 @@ public class CesareanWorker implements Callable> { data.add(twinsPatientsResult); } - } else if ("2".equals(twinsType)) { - if (twinsPatientsResult.getrFactor().contains("瘢痕子宫(距前次剖宫产不足2年)")) { - data.add(twinsPatientsResult); - } - } else if ("3".equals(twinsType)) { + }else if ("2".equals(twinsType)) { if (twinsPatientsResult.getrFactor().contains("剖宫产1次")) { data.add(twinsPatientsResult); } - } else if ("4".equals(twinsType)) { + } else if ("3".equals(twinsType)) { if (twinsPatientsResult.getrFactor().contains("剖宫产≥2次")) { data.add(twinsPatientsResult); } } else if (twinsPatientsResult.getrFactor().contains("类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥次") || - twinsPatientsResult.getrFactor().contains("瘢痕子宫(距前次剖宫产不足2年)") || twinsPatientsResult.getrFactor().contains("剖宫产1次")|| twinsPatientsResult.getrFactor().contains("剖宫产≥2次")) { data.add(twinsPatientsResult); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/HypothyroidismWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/HypothyroidismWorker.java index 9e6f19c..65ad254 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/HypothyroidismWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/HypothyroidismWorker.java @@ -265,9 +265,7 @@ public class HypothyroidismWorker implements Callable> if(basicConfig.getName().contains("亚临床甲减") || basicConfig.getName().contains("甲减(需药物治疗)")|| basicConfig.getName().contains("状腺功能减退引起相应系统功能障碍,基础代谢率小于-50%")|| - basicConfig.getName().contains("甲状腺功能亢进症")|| - basicConfig.getName().contains("甲状腺功能减退症")|| - basicConfig.getName().contains("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病")){ + basicConfig.getName().contains("甲状腺功能减低(无需药物治疗)")){ sb.append(basicConfig.getName()).append(','); } } @@ -330,23 +328,13 @@ public class HypothyroidismWorker implements Callable> data.add(twinsPatientsResult); } } else if ("4".equals(twinsType)) { - if (twinsPatientsResult.getrFactor().contains("甲状腺功能亢进症")) { - data.add(twinsPatientsResult); - } - } else if ("5".equals(twinsType)) { - if (twinsPatientsResult.getrFactor().contains("甲状腺功能减退症")) { - data.add(twinsPatientsResult); - } - } else if ("6".equals(twinsType)) { - if (twinsPatientsResult.getrFactor().contains("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病")) { + if (twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")) { data.add(twinsPatientsResult); } } else if (twinsPatientsResult.getrFactor().contains("亚临床甲减") || twinsPatientsResult.getrFactor().contains("甲减(需药物治疗)") || twinsPatientsResult.getrFactor().contains("状腺功能减退引起相应系统功能障碍,基础代谢率小于-50%") || - twinsPatientsResult.getrFactor().contains("甲状腺功能亢进症") || - twinsPatientsResult.getrFactor().contains("甲状腺功能减退症") || - twinsPatientsResult.getrFactor().contains("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病")) { + twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")) { data.add(twinsPatientsResult); } }