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 02d9f57..3d76d05 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 @@ -1732,33 +1732,40 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (!StringUtils.isNotEmpty(bregmatic) || "1".equals(bregmatic)) { if (bmiD < 18.5) { title = "低体重推荐增重均值"; - color = "#00CD00"; +// color = "#00CD00"; + color = "#008B00"; bmiStr = "BMI<18.5"; } else if (bmiD >= 18.5 && bmiD <= 24.9) { title = "标准体重推荐增重均值"; - color = "#7EC0EE"; +// color = "#7EC0EE"; + color = "#436EEE"; bmiStr = "BMI=18.5-24.9"; } else if (bmiD > 24.9 && bmiD < 30) { title = "超重体重推荐增重均值"; - color = "#CD3333"; +// color = "#CD3333"; + color = "#CD0000"; bmiStr = "BMI=25-29.9"; } else if (bmiD >= 30) { title = "肥胖体重推荐增重均值"; - color = "#CD00CD"; +// color = "#CD00CD"; + color = "#9400D3"; bmiStr = "BMI≥30"; } } else { if (bmiD <= 24.9) { title = "标准体重推荐增重均值"; - color = "#7EC0EE"; +// color = "#7EC0EE"; + color = "#436EEE"; bmiStr = "BMI≤24.9"; } else if (bmiD >= 25 && bmiD <= 29.9) { title = "超重体重推荐增重均值"; - color = "#CD3333"; +// color = "#CD3333"; + color = "#CD0000"; bmiStr = "BMI=25-29.9"; } else if (bmiD >= 30) { title = "肥胖体重推荐增重均值"; - color = "#CD00CD"; +// color = "#CD00CD"; + color = "#9400D3"; bmiStr = "BMI≥30"; } } @@ -1937,33 +1944,40 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (!StringUtils.isNotEmpty(bregmatic) || "1".equals(bregmatic)) { if (bmiD < 18.5) { title = "低体重推荐增重均值"; - color = "#00CD00"; +// color = "#00CD00"; + color = "#008B00"; bmiStr = "BMI<18.5"; } else if (bmiD >= 18.5 && bmiD <= 24.9) { title = "标准体重推荐增重均值"; - color = "#7EC0EE"; +// color = "#7EC0EE"; + color = "#436EEE"; bmiStr = "BMI=18.5-24.9"; } else if (bmiD > 24.9 && bmiD < 30) { title = "超重体重推荐增重均值"; - color = "#CD3333"; +// color = "#CD3333"; + color = "#CD0000"; bmiStr = "BMI=25-29.9"; } else if (bmiD >= 30) { title = "肥胖体重推荐增重均值"; - color = "#CD00CD"; +// color = "#CD00CD"; + color = "#9400D3"; bmiStr = "BMI≥30"; } } else { if (bmiD <= 24.9) { title = "标准体重推荐增重均值"; - color = "#7EC0EE"; +// color = "#7EC0EE"; + color = "#436EEE"; bmiStr = "BMI≤24.9"; } else if (bmiD >= 25 && bmiD <= 29.9) { title = "超重体重推荐增重均值"; - color = "#CD3333"; +// color = "#CD3333"; + color = "#CD0000"; bmiStr = "BMI=25-29.9"; } else if (bmiD >= 30) { title = "肥胖体重推荐增重均值"; - color = "#CD00CD"; +// color = "#CD00CD"; + color = "#9400D3"; bmiStr = "BMI≥30"; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 3660165..919b6f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -1162,28 +1162,32 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService low2 = 11.9; high = 3.8; high2 = 18.1; - color = "#00CD00"; +// color = "#00CD00"; + color = "#008B00"; } else if (bmiD > 18.5 && bmiD <= 24.9) { title = "标准体重推荐增重均值"; low = 1.4; low2 = 11.9; high = 3.2; high2 = 15.9; - color = "#7EC0EE"; +// color = "#7EC0EE"; + color = "#436EEE"; } else if (bmiD > 24.9 && bmiD < 30) { title = "超重体重推荐增重均值"; low = 1.1; low2 = 7.1; high = 3.1; high2 = 11.6; - color = "#CD3333"; +// color = "#CD3333"; + color = "#CD0000"; } else if (bmiD >= 30) { title = "肥胖体重推荐增重均值"; low = 0.8; low2 = 4.9; high = 2.1; high2 = 8.9; - color = "#CD00CD"; +// color = "#CD00CD"; + color = "#9400D3"; } Map highMap = new LinkedHashMap<>();