Commit 1ba3a024d9ca2b1ac40797fff3b1816cef55cbdf

Authored by wangbo
1 parent 8b0342e565

自测bug提交

Showing 3 changed files with 78 additions and 58 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java View file @ 1ba3a02
... ... @@ -12,11 +12,11 @@
12 12  
13 13 BaseResponse deleteTemporaryWeight(String Phone);
14 14  
15   - BaseResponse queryOne(String phone);
  15 + BaseResponse queryOne(String id);
16 16  
17 17 BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, Integer userId);
18 18  
19   - BaseResponse info(String phone);
  19 + BaseResponse info(String id);
20 20  
21 21 BaseResponse getWeightsReport(String phone, Integer userId, String rid);
22 22  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 1ba3a02
... ... @@ -317,7 +317,7 @@
317 317 return df.format(tzzs);
318 318 }
319 319 return "";
320   - }
  320 +}
321 321  
322 322 @Override
323 323 public BaseResponse info(String id) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java View file @ 1ba3a02
... ... @@ -107,6 +107,7 @@
107 107 public BaseResponse queryOne(String id) {
108 108 if (StringUtils.isNotEmpty(id)) {
109 109 TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class);
  110 + temporaryWeightModel.setWeeks(DateUtil.getWeekDesc(temporaryWeightModel.getLastMenses(), new Date()));
110 111 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(temporaryWeightModel);
111 112 }
112 113 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录");
... ... @@ -211,6 +212,16 @@
211 212 }
212 213 patientWeightService.setReport(map, weights, template.getBeforeWeight(), template.getBmi(), template.getDayWeights(), template.getBregmatic());
213 214  
  215 + //高危报告权限判断
  216 + List<String> healthy = new ArrayList();
  217 + healthy.add("d42eec03-aa86-45b8-a4e0-78a0ff365fb6");//健康id//
  218 + healthy.add("a427da89-594a-46c2-b9f7-1b0d355ce54c");//28>BMI>25
  219 + healthy.add("5a40c6c5422b03d4ad2bf7bd");//BMI<18.5
  220 + if (null == template.getRiskFactorId() || healthy.containsAll(template.getRiskFactorId())) {
  221 + map.put("flag", false);
  222 + } else {
  223 + map.put("flag", true);
  224 + }
