From 0d3d7081a7b98693f2a93e0e01009481f3d0a1eb Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Fri, 2 Jul 2021 18:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E8=A1=80=E5=8E=8B=E9=AB=98=E8=A1=80?=
 =?UTF-8?q?=E8=84=82=E9=97=AE=E5=8D=B7=E3=80=81=E5=90=88=E5=90=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B95.1=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 running/pdf/contract.pdf                      | Bin 695221 -> 754618 bytes
 .../domain/SysCustomerHealthyExtended.java    |  20 +++
 .../service/impl/SysOrderServiceImpl.java     |   6 +
 .../SysCustomerHealthyExtendedMapper.xml      |  25 +++-
 .../custom/SysCustomerHealthyMapper.xml       |  10 +-
 .../src/components/HealthyForm/Form8.vue      |  32 ++++
 .../components/HealthyForm/FormExtended.vue   | 140 +++++++++++++++++-
 .../components/PhysicalSignsDialog/index.vue  |   6 +-
 stdiet-ui/src/utils/healthyData.js            | 127 ++++++++++++++--
 .../src/views/custom/signContract/index.vue   |   4 +-
 .../custom/subhealthy/investigation/index.vue |  46 ++++++
 11 files changed, 395 insertions(+), 21 deletions(-)

diff --git a/running/pdf/contract.pdf b/running/pdf/contract.pdf
index 4daa96abcd7fa16751db09648d0f6760c431347d..f3cf0193ef9f8fa691898dd22bbbf604b279fd8f 100644
GIT binary patch
delta 24809
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

delta 29
kcmdnhuD5l&RznM83sVbo3rh=Y3tJ0&3r7p*7Ot(c0i-$#WdHyG

diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthyExtended.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthyExtended.java
index 8fa32eb22..d642b6122 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthyExtended.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthyExtended.java
@@ -41,6 +41,18 @@ public class SysCustomerHealthyExtended extends BaseEntity
     @Excel(name = "长时间服用药物信息：药物类型、药物名称、用药量、用药时间")
     private String longEatDrugMessage;
 
+    /** 服药依从性 */
+    @Excel(name = "服药依从性")
+    private String medicationCompliance;
+
+    /** 药物不良反应标识 */
+    @Excel(name = "药物不良反应标识")
+    private Long adverseReactionsFlag;
+
+    /** 药物不良反应 */
+    @Excel(name = "药物不良反应")
+    private String adverseReactions;
+
     /** 血糖相关信息 */
     @Excel(name = "血糖相关信息")
     private String bloodSugarMessage;
@@ -69,6 +81,14 @@ public class SysCustomerHealthyExtended extends BaseEntity
     @Excel(name = "产后调理信息")
     private String postpartumConditioningMessage;
 
+    /** 高血压信息 */
+    @Excel(name = "高血压信息")
+    private String hypertensionMessage;
+
+    /** 高血脂信息 */
+    @Excel(name = "高血脂信息")
+    private String hyperlipidemiaMessage;
+
     /** 删除标识 0未删除 1已删除 */
     private Long delFlag;
 }
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
index b4cc5a2bd..3e22eddef 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
@@ -285,6 +286,11 @@ public class SysOrderServiceImpl implements ISysOrderService {
                 sysOrder.setCommissStartTime(sysOrder.getStartTime());
             }
         }
+        //旧开始时间为空时，提成计算时间修改为订单成交时间的后三天
+        if(oldSysOrder.getStartTime() == null){
+            LocalDate orderDate = DateUtils.dateToLocalDate(sysOrder.getOrderTime()).plusDays(3);
+            sysOrder.setCommissStartTime(DateUtils.localDateToDate(orderDate));
+        }
         //更新订单
         int row = sysOrderMapper.updateSysOrder(sysOrder);
         // 审核后的订单才生成食谱
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml
index 479a15449..39cca1466 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml
@@ -11,6 +11,9 @@
         <result property="hipline"    column="hipline"    />
         <result property="eatFruitsMessage"    column="eat_fruits_message"    />
         <result property="longEatDrugMessage"    column="long_eat_drug_message"    />
+        <result property="medicationCompliance"    column="medication_compliance"    />
+        <result property="adverseReactionsFlag"    column="adverse_reactions_flag"    />
+        <result property="adverseReactions"    column="adverse_reactions"    />
         <result property="bloodSugarMessage"    column="blood_sugar_message"    />
         <result property="depressedStateMessage"    column="depressed_state_message"    />
         <result property="bloodPressureMessage"    column="blood_pressure_message"    />
@@ -18,12 +21,15 @@
         <result property="menstruationMessage"    column="menstruation_message"    />
         <result property="gastrointestinalMessage"    column="gastrointestinal_message"    />
         <result property="postpartumConditioningMessage"    column="postpartum_conditioning_message"    />
+        <result property="hypertensionMessage"    column="hypertension_message"    />
+        <result property="hyperlipidemiaMessage"    column="hyperlipidemia_message"    />
         <result property="delFlag"    column="del_flag"    />
     </resultMap>
 
     <sql id="selectSysCustomerHealthyExtendedVo">
-        select id, healthy_id, waist, hipline, eat_fruits_message, long_eat_drug_message, blood_sugar_message, depressed_state_message, blood_pressure_message, anxiety_state_message, menstruation_messag,
-        gastrointestinal_message,postpartum_conditioning_message,del_flag
+        select id, healthy_id, waist, hipline, eat_fruits_message, long_eat_drug_message, medication_compliance,adverse_reactions_flag,adverse_reactions,
+        blood_sugar_message, depressed_state_message, blood_pressure_message, anxiety_state_message, menstruation_messag,
+        gastrointestinal_message,postpartum_conditioning_message,hypertension_message,hyperlipidemia_message,del_flag
          from sys_customer_healthy_extended
     </sql>
 
