jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b750b911291f27e7a59d0a3552802beb6585f0b1

Authored by wangbo
1 parent aca47650c9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

权限判断修改

Showing 2 changed files with 20 additions and 30 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ b750b91
... ... @@ -1402,15 +1402,18 @@
1402 1402 patientBaseResult.setPwId(pw.getId());
1403 1403 }
1404 1404 //高危报告权限判断
1405   - String HealthyId = "d42eec03-aa86-45b8-a4e0-78a0ff365fb6";//健康id//
1406   - String bmiId = "a427da89-594a-46c2-b9f7-1b0d355ce54c";//28＞BMI＞25
1407   - String bmiIdStr = "5a40c6c5422b03d4ad2bf7bd";//BMI＜18.5
1408   - if (null == patients.getRiskFactorId() || patients.getRiskFactorId().contains(HealthyId) || patients.getRiskFactorId().contains(bmiId) || patients.getRiskFactorId().contains(bmiIdStr)) {
  1405 + List<String> healthy = new ArrayList();
  1406 + healthy.add("d42eec03-aa86-45b8-a4e0-78a0ff365fb6");//健康id//
  1407 + healthy.add("a427da89-594a-46c2-b9f7-1b0d355ce54c");//28＞BMI＞25
  1408 + healthy.add("5a40c6c5422b03d4ad2bf7bd");//BMI＜18.5
  1409 + if (null == patients.getRiskFactorId() || healthy.containsAll(patients.getRiskFactorId())) {
1409 1410 patientBaseResult.setFlag(false);
1410 1411 } else {
1411 1412 patientBaseResult.setFlag(true);
1412 1413 }
1413 1414 return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
1414 1415 }
  1416 +
  1417 +
1415 1418 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ b750b91
... ... @@ -2062,8 +2062,7 @@
2062 2062 Set set = new HashSet();
2063 2063 if (null != weightReportModel.getgDMId()) {
2064 2064 set.add(weightReportModel.getgDMName());
2065   - }
2066   - if (null != weightReportModel.getMedicationDiabetesID()) {
  2065 + } else if (null != weightReportModel.getMedicationDiabetesID()) {
2067 2066 set.add(weightReportModel.getoDIPName());
2068 2067 }
2069 2068 datas.put("1", this.getDiabetestInfo(weights, data3, weightReportModel, patientWeight, patients, bmiD, week, diabetesKcalStr, set));
... ... @@ -2071,8 +2070,7 @@
2071 2070 Set set = new HashSet();
2072 2071 if (null != weightReportModel.getGestationalHypertensionGHID()) {
2073 2072 set.add(weightReportModel.getGestationalHypertensionGHName());
2074   - }
2075   - if (null != weightReportModel.getChronicHypertensionID()) {
  2073 + } else if (null != weightReportModel.getChronicHypertensionID()) {
2076 2074 set.add(weightReportModel.getChronicHypertensionName());
2077 2075 }
2078 2076 //高血压hypertension
2079 2077  
... ... @@ -2081,10 +2079,8 @@
2081 2079 //甲亢hyperthyroidism
2082 2080 Set set = new HashSet();
2083 2081 if (null != weightReportModel.getHyperthyroidismNeedID()) {
2084   -
2085 2082 set.add(weightReportModel.getHyperthyroidismName());
2086   - }
2087   - if (null != weightReportModel.getHyperthyroidismID()) {
  2083 + } else if (null != weightReportModel.getHyperthyroidismID()) {
2088 2084 set.add(weightReportModel.getHyperthyroidismName());
2089 2085 }
2090 2086 datas.put("4", this.getDiabetestInfo(weights, data4, weightReportModel, patientWeight, patients, bmiD, week, gkKcalStr, set));
2091 2087  
... ... @@ -2094,11 +2090,9 @@
2094 2090 Set set = new HashSet();
2095 2091 if (null != weightReportModel.getHypothyroidismID()) {
2096 2092 set.add(weightReportModel.getHypothyroidismName());
2097   - }
2098   - if (null != weightReportModel.getyLCHypothyroidismID()) {
  2093 + } else if (null != weightReportModel.getyLCHypothyroidismID()) {
2099 2094 set.add(weightReportModel.getyLCHypothyroidismName());
2100   - }
2101   - if (null != weightReportModel.getHypothyroidismNeedID()) {
  2095 + } else if (null != weightReportModel.getHypothyroidismNeedID()) {
2102 2096 set.add(weightReportModel.getHypothyroidismNeedName());
2103 2097 }
2104 2098 datas.put("5", this.getDiabetestInfo(weights, data5, weightReportModel, patientWeight, patients, bmiD, week, gjKcalStr, set));
2105 2099  
2106 2100  
2107 2101  
2108 2102  
... ... @@ -2108,20 +2102,15 @@
2108 2102 Set set = new HashSet();
2109 2103 if (null != weightReportModel.getAnemiaPregnancyId()) {
2110 2104 set.add(weightReportModel.getAnemiaPregnancyName());
2111   - }
2112   - if (null != weightReportModel.getMildAnemiaID()) {
  2105 + } else if (null != weightReportModel.getMildAnemiaID()) {
2113 2106 set.add(weightReportModel.getMildAnemiaName());
2114   - }
2115   - if (null != weightReportModel.getModerateAnemiaID()) {
  2107 + } else if (null != weightReportModel.getModerateAnemiaID()) {
2116 2108 set.add(weightReportModel.getModerateAnemiaName());
2117   - }
2118   - if (null != weightReportModel.getSevereAnemiaID()) {
  2109 + } else if (null != weightReportModel.getSevereAnemiaID()) {
2119 2110 set.add(weightReportModel.getSevereAnemiaName());
2120   - }
2121   - if (null != weightReportModel.getSevereAnemiaHBID()) {
  2111 + } else if (null != weightReportModel.getSevereAnemiaHBID()) {
2122 2112 set.add(weightReportModel.getSevereAnemiaHBName());
2123   - }
2124   - if (null != weightReportModel.getObstructiveAnemiaID()) {
  2113 + } else if (null != weightReportModel.getObstructiveAnemiaID()) {
2125 2114 set.add(weightReportModel.getObstructiveAnemiaName());
2126 2115 }
2127 2116 //贫血anemia
... ... @@ -2130,8 +2119,7 @@
2130 2119 Set set = new HashSet();
2131 2120 if (null != weightReportModel.getDiseasesDigestiveSystemId()) {
2132 2121 set.add(weightReportModel.getDiseasesDigestiveSystemName());
2133   - }
2134   - if (null != weightReportModel.getViralHepatitisId()) {
  2122 + } else if (null != weightReportModel.getViralHepatitisId()) {
2135 2123 set.add(weightReportModel.getViralHepatitisName());
2136 2124 }
2137 2125 //急性肝炎acuteHepatitis
... ... @@ -2141,8 +2129,7 @@
2141 2129 Set set = new HashSet();
2142 2130 if (null != weightReportModel.getCirrhosis()) {
2143 2131 set.add(weightReportModel.getCirrhosisName());
2144   - }
2145   - if (null != weightReportModel.getLiverFunctionErrorId()) {
  2132 + } else if (null != weightReportModel.getLiverFunctionErrorId()) {
2146 2133 set.add(weightReportModel.getLiverFunctionErrorName());
2147 2134 }
2148 2135 datas.put("8", this.getInfo(weights, data6, weightReportModel, patientWeight, patients, bmiD, week, mxgyKcalStr, set));