214 225 CollectionUtils.removeNullValue(map);
215 226 return RespBuilder.buildSuccess(map);
216 227 }
217 228  
218 229  
219 230  
220 231  
... ... @@ -579,65 +590,74 @@
579 590 Integer gjKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, temporary, heights, 1.0));
580 591 String gjKcalStr = gjKcal + "kcal";
581 592 //获取改孕妇的高危项
582   - // String risk = patients.getRiskLevelId();
583   - //if (risk.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) {
584   - //return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围,请到医生处进行咨询");
585   - // } else {
586   - //获取视图
587   - Map<String, String> dayWeights = temporary.getDayWeights();
588   - Map<Integer, String> weights = new LinkedHashMap<>();
589   - if (MapUtils.isNotEmpty(dayWeights)) {
590   - Set<Map.Entry<String, String>> entries = dayWeights.entrySet();
591   - for (Map.Entry<String, String> entry : entries) {
592   - weights.put(DateUtil.getWeek2(temporary.getLastMenses(), DateUtil.parseYMD(entry.getKey())), entry.getValue());
593   - }
594   - }
595   - Map<String, Object> data0 = new HashMap<>();
596   - Map<String, Object> data1 = new HashMap<>();
597   - Map<String, Object> data2 = new HashMap<>();
598   - Map<String, Object> data3 = new HashMap<>();
599   - Map<String, Object> data4 = new HashMap<>();
600   - Map<String, Object> data5 = new HashMap<>();
601   - Map<String, Object> data6 = new HashMap<>();
602   - List<String> reiskFactor = temporary.getRiskFactorId();
603   - List<WeightReportModel> weightReport = mongoTemplate.findAll(WeightReportModel.class);
604   - if (reiskFactor.isEmpty() && weightReport.isEmpty()) {
605   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("对象值为空!").setData("");
606   - } else {
607   - for (String reis : reiskFactor) {
608   - for (WeightReportModel weightReportModel : weightReport) {
609   - if (reis.equals(weightReportModel.getgDMId()) || reis.equals(weightReportModel.getoDIPId()) ||
610   - reis.equals(weightReportModel.getMedicationDiabetesID())) {
611   - //糖尿病diabetes
612   - datas.put("1", this.getDiabetestInfo(weights, data3, weightReportModel, temporary, bmiD, week, diabetesKcalStr));
  593 + List<String> risks = temporary.getRiskFactorId();
  594 + if (CollectionUtils.isNotEmpty(risks)) {
  595 + for (String risk : risks) {
  596 + BasicConfig basicConfigs = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(risk)), BasicConfig.class);
  597 + if (basicConfigs.getParentId().equals("eb146c03-b19f-4e28-b85f-fda574b2283b")) {
  598 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围,请到医生处进行咨询");
  599 + }
  600 + Map<String, String> dayWeights = temporary.getDayWeights();
  601 + Map<Integer, String> weights = new LinkedHashMap<>();
  602 + if (MapUtils.isNotEmpty(dayWeights)) {
  603 + Set<Map.Entry<String, String>> entries = dayWeights.entrySet();
  604 + for (Map.Entry<String, String> entry : entries) {
  605 + weights.put(DateUtil.getWeek2(temporary.getLastMenses(), DateUtil.parseYMD(entry.getKey())), entry.getValue());
  606 + }
  607 + }
  608 + Map<String, Object> data0 = new HashMap<>();
  609 + Map<String, Object> data1 = new HashMap<>();
  610 + Map<String, Object> data2 = new HashMap<>();
  611 + Map<String, Object> data3 = new HashMap<>();
  612 + Map<String, Object> data4 = new HashMap<>();
  613 + Map<String, Object> data5 = new HashMap<>();
  614 + Map<String, Object> data6 = new HashMap<>();
  615 + List<String> reiskFactor = temporary.getRiskFactorId();
  616 + List<WeightReportModel> weightReport = mongoTemplate.findAll(WeightReportModel.class);
  617 + if (reiskFactor.isEmpty() && weightReport.isEmpty()) {
  618 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("对象值为空!").setData("");
  619 + } else {
  620 + for (String reis : reiskFactor) {
  621 + for (WeightReportModel weightReportModel : weightReport) {
  622 + if (reis.equals(weightReportModel.getgDMId()) || reis.equals(weightReportModel.getoDIPId()) ||
  623 + reis.equals(weightReportModel.getMedicationDiabetesID())) {
  624 + //糖尿病diabetes
  625 + datas.put("1", this.getDiabetestInfo(weights, data3, weightReportModel, temporary, bmiD, week, diabetesKcalStr));
613 626  
614   - } else if (reis.equals(weightReportModel.getGestationalHypertensionGHID()) || reis.equals(weightReportModel.getChronicHypertensionID())) {
615   - //高血压hypertension
616   - datas.put("3", this.getInfo(weights, data2, weightReportModel, temporary, bmiD, week, gxyKcalStr));
617   - } else if (reis.equals(weightReportModel.getHyperthyroidismNeedID()) || reis.equals(weightReportModel.getHyperthyroidismID())) {
618   - //甲亢hyperthyroidism
  627 + } else if (reis.equals(weightReportModel.getGestationalHypertensionGHID()) || reis.equals(weightReportModel.getChronicHypertensionID())) {
  628 + //高血压hypertension
  629 + datas.put("3", this.getInfo(weights, data2, weightReportModel, temporary, bmiD, week, gxyKcalStr));
  630 + } else if (reis.equals(weightReportModel.getHyperthyroidismNeedID()) || reis.equals(weightReportModel.getHyperthyroidismID())) {
  631 + //甲亢hyperthyroidism
619 632  
620   - datas.put("4", this.getDiabetestInfo(weights, data4, weightReportModel, temporary, bmiD, week, gkKcalStr));
621   - } else if (reis.equals(weightReportModel.getHypothyroidismID()) || reis.equals(weightReportModel.getyLCHypothyroidismID()) ||
622   - reis.equals(weightReportModel.getHypothyroidismNeedID())) {
623   - //甲减hypothyroidism
  633 + datas.put("4", this.getDiabetestInfo(weights, data4, weightReportModel, temporary, bmiD, week, gkKcalStr));
  634 + } else if (reis.equals(weightReportModel.getHypothyroidismID()) || reis.equals(weightReportModel.getyLCHypothyroidismID()) ||
  635 + reis.equals(weightReportModel.getHypothyroidismNeedID())) {
  636 + //甲减hypothyroidism
624 637  
625   - datas.put("5", this.getDiabetestInfo(weights, data5, weightReportModel, temporary, bmiD, week, gjKcalStr));
626   - } else if (reis.equals(weightReportModel.getAnemiaPregnancyId()) || reis.equals(weightReportModel.getMildAnemiaID()) ||
627   - reis.equals(weightReportModel.getModerateAnemiaID()) || reis.equals(weightReportModel.getSevereAnemiaID()) ||
628   - reis.equals(weightReportModel.getSevereAnemiaHBID()) || reis.equals(weightReportModel.getObstructiveAnemiaID())) {
629   - //贫血anemia
630   - datas.put("6", this.getInfo(weights, data0, weightReportModel, temporary, bmiD, week, gxyKcalStr));
631   - } else if (reis.equals(weightReportModel.getDiseasesDigestiveSystemId()) || reis.equals(weightReportModel.getViralHepatitisId())) {
632   - //急性肝炎acuteHepatitis
633   - datas.put("7", this.getInfo(weights, data1, weightReportModel, temporary, bmiD, week, kcals));
634   - } else if (reis.equals(weightReportModel.getCirrhosis()) || reis.equals(weightReportModel.getLiverFunctionErrorId())) {
635   - //慢性肝炎chronicHepatitis
636   - datas.put("8", this.getInfo(weights, data6, weightReportModel, temporary, bmiD, week, mxgyKcalStr));
  638 + datas.put("5", this.getDiabetestInfo(weights, data5, weightReportModel, temporary, bmiD, week, gjKcalStr));
  639 + } else if (reis.equals(weightReportModel.getAnemiaPregnancyId()) || reis.equals(weightReportModel.getMildAnemiaID()) ||
  640 + reis.equals(weightReportModel.getModerateAnemiaID()) || reis.equals(weightReportModel.getSevereAnemiaID()) ||
  641 + reis.equals(weightReportModel.getSevereAnemiaHBID()) || reis.equals(weightReportModel.getObstructiveAnemiaID())) {
  642 + //贫血anemia
  643 + datas.put("6", this.getInfo(weights, data0, weightReportModel, temporary, bmiD, week, gxyKcalStr));
  644 + } else if (reis.equals(weightReportModel.getDiseasesDigestiveSystemId()) || reis.equals(weightReportModel.getViralHepatitisId())) {
  645 + //急性肝炎acuteHepatitis
  646 + datas.put("7", this.getInfo(weights, data1, weightReportModel, temporary, bmiD, week, kcals));
  647 + } else if (reis.equals(weightReportModel.getCirrhosis()) || reis.equals(weightReportModel.getLiverFunctionErrorId())) {
  648 + //慢性肝炎chronicHepatitis
  649 + datas.put("8", this.getInfo(weights, data6, weightReportModel, temporary, bmiD, week, mxgyKcalStr));
  650 + }
  651 + }
637 652 }
638 653 }
639 654 }
640 655 }
  656 + //if (risk.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) {
  657 + //return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围,请到医生处进行咨询");
  658 + // } else {
  659 + //获取视图
  660 +
641 661 // }
642 662 if (datas.size() == 0) {
643 663 BaseResponse baseResponse = this.report(id, userId, rid);