From 1ba3a024d9ca2b1ac40797fff3b1816cef55cbdf Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Tue, 2 Apr 2019 17:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8Bbug=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/TemporaryWeightService.java | 4 +- .../web/service/impl/PatientWeightServiceImpl.java | 2 +- .../service/impl/TemporaryWeightServiceImpl.java | 130 ++++++++++++--------- 3 files changed, 78 insertions(+), 58 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java index 2b7eb5a..a7f5122 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java @@ -12,11 +12,11 @@ public interface TemporaryWeightService extends IBaseService { BaseResponse deleteTemporaryWeight(String Phone); - BaseResponse queryOne(String phone); + BaseResponse queryOne(String id); BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, Integer userId); - BaseResponse info(String phone); + BaseResponse info(String id); BaseResponse getWeightsReport(String phone, Integer userId, String rid); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index e16f3ee..6e2a33a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -317,7 +317,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return df.format(tzzs); } return ""; - } +} @Override public BaseResponse info(String id) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java index f7d91bb..64e9389 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java @@ -107,6 +107,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo public BaseResponse queryOne(String id) { if (StringUtils.isNotEmpty(id)) { TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class); + temporaryWeightModel.setWeeks(DateUtil.getWeekDesc(temporaryWeightModel.getLastMenses(), new Date())); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(temporaryWeightModel); } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录"); @@ -211,6 +212,16 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo } patientWeightService.setReport(map, weights, template.getBeforeWeight(), template.getBmi(), template.getDayWeights(), template.getBregmatic()); + //高危报告权限判断 + List healthy = new ArrayList(); + healthy.add("d42eec03-aa86-45b8-a4e0-78a0ff365fb6");//健康id// + healthy.add("a427da89-594a-46c2-b9f7-1b0d355ce54c");//28＞BMI＞25 + healthy.add("5a40c6c5422b03d4ad2bf7bd");//BMI＜18.5 + if (null == template.getRiskFactorId() || healthy.containsAll(template.getRiskFactorId())) { + map.put("flag", false); + } else { + map.put("flag", true); + } CollectionUtils.removeNullValue(map); return RespBuilder.buildSuccess(map); } @@ -579,65 +590,74 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo Integer gjKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, temporary, heights, 1.0)); String gjKcalStr = gjKcal + "kcal"; //获取改孕妇的高危项 - // String risk = patients.getRiskLevelId(); - //if (risk.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) { - //return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围，请到医生处进行咨询"); - // } else { - //获取视图 - Map dayWeights = temporary.getDayWeights(); - Map weights = new LinkedHashMap<>(); - if (MapUtils.isNotEmpty(dayWeights)) { - Set> entries = dayWeights.entrySet(); - for (Map.Entry entry : entries) { - weights.put(DateUtil.getWeek2(temporary.getLastMenses(), DateUtil.parseYMD(entry.getKey())), entry.getValue()); - } - } - Map data0 = new HashMap<>(); - Map data1 = new HashMap<>(); - Map data2 = new HashMap<>(); - Map data3 = new HashMap<>(); - Map data4 = new HashMap<>(); - Map data5 = new HashMap<>(); - Map data6 = new HashMap<>(); - List reiskFactor = temporary.getRiskFactorId(); - List weightReport = mongoTemplate.findAll(WeightReportModel.class); - if (reiskFactor.isEmpty() && weightReport.isEmpty()) { - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("对象值为空!").setData(""); - } else { - for (String reis : reiskFactor) { - for (WeightReportModel weightReportModel : weightReport) { - if (reis.equals(weightReportModel.getgDMId()) || reis.equals(weightReportModel.getoDIPId()) || - reis.equals(weightReportModel.getMedicationDiabetesID())) { - //糖尿病diabetes - datas.put("1", this.getDiabetestInfo(weights, data3, weightReportModel, temporary, bmiD, week, diabetesKcalStr)); - - } else if (reis.equals(weightReportModel.getGestationalHypertensionGHID()) || reis.equals(weightReportModel.getChronicHypertensionID())) { - //高血压hypertension - datas.put("3", this.getInfo(weights, data2, weightReportModel, temporary, bmiD, week, gxyKcalStr)); - } else if (reis.equals(weightReportModel.getHyperthyroidismNeedID()) || reis.equals(weightReportModel.getHyperthyroidismID())) { - //甲亢hyperthyroidism - - datas.put("4", this.getDiabetestInfo(weights, data4, weightReportModel, temporary, bmiD, week, gkKcalStr)); - } else if (reis.equals(weightReportModel.getHypothyroidismID()) || reis.equals(weightReportModel.getyLCHypothyroidismID()) || - reis.equals(weightReportModel.getHypothyroidismNeedID())) { - //甲减hypothyroidism - - datas.put("5", this.getDiabetestInfo(weights, data5, weightReportModel, temporary, bmiD, week, gjKcalStr)); - } else if (reis.equals(weightReportModel.getAnemiaPregnancyId()) || reis.equals(weightReportModel.getMildAnemiaID()) || - reis.equals(weightReportModel.getModerateAnemiaID()) || reis.equals(weightReportModel.getSevereAnemiaID()) || - reis.equals(weightReportModel.getSevereAnemiaHBID()) || reis.equals(weightReportModel.getObstructiveAnemiaID())) { - //贫血anemia - datas.put("6", this.getInfo(weights, data0, weightReportModel, temporary, bmiD, week, gxyKcalStr)); - } else if (reis.equals(weightReportModel.getDiseasesDigestiveSystemId()) || reis.equals(weightReportModel.getViralHepatitisId())) { - //急性肝炎acuteHepatitis - datas.put("7", this.getInfo(weights, data1, weightReportModel, temporary, bmiD, week, kcals)); - } else if (reis.equals(weightReportModel.getCirrhosis()) || reis.equals(weightReportModel.getLiverFunctionErrorId())) { - //慢性肝炎chronicHepatitis - datas.put("8", this.getInfo(weights, data6, weightReportModel, temporary, bmiD, week, mxgyKcalStr)); + List risks = temporary.getRiskFactorId(); + if (CollectionUtils.isNotEmpty(risks)) { + for (String risk : risks) { + BasicConfig basicConfigs = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(risk)), BasicConfig.class); + if (basicConfigs.getParentId().equals("eb146c03-b19f-4e28-b85f-fda574b2283b")) { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围，请到医生处进行咨询"); + } + Map dayWeights = temporary.getDayWeights(); + Map weights = new LinkedHashMap<>(); + if (MapUtils.isNotEmpty(dayWeights)) { + Set> entries = dayWeights.entrySet(); + for (Map.Entry entry : entries) { + weights.put(DateUtil.getWeek2(temporary.getLastMenses(), DateUtil.parseYMD(entry.getKey())), entry.getValue()); + } + } + Map data0 = new HashMap<>(); + Map data1 = new HashMap<>(); + Map data2 = new HashMap<>(); + Map data3 = new HashMap<>(); + Map data4 = new HashMap<>(); + Map data5 = new HashMap<>(); + Map data6 = new HashMap<>(); + List reiskFactor = temporary.getRiskFactorId(); + List weightReport = mongoTemplate.findAll(WeightReportModel.class); + if (reiskFactor.isEmpty() && weightReport.isEmpty()) { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("对象值为空!").setData(""); + } else { + for (String reis : reiskFactor) { + for (WeightReportModel weightReportModel : weightReport) { + if (reis.equals(weightReportModel.getgDMId()) || reis.equals(weightReportModel.getoDIPId()) || + reis.equals(weightReportModel.getMedicationDiabetesID())) { + //糖尿病diabetes + datas.put("1", this.getDiabetestInfo(weights, data3, weightReportModel, temporary, bmiD, week, diabetesKcalStr)); + + } else if (reis.equals(weightReportModel.getGestationalHypertensionGHID()) || reis.equals(weightReportModel.getChronicHypertensionID())) { + //高血压hypertension + datas.put("3", this.getInfo(weights, data2, weightReportModel, temporary, bmiD, week, gxyKcalStr)); + } else if (reis.equals(weightReportModel.getHyperthyroidismNeedID()) || reis.equals(weightReportModel.getHyperthyroidismID())) { + //甲亢hyperthyroidism + + datas.put("4", this.getDiabetestInfo(weights, data4, weightReportModel, temporary, bmiD, week, gkKcalStr)); + } else if (reis.equals(weightReportModel.getHypothyroidismID()) || reis.equals(weightReportModel.getyLCHypothyroidismID()) || + reis.equals(weightReportModel.getHypothyroidismNeedID())) { + //甲减hypothyroidism + + datas.put("5", this.getDiabetestInfo(weights, data5, weightReportModel, temporary, bmiD, week, gjKcalStr)); + } else if (reis.equals(weightReportModel.getAnemiaPregnancyId()) || reis.equals(weightReportModel.getMildAnemiaID()) || + reis.equals(weightReportModel.getModerateAnemiaID()) || reis.equals(weightReportModel.getSevereAnemiaID()) || + reis.equals(weightReportModel.getSevereAnemiaHBID()) || reis.equals(weightReportModel.getObstructiveAnemiaID())) { + //贫血anemia + datas.put("6", this.getInfo(weights, data0, weightReportModel, temporary, bmiD, week, gxyKcalStr)); + } else if (reis.equals(weightReportModel.getDiseasesDigestiveSystemId()) || reis.equals(weightReportModel.getViralHepatitisId())) { + //急性肝炎acuteHepatitis + datas.put("7", this.getInfo(weights, data1, weightReportModel, temporary, bmiD, week, kcals)); + } else if (reis.equals(weightReportModel.getCirrhosis()) || reis.equals(weightReportModel.getLiverFunctionErrorId())) { + //慢性肝炎chronicHepatitis + datas.put("8", this.getInfo(weights, data6, weightReportModel, temporary, bmiD, week, mxgyKcalStr)); + } + } } } } } + //if (risk.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) { + //return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围，请到医生处进行咨询"); + // } else { + //获取视图 + // } if (datas.size() == 0) { BaseResponse baseResponse = this.report(id, userId, rid); -- 1.8.3.1