jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e4396911b9289080724a708ff5146ecd6e160aaa

Authored by gaohan
1 parent 5ba9f3445b
Exists in dev

开发回复评价列表接口和小程序视频未返回bug

Showing 5 changed files with 26 additions and 45 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ e439691
... ... @@ -1315,6 +1315,7 @@
1315 1315 String format = df.format(day);
1316 1316 reviewModel.setCreateDate(format);
1317 1317 reviewModel.setYn(YnEnums.YES.getId());
  1318 + reviewModel.setParentId("0");
1318 1319 reviewModel.setState(0);
1319 1320  
1320 1321 courseEvalService.reviewAdd(reviewModel);
... ... @@ -1346,7 +1347,7 @@
1346 1347 reviewQuery.setYn(YnEnums.YES.getId());
1347 1348 reviewQuery.setNeed("true");
1348 1349 reviewQuery.setCouresId(couresId);
1349   - reviewQuery.setCouresId(reviewId);
  1350 + reviewQuery.setParentId(reviewId);
1350 1351 BaseListResponse objectResponse = new BaseListResponse();
1351 1352  
1352 1353 List<ReviewModel> models = courseEvalService.reviewList(reviewQuery);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ e439691
... ... @@ -1528,20 +1528,16 @@
1528 1528 Criteria criteria1 = Criteria.where("name").is("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次");
1529 1529 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1));
1530 1530 } else if ("2".equals(riskPatientsQueryRequest.getTwinsType())) {
1531   - Criteria criteria2 = Criteria.where("name").is("瘢痕子宫（距前次剖宫产不足2年）");
  1531 + Criteria criteria2 = Criteria.where("name").is("剖宫产1次");
1532 1532 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2));
1533 1533 } else if ("3".equals(riskPatientsQueryRequest.getTwinsType())) {
1534   - Criteria criteria3 = Criteria.where("name").is("剖宫产1次");
  1534 + Criteria criteria3 = Criteria.where("name").is("剖宫产≥2次");
1535 1535 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3));
1536   - } else if ("4".equals(riskPatientsQueryRequest.getTwinsType())) {
1537   - Criteria criteria4 = Criteria.where("name").is("剖宫产≥2次");
1538   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
1539 1536 } else {
1540 1537 Criteria criteria1 = Criteria.where("name").is("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次");
1541   - Criteria criteria2 = Criteria.where("name").is("瘢痕子宫（距前次剖宫产不足2年）");
1542   - Criteria criteria3 = Criteria.where("name").is("剖宫产1次");
1543   - Criteria criteria4 = Criteria.where("name").is("剖宫产≥2次");
1544   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4));
  1538 + Criteria criteria2 = Criteria.where("name").is("剖宫产1次");
  1539 + Criteria criteria3 = Criteria.where("name").is("剖宫产≥2次");
  1540 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3));
1545 1541 }
1546 1542 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
1547 1543 List <String> rFactorList = new ArrayList <>();
1548 1544  
1549 1545  
... ... @@ -1766,22 +1762,14 @@
1766 1762 Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%");
1767 1763 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3));
1768 1764 } else if ("4".equals(riskPatientsQueryRequest.getTwinsType())) {
1769   - Criteria criteria4 = Criteria.where("name").is("甲状腺功能亢进症");
  1765 + Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低(无需药物治疗");
1770 1766 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
1771   - }else if ("5".equals(riskPatientsQueryRequest.getTwinsType())) {
1772   - Criteria criteria5 = Criteria.where("name").is("甲状腺功能减退症");
1773   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria5));
1774   - }else if ("6".equals(riskPatientsQueryRequest.getTwinsType())) {
1775   - Criteria criteria6 = Criteria.where("name").is("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病");
1776   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria6));
1777 1767 }else {
1778 1768 Criteria criteria1 = Criteria.where("name").is("亚临床甲减");
1779 1769 Criteria criteria2 = Criteria.where("name").is("甲减（需药物治疗）");
1780 1770 Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%");
1781   - Criteria criteria4 = Criteria.where("name").is("甲状腺功能亢进症");
1782   - Criteria criteria5 = Criteria.where("name").is("甲状腺功能减退症");
1783   - Criteria criteria6 = Criteria.where("name").is("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病");
1784   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6));
  1771 + Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低(无需药物治疗");
  1772 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4));
