diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java
index f6ac16b..794d518 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.pojo;
 
+import org.codehaus.jackson.annotate.JsonProperty;
 import com.lyms.platform.beans.SerialIdEnum;
 import com.lyms.platform.common.result.BaseModel;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -34,83 +35,1133 @@ public class VolumeComponentAnalysisModel extends BaseModel {
     private Integer yn;
     //前囟 单胎/双胎/多胎
     private String bregmatic;
-
-
     private String parentId;
+
+    @JsonProperty("UUID")
     private String uuId;//  ABC-001;,    //单位代码
-    private String deviceID;// 16ART1B0007;       //仪器编号
+    @JsonProperty("deviceType")
     private String deviceType;// BCA-1D;,              //仪器型号
+    private String deviceID;
+
+    @JsonProperty("memberId")
     private String memberId; // 13902345678;,       //测试者编号
+    @JsonProperty("testID")
     private String testID; // ;201704281014;,         //测试序号
+    @JsonProperty("testDate")
     private String testDate; // 20170428;,            //测试日期
+
     private String name;// 张三;,               //姓名（UTF-8编码）
     private String sex;// 1;,                    //性别 （男1，女2）
+
     private String height;// 178.5;,              //身高
     private String birthYear;// 1985;,            //出生年份
+
+    @JsonProperty("Weight")
     private String weight; // 72.5;,              //体重(当前体重)
+
+    @JsonProperty("Fat")
     private String fat;// 23.1;,                 //脂肪
+    @JsonProperty("Bone")
     private String bone;// 3.8;,                //骨质
+    @JsonProperty("Protein")
     private String protein;// 18.6;,             //蛋白质
+    @JsonProperty("Water")
     private String water;// 33.5;,              //水分
+    @JsonProperty("Muscle")
     private String muscle;// 40.1;,             //肌肉
+    @JsonProperty("SMM")
     private String smm;// 18.5;,              //骨骼肌
+    @JsonProperty("PBF")
     private String pbf;// 22.1;,               //体脂百分比
+    @JsonProperty("BMI")
     private String bmi;// 22.4;,              //体质指数
+    @JsonProperty("BMR")
     private String bmr;// 1665.0;,           //基础代谢
+    @JsonProperty("WHR")
     private String whr;// 0.89;,            //腰臀比（2位小数）
+    @JsonProperty("Edema")
     private String edema;// 0.33;,           //水肿系数（2位小数）
+
+    @JsonProperty("LA_edema")
+    private String LA_edema;
+
+    @JsonProperty("LL_edema")
+    private String LL_edema;
+
+    @JsonProperty("VFI")
     private String vfi;// 12.0;,             //内脏脂肪指数
+    @JsonProperty("BodyAge")
     private String bodyAge;// 23;,          //身体年龄
+    @JsonProperty("Score")
     private String score;//78.0;,            //健康评分
+    @JsonProperty("BodyType")
     private String bodyType;// 4;,          //体型判定
+    @JsonProperty("LBM")
     private String lbm;// 50.1;,            //瘦体重（去脂体重）
+
+    @JsonProperty("LA_LBM")
+    private String LA_LBM;//
+    @JsonProperty("OH")
+    private String OH;//
+
+    @JsonProperty("RA100")
+    private String  RA100;
+    @JsonProperty("RA250")
+    private String  RA250;
+    @JsonProperty("RA5")
+    private String  RA5;
+    @JsonProperty("RA50")
+    private String  RA50;
+    @JsonProperty("RA500")
+    private String  RA500;
+
+
+    @JsonProperty("RL100")
+    private String  RL100;
+    @JsonProperty("RL250")
+    private String  RL250;
+    @JsonProperty("RL5")
+    private String  RL5;
+    @JsonProperty("RL50")
+    private String  RL50;
+    @JsonProperty("RL500")
+    private String  RL500;
+
+    @JsonProperty("LA100")
+    private String  LA100;
+    @JsonProperty("LA250")
+    private String  LA250;
+    @JsonProperty("LA5")
+    private String  LA5;
+    @JsonProperty("LA50")
+    private String  LA50;
+    @JsonProperty("LA500")
+    private String  LA500;
+
+    @JsonProperty("ICW")
     private String icw;// 23.0;,            //细胞内液
+
+
+    @JsonProperty("LL100")
+    private String LL100;
+    @JsonProperty("LL250")
+    private String LL250;
+    @JsonProperty("LL5")
+    private String LL5;
+    @JsonProperty("LL50")
+    private String LL50;
+    @JsonProperty("LL500")
+    private String LL500;
+
+    @JsonProperty("ICWMax")
+    private String ICWMax;//
+
+    @JsonProperty("ICWMin")
+    private String ICWMin;//
+
+
+    @JsonProperty("ECW")
     private String ecw;// 10.5;,           //细胞外液
+    @JsonProperty("StandardWeight")
     private String standardWeight;// 70.5;,   //目标体重
+    @JsonProperty("WeightControl")
     private String weightControl;// 2.0;,   //体重控制
+    @JsonProperty("FatControl")
     private String fatControl;// 1.3;,      //脂肪控制量
+    @JsonProperty("MuscleControl")
     private String muscleControl;// 0.7;,  //肌肉控制量
+    @JsonProperty("LiverRisk")
     private String liverRisk;// 65;        //脂肪肝风险系数
+    @JsonProperty("TR_fat")
     private String trFat;// 14.5;,        //躯干脂肪量
+
+    @JsonProperty("LA_ECW")
+    private String LA_ECW;
+    @JsonProperty("LA_ICW")
+    private String LA_ICW;
+
+
+    @JsonProperty("TR_ECW")
+    private String TR_ECW;
+    @JsonProperty("TR_ICW")
+    private String TR_ICW;
+
+    @JsonProperty("TR_LBM")
+    private String TR_LBM;
+
+    @JsonProperty("RL_ECW")
+    private String RL_ECW;
+    @JsonProperty("RL_ICW")
+    private String RL_ICW;
+
+    @JsonProperty("LA_fat")
     private String laFat;// 2.1;,         //左上肢脂肪
+    @JsonProperty("RA_fat")
     private String raFat;// 2.1;,         //右上肢脂肪
+    @JsonProperty("LL_fat")
     private String llFat;// 5.2;,         //左下肢脂肪
+    @JsonProperty("RL_fat")
     private String rlFat;// 5.2;,         //右下肢脂肪
+    @JsonProperty("TR_water")
     private String trWater;// 17.9;,     //躯干水分量
+    @JsonProperty("LA_water")
     private String laWater;// 2.6;,      //左上肢水分
+    @JsonProperty("RA_water")
     private String raWater;// 2.9;,      //右上肢水分
+    @JsonProperty("LL_water")
     private String llWater;// 4.2;,      //左下肢水分
+    @JsonProperty("RL_water")
     private String rlWater;// 4.3;,      //右下肢水分
+    @JsonProperty("TR_muscle")
     private String trMuscle;// 23.9;,     //躯干肌肉量
+    @JsonProperty("LA_muscle")
     private String laMuscle;// 6.6;,      //左上肢肌肉
+    @JsonProperty("RA_muscle")
     private String raMuscle;// 6.9;,      //右上肢肌肉
+    @JsonProperty("LL_muscle")
     private String llMuscle;// 14.2;,      //左下肢肌肉
+    @JsonProperty("RL_muscle")
     private String rlMuscle;// 14.3;      //右下肢肌肉
+    @JsonProperty("WeightMax")
     private String weightMax; // 84.5;,    //体重正常范围的高值
+    @JsonProperty("WeightMin")
     private String weightMin; // 69.5;,    //体重正常范围的低值
+    @JsonProperty("FatMax")
     private String fatMax; // 22.5;,      //脂肪正常范围的高值
+    @JsonProperty("FatMin")
     private String fatMin; // 13.6;,      //脂肪正常范围的低值
+    @JsonProperty("BoneMax")
     private String boneMax; // 3.7;,    //骨质正常范围的高值
+    @JsonProperty("BoneMin")
     private String boneMin; // 3.1;,    //骨质正常范围的低值
+    @JsonProperty("ProteinMax")
     private String proteinMax; // 22.5;,    //蛋白质正常范围的高值
+    @JsonProperty("ProteinMin")
     private String proteinMin; // 17.5;,    //蛋白质正常范围的低值
+    @JsonProperty("WaterMax")
     private String waterMax; // 43.6;,    //水分正常范围的高值
+    @JsonProperty("WaterMin")
     private String waterMin; // 32.5;,    //水分正常范围的低值
+    @JsonProperty("MuscleMax")
     private String muscleMax; // 54.5;,    //肌肉正常范围的高值
+    @JsonProperty("MuscleMin")
     private String muscleMin; // 36.5;,    //肌肉正常范围的低值
+    @JsonProperty("SMMMax")
     private String smmMax; // 32.5;,    //骨骼肌正常范围的高值
+    @JsonProperty("SMMMin")
     private String smmMin; // 24.1;,    //骨骼肌正常范围的低值
+    @JsonProperty("PBFMax")
     private String pbfMax; // 10.0;,    //体脂率正常范围的高值
+    @JsonProperty("PBFMin")
     private String pbfMin; // 20.0;,    //体脂率正常范围的低值
+    @JsonProperty("BMIMax")
     private String bmiMax; // 18.5;,    //体质指数正常范围的高值
+    @JsonProperty("BMIMin")
     private String bmiMin; // 23.9;,    //体质指数正常范围的低值
+    @JsonProperty("WHRMax")
     private String whrMax; // 0.7;,    //腰臀比正常范围的高值
+    @JsonProperty("WHRMin")
     private String whrMin; // 0.8;,    //腰臀比正常范围的低值
+    @JsonProperty("EdemaMax")
     private String edemaMax; // 0.3;,    //水肿系数正常范围的高值
+    @JsonProperty("EdemaMin")
     private String edemaMin; // 0.35;,    //水肿系数正常范围的低值
+    @JsonProperty("VFIMax")
     private String vfiMax; // 5;,    //内脏脂肪指数正常范围的高值
+    @JsonProperty("VFIMin")
     private String vfiMin; // 10;    //内脏脂肪指数正常范围的低值
 
+    @JsonProperty("ArmGrade")
+    private String ArmGrade;
+    @JsonProperty("LA_bone")
+    private String LA_bone;
+    @JsonProperty("LL_bone")
+    private String  LL_bone;
+    @JsonProperty("LegGrade")
+    private String  LegGrade;
+    @JsonProperty("MuscleBalance")
+    private String MuscleBalance;
+    @JsonProperty("RA_bone")
+    private String  RA_bone;
+    @JsonProperty("RL_bone")
+    private String  RL_bone;
+    @JsonProperty("TR_bone")
+    private String TR_bone;
+    @JsonProperty("UID")
+    private String UID;
+    @JsonProperty("WaterPercentMax")
+    private String WaterPercentMax;
+    @JsonProperty("WaterPercentMin")
+    private String  WaterPercentMin;
+
+    @JsonProperty("ASMI")
+    private String  ASMI;
+    @JsonProperty("DW")
+    private String  DW;
+    @JsonProperty("ECWMax")
+    private String  ECWMax;
+    @JsonProperty("Doctor")
+    private String  Doctor;
+
+    @JsonProperty("ECWMin")
+    private String  ECWMin;
+    private String  image_name;
+    private String  message;
+
+
+
+    @JsonProperty("LL_ECW")
+    private String  LL_ECW;
+    @JsonProperty("LL_ICW")
+    private String  LL_ICW;
+    @JsonProperty("LL_LBM")
+    private String  LL_LBM;
+
+    @JsonProperty("T100KCH1")
+    private String T100KCH1;
+    @JsonProperty("T100KCH2")
+    private String T100KCH2;
+    @JsonProperty("T100KCH3")
+    private String T100KCH3;
+    @JsonProperty("T100KCH4")
+    private String T100KCH4;
+    @JsonProperty("T100KCH5")
+    private String T100KCH5;
+    @JsonProperty("T100KCH6")
+    private String T100KCH6;
+    @JsonProperty("T250KCH1")
+    private String T250KCH1;
+    @JsonProperty("T250KCH2")
+    private String T250KCH2;
+    @JsonProperty("T250KCH3")
+    private String T250KCH3;
+    @JsonProperty("T250KCH4")
+    private String T250KCH4;
+    @JsonProperty("T250KCH5")
+    private String T250KCH5;
+    @JsonProperty("T250KCH6")
+    private String T250KCH6;
+    @JsonProperty("T500KCH1")
+    private String T500KCH1;
+    @JsonProperty("T500KCH2")
+    private String T500KCH2;
+    @JsonProperty("T500KCH3")
+    private String T500KCH3;
+    @JsonProperty("T500KCH4")
+    private String T500KCH4;
+    @JsonProperty("T500KCH5")
+    private String T500KCH5;
+    @JsonProperty("T500KCH6")
+    private String T500KCH6;
+    @JsonProperty("T50KCH1")
+    private String T50KCH1;
+    @JsonProperty("T50KCH2")
+    private String T50KCH2;
+    @JsonProperty("T50KCH3")
+    private String T50KCH3;
+    @JsonProperty("T50KCH4")
+    private String T50KCH4;
+    @JsonProperty("T50KCH5")
+    private String T50KCH5;
+    @JsonProperty("T50KCH6")
+    private String T50KCH6;
+    @JsonProperty("T5KCH1")
+    private String T5KCH1;
+    @JsonProperty("T5KCH2")
+    private String T5KCH2;
+    @JsonProperty("T5KCH3")
+    private String T5KCH3;
+    @JsonProperty("T5KCH4")
+    private String T5KCH4;
+    @JsonProperty("T5KCH5")
+    private String T5KCH5;
+    @JsonProperty("T5KCH6")
+    private String T5KCH6;
+    @JsonProperty("TR100")
+    private String TR100;
+    @JsonProperty("TR250")
+    private String TR250;
+    @JsonProperty("TR5")
+    private String TR5;
+    @JsonProperty("TR50")
+    private String TR50;
+    @JsonProperty("TR500")
+    private String TR500;
+
+    @JsonProperty("RA_ECW")
+    private String RA_ECW;
+    @JsonProperty("RA_ICW")
+    private String RA_ICW;
+    @JsonProperty("RA_LBM")
+    private String RA_LBM;
+    @JsonProperty("RA_edema")
+    private String RA_edema;
+    @JsonProperty("RL_edema")
+    private String RL_edema;
+    @JsonProperty("TR_edema")
+    private String TR_edema;
+
+
+    public String getTR_edema() {
+        return TR_edema;
+    }
+
+    public void setTR_edema(String TR_edema) {
+        this.TR_edema = TR_edema;
+    }
+
+    public String getRL_edema() {
+        return RL_edema;
+    }
+
+    public void setRL_edema(String RL_edema) {
+        this.RL_edema = RL_edema;
+    }
+
+    public String getRA_edema() {
+        return RA_edema;
+    }
+
+    public void setRA_edema(String RA_edema) {
+        this.RA_edema = RA_edema;
+    }
+
+    public String getRA_ECW() {
+        return RA_ECW;
+    }
+
+    public void setRA_ECW(String RA_ECW) {
+        this.RA_ECW = RA_ECW;
+    }
+
+    public String getRA_ICW() {
+        return RA_ICW;
+    }
+
+    public void setRA_ICW(String RA_ICW) {
+        this.RA_ICW = RA_ICW;
+    }
+
+    public String getRA_LBM() {
+        return RA_LBM;
+    }
+
+    public void setRA_LBM(String RA_LBM) {
+        this.RA_LBM = RA_LBM;
+    }
+
+    public String getLL_ECW() {
+        return LL_ECW;
+    }
+
+    public void setLL_ECW(String LL_ECW) {
+        this.LL_ECW = LL_ECW;
+    }
+
+    public String getLL_ICW() {
+        return LL_ICW;
+    }
+
+    public void setLL_ICW(String LL_ICW) {
+        this.LL_ICW = LL_ICW;
+    }
+
+    public String getLL_LBM() {
+        return LL_LBM;
+    }
+
+    public void setLL_LBM(String LL_LBM) {
+        this.LL_LBM = LL_LBM;
+    }
+
+    public String getLA100() {
+        return LA100;
+    }
+
+    public void setLA100(String LA100) {
+        this.LA100 = LA100;
+    }
+
+    public String getLA250() {
+        return LA250;
+    }
+
+    public void setLA250(String LA250) {
+        this.LA250 = LA250;
+    }
+
+    public String getLA5() {
+        return LA5;
+    }
+
+    public void setLA5(String LA5) {
+        this.LA5 = LA5;
+    }
+
+    public String getLA50() {
+        return LA50;
+    }
+
+    public void setLA50(String LA50) {
+        this.LA50 = LA50;
+    }
+
+    public String getLA500() {
+        return LA500;
+    }
+
+    public void setLA500(String LA500) {
+        this.LA500 = LA500;
+    }
+
+    public String getLL_edema() {
+        return LL_edema;
+    }
+
+    public void setLL_edema(String LL_edema) {
+        this.LL_edema = LL_edema;
+    }
+
+    public String getTR_LBM() {
+        return TR_LBM;
+    }
+
+    public void setTR_LBM(String TR_LBM) {
+        this.TR_LBM = TR_LBM;
+    }
+
+    public String getTR_ICW() {
+        return TR_ICW;
+    }
+
+    public void setTR_ICW(String TR_ICW) {
+        this.TR_ICW = TR_ICW;
+    }
+
+    public String getTR_ECW() {
+        return TR_ECW;
+    }
+
+    public void setTR_ECW(String TR_ECW) {
+        this.TR_ECW = TR_ECW;
+    }
+
+    public String getLA_edema() {
+        return LA_edema;
+    }
+
+    public void setLA_edema(String LA_edema) {
+        this.LA_edema = LA_edema;
+    }
+
+    public String getLA_LBM() {
+        return LA_LBM;
+    }
+
+    public void setLA_LBM(String LA_LBM) {
+        this.LA_LBM = LA_LBM;
+    }
+
+    public String getOH() {
+        return OH;
+    }
+
+    public void setOH(String OH) {
+        this.OH = OH;
+    }
+
+    public String getRA100() {
+        return RA100;
+    }
+
+    public void setRA100(String RA100) {
+        this.RA100 = RA100;
+    }
+
+    public String getRA250() {
+        return RA250;
+    }
+
+    public void setRA250(String RA250) {
+        this.RA250 = RA250;
+    }
+
+    public String getRA5() {
+        return RA5;
+    }
+
+    public void setRA5(String RA5) {
+        this.RA5 = RA5;
+    }
+
+    public String getRA50() {
+        return RA50;
+    }
+
+    public void setRA50(String RA50) {
+        this.RA50 = RA50;
+    }
+
+    public String getRA500() {
+        return RA500;
+    }
+
+    public void setRA500(String RA500) {
+        this.RA500 = RA500;
+    }
+
+    public String getRL100() {
+        return RL100;
+    }
+
+    public void setRL100(String RL100) {
+        this.RL100 = RL100;
+    }
+
+    public String getRL250() {
+        return RL250;
+    }
+
+    public void setRL250(String RL250) {
+        this.RL250 = RL250;
+    }
+
+    public String getRL5() {
+        return RL5;
+    }
+
+    public void setRL5(String RL5) {
+        this.RL5 = RL5;
+    }
+
+    public String getRL50() {
+        return RL50;
+    }
+
+    public void setRL50(String RL50) {
+        this.RL50 = RL50;
+    }
+
+    public String getRL500() {
+        return RL500;
+    }
+
+    public void setRL500(String RL500) {
+        this.RL500 = RL500;
+    }
+
+    public String getLL100() {
+        return LL100;
+    }
+
+    public void setLL100(String LL100) {
+        this.LL100 = LL100;
+    }
+
+    public String getLL250() {
+        return LL250;
+    }
+
+    public void setLL250(String LL250) {
+        this.LL250 = LL250;
+    }
+
+    public String getLL5() {
+        return LL5;
+    }
+
+    public void setLL5(String LL5) {
+        this.LL5 = LL5;
+    }
+
+    public String getLL50() {
+        return LL50;
+    }
+
+    public void setLL50(String LL50) {
+        this.LL50 = LL50;
+    }
+
+    public String getLL500() {
+        return LL500;
+    }
+
+    public void setLL500(String LL500) {
+        this.LL500 = LL500;
+    }
+
+    public String getICWMax() {
+        return ICWMax;
+    }
+
+    public void setICWMax(String ICWMax) {
+        this.ICWMax = ICWMax;
+    }
+
+    public String getICWMin() {
+        return ICWMin;
+    }
+
+    public void setICWMin(String ICWMin) {
+        this.ICWMin = ICWMin;
+    }
+
+    public String getLA_ECW() {
+        return LA_ECW;
+    }
+
+    public void setLA_ECW(String LA_ECW) {
+        this.LA_ECW = LA_ECW;
+    }
+
+    public String getLA_ICW() {
+        return LA_ICW;
+    }
+
+    public void setLA_ICW(String LA_ICW) {
+        this.LA_ICW = LA_ICW;
+    }
+
+    public String getRL_ECW() {
+        return RL_ECW;
+    }
+
+    public void setRL_ECW(String RL_ECW) {
+        this.RL_ECW = RL_ECW;
+    }
+
+    public String getRL_ICW() {
+        return RL_ICW;
+    }
+
+    public void setRL_ICW(String RL_ICW) {
+        this.RL_ICW = RL_ICW;
+    }
+
+    public String getT100KCH1() {
+        return T100KCH1;
+    }
+
+    public void setT100KCH1(String t100KCH1) {
+        T100KCH1 = t100KCH1;
+    }
+
+    public String getT100KCH2() {
+        return T100KCH2;
+    }
+
+    public void setT100KCH2(String t100KCH2) {
+        T100KCH2 = t100KCH2;
+    }
+
+    public String getT100KCH3() {
+        return T100KCH3;
+    }
+
+    public void setT100KCH3(String t100KCH3) {
+        T100KCH3 = t100KCH3;
+    }
+
+    public String getT100KCH4() {
+        return T100KCH4;
+    }
+
+    public void setT100KCH4(String t100KCH4) {
+        T100KCH4 = t100KCH4;
+    }
+
+    public String getT100KCH5() {
+        return T100KCH5;
+    }
+
+    public void setT100KCH5(String t100KCH5) {
+        T100KCH5 = t100KCH5;
+    }
+
+    public String getT100KCH6() {
+        return T100KCH6;
+    }
+
+    public void setT100KCH6(String t100KCH6) {
+        T100KCH6 = t100KCH6;
+    }
+
+    public String getT250KCH1() {
+        return T250KCH1;
+    }
+
+    public void setT250KCH1(String t250KCH1) {
+        T250KCH1 = t250KCH1;
+    }
+
+    public String getT250KCH2() {
+        return T250KCH2;
+    }
+
+    public void setT250KCH2(String t250KCH2) {
+        T250KCH2 = t250KCH2;
+    }
+
+    public String getT250KCH3() {
+        return T250KCH3;
+    }
+
+    public void setT250KCH3(String t250KCH3) {
+        T250KCH3 = t250KCH3;
+    }
+
+    public String getT250KCH4() {
+        return T250KCH4;
+    }
+
+    public void setT250KCH4(String t250KCH4) {
+        T250KCH4 = t250KCH4;
+    }
+
+    public String getT250KCH5() {
+        return T250KCH5;
+    }
+
+    public void setT250KCH5(String t250KCH5) {
+        T250KCH5 = t250KCH5;
+    }
+
+    public String getT250KCH6() {
+        return T250KCH6;
+    }
+
+    public void setT250KCH6(String t250KCH6) {
+        T250KCH6 = t250KCH6;
+    }
+
+    public String getT500KCH1() {
+        return T500KCH1;
+    }
+
+    public void setT500KCH1(String t500KCH1) {
+        T500KCH1 = t500KCH1;
+    }
+
+    public String getT500KCH2() {
+        return T500KCH2;
+    }
+
+    public void setT500KCH2(String t500KCH2) {
+        T500KCH2 = t500KCH2;
+    }
+
+    public String getT500KCH3() {
+        return T500KCH3;
+    }
+
+    public void setT500KCH3(String t500KCH3) {
+        T500KCH3 = t500KCH3;
+    }
+
+    public String getT500KCH4() {
+        return T500KCH4;
+    }
+
+    public void setT500KCH4(String t500KCH4) {
+        T500KCH4 = t500KCH4;
+    }
+
+    public String getT500KCH5() {
+        return T500KCH5;
+    }
+
+    public void setT500KCH5(String t500KCH5) {
+        T500KCH5 = t500KCH5;
+    }
+
+    public String getT500KCH6() {
+        return T500KCH6;
+    }
+
+    public void setT500KCH6(String t500KCH6) {
+        T500KCH6 = t500KCH6;
+    }
+
+    public String getT50KCH1() {
+        return T50KCH1;
+    }
+
+    public void setT50KCH1(String t50KCH1) {
+        T50KCH1 = t50KCH1;
+    }
+
+    public String getT50KCH2() {
+        return T50KCH2;
+    }
+
+    public void setT50KCH2(String t50KCH2) {
+        T50KCH2 = t50KCH2;
+    }
+
+    public String getT50KCH3() {
+        return T50KCH3;
+    }
+
+    public void setT50KCH3(String t50KCH3) {
+        T50KCH3 = t50KCH3;
+    }
+
+    public String getT50KCH4() {
+        return T50KCH4;
+    }
+
+    public void setT50KCH4(String t50KCH4) {
+        T50KCH4 = t50KCH4;
+    }
+
+    public String getT50KCH5() {
+        return T50KCH5;
+    }
+
+    public void setT50KCH5(String t50KCH5) {
+        T50KCH5 = t50KCH5;
+    }
+
+    public String getT50KCH6() {
+        return T50KCH6;
+    }
+
+    public void setT50KCH6(String t50KCH6) {
+        T50KCH6 = t50KCH6;
+    }
+
+    public String getT5KCH1() {
+        return T5KCH1;
+    }
+
+    public void setT5KCH1(String t5KCH1) {
+        T5KCH1 = t5KCH1;
+    }
+
+    public String getT5KCH2() {
+        return T5KCH2;
+    }
+
+    public void setT5KCH2(String t5KCH2) {
+        T5KCH2 = t5KCH2;
+    }
+
+    public String getT5KCH3() {
+        return T5KCH3;
+    }
+
+    public void setT5KCH3(String t5KCH3) {
+        T5KCH3 = t5KCH3;
+    }
+
+    public String getT5KCH4() {
+        return T5KCH4;
+    }
+
+    public void setT5KCH4(String t5KCH4) {
+        T5KCH4 = t5KCH4;
+    }
+
+    public String getT5KCH5() {
+        return T5KCH5;
+    }
+
+    public void setT5KCH5(String t5KCH5) {
+        T5KCH5 = t5KCH5;
+    }
+
+    public String getT5KCH6() {
+        return T5KCH6;
+    }
+
+    public void setT5KCH6(String t5KCH6) {
+        T5KCH6 = t5KCH6;
+    }
+
+    public String getTR100() {
+        return TR100;
+    }
+
+    public void setTR100(String TR100) {
+        this.TR100 = TR100;
+    }
+
+    public String getTR250() {
+        return TR250;
+    }
+
+    public void setTR250(String TR250) {
+        this.TR250 = TR250;
+    }
+
+    public String getTR5() {
+        return TR5;
+    }
+
+    public void setTR5(String TR5) {
+        this.TR5 = TR5;
+    }
+
+    public String getTR50() {
+        return TR50;
+    }
+
+    public void setTR50(String TR50) {
+        this.TR50 = TR50;
+    }
+
+    public String getTR500() {
+        return TR500;
+    }
+
+    public void setTR500(String TR500) {
+        this.TR500 = TR500;
+    }
+
+    public String getECWMin() {
+        return ECWMin;
+    }
+
+    public void setECWMin(String ECWMin) {
+        this.ECWMin = ECWMin;
+    }
+
+    public String getECWMax() {
+        return ECWMax;
+    }
+
+    public void setECWMax(String ECWMax) {
+        this.ECWMax = ECWMax;
+    }
+
+    public String getDoctor() {
+        return Doctor;
+    }
+
+    public void setDoctor(String doctor) {
+        Doctor = doctor;
+    }
+
+    public String getDW() {
+        return DW;
+    }
+
+    public void setDW(String DW) {
+        this.DW = DW;
+    }
+
+    public String getASMI() {
+        return ASMI;
+    }
+
+    public void setASMI(String ASMI) {
+        this.ASMI = ASMI;
+    }
+
+    public String getArmGrade() {
+        return ArmGrade;
+    }
+
+    public void setArmGrade(String armGrade) {
+        ArmGrade = armGrade;
+    }
+
+    public String getLA_bone() {
+        return LA_bone;
+    }
+
+    public void setLA_bone(String LA_bone) {
+        this.LA_bone = LA_bone;
+    }
+
+    public String getLL_bone() {
+        return LL_bone;
+    }
+
+    public void setLL_bone(String LL_bone) {
+        this.LL_bone = LL_bone;
+    }
+
+    public String getLegGrade() {
+        return LegGrade;
+    }
+
+    public void setLegGrade(String legGrade) {
+        LegGrade = legGrade;
+    }
+
+    public String getMuscleBalance() {
+        return MuscleBalance;
+    }
+
+    public void setMuscleBalance(String muscleBalance) {
+        MuscleBalance = muscleBalance;
+    }
+
+    public String getRA_bone() {
+        return RA_bone;
+    }
+
+    public void setRA_bone(String RA_bone) {
+        this.RA_bone = RA_bone;
+    }
+
+    public String getRL_bone() {
+        return RL_bone;
+    }
+
+    public void setRL_bone(String RL_bone) {
+        this.RL_bone = RL_bone;
+    }
+
+    public String getTR_bone() {
+        return TR_bone;
+    }
+
+    public void setTR_bone(String TR_bone) {
+        this.TR_bone = TR_bone;
+    }
+
+    public String getUID() {
+        return UID;
+    }
+
+    public void setUID(String UID) {
+        this.UID = UID;
+    }
+
+    public String getWaterPercentMax() {
+        return WaterPercentMax;
+    }
+
+    public void setWaterPercentMax(String waterPercentMax) {
+        WaterPercentMax = waterPercentMax;
+    }
+
+    public String getWaterPercentMin() {
+        return WaterPercentMin;
+    }
+
+    public void setWaterPercentMin(String waterPercentMin) {
+        WaterPercentMin = waterPercentMin;
+    }
+
+    public String getImage_name() {
+        return image_name;
+    }
+
+    public void setImage_name(String image_name) {
+        this.image_name = image_name;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
     public String getBregmatic() {
         return bregmatic;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VolumeComponentAnalysisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VolumeComponentAnalysisController.java
index 9a1c519..d83bf5c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VolumeComponentAnalysisController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VolumeComponentAnalysisController.java
@@ -5,15 +5,18 @@ import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
+import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.facade.MeasureInfoFacade;
 import com.lyms.platform.operate.web.facade.VolumeComponentAnalysisFacade;
 import com.lyms.platform.pojo.VolumeComponentAnalysisModel;
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.io.IOException;
 import java.text.ParseException;
 
 /**
@@ -48,8 +51,17 @@ public class VolumeComponentAnalysisController extends BaseController {
      */
     @RequestMapping(method = RequestMethod.POST, value = "/addComponentAnalysis")
     @ResponseBody
-    public BaseObjectResponse addComponentAnalysis(@RequestBody @Valid VolumeComponentAnalysisModel volume) {
-
+//    public BaseObjectResponse addComponentAnalysis(@RequestBody @Valid  VolumeComponentAnalysisModel volume,HttpServletRequest request) {
+    public BaseObjectResponse addComponentAnalysis(HttpServletRequest request) {
+
+        try {
+            String json = IOUtils.toString(request.getInputStream());
+            System.out.println(json);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        VolumeComponentAnalysisModel volume = null;
+        System.out.println(volume);
         return volumeComponentAnalysisFacade.addComponentAnalysis(volume);
 
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index d058d01..ec39cb5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -3371,7 +3371,7 @@ public class BabyBookbuildingFacade {
         babyQuery.setQueryNo(request.getQueryNo());
         //滦平、隆化-儿保管理-全部 加健康/高危筛选
         babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null);
-//        System.out.println(babyQuery.convertToQuery().convertToMongoQuery().toString());
+        System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString());
         List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
 
         return models;
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 2f9778a..f88c049 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
@@ -1,6 +1,8 @@
 package com.lyms.platform.operate.web.facade;
 
 import com.alibaba.druid.util.StringUtils;
+import com.lyms.platform.biz.service.PatientWeightService2;
+import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
@@ -15,8 +17,11 @@ import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
 import com.lyms.platform.operate.web.service.impl.ComputeKulServiceManager;
 import com.lyms.platform.operate.web.utils.ReportConfig;
 import com.lyms.platform.pojo.BodyMassAnalysisModel;
+import com.lyms.platform.pojo.PatientWeight;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.VolumeComponentAnalysisModel;
+import com.lyms.platform.query.PatientsQuery;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -50,8 +55,47 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl {
 
     @Autowired
     private HealthChargeFacade healthChargeFacade;
+    @Autowired
+    private PatientWeightService2 patientWeightService2;
+    @Autowired
+    private PatientsService patientsService;
 
     public BaseObjectResponse addComponentAnalysis(VolumeComponentAnalysisModel volume) {
+
+        BaseObjectResponse objectResponse = new BaseObjectResponse();
+        PatientsQuery patientsQuery = new PatientsQuery();
+        patientsQuery.setType(1);
+        patientsQuery.setCardNo(volume.getMemberId());
+        patientsQuery.setYn(YnEnums.YES.getId());
+        List<Patients> patientses = patientsService.queryPatient(patientsQuery);
+        if (CollectionUtils.isEmpty(patientses)) {
+            objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA);
+            objectResponse.setErrormsg("测量用户还未建档");
+            return objectResponse;
+        }
+
+        Patients pat = patientses.get(0);
+        volume.setPid(pat.getPid());
+        volume.setPatientId(pat.getId());
+        volume.setCertNo(pat.getCardNo());
+        volume.setCertType(pat.getPcerteTypeId());
+        volume.setPhone(pat.getPhone());
+        volume.setVcCardNo(pat.getVcCardNo());
+
+
+        //查询当前测量体重记录
+        List<PatientWeight> patientWeights = patientWeightService2.queryPatientWeight(Query.query(Criteria.where("pid").is(pat.getPid())));
+        if (CollectionUtils.isNotEmpty(patientWeights)) {
+            PatientWeight patientWeight = patientWeights.get(0);
+            if (patientWeight != null)
+            {
+                volume.setBregmatic(patientWeight.getBregmatic());
+                volume.setBeforeWeight(patientWeight.getBeforeWeight());
+            }
+        }
+
+
+
         //20200204 李泉渝 @涛涛 同一天多次测量就是修改
         VolumeComponentAnalysisModel vc= mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(volume.getPatientId())
                 .and("certNo").is(volume.getCertNo())
@@ -67,7 +111,7 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl {
             Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(volume));
             mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(vc.getId())), update, VolumeComponentAnalysisModel.class);
         }
-        BaseObjectResponse objectResponse = new BaseObjectResponse();
+
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
         objectResponse.setErrormsg("成功");
         return objectResponse;