@@ -44,6 +50,9 @@
             <if test="hipline != null">hipline,</if>
             <if test="eatFruitsMessage != null">eat_fruits_message,</if>
             <if test="longEatDrugMessage != null">long_eat_drug_message,</if>
+            <if test="medicationCompliance != null">medication_compliance,</if>
+            <if test="adverseReactionsFlag != null">adverse_reactions_flag,</if>
+            <if test="adverseReactions != null">adverse_reactions,</if>
             <if test="bloodSugarMessage != null">blood_sugar_message,</if>
             <if test="depressedStateMessage != null">depressed_state_message,</if>
             <if test="bloodPressureMessage != null">blood_pressure_message,</if>
@@ -51,6 +60,8 @@
             <if test="menstruationMessage != null">menstruation_message,</if>
             <if test="gastrointestinalMessage != null">gastrointestinal_message,</if>
             <if test="postpartumConditioningMessage != null">postpartum_conditioning_message,</if>
+            <if test="hypertensionMessage != null">hypertension_message,</if>
+            <if test="hyperlipidemiaMessage != null">hyperlipidemia_message,</if>
             <if test="delFlag != null">del_flag,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -59,6 +70,9 @@
             <if test="hipline != null">#{hipline},</if>
             <if test="eatFruitsMessage != null">#{eatFruitsMessage},</if>
             <if test="longEatDrugMessage != null">#{longEatDrugMessage},</if>
+            <if test="medicationCompliance != null">#{medicationCompliance},</if>
+            <if test="adverseReactionsFlag != null">#{adverseReactionsFlag},</if>
+            <if test="adverseReactions != null">#{adverseReactions},</if>
             <if test="bloodSugarMessage != null">#{bloodSugarMessage},</if>
             <if test="depressedStateMessage != null">#{depressedStateMessage},</if>
             <if test="bloodPressureMessage != null">#{bloodPressureMessage},</if>
@@ -66,6 +80,8 @@
             <if test="menstruationMessage != null">#{menstruationMessage},</if>
             <if test="gastrointestinalMessage != null">#{gastrointestinalMessage},</if>
             <if test="postpartumConditioningMessage != null">#{postpartumConditioningMessage},</if>
+            <if test="hypertensionMessage != null">#{hypertensionMessage},</if>
+            <if test="hyperlipidemiaMessage != null">#{hyperlipidemiaMessage},</if>
             <if test="delFlag != null">#{delFlag},</if>
         </trim>
     </insert>
@@ -78,6 +94,9 @@
             <if test="hipline != null">hipline = #{hipline},</if>
             <if test="eatFruitsMessage != null">eat_fruits_message = #{eatFruitsMessage},</if>
             <if test="longEatDrugMessage != null">long_eat_drug_message = #{longEatDrugMessage},</if>
+            <if test="medicationCompliance != null">medication_compliance = #{medicationCompliance},</if>
+            <if test="adverseReactionsFlag != null">adverse_reactions_flag = #{adverseReactionsFlag},</if>
+            <if test="adverseReactions != null">adverse_reactions = #{adverseReactions},</if>
             <if test="bloodSugarMessage != null">blood_sugar_message = #{bloodSugarMessage},</if>
             <if test="depressedStateMessage != null">depressed_state_message = #{depressedStateMessage},</if>
             <if test="bloodPressureMessage != null">blood_pressure_message = #{bloodPressureMessage},</if>
@@ -85,6 +104,8 @@
             <if test="menstruationMessage != null">menstruation_message = #{menstruationMessage},</if>
             <if test="gastrointestinalMessage != null">gastrointestinal_message = #{gastrointestinalMessage},</if>
             <if test="postpartumConditioningMessage != null">postpartum_conditioning_message = #{postpartumConditioningMessage},</if>
+            <if test="hypertensionMessage != null">hypertension_message = #{hypertensionMessage},</if>
+            <if test="hyperlipidemiaMessage != null">hyperlipidemia_message = #{hyperlipidemiaMessage},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
         </trim>
         where id = #{id}
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml
index ad06934a0..2b2f6c02c 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml
@@ -549,6 +549,9 @@
         <result property="hipline"    column="hipline"    />
         <result property="eatFruitsMessage"    column="eat_fruits_message"    />
         <result property="longEatDrugMessage"    column="long_eat_drug_message"    />
+        <result property="medicationCompliance"    column="medication_compliance"    />
+        <result property="adverseReactionsFlag"    column="adverse_reactions_flag"    />
+        <result property="adverseReactions"    column="adverse_reactions"    />
         <result property="bloodSugarMessage"    column="blood_sugar_message"    />
         <result property="depressedStateMessage"    column="depressed_state_message"    />
         <result property="bloodPressureMessage"    column="blood_pressure_message"    />
@@ -556,12 +559,15 @@
         <result property="menstruationMessage"    column="menstruation_message"    />
         <result property="gastrointestinalMessage"    column="gastrointestinal_message"    />
         <result property="postpartumConditioningMessage"    column="postpartum_conditioning_message"    />
+        <result property="hypertensionMessage"    column="hypertension_message"    />
+        <result property="hyperlipidemiaMessage"    column="hyperlipidemia_message"    />
         <result property="delFlag"    column="del_flag"    />
     </resultMap>
 
     <select id="getHealthyExtendedByHealthyId" parameterType="Long" resultMap="HealthyExtendedResult">
