Commit 9aa4d72a8f16815a7d490979f9ebf10f2d498fb4
1 parent
29409f9c85
Exists in
master
and in
6 other branches
修改颜色
Showing 2 changed files with 36 additions and 18 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
9aa4d72
| ... | ... | @@ -1732,33 +1732,40 @@ |
| 1732 | 1732 | if (!StringUtils.isNotEmpty(bregmatic) || "1".equals(bregmatic)) { |
| 1733 | 1733 | if (bmiD < 18.5) { |
| 1734 | 1734 | title = "低体重推荐增重均值"; |
| 1735 | - color = "#00CD00"; | |
| 1735 | +// color = "#00CD00"; | |
| 1736 | + color = "#008B00"; | |
| 1736 | 1737 | bmiStr = "BMI<18.5"; |
| 1737 | 1738 | } else if (bmiD >= 18.5 && bmiD <= 24.9) { |
| 1738 | 1739 | title = "标准体重推荐增重均值"; |
| 1739 | - color = "#7EC0EE"; | |
| 1740 | +// color = "#7EC0EE"; | |
| 1741 | + color = "#436EEE"; | |
| 1740 | 1742 | bmiStr = "BMI=18.5-24.9"; |
| 1741 | 1743 | } else if (bmiD > 24.9 && bmiD < 30) { |
| 1742 | 1744 | title = "超重体重推荐增重均值"; |
| 1743 | - color = "#CD3333"; | |
| 1745 | +// color = "#CD3333"; | |
| 1746 | + color = "#CD0000"; | |
| 1744 | 1747 | bmiStr = "BMI=25-29.9"; |
| 1745 | 1748 | } else if (bmiD >= 30) { |
| 1746 | 1749 | title = "肥胖体重推荐增重均值"; |
| 1747 | - color = "#CD00CD"; | |
| 1750 | +// color = "#CD00CD"; | |
| 1751 | + color = "#9400D3"; | |
| 1748 | 1752 | bmiStr = "BMI≥30"; |
| 1749 | 1753 | } |
| 1750 | 1754 | } else { |
| 1751 | 1755 | if (bmiD <= 24.9) { |
| 1752 | 1756 | title = "标准体重推荐增重均值"; |
| 1753 | - color = "#7EC0EE"; | |
| 1757 | +// color = "#7EC0EE"; | |
| 1758 | + color = "#436EEE"; | |
| 1754 | 1759 | bmiStr = "BMI≤24.9"; |
| 1755 | 1760 | } else if (bmiD >= 25 && bmiD <= 29.9) { |
| 1756 | 1761 | title = "超重体重推荐增重均值"; |
| 1757 | - color = "#CD3333"; | |
| 1762 | +// color = "#CD3333"; | |
| 1763 | + color = "#CD0000"; | |
| 1758 | 1764 | bmiStr = "BMI=25-29.9"; |
| 1759 | 1765 | } else if (bmiD >= 30) { |
| 1760 | 1766 | title = "肥胖体重推荐增重均值"; |
| 1761 | - color = "#CD00CD"; | |
| 1767 | +// color = "#CD00CD"; | |
| 1768 | + color = "#9400D3"; | |
| 1762 | 1769 | bmiStr = "BMI≥30"; |
| 1763 | 1770 | } |
| 1764 | 1771 | } |
| 1765 | 1772 | |
| 1766 | 1773 | |
| 1767 | 1774 | |
| 1768 | 1775 | |
| 1769 | 1776 | |
| 1770 | 1777 | |
| ... | ... | @@ -1937,33 +1944,40 @@ |
| 1937 | 1944 | if (!StringUtils.isNotEmpty(bregmatic) || "1".equals(bregmatic)) { |
| 1938 | 1945 | if (bmiD < 18.5) { |
| 1939 | 1946 | title = "低体重推荐增重均值"; |
| 1940 | - color = "#00CD00"; | |
| 1947 | +// color = "#00CD00"; | |
| 1948 | + color = "#008B00"; | |
| 1941 | 1949 | bmiStr = "BMI<18.5"; |
| 1942 | 1950 | } else if (bmiD >= 18.5 && bmiD <= 24.9) { |
| 1943 | 1951 | title = "标准体重推荐增重均值"; |
| 1944 | - color = "#7EC0EE"; | |
| 1952 | +// color = "#7EC0EE"; | |
| 1953 | + color = "#436EEE"; | |
| 1945 | 1954 | bmiStr = "BMI=18.5-24.9"; |
| 1946 | 1955 | } else if (bmiD > 24.9 && bmiD < 30) { |
| 1947 | 1956 | title = "超重体重推荐增重均值"; |
| 1948 | - color = "#CD3333"; | |
| 1957 | +// color = "#CD3333"; | |
| 1958 | + color = "#CD0000"; | |
| 1949 | 1959 | bmiStr = "BMI=25-29.9"; |
| 1950 | 1960 | } else if (bmiD >= 30) { |
| 1951 | 1961 | title = "肥胖体重推荐增重均值"; |
| 1952 | - color = "#CD00CD"; | |
| 1962 | +// color = "#CD00CD"; | |
| 1963 | + color = "#9400D3"; | |
| 1953 | 1964 | bmiStr = "BMI≥30"; |
| 1954 | 1965 | } |
| 1955 | 1966 | } else { |
| 1956 | 1967 | if (bmiD <= 24.9) { |
| 1957 | 1968 | title = "标准体重推荐增重均值"; |
| 1958 | - color = "#7EC0EE"; | |
| 1969 | +// color = "#7EC0EE"; | |
| 1970 | + color = "#436EEE"; | |
| 1959 | 1971 | bmiStr = "BMI≤24.9"; |
| 1960 | 1972 | } else if (bmiD >= 25 && bmiD <= 29.9) { |
| 1961 | 1973 | title = "超重体重推荐增重均值"; |
| 1962 | - color = "#CD3333"; | |
| 1974 | +// color = "#CD3333"; | |
| 1975 | + color = "#CD0000"; | |
| 1963 | 1976 | bmiStr = "BMI=25-29.9"; |
| 1964 | 1977 | } else if (bmiD >= 30) { |
| 1965 | 1978 | title = "肥胖体重推荐增重均值"; |
| 1966 | - color = "#CD00CD"; | |
| 1979 | +// color = "#CD00CD"; | |
| 1980 | + color = "#9400D3"; | |
| 1967 | 1981 | bmiStr = "BMI≥30"; |
| 1968 | 1982 | } |
| 1969 | 1983 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
9aa4d72
| ... | ... | @@ -1162,28 +1162,32 @@ |
| 1162 | 1162 | low2 = 11.9; |
| 1163 | 1163 | high = 3.8; |
| 1164 | 1164 | high2 = 18.1; |
| 1165 | - color = "#00CD00"; | |
| 1165 | +// color = "#00CD00"; | |
| 1166 | + color = "#008B00"; | |
| 1166 | 1167 | } else if (bmiD > 18.5 && bmiD <= 24.9) { |
| 1167 | 1168 | title = "标准体重推荐增重均值"; |
| 1168 | 1169 | low = 1.4; |
| 1169 | 1170 | low2 = 11.9; |
| 1170 | 1171 | high = 3.2; |
| 1171 | 1172 | high2 = 15.9; |
| 1172 | - color = "#7EC0EE"; | |
| 1173 | +// color = "#7EC0EE"; | |
| 1174 | + color = "#436EEE"; | |
| 1173 | 1175 | } else if (bmiD > 24.9 && bmiD < 30) { |
| 1174 | 1176 | title = "超重体重推荐增重均值"; |
| 1175 | 1177 | low = 1.1; |
| 1176 | 1178 | low2 = 7.1; |
| 1177 | 1179 | high = 3.1; |
| 1178 | 1180 | high2 = 11.6; |
| 1179 | - color = "#CD3333"; | |
| 1181 | +// color = "#CD3333"; | |
| 1182 | + color = "#CD0000"; | |
| 1180 | 1183 | } else if (bmiD >= 30) { |
| 1181 | 1184 | title = "肥胖体重推荐增重均值"; |
| 1182 | 1185 | low = 0.8; |
| 1183 | 1186 | low2 = 4.9; |
| 1184 | 1187 | high = 2.1; |
| 1185 | 1188 | high2 = 8.9; |
| 1186 | - color = "#CD00CD"; | |
| 1189 | +// color = "#CD00CD"; | |
| 1190 | + color = "#9400D3"; | |
| 1187 | 1191 | } |
| 1188 | 1192 | |
| 1189 | 1193 | Map<Integer, Double> highMap = new LinkedHashMap<>(); |