From 4db5ed1c66ca6506be73c32248e3fb388dac5647 Mon Sep 17 00:00:00 2001
From: wtt <1872109740@qq.com>
Date: Fri, 14 Feb 2020 15:40:21 +0800
Subject: [PATCH] update

---
 .../web/facade/VolumeComponentAnalysisFacade.java  | 79 ++++++++++++++++++----
 1 file changed, 66 insertions(+), 13 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java
index 2fae930..cacae05 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java
@@ -302,17 +302,24 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl {
             //营养评估
             Map<String, Object> nutritionalAssessment = new HashMap<>();
             nutritionalAssessment.put("nutritionalBmr", volumeComponentAnalysisModel.getBmr());//基础代谢
-            nutritionalAssessment.put("protein", range(DateUtil.getWeek2(patients.getLastMenses(), new Date()),
+          /*  nutritionalAssessment.put("protein", range(DateUtil.getWeek2(patients.getLastMenses(), new Date()),
                     Double.valueOf(volumeComponentAnalysisModel.getWeight()),
                     Double.valueOf(volumeComponentAnalysisModel.getProtein()),
+                    "dbz"));*/
+            nutritionalAssessment.put("protein", rangeNew(
+                    Double.valueOf(volumeComponentAnalysisModel.getProtein()),
+                    Double.valueOf(volumeComponentAnalysisModel.getProteinMax()),
+                    Double.valueOf(volumeComponentAnalysisModel.getProteinMin()),
                     "dbz"));
-            nutritionalAssessment.put("fat", range(DateUtil.getWeek(patients.getLastMenses(), new Date()),
-                    Double.valueOf(volumeComponentAnalysisModel.getWeight()),
+            nutritionalAssessment.put("fat", rangeNew(
                     Double.valueOf(volumeComponentAnalysisModel.getFat()),
+                    Double.valueOf(volumeComponentAnalysisModel.getFatMax()),
+                    Double.valueOf(volumeComponentAnalysisModel.getFatMin()),
                     "zf"));
-            nutritionalAssessment.put("wjy", range(DateUtil.getWeek(patients.getLastMenses(), new Date()),
-                    Double.valueOf(volumeComponentAnalysisModel.getWeight()),
+            nutritionalAssessment.put("wjy", rangeNew(
                     Double.valueOf(volumeComponentAnalysisModel.getBone()),
+                    Double.valueOf(volumeComponentAnalysisModel.getBoneMax()),
+                    Double.valueOf(volumeComponentAnalysisModel.getBoneMin()),
                     "wjy"));
             data.add(nutritionalAssessment);
 
@@ -333,19 +340,22 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl {
 
             //第二、三页开始
             //获取体质
-            String tz = range(DateUtil.getWeek(patients.getLastMenses(), new Date()),
-                    Double.valueOf(volumeComponentAnalysisModel.getWeight()),
-                    Double.valueOf(volumeComponentAnalysisModel.getProtein()),
+            String tz = rangeNew(
+                    Double.valueOf(volumeComponentAnalysisModel.getFat()),
+                    Double.valueOf(volumeComponentAnalysisModel.getFatMax()),
+                    Double.valueOf(volumeComponentAnalysisModel.getFatMin()),
                     "zf");
             //肌肉的计算规则
-            String jr = range(DateUtil.getWeek(patients.getLastMenses(), new Date()),
-                    Double.valueOf(volumeComponentAnalysisModel.getWeight()),
-                    Double.valueOf(volumeComponentAnalysisModel.getProtein()),
+            String jr = rangeNew(
+                    Double.valueOf(volumeComponentAnalysisModel.getMuscle()),
+                    Double.valueOf(volumeComponentAnalysisModel.getMuscleMax()),
+                    Double.valueOf(volumeComponentAnalysisModel.getMuscleMin()),
                     "jr");
             //无机盐
-            String wjy = range(DateUtil.getWeek(patients.getLastMenses(), new Date()),
-                    Double.valueOf(volumeComponentAnalysisModel.getWeight()),
+            String wjy = rangeNew(
                     Double.valueOf(volumeComponentAnalysisModel.getBone()),
+                    Double.valueOf(volumeComponentAnalysisModel.getBoneMax()),
+                    Double.valueOf(volumeComponentAnalysisModel.getBoneMin()),
                     "wjy");
 
             double kulStart = Double.valueOf(kmap.get("kulStart"));
@@ -596,6 +606,49 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl {
         }
         return "";
     }
+
+    /**
+     *最新规则
+//     * @param week 孕周
+//     * @param weight 体重
+     * @param value 蛋白质
+     * @param type  dbz类型
+     * @return
+     */
+    private String  rangeNew(Double value, Double max,Double min,String type) {
+        if ("dbz".equals(type)) {//蛋白质
+            if (value < min) {
+                return "不足";
+            } else {
+                return "正常";
+            }
+        }else if ("zf".equals(type)) {//脂肪
+            if (value < min) {
+                return "不足";//体成分分析体型判定--体脂不足
+            } else if (value > max) {
+                return "过量";//体成分分析体型判定--体脂过量
+            } else {
+                return "正常";//体成分分析体型判定--体脂正常
+            }
+        }else if ("wjy".equals(type)) {//无机盐
+            if (value < min) {
+                return "不足";
+            } else if (value > max) {
+                return "过量";
+            } else {
+                return "正常";
+            }
+        } else if ("jr".equals(type)) {
+            if (value < min) {
+                return "低肌肉";//体成分分析体型判定--肌肉不足
+            }if (value > max) {
+                return "肌肉过量";//体成分分析体型判定--肌肉过量
+            } else {
+                return "正常";//体成分分析体型判定--肌肉正常范围内
+            }
+        }
+        return "";
+    }
     /**
      *
      * @param week 孕周
-- 
1.8.3.1