diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
index a6cadfa..86d9e91 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
@@ -3035,7 +3035,7 @@ public class BasicConfigServiceTest {
                     weighReport.setoDIPId("5aab6d3e422b03d4ad2bf83f");
                     weighReport.setoDIPName("糖尿病合并妊娠（无需药物治疗）");
                     weighReport.setMedicationDiabetesID("de7468e6-1bb5-4fab-ae84-78857868409a");
-                    weighReport.setModerateAnemiaName("需药物治疗的糖尿病");
+                    weighReport.setMedicationDiabetesName("需药物治疗的糖尿病");
                     Cell[] cells = s16.getRow(i);
                     if (cells.length > 0) {
                         //遍历每行中的每列
@@ -3093,7 +3093,7 @@ public class BasicConfigServiceTest {
                     weighReport.setoDIPId("5aab6d3e422b03d4ad2bf83f");
                     weighReport.setoDIPName("糖尿病合并妊娠（无需药物治疗）");
                     weighReport.setMedicationDiabetesID("de7468e6-1bb5-4fab-ae84-78857868409a");
-                    weighReport.setModerateAnemiaName("需药物治疗的糖尿病");
+                    weighReport.setMedicationDiabetesName("需药物治疗的糖尿病");
                     Cell[] cells = s17.getRow(i);
                     if (cells.length > 0) {
                         //遍历每行中的每列
@@ -3131,7 +3131,7 @@ public class BasicConfigServiceTest {
                     weighReport.setoDIPId("5aab6d3e422b03d4ad2bf83f");
                     weighReport.setoDIPName("糖尿病合并妊娠（无需药物治疗）");
                     weighReport.setMedicationDiabetesID("de7468e6-1bb5-4fab-ae84-78857868409a");
-                    weighReport.setModerateAnemiaName("需药物治疗的糖尿病");
+                    weighReport.setMedicationDiabetesName("需药物治疗的糖尿病");
                     Cell[] cells = s18.getRow(i);
                     if (cells.length > 0) {
                         //遍历每行中的每列
@@ -3168,7 +3168,7 @@ public class BasicConfigServiceTest {
                     weighReport.setoDIPId("5aab6d3e422b03d4ad2bf83f");
                     weighReport.setoDIPName("糖尿病合并妊娠（无需药物治疗）");
                     weighReport.setMedicationDiabetesID("de7468e6-1bb5-4fab-ae84-78857868409a");
-                    weighReport.setModerateAnemiaName("需药物治疗的糖尿病");
+                    weighReport.setMedicationDiabetesName("需药物治疗的糖尿病");
                     Cell[] cells = s19.getRow(i);
                     if (cells.length > 0) {
                         //遍历每行中的每列
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 9487fdf..8629ed9 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
@@ -1970,7 +1970,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
         String weight = patientWeight.getBeforeWeight();*/
         Double heights = Double.valueOf(patientWeight.getBeforeHeight()).doubleValue() / 100;
         int week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
-        this.getAcuteHepatitis(heights, week);
         //获取胎数
         String bregmatic = patientWeight.getBregmatic();
         //获取bmi值
@@ -2023,8 +2022,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
         Integer kcal = getRounding((int) this.getAcuteHepatitis(heights, week));
         String kcals = kcal + "kcal";
         //糖尿病计算规则
-        Integer diabetesKcal = getDiabetesRounding((int) this.getAcuteHepatitis(heights, week));
+        Integer diabetesKcal = getDiabetesRounding((int) this.getDiabetes(heights, week));
         String diabetesKcalStr = diabetesKcal + "kcal";
+        System.out.println(diabetesKcalStr);
         //甲亢计算规则
         Integer gkKcal = this.getRounding((int) this.getKcal(bregmatic, residualWeight, low, high, week, bmiD, patients, patientWeight, heights, 1.45));
         String gkKcalStr = gkKcal + "kcal";
@@ -2034,7 +2034,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
         //获取改孕妇的高危项
         String risk = patients.getRiskLevelId();
         if (risk.contains("eb146c03-b19f-4e28-b85f-fda574b2283b") || risk.contains("224b2329-cb82-4da3-a071-8527f8283aab")) {
-            return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围，请咨询医生进行咨询");
+            return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("警告").setData("该风险已超过管控范围，请到医生处进行咨询");
         } else {
             //获取视图
             Map<String, String> dayWeights = patientWeight.getDayWeights();
@@ -2063,17 +2063,23 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
                                 reis.equals(weightReportModel.getMedicationDiabetesID())) {
                             //糖尿病diabetes
                             Set set = new HashSet();
-                            if (null != weightReportModel.getgDMId()) {
+                            if (null != weightReportModel.getgDMId() && reiskFactor.contains(weightReportModel.getgDMId())) {
                                 set.add(weightReportModel.getgDMName());
-                            } else if (null != weightReportModel.getMedicationDiabetesID()) {
+                            }
+                            if (null != weightReportModel.getMedicationDiabetesID() && reiskFactor.contains(weightReportModel.getMedicationDiabetesID())) {
+                                set.add(weightReportModel.getMedicationDiabetesName());
+                            }
+                            if (null != weightReportModel.getoDIPId() && reiskFactor.contains(weightReportModel.getoDIPId())) {
                                 set.add(weightReportModel.getoDIPName());
                             }
                             datas.put("1", this.getDiabetestInfo(weights, data3, weightReportModel, patientWeight, patients, bmiD, week, diabetesKcalStr, set));
+
                         } else if (reis.equals(weightReportModel.getGestationalHypertensionGHID()) || reis.equals(weightReportModel.getChronicHypertensionID())) {
                             Set set = new HashSet();
-                            if (null != weightReportModel.getGestationalHypertensionGHID()) {
+                            if (null != weightReportModel.getGestationalHypertensionGHID() && reiskFactor.contains(weightReportModel.getGestationalHypertensionGHID())) {
                                 set.add(weightReportModel.getGestationalHypertensionGHName());
-                            } else if (null != weightReportModel.getChronicHypertensionID()) {
+                            }
+                            if (null != weightReportModel.getChronicHypertensionID() && reiskFactor.contains(weightReportModel.getChronicHypertensionID())) {
                                 set.add(weightReportModel.getChronicHypertensionName());
                             }
                             //高血压hypertension
@@ -2081,9 +2087,10 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
                         } else if (reis.equals(weightReportModel.getHyperthyroidismNeedID()) || reis.equals(weightReportModel.getHyperthyroidismID())) {
                             //甲亢hyperthyroidism
                             Set set = new HashSet();
-                            if (null != weightReportModel.getHyperthyroidismNeedID()) {
+                            if (null != weightReportModel.getHyperthyroidismNeedID() && reiskFactor.contains(weightReportModel.getHyperthyroidismNeedID())) {
                                 set.add(weightReportModel.getHyperthyroidismName());
-                            } else if (null != weightReportModel.getHyperthyroidismID()) {
+                            }
+                            if (null != weightReportModel.getHyperthyroidismID() && reiskFactor.contains(weightReportModel.getHyperthyroidismID())) {
                                 set.add(weightReportModel.getHyperthyroidismName());
                             }
                             datas.put("4", this.getDiabetestInfo(weights, data4, weightReportModel, patientWeight, patients, bmiD, week, gkKcalStr, set));
@@ -2091,11 +2098,13 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
                                 reis.equals(weightReportModel.getHypothyroidismNeedID())) {
                             //甲减hypothyroidism
                             Set set = new HashSet();
-                            if (null != weightReportModel.getHypothyroidismID()) {
+                            if (null != weightReportModel.getHypothyroidismID() && reiskFactor.contains(weightReportModel.getHypothyroidismID())) {
                                 set.add(weightReportModel.getHypothyroidismName());
-                            } else if (null != weightReportModel.getyLCHypothyroidismID()) {
+                            }
+                            if (null != weightReportModel.getyLCHypothyroidismID() && reiskFactor.contains(weightReportModel.getyLCHypothyroidismID())) {
                                 set.add(weightReportModel.getyLCHypothyroidismName());
-                            } else if (null != weightReportModel.getHypothyroidismNeedID()) {
+                            }
+                            if (null != weightReportModel.getHypothyroidismNeedID() && reiskFactor.contains(weightReportModel.getHypothyroidismNeedID())) {
                                 set.add(weightReportModel.getHypothyroidismNeedName());
                             }
                             datas.put("5", this.getDiabetestInfo(weights, data5, weightReportModel, patientWeight, patients, bmiD, week, gjKcalStr, set));
@@ -2103,26 +2112,32 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
                                 reis.equals(weightReportModel.getModerateAnemiaID()) || reis.equals(weightReportModel.getSevereAnemiaID()) ||
                                 reis.equals(weightReportModel.getSevereAnemiaHBID()) || reis.equals(weightReportModel.getObstructiveAnemiaID())) {
                             Set set = new HashSet();
-                            if (null != weightReportModel.getAnemiaPregnancyId()) {
+                            if (null != weightReportModel.getAnemiaPregnancyId() && reiskFactor.contains(weightReportModel.getAnemiaPregnancyId())) {
                                 set.add(weightReportModel.getAnemiaPregnancyName());
-                            } else if (null != weightReportModel.getMildAnemiaID()) {
+                            }
+                            if (null != weightReportModel.getMildAnemiaID() && reiskFactor.contains(weightReportModel.getMildAnemiaID())) {
                                 set.add(weightReportModel.getMildAnemiaName());
-                            } else if (null != weightReportModel.getModerateAnemiaID()) {
+                            }
+                            if (null != weightReportModel.getModerateAnemiaID() && reiskFactor.contains(weightReportModel.getModerateAnemiaID())) {
                                 set.add(weightReportModel.getModerateAnemiaName());
-                            } else if (null != weightReportModel.getSevereAnemiaID()) {
+                            }
+                            if (null != weightReportModel.getSevereAnemiaID() && reiskFactor.contains(weightReportModel.getSevereAnemiaID())) {
                                 set.add(weightReportModel.getSevereAnemiaName());
-                            } else if (null != weightReportModel.getSevereAnemiaHBID()) {
+                            }
+                            if (null != weightReportModel.getSevereAnemiaHBID() && reiskFactor.contains(weightReportModel.getSevereAnemiaHBID())) {
                                 set.add(weightReportModel.getSevereAnemiaHBName());
-                            } else if (null != weightReportModel.getObstructiveAnemiaID()) {
+                            }
+                            if (null != weightReportModel.getObstructiveAnemiaID() && reiskFactor.contains(weightReportModel.getObstructiveAnemiaID())) {
                                 set.add(weightReportModel.getObstructiveAnemiaName());
                             }
                             //贫血anemia
                             datas.put("6", this.getInfo(weights, data0, weightReportModel, patientWeight, patients, bmiD, week, gjKcalStr, set));
                         } else if (reis.equals(weightReportModel.getDiseasesDigestiveSystemId()) || reis.equals(weightReportModel.getViralHepatitisId())) {
                             Set set = new HashSet();
-                            if (null != weightReportModel.getDiseasesDigestiveSystemId()) {
+                            if (null != weightReportModel.getDiseasesDigestiveSystemId() && reiskFactor.contains(weightReportModel.getDiseasesDigestiveSystemId())) {
                                 set.add(weightReportModel.getDiseasesDigestiveSystemName());
-                            } else if (null != weightReportModel.getViralHepatitisId()) {
+                            }
+                            if (null != weightReportModel.getViralHepatitisId() && reiskFactor.contains(weightReportModel.getViralHepatitisId())) {
                                 set.add(weightReportModel.getViralHepatitisName());
                             }
                             //急性肝炎acuteHepatitis
@@ -2130,9 +2145,10 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
                         } else if (reis.equals(weightReportModel.getCirrhosis()) || reis.equals(weightReportModel.getLiverFunctionErrorId())) {
                             //慢性肝炎chronicHepatitis
                             Set set = new HashSet();
-                            if (null != weightReportModel.getCirrhosis()) {
+                            if (null != weightReportModel.getCirrhosis() && reiskFactor.contains(weightReportModel.getCirrhosis())) {
                                 set.add(weightReportModel.getCirrhosisName());
-                            } else if (null != weightReportModel.getLiverFunctionErrorId()) {
+                            }
+                            if (null != weightReportModel.getLiverFunctionErrorId() && reiskFactor.contains(weightReportModel.getLiverFunctionErrorId())) {
                                 set.add(weightReportModel.getLiverFunctionErrorName());
                             }
                             datas.put("8", this.getInfo(weights, data6, weightReportModel, patientWeight, patients, bmiD, week, mxgyKcalStr, set));
@@ -2307,6 +2323,18 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
         return 0.0;
     }
 
+
+    public double getDiabetes(double height, Integer weeks) {
+        if (weeks > 0 && weeks <= 12) {
+            return height * height * 21 * 30;
+        } else if (weeks >= 13 && weeks <= 28) {
+            return height * height * 21 * 30 + 340;
+        } else if (weeks >= 29 && weeks <= 40) {
+            return height * height * 21 * 30 + 450;
+        }
+        return 0.0;
+    }
+
     public int getDiabetesRounding(Integer number) {
         if (number <= 1200) {
             return 1200;