Commit e16a4963ac6031db9aaf1599b0ccf5b6e20fb2b8
1 parent
d85a1848c1
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 54 additions and 26 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
View file @
e16a496
| ... | ... | @@ -3035,7 +3035,7 @@ |
| 3035 | 3035 | weighReport.setoDIPId("5aab6d3e422b03d4ad2bf83f"); |
| 3036 | 3036 | weighReport.setoDIPName("糖尿病合并妊娠（无需药物治疗）"); |
| 3037 | 3037 | weighReport.setMedicationDiabetesID("de7468e6-1bb5-4fab-ae84-78857868409a"); |
| 3038 | - weighReport.setModerateAnemiaName("需药物治疗的糖尿病"); | |
| 3038 | + weighReport.setMedicationDiabetesName("需药物治疗的糖尿病"); | |
| 3039 | 3039 | Cell[] cells = s16.getRow(i); |
| 3040 | 3040 | if (cells.length > 0) { |
| 3041 | 3041 | //遍历每行中的每列 |
| ... | ... | @@ -3093,7 +3093,7 @@ |
| 3093 | 3093 | weighReport.setoDIPId("5aab6d3e422b03d4ad2bf83f"); |
| 3094 | 3094 | weighReport.setoDIPName("糖尿病合并妊娠（无需药物治疗）"); |
| 3095 | 3095 | weighReport.setMedicationDiabetesID("de7468e6-1bb5-4fab-ae84-78857868409a"); |
| 3096 | - weighReport.setModerateAnemiaName("需药物治疗的糖尿病"); | |
| 3096 | + weighReport.setMedicationDiabetesName("需药物治疗的糖尿病"); | |
| 3097 | 3097 | Cell[] cells = s17.getRow(i); |
| 3098 | 3098 | if (cells.length > 0) { |
| 3099 | 3099 | //遍历每行中的每列 |
| ... | ... | @@ -3131,7 +3131,7 @@ |
| 3131 | 3131 | weighReport.setoDIPId("5aab6d3e422b03d4ad2bf83f"); |
| 3132 | 3132 | weighReport.setoDIPName("糖尿病合并妊娠（无需药物治疗）"); |
| 3133 | 3133 | weighReport.setMedicationDiabetesID("de7468e6-1bb5-4fab-ae84-78857868409a"); |
| 3134 | - weighReport.setModerateAnemiaName("需药物治疗的糖尿病"); | |
| 3134 | + weighReport.setMedicationDiabetesName("需药物治疗的糖尿病"); | |
| 3135 | 3135 | Cell[] cells = s18.getRow(i); |
| 3136 | 3136 | if (cells.length > 0) { |
| 3137 | 3137 | //遍历每行中的每列 |
| ... | ... | @@ -3168,7 +3168,7 @@ |
| 3168 | 3168 | weighReport.setoDIPId("5aab6d3e422b03d4ad2bf83f"); |
| 3169 | 3169 | weighReport.setoDIPName("糖尿病合并妊娠（无需药物治疗）"); |
| 3170 | 3170 | weighReport.setMedicationDiabetesID("de7468e6-1bb5-4fab-ae84-78857868409a"); |
| 3171 | - weighReport.setModerateAnemiaName("需药物治疗的糖尿病"); | |
| 3171 | + weighReport.setMedicationDiabetesName("需药物治疗的糖尿病"); | |
| 3172 | 3172 | Cell[] cells = s19.getRow(i); |
| 3173 | 3173 | if (cells.length > 0) { |
| 3174 | 3174 | //遍历每行中的每列 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
e16a496
| ... | ... | @@ -1970,7 +1970,6 @@ |
| 1970 | 1970 | String weight = patientWeight.getBeforeWeight();*/ |
| 1971 | 1971 | Double heights = Double.valueOf(patientWeight.getBeforeHeight()).doubleValue() / 100; |
| 1972 | 1972 | int week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); |
| 1973 | - this.getAcuteHepatitis(heights, week); | |
| 1974 | 1973 | //获取胎数 |
| 1975 | 1974 | String bregmatic = patientWeight.getBregmatic(); |
| 1976 | 1975 | //获取bmi值 |
| 1977 | 1976 | |
| ... | ... | @@ -2023,8 +2022,9 @@ |
| 2023 | 2022 | Integer kcal = getRounding((int) this.getAcuteHepatitis(heights, week)); |
| 2024 | 2023 | String kcals = kcal + "kcal"; |
| 2025 | 2024 | //糖尿病计算规则 |
| 2026 | - Integer diabetesKcal = getDiabetesRounding((int) this.getAcuteHepatitis(heights, week)); | |
| 2025 | + Integer diabetesKcal = getDiabetesRounding((int) this.getDiabetes(heights, week)); | |
| 2027 | 2026 | String diabetesKcalStr = diabetesKcal + "kcal"; |
| 2027 | + System.out.println(diabetesKcalStr); | |
| 2028 | 2028 | //甲亢计算规则 |
| 2029 | 2029 | Integer gkKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, patients, patientWeight, heights, 1.45)); |
| 2030 | 2030 | String gkKcalStr = gkKcal + "kcal"; |
| ... | ... | @@ -2034,7 +2034,7 @@ |
| 2034 | 2034 | //获取改孕妇的高危项 |
| 2035 | 2035 | String risk = patients.getRiskLevelId(); |
| 2036 | 2036 | if (risk.contains("eb146c03-b19f-4e28-b85f-fda574b2283b") || risk.contains("224b2329-cb82-4da3-a071-8527f8283aab")) { |
| 2037 | - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围，请咨询医生进行咨询"); | |
| 2037 | + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围，请到医生处进行咨询"); | |
| 2038 | 2038 | } else { |
| 2039 | 2039 | //获取视图 |
| 2040 | 2040 | Map<String, String> dayWeights = patientWeight.getDayWeights(); |
| 2041 | 2041 | |
| 2042 | 2042 | |
| 2043 | 2043 | |
| 2044 | 2044 | |
| ... | ... | @@ -2063,17 +2063,23 @@ |
| 2063 | 2063 | reis.equals(weightReportModel.getMedicationDiabetesID())) { |
| 2064 | 2064 | //糖尿病diabetes |
| 2065 | 2065 | Set set = new HashSet(); |
| 2066 | - if (null != weightReportModel.getgDMId()) { | |
| 2066 | + if (null != weightReportModel.getgDMId() && reiskFactor.contains(weightReportModel.getgDMId())) { | |
| 2067 | 2067 | set.add(weightReportModel.getgDMName()); |
| 2068 | - } else if (null != weightReportModel.getMedicationDiabetesID()) { | |
| 2068 | + } | |
| 2069 | + if (null != weightReportModel.getMedicationDiabetesID() && reiskFactor.contains(weightReportModel.getMedicationDiabetesID())) { | |
| 2070 | + set.add(weightReportModel.getMedicationDiabetesName()); | |
| 2071 | + } | |
| 2072 | + if (null != weightReportModel.getoDIPId() && reiskFactor.contains(weightReportModel.getoDIPId())) { | |
| 2069 | 2073 | set.add(weightReportModel.getoDIPName()); |
| 2070 | 2074 | } |
| 2071 | 2075 | datas.put("1", this.getDiabetestInfo(weights, data3, weightReportModel, patientWeight, patients, bmiD, week, diabetesKcalStr, set)); |
| 2076 | + | |
| 2072 | 2077 | } else if (reis.equals(weightReportModel.getGestationalHypertensionGHID()) || reis.equals(weightReportModel.getChronicHypertensionID())) { |
| 2073 | 2078 | Set set = new HashSet(); |
| 2074 | - if (null != weightReportModel.getGestationalHypertensionGHID()) { | |
| 2079 | + if (null != weightReportModel.getGestationalHypertensionGHID() && reiskFactor.contains(weightReportModel.getGestationalHypertensionGHID())) { | |
| 2075 | 2080 | set.add(weightReportModel.getGestationalHypertensionGHName()); |
| 2076 | - } else if (null != weightReportModel.getChronicHypertensionID()) { | |
| 2081 | + } | |
| 2082 | + if (null != weightReportModel.getChronicHypertensionID() && reiskFactor.contains(weightReportModel.getChronicHypertensionID())) { | |
| 2077 | 2083 | set.add(weightReportModel.getChronicHypertensionName()); |
| 2078 | 2084 | } |
| 2079 | 2085 | //高血压hypertension |
| 2080 | 2086 | |
| ... | ... | @@ -2081,9 +2087,10 @@ |
| 2081 | 2087 | } else if (reis.equals(weightReportModel.getHyperthyroidismNeedID()) || reis.equals(weightReportModel.getHyperthyroidismID())) { |
| 2082 | 2088 | //甲亢hyperthyroidism |
| 2083 | 2089 | Set set = new HashSet(); |
| 2084 | - if (null != weightReportModel.getHyperthyroidismNeedID()) { | |
| 2090 | + if (null != weightReportModel.getHyperthyroidismNeedID() && reiskFactor.contains(weightReportModel.getHyperthyroidismNeedID())) { | |
| 2085 | 2091 | set.add(weightReportModel.getHyperthyroidismName()); |
| 2086 | - } else if (null != weightReportModel.getHyperthyroidismID()) { | |
| 2092 | + } | |
| 2093 | + if (null != weightReportModel.getHyperthyroidismID() && reiskFactor.contains(weightReportModel.getHyperthyroidismID())) { | |
| 2087 | 2094 | set.add(weightReportModel.getHyperthyroidismName()); |
| 2088 | 2095 | } |
| 2089 | 2096 | datas.put("4", this.getDiabetestInfo(weights, data4, weightReportModel, patientWeight, patients, bmiD, week, gkKcalStr, set)); |
| 2090 | 2097 | |
| 2091 | 2098 | |
| ... | ... | @@ -2091,11 +2098,13 @@ |
| 2091 | 2098 | reis.equals(weightReportModel.getHypothyroidismNeedID())) { |
| 2092 | 2099 | //甲减hypothyroidism |
| 2093 | 2100 | Set set = new HashSet(); |
| 2094 | - if (null != weightReportModel.getHypothyroidismID()) { | |
| 2101 | + if (null != weightReportModel.getHypothyroidismID() && reiskFactor.contains(weightReportModel.getHypothyroidismID())) { | |
| 2095 | 2102 | set.add(weightReportModel.getHypothyroidismName()); |
| 2096 | - } else if (null != weightReportModel.getyLCHypothyroidismID()) { | |
| 2103 | + } | |
| 2104 | + if (null != weightReportModel.getyLCHypothyroidismID() && reiskFactor.contains(weightReportModel.getyLCHypothyroidismID())) { | |
| 2097 | 2105 | set.add(weightReportModel.getyLCHypothyroidismName()); |
| 2098 | - } else if (null != weightReportModel.getHypothyroidismNeedID()) { | |
| 2106 | + } | |
| 2107 | + if (null != weightReportModel.getHypothyroidismNeedID() && reiskFactor.contains(weightReportModel.getHypothyroidismNeedID())) { | |
| 2099 | 2108 | set.add(weightReportModel.getHypothyroidismNeedName()); |
| 2100 | 2109 | } |
| 2101 | 2110 | datas.put("5", this.getDiabetestInfo(weights, data5, weightReportModel, patientWeight, patients, bmiD, week, gjKcalStr, set)); |
| 2102 | 2111 | |
| 2103 | 2112 | |
| 2104 | 2113 | |
| 2105 | 2114 | |
| 2106 | 2115 | |
| 2107 | 2116 | |
| 2108 | 2117 | |
| ... | ... | @@ -2103,26 +2112,32 @@ |
| 2103 | 2112 | reis.equals(weightReportModel.getModerateAnemiaID()) || reis.equals(weightReportModel.getSevereAnemiaID()) || |
| 2104 | 2113 | reis.equals(weightReportModel.getSevereAnemiaHBID()) || reis.equals(weightReportModel.getObstructiveAnemiaID())) { |
| 2105 | 2114 | Set set = new HashSet(); |
| 2106 | - if (null != weightReportModel.getAnemiaPregnancyId()) { | |
| 2115 | + if (null != weightReportModel.getAnemiaPregnancyId() && reiskFactor.contains(weightReportModel.getAnemiaPregnancyId())) { | |
| 2107 | 2116 | set.add(weightReportModel.getAnemiaPregnancyName()); |
| 2108 | - } else if (null != weightReportModel.getMildAnemiaID()) { | |
| 2117 | + } | |
| 2118 | + if (null != weightReportModel.getMildAnemiaID() && reiskFactor.contains(weightReportModel.getMildAnemiaID())) { | |
| 2109 | 2119 | set.add(weightReportModel.getMildAnemiaName()); |
| 2110 | - } else if (null != weightReportModel.getModerateAnemiaID()) { | |
| 2120 | + } | |
| 2121 | + if (null != weightReportModel.getModerateAnemiaID() && reiskFactor.contains(weightReportModel.getModerateAnemiaID())) { | |
| 2111 | 2122 | set.add(weightReportModel.getModerateAnemiaName()); |
| 2112 | - } else if (null != weightReportModel.getSevereAnemiaID()) { | |
| 2123 | + } | |
| 2124 | + if (null != weightReportModel.getSevereAnemiaID() && reiskFactor.contains(weightReportModel.getSevereAnemiaID())) { | |
| 2113 | 2125 | set.add(weightReportModel.getSevereAnemiaName()); |
| 2114 | - } else if (null != weightReportModel.getSevereAnemiaHBID()) { | |
| 2126 | + } | |
| 2127 | + if (null != weightReportModel.getSevereAnemiaHBID() && reiskFactor.contains(weightReportModel.getSevereAnemiaHBID())) { | |
| 2115 | 2128 | set.add(weightReportModel.getSevereAnemiaHBName()); |
| 2116 | - } else if (null != weightReportModel.getObstructiveAnemiaID()) { | |
| 2129 | + } | |
| 2130 | + if (null != weightReportModel.getObstructiveAnemiaID() && reiskFactor.contains(weightReportModel.getObstructiveAnemiaID())) { | |
| 2117 | 2131 | set.add(weightReportModel.getObstructiveAnemiaName()); |
| 2118 | 2132 | } |
| 2119 | 2133 | //贫血anemia |
| 2120 | 2134 | datas.put("6", this.getInfo(weights, data0, weightReportModel, patientWeight, patients, bmiD, week, gjKcalStr, set)); |
| 2121 | 2135 | } else if (reis.equals(weightReportModel.getDiseasesDigestiveSystemId()) || reis.equals(weightReportModel.getViralHepatitisId())) { |
| 2122 | 2136 | Set set = new HashSet(); |
| 2123 | - if (null != weightReportModel.getDiseasesDigestiveSystemId()) { | |
| 2137 | + if (null != weightReportModel.getDiseasesDigestiveSystemId() && reiskFactor.contains(weightReportModel.getDiseasesDigestiveSystemId())) { | |
| 2124 | 2138 | set.add(weightReportModel.getDiseasesDigestiveSystemName()); |
| 2125 | - } else if (null != weightReportModel.getViralHepatitisId()) { | |
| 2139 | + } | |
| 2140 | + if (null != weightReportModel.getViralHepatitisId() && reiskFactor.contains(weightReportModel.getViralHepatitisId())) { | |
| 2126 | 2141 | set.add(weightReportModel.getViralHepatitisName()); |
| 2127 | 2142 | } |
| 2128 | 2143 | //急性肝炎acuteHepatitis |
| 2129 | 2144 | |
| ... | ... | @@ -2130,9 +2145,10 @@ |
| 2130 | 2145 | } else if (reis.equals(weightReportModel.getCirrhosis()) || reis.equals(weightReportModel.getLiverFunctionErrorId())) { |
| 2131 | 2146 | //慢性肝炎chronicHepatitis |
| 2132 | 2147 | Set set = new HashSet(); |
| 2133 | - if (null != weightReportModel.getCirrhosis()) { | |
| 2148 | + if (null != weightReportModel.getCirrhosis() && reiskFactor.contains(weightReportModel.getCirrhosis())) { | |
| 2134 | 2149 | set.add(weightReportModel.getCirrhosisName()); |
| 2135 | - } else if (null != weightReportModel.getLiverFunctionErrorId()) { | |
| 2150 | + } | |
| 2151 | + if (null != weightReportModel.getLiverFunctionErrorId() && reiskFactor.contains(weightReportModel.getLiverFunctionErrorId())) { | |
| 2136 | 2152 | set.add(weightReportModel.getLiverFunctionErrorName()); |
| 2137 | 2153 | } |
| 2138 | 2154 | datas.put("8", this.getInfo(weights, data6, weightReportModel, patientWeight, patients, bmiD, week, mxgyKcalStr, set)); |
| ... | ... | @@ -2303,6 +2319,18 @@ |
| 2303 | 2319 | return height * height * 21 * 35 + 340; |
| 2304 | 2320 | } else if (weeks >= 29 && weeks <= 40) { |
| 2305 | 2321 | return height * height * 21 * 35 + 450; |
| 2322 | + } | |
| 2323 | + return 0.0; | |
| 2324 | + } | |
| 2325 | + | |
| 2326 | + | |
| 2327 | + public double getDiabetes(double height, Integer weeks) { | |
| 2328 | + if (weeks > 0 && weeks <= 12) { | |
| 2329 | + return height * height * 21 * 30; | |
| 2330 | + } else if (weeks >= 13 && weeks <= 28) { | |
| 2331 | + return height * height * 21 * 30 + 340; | |
| 2332 | + } else if (weeks >= 29 && weeks <= 40) { | |
| 2333 | + return height * height * 21 * 30 + 450; | |
| 2306 | 2334 | } |
| 2307 | 2335 | return 0.0; |
| 2308 | 2336 | } |