-       select id, healthy_id, waist, hipline, eat_fruits_message, long_eat_drug_message, blood_sugar_message, depressed_state_message,
-       blood_pressure_message, anxiety_state_message,menstruation_message,gastrointestinal_message,postpartum_conditioning_message
+       select id, healthy_id, waist, hipline, eat_fruits_message, long_eat_drug_message, medication_compliance,adverse_reactions_flag,adverse_reactions,
+       blood_sugar_message, depressed_state_message,blood_pressure_message, anxiety_state_message,menstruation_message,gastrointestinal_message,postpartum_conditioning_message,
+       hypertension_message,hyperlipidemia_message
        from sys_customer_healthy_extended where del_flag = 0 and  healthy_id = #{id} limit 1
     </select>
 
diff --git a/stdiet-ui/src/components/HealthyForm/Form8.vue b/stdiet-ui/src/components/HealthyForm/Form8.vue
index 589bc3e35..78bd36344 100644
--- a/stdiet-ui/src/components/HealthyForm/Form8.vue
+++ b/stdiet-ui/src/components/HealthyForm/Form8.vue
@@ -109,6 +109,26 @@
         ></el-input>
       </div>
     </el-form-item>
+    <el-form-item label="(3) 服药依从性" prop="" class="margin-left">
+      <el-radio-group v-model="form.healthyExtend.medicationCompliance">
+          <el-radio  v-for="(item,index) in healthyData['medicationComplianceArray']"  :label="item.value" :key="index">{{ item.name }}</el-radio>
+      </el-radio-group>      
+    </el-form-item>
+   <el-form-item label="(4)、是否存在药物不良反应" class="margin-left">
+      <el-radio-group  v-model="form.healthyExtend.adverseReactionsFlag">
+          <el-radio  :label="1" >是</el-radio>
+          <el-radio  :label="0" >否</el-radio>
+      </el-radio-group>        
+      <div style="margin-top:8px;"><span class="text-span">若存在药物不良反应，请描述下情况</span>
+          <el-input maxlength="200"
+              type="textarea"
+              v-model="form.healthyExtend.adverseReactions"
+              placeholder="请输入药物不良反应情况"
+              show-word-limit
+              rows="3"
+          ></el-input>
+        </div>
+    </el-form-item>         
     <p class="p_title_2">6、过敏史</p>
     <el-form-item label="(1) 曾经是否出现过过敏" prop="allergyFlag" class="margin-left">
       <el-radio-group v-model="form.allergyFlag">
@@ -280,6 +300,18 @@ export default {
     margin-right: 5px;
   }
 
+  .text-span{
+    color:#606266;
+    font-weight: 700;
+    font-size: 14px
+  }
+
+  .text-span-min{
+    color:#606266;
+    font-weight: 400;
+    font-size: 13px
+  }
+
 
 </style>
 
diff --git a/stdiet-ui/src/components/HealthyForm/FormExtended.vue b/stdiet-ui/src/components/HealthyForm/FormExtended.vue
index e373a3e65..00fc07105 100644
--- a/stdiet-ui/src/components/HealthyForm/FormExtended.vue
+++ b/stdiet-ui/src/components/HealthyForm/FormExtended.vue
@@ -61,7 +61,7 @@
 
               </div>
               </el-form-item>
-              <p class="p_title_2">2、体重变化情况</p>
+              <p class="p_title_2">3、体重变化情况</p>
               <el-form-item :label="'(1) 近三个月体重是否有变化'"  class="margin-left">
                 <el-radio-group v-model="form.healthyExtend.bloodSugarMessage.weightChangeFlag">
                   <el-radio  :label="1" >是</el-radio>
@@ -79,7 +79,7 @@
               </el-form-item>
             </div>
 
-            <div v-show="form.conditioningProjectId == 5">
+            <!--<div v-show="form.conditioningProjectId == 5">
               <p class="p_title_2">1、餐前餐后血压</p>
               <div style="margin-top:10px">
                   <div class="margin-left"><span>餐前：</span><el-input placeholder="输入血压数值" maxlength="100" v-model="form.healthyExtend.bloodPressureMessage.beforeMealBloodPressure" style="width:50%"></el-input><span class="margin-left">mmHg</span></div>
@@ -143,10 +143,103 @@
                     <el-radio  :label="0" >否</el-radio>
                   </el-radio-group>
                 </el-form-item>
