Commit bbcb4cc5dd14a75e2e04ac6f08635e5611978a25
1 parent
380cc35008
Exists in
master
and in
6 other branches
威海体重
Showing 1 changed file with 17 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
bbcb4cc
... | ... | @@ -1034,13 +1034,19 @@ |
1034 | 1034 | if (StringUtils.isNotEmpty(range)) { |
1035 | 1035 | String[] array = range.split("-"); |
1036 | 1036 | double cz = getDiff(beforeWeight, weight); |
1037 | - if ((cz-Double.parseDouble(array[1])) >= add && cz/Double.parseDouble(array[1]) > prcent) | |
1037 | + if (Double.parseDouble(array[0]) > cz) | |
1038 | 1038 | { |
1039 | - level = 1; | |
1039 | + if ((Double.parseDouble(array[0])-cz)*prcent < 1) | |
1040 | + { | |
1041 | + level = -1; | |
1042 | + } | |
1040 | 1043 | } |
1041 | - else if ((Double.parseDouble(array[0])-cz) >= add && Double.parseDouble(array[0])/cz > prcent) | |
1044 | + else if (Double.parseDouble(array[1]) < cz) | |
1042 | 1045 | { |
1043 | - level = -1; | |
1046 | + if ((cz-Double.parseDouble(array[1]))*prcent > 1) | |
1047 | + { | |
1048 | + level = 1; | |
1049 | + } | |
1044 | 1050 | } |
1045 | 1051 | } |
1046 | 1052 | return level; |
1047 | 1053 | |
1048 | 1054 | |
1049 | 1055 | |
1050 | 1056 | |
1051 | 1057 | |
1052 | 1058 | |
... | ... | @@ -1056,29 +1062,29 @@ |
1056 | 1062 | |
1057 | 1063 | if (bmiD < 18.5) { |
1058 | 1064 | lbmiStr = "BMI<18.5"; |
1059 | - level = getLevel( lbmiStr, week, beforeWeight, weight,1,1.2); | |
1065 | + level = getLevel( lbmiStr, week, beforeWeight, weight,1,0.2); | |
1060 | 1066 | } else if (bmiD >= 18.5 && bmiD <= 24.9) { |
1061 | 1067 | lbmiStr = "BMI=18.5-24.9"; |
1062 | - level = getLevel( lbmiStr, week, beforeWeight, weight,1,1.2); | |
1068 | + level = getLevel( lbmiStr, week, beforeWeight, weight,1,0.2); | |
1063 | 1069 | } else if (bmiD > 24.9 && bmiD < 30) { |
1064 | 1070 | lbmiStr = "BMI=25-29.9"; |
1065 | - level = getLevel( lbmiStr, week, beforeWeight, weight,1,1.25); | |
1071 | + level = getLevel( lbmiStr, week, beforeWeight, weight,1,0.25); | |
1066 | 1072 | } else if (bmiD >= 30) { |
1067 | 1073 | lbmiStr = "BMI≥30"; |
1068 | - level = getLevel( lbmiStr, week, beforeWeight, weight,1,1.25); | |
1074 | + level = getLevel( lbmiStr, week, beforeWeight, weight,1,0.25); | |
1069 | 1075 | } |
1070 | 1076 | } |
1071 | 1077 | else |
1072 | 1078 | { |
1073 | 1079 | if (bmiD <= 24.9) { |
1074 | 1080 | lbmiStr = "BMI≤24.9"; |
1075 | - level = getDLevel(lbmiStr, week, beforeWeight, weight, 1, 1.15); | |
1081 | + level = getDLevel(lbmiStr, week, beforeWeight, weight, 1, 0.15); | |
1076 | 1082 | } else if (bmiD >= 25 && bmiD <= 29.9) { |
1077 | 1083 | lbmiStr = "BMI=25-29.9"; |
1078 | - level = getDLevel(lbmiStr, week, beforeWeight, weight,1,1.2); | |
1084 | + level = getDLevel(lbmiStr, week, beforeWeight, weight,1,0.2); | |
1079 | 1085 | } else if (bmiD >= 30) { |
1080 | 1086 | lbmiStr = "BMI≥30"; |
1081 | - level = getDLevel(lbmiStr, week, beforeWeight, weight,1,1.2); | |
1087 | + level = getDLevel(lbmiStr, week, beforeWeight, weight,1,0.2); | |
1082 | 1088 | } |
1083 | 1089 | } |
1084 | 1090 | return level; |