From bbcb4cc5dd14a75e2e04ac6f08635e5611978a25 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 11 Jan 2019 19:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E4=BD=93=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/PatientWeightServiceImpl.java | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

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 7f5c31c..17172bd 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
@@ -1034,13 +1034,19 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
         if (StringUtils.isNotEmpty(range)) {
             String[] array = range.split("-");
             double cz = getDiff(beforeWeight, weight);
-            if ((cz-Double.parseDouble(array[1])) >= add && cz/Double.parseDouble(array[1]) > prcent)
+            if (Double.parseDouble(array[0]) > cz)
             {
-                level = 1;
+                if ((Double.parseDouble(array[0])-cz)*prcent < 1)
+                {
+                    level = -1;
+                }
             }
-            else if ((Double.parseDouble(array[0])-cz) >= add && Double.parseDouble(array[0])/cz > prcent)
+            else if (Double.parseDouble(array[1]) < cz)
             {
-                level = -1;
+                if ((cz-Double.parseDouble(array[1]))*prcent > 1)
+                {
+                    level = 1;
+                }
             }
         }
         return  level;
@@ -1056,29 +1062,29 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
 
             if (bmiD < 18.5) {
                 lbmiStr = "BMI<18.5";
-                level = getLevel( lbmiStr, week, beforeWeight, weight,1,1.2);
+                level = getLevel( lbmiStr, week, beforeWeight, weight,1,0.2);
             } else if (bmiD >= 18.5 && bmiD <= 24.9) {
                 lbmiStr = "BMI=18.5-24.9";
-                level = getLevel( lbmiStr, week, beforeWeight, weight,1,1.2);
+                level = getLevel( lbmiStr, week, beforeWeight, weight,1,0.2);
             } else if (bmiD > 24.9 && bmiD < 30) {
                 lbmiStr = "BMI=25-29.9";
-                level = getLevel( lbmiStr, week, beforeWeight, weight,1,1.25);
+                level = getLevel( lbmiStr, week, beforeWeight, weight,1,0.25);
             } else if (bmiD >= 30) {
                 lbmiStr = "BMI≥30";
-                level = getLevel( lbmiStr, week, beforeWeight, weight,1,1.25);
+                level = getLevel( lbmiStr, week, beforeWeight, weight,1,0.25);
             }
         }
         else
         {
             if (bmiD <= 24.9) {
                 lbmiStr = "BMI≤24.9";
-                level = getDLevel(lbmiStr, week, beforeWeight, weight, 1, 1.15);
+                level = getDLevel(lbmiStr, week, beforeWeight, weight, 1, 0.15);
             } else if (bmiD >= 25 && bmiD <= 29.9) {
                 lbmiStr = "BMI=25-29.9";
-                level = getDLevel(lbmiStr, week, beforeWeight, weight,1,1.2);
+                level = getDLevel(lbmiStr, week, beforeWeight, weight,1,0.2);
             } else if (bmiD >= 30) {
                 lbmiStr = "BMI≥30";
-                level = getDLevel(lbmiStr, week, beforeWeight, weight,1,1.2);
+                level = getDLevel(lbmiStr, week, beforeWeight, weight,1,0.2);
             }
         }
         return level;
-- 
1.8.3.1