1785 1773 }
1786 1774 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
1787 1775 List <String> rFactorList = new ArrayList <>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java View file @ e439691
... ... @@ -41,6 +41,16 @@
41 41 private String hospitalId;
42 42 private String courseEndTime;
43 43  
  44 + private String courseVideo;
  45 +
  46 + public String getCourseVideo() {
  47 + return courseVideo;
  48 + }
  49 +
  50 + public void setCourseVideo(String courseVideo) {
  51 + this.courseVideo = courseVideo;
  52 + }
  53 +
44 54 public Integer getCourseObjId() {
45 55 return courseObjId;
46 56 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CesareanWorker.java View file @ e439691
... ... @@ -263,8 +263,7 @@
263 263 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
264 264 if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
265 265 if(basicConfig.getName().contains("各类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥2次") ||
266   - basicConfig.getName().contains("瘢痕子宫(距前次剖宫产不足2年)") ||
267   - basicConfig.getName().contains("剖宫产1次")||
  266 + basicConfig.getName().contains("剖宫产1次") ||
268 267 basicConfig.getName().contains("剖宫产≥2次")){
269 268 sb.append(basicConfig.getName()).append(',');
270 269 }
271 270  
272 271  
... ... @@ -319,20 +318,15 @@
319 318 data.add(twinsPatientsResult);
320 319 }
321 320  
322   - } else if ("2".equals(twinsType)) {
323   - if (twinsPatientsResult.getrFactor().contains("瘢痕子宫(距前次剖宫产不足2年)")) {
324   - data.add(twinsPatientsResult);
325   - }
326   - } else if ("3".equals(twinsType)) {
  321 + }else if ("2".equals(twinsType)) {
327 322 if (twinsPatientsResult.getrFactor().contains("剖宫产1次")) {
328 323 data.add(twinsPatientsResult);
329 324 }
330   - } else if ("4".equals(twinsType)) {
  325 + } else if ("3".equals(twinsType)) {
331 326 if (twinsPatientsResult.getrFactor().contains("剖宫产≥2次")) {
332 327 data.add(twinsPatientsResult);
333 328 }
334 329 } else if (twinsPatientsResult.getrFactor().contains("类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥次") ||
335   - twinsPatientsResult.getrFactor().contains("瘢痕子宫(距前次剖宫产不足2年)") ||
336 330 twinsPatientsResult.getrFactor().contains("剖宫产1次")||
337 331 twinsPatientsResult.getrFactor().contains("剖宫产≥2次")) {
338 332 data.add(twinsPatientsResult);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/HypothyroidismWorker.java View file @ e439691
... ... @@ -265,9 +265,7 @@
265 265 if(basicConfig.getName().contains("亚临床甲减") ||
266 266 basicConfig.getName().contains("甲减(需药物治疗)")||
267 267 basicConfig.getName().contains("状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%")||
268   - basicConfig.getName().contains("甲状腺功能亢进症")||
269   - basicConfig.getName().contains("甲状腺功能减退症")||
270   - basicConfig.getName().contains("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病")){
  268 + basicConfig.getName().contains("甲状腺功能减低(无需药物治疗)")){
271 269 sb.append(basicConfig.getName()).append(',');
272 270 }
273 271 }
274 272  
275 273  
... ... @@ -330,23 +328,13 @@
330 328 data.add(twinsPatientsResult);
331 329 }
332 330 } else if ("4".equals(twinsType)) {
333   - if (twinsPatientsResult.getrFactor().contains("甲状腺功能亢进症")) {
  331 + if (twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")) {
334 332 data.add(twinsPatientsResult);
335 333 }
336   - } else if ("5".equals(twinsType)) {
337   - if (twinsPatientsResult.getrFactor().contains("甲状腺功能减退症")) {
338   - data.add(twinsPatientsResult);
339   - }
340   - } else if ("6".equals(twinsType)) {
341   - if (twinsPatientsResult.getrFactor().contains("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病")) {
342   - data.add(twinsPatientsResult);
343   - }
344 334 } else if (twinsPatientsResult.getrFactor().contains("亚临床甲减") ||
345 335 twinsPatientsResult.getrFactor().contains("甲减(需药物治疗)") ||
346 336 twinsPatientsResult.getrFactor().contains("状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%") ||
347   - twinsPatientsResult.getrFactor().contains("甲状腺功能亢进症") ||
348   - twinsPatientsResult.getrFactor().contains("甲状腺功能减退症") ||
349   - twinsPatientsResult.getrFactor().contains("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病")) {
  337 + twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")) {
350 338 data.add(twinsPatientsResult);
351 339 }
352 340 }