+            </div>-->
+          
+            <div v-show="form.conditioningProjectId == 5">
+                <p class="p_title_2">1、现病史</p>
+                <div style="margin-top:10px">
+                <el-input type="textarea"
+                            v-model="form.healthyExtend.hypertensionMessage.historyOfPresentIllness"
+                            placeholder="请描述自己发现高血压及治疗的过程"
+                            maxlength="200"
+                            show-word-limit
+                            rows="3"
+                  ></el-input>
+                </div>
+                <p class="p_title_2">2、血压情况</p>
+                <el-form-item label="(1)、历史最高血压" class="margin-left">
+                  <div class="margin-left">
+                    <span class="text-span">收缩压/高压</span>
+                    <el-input placeholder="输入最高收缩压/高压" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.maxHighPressure" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmHg</span>
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">舒张压/低压</span>
+                    <el-input placeholder="输入最高舒张压/低压" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.maxLowPressure" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmHg</span>
+                  </div>
+                </el-form-item>
+                <el-form-item label="(2)、近期血压" class="margin-left">
+                  <div class="margin-left">
+                    <span class="text-span">日期</span>
+                    <el-input placeholder="输入近期血压日期" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.recentTime" style="width:60%;margin-left:10px"/>
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">收缩压/高压</span>
+                    <el-input placeholder="输入近期收缩压/高压" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.recentHighPressure" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmHg</span>
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">舒张压/低压</span>
+                    <el-input placeholder="输入近期舒张压/低压" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.recentLowPressure" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmHg</span>
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">静息心率</span>
+                    <el-input placeholder="输入静息心率" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.restingHeartRate" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left">次/分</span>
+                  </div>
+                </el-form-item>
+                <el-form-item label="(3)、是否规律测量血压" class="margin-left">
+                  <el-radio-group v-model="form.healthyExtend.hypertensionMessage.measureBloodPressure">
+                      <el-radio  v-for="(item,index) in healthyData['measureBloodPressureArray']" :label="item.value" :key="index">{{ item.name }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <p class="p_title_2">3、实验室检查结果</p>
+                <el-form-item label="(1)、胆固醇结果" class="margin-left">
+                  <div class="margin-left">
+                    <span class="text-span">总胆固醇</span>
+                    <el-input placeholder="输入总胆固醇" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.totalCholesterol" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmol/L</span>
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">高密度脂蛋白胆固醇</span>
+                    <el-input placeholder="输入高密度脂蛋白胆固醇" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.highLipoproteinCholesterol" style="width:35%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmol/L</span>
+                  </div>
+                   <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">低密度脂蛋白胆固醇</span>
+                    <el-input placeholder="输入低密度脂蛋白胆固醇" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.lowLipoproteinCholesterol" style="width:35%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmol/L</span>
+                  </div>
+                </el-form-item>
+                <el-form-item label="(2)、甘油三酯结果" class="margin-left">
+                  <div class="margin-left">
+                    <span class="text-span">甘油三酯</span>
+                    <el-input placeholder="输入甘油三酯" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.triglyceride" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmol/L</span>
+                  </div>
+                </el-form-item>
+                <el-form-item label="(3)、血糖结果" class="margin-left">
+                  <div class="margin-left">
+                    <span class="text-span">血糖</span>
+                    <el-input placeholder="输入血糖" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.bloodSugar" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmol/L</span>
+                  </div>
+                </el-form-item>
+                <el-form-item label="(4)、尿常规情况" class="margin-left">
+                  <el-input type="textarea"
+                            v-model="form.healthyExtend.hypertensionMessage.urinalysis"
+                            placeholder="请描述尿常规情况"
+                            maxlength="200"
+                            show-word-limit
+                            rows="3"
+                  ></el-input>
+                </el-form-item>
             </div>
 
             <div>
-                <p class="p_title_2">3、焦虑状态评估</p>
+                <p class="p_title_2">4、焦虑状态评估</p>
               <el-form-item label="(1) 你认为你是一个容易焦虑或紧张的人吗?"  class="margin-left">
                 <el-radio-group v-model="form.healthyExtend.anxietyStateMessage.easyAnxiousFlag">
                   <el-radio  :label="1" >是</el-radio>
@@ -171,7 +264,7 @@
                   <el-radio  :label="0" >否</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <p class="p_title_2">4、郁抑状态评估</p>
+              <p class="p_title_2">5、郁抑状态评估</p>
               <el-form-item label="(1) 过去几周(或几个月)是否感觉到无精打采、伤感、或对生活的乐趣减少?"  class="margin-left">
                 <el-radio-group v-model="form.healthyExtend.depressedStateMessage.listlessRecentlyFlag">
                   <el-radio  :label="1" >是</el-radio>
@@ -198,6 +291,7 @@
               </el-form-item>
             </div>
         </div>
+
         <!-- 月经不调、多囊卵巢综合症 -->
         <div v-if="form.conditioningProjectId == 1 || form.conditioningProjectId == 2">
             <p class="p_title_2">1、月经基础情况</p>
@@ -543,6 +637,44 @@
                    
             </div>
         </div>
+        <!-- 高血脂 -->
+        <div v-if="form.conditioningProjectId == 7">
+          <p class="p_title_2">1、实验室检查结果</p>
+          <el-form-item label="(1)、胆固醇结果" class="margin-left">
+                  <div class="margin-left">
+                    <span class="text-span">总胆固醇</span>
+                    <el-input placeholder="输入总胆固醇" maxlength="20" v-model="form.healthyExtend.hyperlipidemiaMessage.totalCholesterol" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmol/L</span>
+                  </div>      
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">高密度脂蛋白胆固醇</span>
+                    <el-input placeholder="输入高密度脂蛋白胆固醇" maxlength="20" v-model="form.healthyExtend.hyperlipidemiaMessage.highLipoproteinCholesterol" style="width:35%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmol/L</span>
+                  </div>
+                   <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">低密度脂蛋白胆固醇</span>
+                    <el-input placeholder="输入低密度脂蛋白胆固醇" maxlength="20" v-model="form.healthyExtend.hyperlipidemiaMessage.lowLipoproteinCholesterol" style="width:35%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmol/L</span>
+                  </div>
+                </el-form-item>    
+                <el-form-item label="(2)、甘油三酯结果" class="margin-left">
+                  <div class="margin-left">
+                    <span class="text-span">甘油三酯</span>
+                    <el-input placeholder="输入甘油三酯" maxlength="20" v-model="form.healthyExtend.hyperlipidemiaMessage.triglyceride" style="width:50%;margin-left:10px"/>
+                    <span class="text-span margin-left" >mmol/L</span>
+                  </div>
+                </el-form-item>
+               
+                <el-form-item label="(3)、肝功能情况" class="margin-left">
+                  <el-input type="textarea"
+                            v-model="form.healthyExtend.hyperlipidemiaMessage.liverFunction"
+                            placeholder="请描述肝功能情况"
+                            maxlength="200"
+                            show-word-limit
+                            rows="3"
+                  ></el-input>
+                </el-form-item>
+        </div>
   </div>
 </template>
 <script>
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
index 115ac94d3..897c203a2 100644
--- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
+++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
@@ -175,7 +175,7 @@
               </div>
             </div>
             <div
-              v-for="(item, index) in dataList.slice(9, 16)"
+              v-for="(item, index) in dataList.slice(9, 17)"
               style="margin-bottom: 50px"
               :key="'sign'+index"
             >
@@ -322,7 +322,7 @@ export default {
       healthyTitleData: healthyData['healthyTitleData'],
       // 健康评估属性
       healthyValueData: healthyData['healthyValueData'],
-       extendedTitleArray:['十、高血糖信息评估',"十、高血压信息评估","十一、焦虑信息评估","十二、抑郁信息评估","九、月经不调、多囊信息评估","九、胃肠肿瘤信息评估","九、产后调理信息评估"],
+       extendedTitleArray:['十、高血糖信息评估',"十、高血压信息评估","十一、焦虑信息评估","十二、抑郁信息评估","九、月经不调、多囊信息评估","九、胃肠肿瘤信息评估","九、产后调理信息评估","九、高血脂信息评估"],
       copyValue: "",
       detailHealthy: null,
       dialogWidth: "950px",
@@ -704,6 +704,8 @@ export default {
            return index == 5;
          }else if(this.healthyData.conditioningProjectId == 4){
            return index == 6;
+         }else if(this.healthyData.conditioningProjectId == 7){
+           return index == 7;
          }
          return false;
      },
diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js
index 6f9ab044f..c286b1df6 100644
--- a/stdiet-ui/src/utils/healthyData.js
+++ b/stdiet-ui/src/utils/healthyData.js
@@ -437,6 +437,20 @@ export const postpartumSymptomsArray = [
   {name: "虚弱怕冷", value: "11"}
 ]
 
+//服药依从性
+export const medicationComplianceArray = [
+  {name: "规律", value: "1" },
+  {name: "间断", value: "2"},
+  {name: "不服药", value: "3"}
+];
+
+//是否经常测量血压
+export const measureBloodPressureArray = [
+  {name: "规律", value: "1" },
+  {name: "偶尔", value: "2"},
+  {name: "不测量", value: "3"}
+];
+
 
 //需要将数组转成字符串的属性名称，包含对象数组、字符串数组
 export const arrayName = [
@@ -621,7 +635,9 @@ export const needJSONFieldName = [
   "depressedStateMessage",
   "menstruationMessage",
   "gastrointestinalMessage",
-  "postpartumConditioningMessage"
+  "postpartumConditioningMessage",
+  "hypertensionMessage",
+  "hyperlipidemiaMessage"
 ];
 
 //健康信息处理，将数组转为字符串
@@ -807,12 +823,12 @@ export function dealHealthy(customerHealthy) {
   return customerHealthy;
 }
 
-export const extendHealthyTitle = {"0":"减脂","5":"降血压","6":"降血糖","3": "备孕营养", "1": "月经不调", "2": "多囊调理", "11":"心脑血管调理","13":"胃肠肿瘤调理","4":"产后调理"};
-export const projectName = {"0":"减脂","5":"高血压","6":"高血糖","3": "备孕营养", "1":"月经不调", "2":"多囊卵巢综合症", "13":"胃肠肿瘤","4":"产后调理"};
+export const extendHealthyTitle = {"0":"减脂","5":"降血压","6":"降血糖","3": "备孕营养", "1": "月经不调", "2": "多囊调理", "11":"心脑血管调理","13":"胃肠肿瘤调理","4":"产后调理","7":"高血脂"};
+export const projectName = {"0":"减脂","5":"高血压","6":"高血糖","3": "备孕营养", "1":"月经不调", "2":"多囊卵巢综合症", "13":"胃肠肿瘤","4":"产后调理","7":"高血脂"};
 //需要填写慢病调查问卷的项目
-export const extendHealthyIndex = [5, 6, 1, 2, 13,4];
+export const extendHealthyIndex = [5, 6, 1, 2, 13,4,7];
 //跳过减脂经历问卷的项目
-export const notExperienceIndex = [3,1,2,13,4];
+export const notExperienceIndex = [3,1,2,13,4,7];
 
 export function getTitleKey(projectId){
     return extendHealthyTitle[projectId+""] != null ? extendHealthyTitle[projectId+""] : extendHealthyTitle["0"];
@@ -914,6 +930,7 @@ export const extendedYesNoAttrName = [
   {"targetAttrName": "foodIntoleranceFlag", "healthyAttrName": "gastrointestinalMessage,foodIntoleranceFlag"},
 
   {"targetAttrName": "resumeMenstruationFlag", "healthyAttrName": "postpartumConditioningMessage,resumeMenstruationFlag"} 
+
 ]
 
 //单选的value转成对应name
@@ -959,6 +976,11 @@ export function dealHealthyExtend(detailHealthy){
      });
   }
 
+  //服药依从性
+  detailHealthy.medicationCompliance = getStringBySigleValue(medicationComplianceArray, detailHealthy.healthyExtend.medicationCompliance);
+  detailHealthy.adverseReactionsFlag = detailHealthy.healthyExtend.adverseReactionsFlag == 0 ? "否" : "是";
+  detailHealthy.adverseReactions = detailHealthy.healthyExtend.adverseReactions;
+
   //高血糖
   detailHealthy.healthyExtend.eatFruitsMessage = eatFruitsMessage;
   detailHealthy.mealBloodSugar = "餐前血糖："+(detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar == null ? "" : (detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar+"mmol/L"))+", "
@@ -972,7 +994,7 @@ export function dealHealthyExtend(detailHealthy){
   detailHealthy.weightChangeFlag = detailHealthy.weightChangeFlag + "，具体变化情况："+detailHealthy.healthyExtend.bloodSugarMessage.weightChangeDescribe;
 
   //高血压
-  detailHealthy.mealBloodPressure = "餐前血压："+(detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure == null ? "" : (detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure+"mmHg"))+", "
+  /*detailHealthy.mealBloodPressure = "餐前血压："+(detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure == null ? "" : (detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure+"mmHg"))+", "
       +"餐后两小时血压："+(detailHealthy.healthyExtend.bloodPressureMessage.afterMealBloodPressure == null ? "" : (detailHealthy.healthyExtend.bloodPressureMessage.afterMealBloodPressure+"mmHg"));
   detailHealthy.measureBloodPressureFlag = detailHealthy.healthyExtend.bloodPressureMessage.measureBloodPressureFlag == 1 ? "是" : "否";
   detailHealthy.measureBloodPressureTime = detailHealthy.healthyExtend.bloodPressureMessage.measureBloodPressureTime;
@@ -981,7 +1003,52 @@ export function dealHealthyExtend(detailHealthy){
   detailHealthy.pressureComplicationFlag = detailHealthy.healthyExtend.bloodPressureMessage.complicationFlag == 1 ? "是" : "否";
   detailHealthy.pressureComplication = detailHealthy.healthyExtend.bloodPressureMessage.complication;
   detailHealthy.pressureInferiorSymptom = (detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptomFlag == 1 ? "是" : "否") + ", 具体症状："+getStringByMuchValue(syndromeNameArray,detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptom);
-  detailHealthy.pressureWeightChangeFlag = detailHealthy.healthyExtend.bloodPressureMessage.weightChangeFlag == 1 ? "是" : "否";
+  detailHealthy.pressureWeightChangeFlag = detailHealthy.healthyExtend.bloodPressureMessage.weightChangeFlag == 1 ? "是" : "否";*/
+
+  detailHealthy.historyOfPresentIllness = detailHealthy.healthyExtend.hypertensionMessage.historyOfPresentIllness;
+  let maxPressure = "";
+  let maxHighPressure = detailHealthy.healthyExtend.hypertensionMessage.maxHighPressure;
+  if(nullToString(maxHighPressure) != ""){
+    maxPressure += "收缩压/高压：" + maxHighPressure + " mmHg";
+  }
+  let maxLowPressure = detailHealthy.healthyExtend.hypertensionMessage.maxLowPressure;
+  if(nullToString(maxLowPressure) != ""){
+    maxPressure += (maxPressure != "" ? "，" : "") +  "舒张压/低压：" + maxLowPressure + " mmHg";
+  }
+  detailHealthy.maxPressure = maxPressure;
+  let recentPressure = "时间：" + nullToString(detailHealthy.healthyExtend.hypertensionMessage.recentTime);
+  let recentHighPressure = nullToString(detailHealthy.healthyExtend.hypertensionMessage.recentHighPressure);
+  recentPressure += "，收缩压/高压：" + recentHighPressure + (recentHighPressure != "" ? " mmHg" : "");
+  let recentLowPressure = nullToString(detailHealthy.healthyExtend.hypertensionMessage.recentLowPressure);
+  recentPressure += "，舒张压/低压：" + recentLowPressure +  (recentLowPressure != "" ? " mmHg" : "");
+  detailHealthy.recentPressure = recentPressure;
+  detailHealthy.restingHeartRate = nullToString(detailHealthy.healthyExtend.hypertensionMessage.restingHeartRate);
+  if(detailHealthy.restingHeartRate != ""){
+    detailHealthy.restingHeartRate += " 次/分"
+  }
+  detailHealthy.measureBloodPressure = getStringBySigleValue(measureBloodPressureArray, detailHealthy.healthyExtend.hypertensionMessage.measureBloodPressure);
+  detailHealthy.totalCholesterol =  nullToString(detailHealthy.healthyExtend.hypertensionMessage.totalCholesterol);
+  if(detailHealthy.totalCholesterol != ""){
+    detailHealthy.totalCholesterol += " mmol/L"
+  }
+
+  detailHealthy.highLipoproteinCholesterol =  nullToString(detailHealthy.healthyExtend.hypertensionMessage.highLipoproteinCholesterol);
+  if(detailHealthy.highLipoproteinCholesterol != ""){
+    detailHealthy.highLipoproteinCholesterol += " mmol/L"
+  }
+  detailHealthy.lowLipoproteinCholesterol =  nullToString(detailHealthy.healthyExtend.hypertensionMessage.lowLipoproteinCholesterol);
+  if(detailHealthy.lowLipoproteinCholesterol != ""){
+    detailHealthy.lowLipoproteinCholesterol += " mmol/L"
+  }
+  detailHealthy.triglyceride =  nullToString(detailHealthy.healthyExtend.hypertensionMessage.triglyceride);
+  if(detailHealthy.triglyceride != ""){
+    detailHealthy.triglyceride += " mmol/L"
+  }
+  detailHealthy.bloodSugar =  nullToString(detailHealthy.healthyExtend.hypertensionMessage.bloodSugar);
+  if(detailHealthy.bloodSugar != ""){
+    detailHealthy.bloodSugar += " mmol/L"
+  }
+  detailHealthy.urinalysis =  nullToString(detailHealthy.healthyExtend.hypertensionMessage.urinalysis);
 
   //月经不调、多囊
   detailHealthy.menstrualCycle = "生理周期：" + nullToString(detailHealthy.healthyExtend.menstruationMessage.menstrualCycle) + "，生理天数：" + nullToString(detailHealthy.healthyExtend.menstruationMessage.menstrualDays);
@@ -1063,6 +1130,26 @@ export function dealHealthyExtend(detailHealthy){
 
   detailHealthy.productionNum = "生产次数：" + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.productionNum);
   detailHealthy.productionNum += "，流产次数：" + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.abortionNum);
+
+
+  //高血脂
+  detailHealthy.hyperlipidemiaTotalCholesterol =  nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.totalCholesterol);
+  if(detailHealthy.hyperlipidemiaTotalCholesterol != ""){
+    detailHealthy.hyperlipidemiaTotalCholesterol += " mmol/L"
+  }
+  detailHealthy.hyperlipidemiaHighLipoproteinCholesterol =  nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.highLipoproteinCholesterol);
+  if(detailHealthy.hyperlipidemiaHighLipoproteinCholesterol != ""){
+    detailHealthy.hyperlipidemiaHighLipoproteinCholesterol += " mmol/L"
+  }
+  detailHealthy.hyperlipidemiaLowLipoproteinCholesterol =  nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.lowLipoproteinCholesterol);
+  if(detailHealthy.hyperlipidemiaLowLipoproteinCholesterol != ""){
+    detailHealthy.hyperlipidemiaLowLipoproteinCholesterol += " mmol/L"
+  }
+  detailHealthy.hyperlipidemiaTriglyceride =  nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.triglyceride);
+  if(detailHealthy.hyperlipidemiaTriglyceride != ""){
+    detailHealthy.hyperlipidemiaTriglyceride += " mmol/L"
+  }
+  detailHealthy.hyperlipidemiaLiverFunction = nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.liverFunction);
 }
 
 export function nullToString(val){
@@ -1127,6 +1214,7 @@ export const healthyTitleData = [
     ["病史体征", "湿气数据", "气血数据"],
     ["家族疾病史", "手术史", "近期是否做过手术"],
     ["手术恢复情况", "是否长期服用药物", "长期服用的药物"],
+    ["服药依从性", "是否药物不良反应","药物不良反应"],
     ["是否出现过过敏症状", "过敏症状", "过敏源"],
   ],
   [["体检报告(1)", "体检报告(2)", "体检报告(3)"]],
@@ -1137,10 +1225,16 @@ export const healthyTitleData = [
 
   ],
   [
+    ["现病史","历史最高血压","近期血压"],
+    ["静息心率","是否规律测量血压","总胆固醇"],
+    ["高密度脂蛋白胆固醇","低密度脂蛋白胆固醇","甘油三酯"],
+    ["血糖","尿常规",""]
+  ],
+  /*[
     ["餐前餐后血压", "是否有规律测血压", "测量血压时间"],
     ["近期血压水平", "是否有低血压反应", "是否有出现并发症"],
     ["并发症情况", "存在症状", "近三个月体重是否有变化"]
-  ],
+  ],*/
   [
       ["你认为你是一个容易焦虑或紧张的人吗","最近一段时间，你是否比平时更感到焦虑或忐忑不安","是否有一些特殊场合或情景更容易使得你紧张、焦虑"],
       ["你曾经有过惊恐发作吗.即突然发生的强烈不适感或心慌、眩晕、感到憋气或呼吸困难等症状","",""]
@@ -1165,6 +1259,10 @@ export const healthyTitleData = [
     ["孕期增长","产后几个月","生产状况"],
     ["孕期疾病","喂养方式","乳汁状态"],
     ["产后症状","恢复月经","生育史"]
+  ],
+  [
+    ["总胆固醇","高密度脂蛋白胆固醇","低密度脂蛋白胆固醇"],
+    ["甘油三酯","肝功能",""]
   ]
 ]
 
@@ -1215,6 +1313,7 @@ export const healthyValueData = [
     ["physicalSigns", "moistureDate", "bloodData"],
     ["familyIllnessHistory", "operationHistory", "nearOperationFlag"],
     ["recoveryeSituation", "longEatDrugFlag", "longEatDrugClassify"],
+    ["medicationCompliance", "adverseReactionsFlag","adverseReactions"],
     ["allergyFlag", "allergySituation", "allergen"],
   ],
   [["medicalReport_one", "medicalReport_two", "medicalReport_three"]],
@@ -1223,10 +1322,16 @@ export const healthyValueData = [
     ["nearBloodSugar", "lowBloodSugarFlag", "complicationFlag"],
     ["complication", "inferiorSymptom", "weightChangeFlag"]
   ],
-  [
+  /*[
     ["mealBloodPressure", "measureBloodPressureFlag", "measureBloodPressureTime"],
     ["nearBloodPressure", "lowBloodPressureFlag", "pressureComplicationFlag"],
     ["pressureComplication", "pressureInferiorSymptom", "pressureWeightChangeFlag"],
+  ],*/
+  [
+    ["historyOfPresentIllness","maxPressure","recentPressure"],
+    ["restingHeartRate","measureBloodPressure","totalCholesterol"],
+    ["highLipoproteinCholesterol","lowLipoproteinCholesterol","triglyceride"],
+    ["bloodSugar","urinalysis",""]
   ],
   [
     ["easyAnxiousFlag","upsetRecently","nervousOnSpecialOccasionsFlag"],
@@ -1252,6 +1357,10 @@ export const healthyValueData = [
     ["weightGain","postpartumMonth","productionStatus"],
     ["pregnancyDisease","feedingMethods","milkState"],
     ["postpartumSymptoms","resumeMenstruationFlag","productionNum"]
+  ],
+  [
+    ["hyperlipidemiaTotalCholesterol","hyperlipidemiaHighLipoproteinCholesterol","hyperlipidemiaLowLipoproteinCholesterol"],
+    ["hyperlipidemiaTriglyceride","hyperlipidemiaLiverFunction",""]
   ]
 ]
 
diff --git a/stdiet-ui/src/views/custom/signContract/index.vue b/stdiet-ui/src/views/custom/signContract/index.vue
index 64525a5d1..d3f2800a7 100644
--- a/stdiet-ui/src/views/custom/signContract/index.vue
+++ b/stdiet-ui/src/views/custom/signContract/index.vue
@@ -77,7 +77,7 @@
           <div class="line-rule">3、甲方按与乙方约定事项及服务内容，通过定制营养减脂饮食方案为乙方提供减脂服务，服务中不使用任何仪器、针药、不使用医疗类药物等。</div>
           <div class="line-rule">4、甲方为乙方提供专业营养指导咨询服务。</div>
           <div class="line-rule">5、服务标准</div>
-          <div style="margin-left: 24px">5.1、甲方为乙方每周提供一对一有效咨询时间6日，每日咨询服务时间为早10:00—晚20:30。每日服务10.5小时（法定节假日除外）</div>
+          <div style="margin-left: 24px">5.1、甲方为乙方每周提供一对一有效咨询时间6日，每日咨询服务时间为早10:00—晚19:00。每日服务9小时（法定节假日除外）</div>
           <div style="margin-left: 24px">5.2、乙方可享受营养学基础知识学习，肥胖与生活习惯知识学习，享受营养师亲自培训初级自我体重管理知识。</div>
           <div style="margin-left: 24px">5.3、甲方为乙方定制营养减脂饮食方案，7天为一期，每期结束前1—2天，更新发送下一期饮食减脂方案。</div>
           <div style="margin-left: 24px">5.4、甲方对乙方所做出的承诺不得超出力所能及的范围，不得夸大、吹嘘、作假服务效果，双方明确，甲方只提供咨询服务，不含任何医疗行为。</div>
@@ -86,7 +86,7 @@
           <div style="margin-left: 24px">5.7、乙方不能在家佐餐，需要进行外食指导，甲方有责任及义务为乙方提供对应的指导。</div>
           <div style="margin-left: 24px">5.8、乙方自订购服务日起，享有单一营养师的指导及咨询服务，如需中途更换指导老师，需在当期方案执行结束至少3日内告知，以便于更换指导。</div>
           <div style="margin-left: 24px">5.9、甲方每日会敦促乙方进行服务效果反馈，一日三餐需进行打卡。</div>
-          <div style="margin-left: 24px">5.10、甲方在接收到乙方发送咨询需求3.5小时内需及时为乙方解答（周日及法定节假日除外）。</div>
+          <!--<div style="margin-left: 24px">5.10、甲方在接收到乙方发送咨询需求3.5小时内需及时为乙方解答（周日及法定节假日除外）。</div>-->
           </p>
 
           <p>第二条 合作内容及费用
diff --git a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
index b87bdfd74..b087c3948 100644
--- a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
+++ b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
@@ -210,6 +210,11 @@ export default {
             eatFruitsMessage:[],
             //长期服用药物JSON数组, [{'type': 1, 'drug':[{'name':'降压药1','num':'每天三粒','time':'早中晚'}]}]
             longEatDrugMessage:[],
+            //服药依从性
+            medicationCompliance: "1",
+            //药物不良反应
+            adverseReactionsFlag: 0,
+            adverseReactions: null,
             //高血糖评估
             bloodSugarMessage: {
               beforeMealBloodSugar: null,
@@ -356,6 +361,47 @@ export default {
                 productionNum: null,
                 //流产次数
                 abortionNum: null
+            },
+            //高血压（第二版）
+            hypertensionMessage:{
+                //现病史
+                historyOfPresentIllness: null,
+                maxHighPressure: null,
+                maxLowPressure: null,
+                recentTime: null,
+                recentHighPressure: null,
+                recentLowPressure: null,
+                //静息心率
+                restingHeartRate: null,
+                measureBloodPressure: "1",
+
+                totalCholesterol: null,
+                //高密度脂蛋白胆固醇
+                highLipoproteinCholesterol: null,
+                //低密度脂蛋白胆固醇
+                lowLipoproteinCholesterol: null,
+                //甘油三酯
+                triglyceride: null,
+                //血糖
+                bloodSugar: null,
+                //尿常规
+                urinalysis: null,
+                //月经史
+                menstrualHistory: null,
+                //妊娠史
+                historyOfPregnancy: null
+            },
+            //高血脂
+            hyperlipidemiaMessage:{
+                totalCholesterol: null,
+                //高密度脂蛋白胆固醇
+                highLipoproteinCholesterol: null,
+                //低密度脂蛋白胆固醇
+                lowLipoproteinCholesterol: null,
+                //甘油三酯
+                triglyceride: null,
+                //肝功能
+                liverFunction: null
             }
         }
       },