From 6293b386b2fccf7b74fe4e2c2261e40d588b070c Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Wed, 30 Jun 2021 18:53:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=90=8E=E8=B0=83=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E8=83=83=E8=82=A0=E8=82=BF=E7=98=A4=E9=97=AE=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/InvestigateController.java         |   7 +
 .../domain/SysCustomerHealthyExtended.java    |   8 +
 .../SysCustomerHealthyExtendedMapper.xml      |  12 +-
 .../custom/SysCustomerHealthyMapper.xml       |   6 +-
 .../src/components/HealthyForm/Form1.vue      |   2 +-
 .../src/components/HealthyForm/Form8.vue      |   4 +-
 .../components/HealthyForm/FormExtended.vue   | 185 +++++++++++++++++-
 .../components/PhysicalSignsDialog/index.vue  |  11 +-
 stdiet-ui/src/utils/healthyData.js            | 171 +++++++++++++++-
 .../custom/subhealthy/investigation/index.vue | 127 ++++++++----
 10 files changed, 478 insertions(+), 55 deletions(-)

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/common/InvestigateController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/common/InvestigateController.java
index 1e07cbb69..83f151ba0 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/common/InvestigateController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/common/InvestigateController.java
@@ -7,6 +7,7 @@ import com.stdiet.common.utils.StringUtils;
 import com.stdiet.common.utils.sign.AesUtils;
 import com.stdiet.custom.domain.SysCustomer;
 import com.stdiet.custom.domain.SysCustomerHealthy;
+import com.stdiet.custom.domain.SysOrder;
 import com.stdiet.custom.domain.SysPhysicalSigns;
 import com.stdiet.custom.dto.request.CustomerInvestigateRequest;
 import com.stdiet.custom.dto.request.FoodHeatCalculatorRequest;
@@ -47,6 +48,9 @@ public class InvestigateController extends BaseController {
     @Autowired
     private ISysFoodHeatStatisticsService sysFoodHeatStatisticsService;
 
+    @Autowired
+    private ISysOrderService sysOrderService;
+
     /**
      * 建立客户信息档案
      */
@@ -92,6 +96,9 @@ public class InvestigateController extends BaseController {
                 Map<String, Object> result = new HashMap<>();
                 result.put("name", sysCustomer.getName());
                 result.put("phone", sysCustomer.getPhone());
+                //查询下单对应调理项目
+                SysOrder order = sysOrderService.getLastOrderByCusId(Long.parseLong(id));
+                result.put("projectId", (order != null && order.getConditioningProjectId() != null) ? order.getConditioningProjectId() : null);
                 return AjaxResult.success(result);
             }
         }
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 90c66cd26..8fa32eb22 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
@@ -61,6 +61,14 @@ public class SysCustomerHealthyExtended extends BaseEntity
     @Excel(name = "月经不调、多囊信息")
     private String menstruationMessage;
 
+    /** 胃肠肿瘤信息 */
+    @Excel(name = "胃肠肿瘤信息")
+    private String gastrointestinalMessage;
+
+    /** 产后调理信息 */
+    @Excel(name = "产后调理信息")
+    private String postpartumConditioningMessage;
+
     /** 删除标识 0未删除 1已删除 */
     private Long delFlag;
 }
\ No newline at end of file
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml
index eac78d073..479a15449 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml
@@ -16,11 +16,15 @@
         <result property="bloodPressureMessage"    column="blood_pressure_message"    />
         <result property="anxietyStateMessage"    column="anxiety_state_message"    />
         <result property="menstruationMessage"    column="menstruation_message"    />
+        <result property="gastrointestinalMessage"    column="gastrointestinal_message"    />
+        <result property="postpartumConditioningMessage"    column="postpartum_conditioning_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,del_flag from sys_customer_healthy_extended
+        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
+         from sys_customer_healthy_extended
     </sql>
 
     <select id="selectSysCustomerHealthyExtendedList" parameterType="SysCustomerHealthyExtended" resultMap="SysCustomerHealthyExtendedResult">
@@ -45,6 +49,8 @@
             <if test="bloodPressureMessage != null">blood_pressure_message,</if>
             <if test="anxietyStateMessage != null">anxiety_state_message,</if>
             <if test="menstruationMessage != null">menstruation_message,</if>
+            <if test="gastrointestinalMessage != null">gastrointestinal_message,</if>
+            <if test="postpartumConditioningMessage != null">postpartum_conditioning_message,</if>
             <if test="delFlag != null">del_flag,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -58,6 +64,8 @@
             <if test="bloodPressureMessage != null">#{bloodPressureMessage},</if>
             <if test="anxietyStateMessage != null">#{anxietyStateMessage},</if>
             <if test="menstruationMessage != null">#{menstruationMessage},</if>
+            <if test="gastrointestinalMessage != null">#{gastrointestinalMessage},</if>
+            <if test="postpartumConditioningMessage != null">#{postpartumConditioningMessage},</if>
             <if test="delFlag != null">#{delFlag},</if>
         </trim>
     </insert>
@@ -75,6 +83,8 @@
             <if test="bloodPressureMessage != null">blood_pressure_message = #{bloodPressureMessage},</if>
             <if test="anxietyStateMessage != null">anxiety_state_message = #{anxietyStateMessage},</if>
             <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="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 38421789b..ad06934a0 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml
@@ -554,11 +554,15 @@
         <result property="bloodPressureMessage"    column="blood_pressure_message"    />
         <result property="anxietyStateMessage"    column="anxiety_state_message"    />
         <result property="menstruationMessage"    column="menstruation_message"    />
+        <result property="gastrointestinalMessage"    column="gastrointestinal_message"    />
+        <result property="postpartumConditioningMessage"    column="postpartum_conditioning_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 from sys_customer_healthy_extended where del_flag = 0 and  healthy_id = #{id} limit 1
+       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
+       from sys_customer_healthy_extended where del_flag = 0 and  healthy_id = #{id} limit 1
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/stdiet-ui/src/components/HealthyForm/Form1.vue b/stdiet-ui/src/components/HealthyForm/Form1.vue
index 959ffc575..62b9313c1 100644
--- a/stdiet-ui/src/components/HealthyForm/Form1.vue
+++ b/stdiet-ui/src/components/HealthyForm/Form1.vue
@@ -30,7 +30,7 @@
       <el-input v-model="form.healthyExtend.hipline" placeholder="请输入臀围（可保留一位小数）" autocomplete="off" ></el-input>
     </el-form-item>
     <el-form-item label="调理项目" prop="conditioningProjectId">
-      <el-select v-model="form.conditioningProjectId" filterable clearable placeholder="请选择">
+      <el-select v-model="form.conditioningProjectId" :disabled="form.projectDisabledFlag" filterable clearable placeholder="请选择">
         <el-option
           v-for="dict in conditioningProjectIdOption"
           :key="dict.dictValue"
diff --git a/stdiet-ui/src/components/HealthyForm/Form8.vue b/stdiet-ui/src/components/HealthyForm/Form8.vue
index 932593bda..589bc3e35 100644
--- a/stdiet-ui/src/components/HealthyForm/Form8.vue
+++ b/stdiet-ui/src/components/HealthyForm/Form8.vue
@@ -55,10 +55,10 @@
       <el-checkbox-group v-model="form.operationHistory">
         <el-checkbox v-for="(item, index) in healthyData['operationHistoryArray']" :key="index" :label="item.value" >{{item.name}}</el-checkbox>
       </el-checkbox-group>
-      <div><span>其他手术史</span>
+      <div><span>其他手术史以及手术时间</span>
         <el-input
           type="textarea"
-          placeholder="请输入其他手术史"
+          placeholder="请输入其他手术史以及手术时间"
           v-model="form.otherOperationHistory"
           maxlength="200"
           show-word-limit
diff --git a/stdiet-ui/src/components/HealthyForm/FormExtended.vue b/stdiet-ui/src/components/HealthyForm/FormExtended.vue
index 34953375d..e373a3e65 100644
--- a/stdiet-ui/src/components/HealthyForm/FormExtended.vue
+++ b/stdiet-ui/src/components/HealthyForm/FormExtended.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="p_title_1">九、{{healthyData.projectName[form.conditioningProjectId+'']}}信息评估</p>
+    <p class="p_title_1">{{getTitle()}}</p>
     <!--高血糖-->
     <div v-show="form.conditioningProjectId == 6 || form.conditioningProjectId == 5">
             <div v-show="form.conditioningProjectId == 6">
@@ -366,6 +366,183 @@
             </el-form-item>
 
         </div>
+         <!-- 胃肠肿瘤 -->
+        <div v-if="form.conditioningProjectId == 13">
+            <p class="p_title_2">1、体重变化情况</p>
+              <el-form-item :label="'(1) 近三个月体重变化情况'"  class="margin-left">
+                <el-input type="textarea"
+                          v-model="form.healthyExtend.gastrointestinalMessage.weightChangeDescribe"
+                          placeholder="近三个月体重变化情况"
+                          maxlength="200"
+                          show-word-limit
+                          rows="3"
+                ></el-input>
+              </el-form-item>
+              <p class="p_title_2">2、饮食习惯</p>
+              <div style="margin-top:10px">
+                  <div class="margin-left">
+                    <span class="text-span">一餐</span>
+                    <el-input placeholder="输入每餐几碗饭" maxlength="20" v-model="form.healthyExtend.gastrointestinalMessage.riceNum" style="width:50%;margin-left:10px">
+                    </el-input><span class="text-span margin-left">碗</span>
+                     
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">一餐</span>
+                    <el-input placeholder="输入每餐几个菜" maxlength="20" v-model="form.healthyExtend.gastrointestinalMessage.dishNum" style="width:50%;margin-left:10px">
+                    </el-input><span class="text-span margin-left">个菜</span>
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">一餐</span>
+                    <el-input placeholder="输入每餐几个汤" maxlength="20" v-model="form.healthyExtend.gastrointestinalMessage.soupNum" style="width:50%;margin-left:10px">
+                    </el-input><span class="text-span margin-left">个汤</span>
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">一天食量</span>
+                    <el-input placeholder="输入食量（拳头或斤作为单位）" maxlength="20" v-model="form.healthyExtend.gastrointestinalMessage.dailyFoodIntake" style="width:70%;margin-left:10px"></el-input>
+              </div>
+              <p class="p_title_2">3、食欲情况</p>
+              <el-form-item label="(1)、食欲程度" class="margin-left">
+                  <el-radio-group v-model="form.healthyExtend.gastrointestinalMessage.appetite">
+                    <el-radio  v-for="(item,index) in healthyData['appetiteArray']" :style="'width:100%;'+(index >0 ? 'margin-top:7px' : '')" :label="item.value" :key="index">{{ item.name }}</el-radio>
+                  </el-radio-group>
+                  <div style="margin-top:8px;"><span class="text-span">其他</span>
+                  <el-input maxlength="100"
+                          v-model="form.healthyExtend.gastrointestinalMessage.otherAppetite"
+                          placeholder="请输入其他食欲程度"
+                  ></el-input>
+                  </div>
+              </el-form-item>
+              <p class="p_title_2">4、睡眠状况</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.gastrointestinalMessage.sleepTime" 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.gastrointestinalMessage.upTime" 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.gastrointestinalMessage.lunchBreak" style="width:69%;margin-left:10px"/>
+                  </div>
+              </el-form-item>
+              <p class="p_title_2">5、放化疗情况</p>
+               <el-form-item label="(1)、是否放化疗" class="margin-left">
+
+              <el-radio-group  v-model="form.healthyExtend.gastrointestinalMessage.chemotherapyFlag">
+                  <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"
+                          v-model="form.healthyExtend.gastrointestinalMessage.chemotherapy"
+                          placeholder="请输入放化疗情况"
+                          type="textarea"
+                            show-word-limit
+                            rows="3"
+                ></el-input>
+                </div>
+            </el-form-item>
+            <p class="p_title_2">6、食物不耐受检测</p>
+            <el-form-item label="(1)、是否食物不耐受" class="margin-left">
+
+              <el-radio-group  v-model="form.healthyExtend.gastrointestinalMessage.foodIntoleranceFlag">
+                  <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"
+                          v-model="form.healthyExtend.gastrointestinalMessage.foodIntolerance"
+                          placeholder="请输入食物不耐受情况"
+                           type="textarea"
+                            show-word-limit
+                            rows="3"
+                ></el-input>
+                </div>
+            </el-form-item>
+        </div>
+      </div>
+      <div v-if="form.conditioningProjectId == 4">  
+            <p class="p_title_2">1、产后情况</p>
+            <div style="margin-top:10px">
+                  <div class="margin-left">
+                    <span class="text-span">(1)、孕期增长</span>
+                    <el-input placeholder="输入斤数" maxlength="20" v-model="form.healthyExtend.postpartumConditioningMessage.weightGain" style="width:50%;margin-left:10px">
+                    </el-input><span class="text-span margin-left">斤</span>
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">(2)、目前产后</span>
+                    <el-input placeholder="输入产后几个月" maxlength="20" v-model="form.healthyExtend.postpartumConditioningMessage.postpartumMonth" style="width:50%;margin-left:10px">
+                    </el-input><span class="text-span margin-left">个月</span>
+                  </div>
+                  <el-form-item label="(3)、生产状况" class="margin-left">
+                     <el-radio-group v-model="form.healthyExtend.postpartumConditioningMessage.productionStatus">
+                      <el-radio  v-for="(item,index) in healthyData['productionStatusArray']"  :label="item.value" :key="index">{{ item.name }}</el-radio>
+                    </el-radio-group>
+                    <div style="margin-top:8px;"><span class="text-span">其他状况</span>
+                      <el-input maxlength="100"
+                              v-model="form.healthyExtend.postpartumConditioningMessage.otherProductionStatus"
+                              placeholder="请输入其他状况"
+                      ></el-input>
+                    </div>
+                  </el-form-item>
+                  <el-form-item label="(4)、孕期疾病" class="margin-left">
+                     <el-radio-group v-model="form.healthyExtend.postpartumConditioningMessage.pregnancyDisease">
+                      <el-radio  v-for="(item,index) in healthyData['pregnancyDiseaseArray']"  :label="item.value" :key="index">{{ item.name }}</el-radio>
+                    </el-radio-group>
+                    <div style="margin-top:8px;"><span class="text-span">其他疾病</span>
+                      <el-input maxlength="100"
+                              v-model="form.healthyExtend.postpartumConditioningMessage.otherPregnancyDisease"
+                              placeholder="请输入其他疾病"
+                      ></el-input>
+                    </div>
+                  </el-form-item>
+                   <el-form-item label="(5)、喂养方式" class="margin-left">
+                     <el-radio-group v-model="form.healthyExtend.postpartumConditioningMessage.feedingMethods">
+                      <el-radio  v-for="(item,index) in healthyData['feedingMethodsArray']"  :label="item.value" :key="index">{{ item.name }}</el-radio>
+                    </el-radio-group>
+                    <div style="margin-top:8px;"><span class="text-span">其他喂养方式</span>
+                      <el-input maxlength="100"
+                              v-model="form.healthyExtend.postpartumConditioningMessage.otherFeedingMethods"
+                              placeholder="请输入其他喂养方式"
+                      ></el-input>
+                    </div>
+                  </el-form-item>
+                  <el-form-item label="(6)、乳汁状态" class="margin-left">
+                     <el-radio-group v-model="form.healthyExtend.postpartumConditioningMessage.milkState">
+                      <el-radio  v-for="(item,index) in healthyData['milkStateArray']"  :label="item.value" :key="index">{{ item.name }}</el-radio>
+                    </el-radio-group>
+                    <div style="margin-top:8px;"><span class="text-span">其他乳汁状态</span>
+                      <el-input maxlength="100"
+                              v-model="form.healthyExtend.postpartumConditioningMessage.otherMilkState"
+                              placeholder="请输入其他乳汁状态"
+                      ></el-input>
+                    </div>
+                  </el-form-item>
+                  <el-form-item label="(7)、产后症状" class="margin-left">
+                      <el-checkbox-group v-model="form.healthyExtend.postpartumConditioningMessage.postpartumSymptoms">
+                        <el-checkbox v-for="(item,index) in healthyData['postpartumSymptomsArray']" :label="item.value" :key="index">{{ item.name }}</el-checkbox>
+                      </el-checkbox-group>
+                    <div style="margin-top:8px;"><span class="text-span">其他产后症状</span>
+                      <el-input maxlength="100"
+                              v-model="form.healthyExtend.postpartumConditioningMessage.otherPostpartumSymptoms"
+                              placeholder="请输入其他产后症状"
+                      ></el-input>
+                    </div>
+                  </el-form-item>
+                  <p class="p_title_2">2、生育史</p>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">(1)、生产几次</span>
+                    <el-input placeholder="生产次数" maxlength="20" v-model="form.healthyExtend.postpartumConditioningMessage.productionNum" style="width:50%;margin-left:10px"/>
+                  </div>
+                  <div class="margin-left" style="margin-top:8px;">
+                    <span class="text-span">(2)、流产几次</span>
+                    <el-input placeholder="流产次数" maxlength="20" v-model="form.healthyExtend.postpartumConditioningMessage.abortionNum" style="width:50%;margin-left:10px"/>
+                  </div>
+                   
+            </div>
+        </div>
   </div>
 </template>
 <script>
@@ -380,7 +557,9 @@ export default {
     };
   },
   methods: {
-
+      getTitle(){
+        return (healthyData['notExperienceIndex'].indexOf(this.form.conditioningProjectId) != -1 ? "八、" : "九、") + healthyData.projectName[this.form.conditioningProjectId+""] + "信息评估（重点）";
+      }
   },
   props: {
     form: {
@@ -389,7 +568,7 @@ export default {
     }
   },
   created() {
-
+      console.log(healthyData['postpartumSymptomsArray'].length);
   },
   computed:{
 
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
index 138caf25d..115ac94d3 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, 14)"
+              v-for="(item, index) in dataList.slice(9, 16)"
               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",
@@ -331,7 +331,7 @@ export default {
   },
   methods: {
     getTitle(index){
-      return healthyData.getTitle(this.healthyData.conditioningProjectId, index, 1)
+      return healthyData.getShowTitle(this.healthyData.conditioningProjectId, index)
     },
     getImgUrl(idx) {
       return `${window.location.origin}${this.medicalReportPathArray[idx]}`;
@@ -680,7 +680,6 @@ export default {
       ).toFixed(1);
 
       this.detailHealthy = healthyData.dealHealthyExtend(detailHealthy);
-
       for (let i = 0; i < this.healthyTitleData.length; i++) {
         let stepArray = [];
         for (let j = 0; j < this.healthyTitleData[i].length; j++) {
@@ -701,6 +700,10 @@ export default {
              return index == 2 || index == 3 || (this.healthyData.conditioningProjectId == 5 && index == 1) || (this.healthyData.conditioningProjectId == 6 && index == 0)
          }else if(this.healthyData.conditioningProjectId == 1 || this.healthyData.conditioningProjectId == 2){
              return index == 4;
+         }else if(this.healthyData.conditioningProjectId == 13){
+           return index == 5;
+         }else if(this.healthyData.conditioningProjectId == 4){
+           return index == 6;
          }
          return false;
      },
diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js
index 1c19c397e..6f9ab044f 100644
--- a/stdiet-ui/src/utils/healthyData.js
+++ b/stdiet-ui/src/utils/healthyData.js
@@ -386,6 +386,58 @@ export const menstrualTypeIntroduceArray = [
   { name: "湿热瘀结型", value: "湿热瘀结型，特点是经期疼痛、经血深红粘稠，腰部胀痛，或者有低热，小便黄，便秘" }
 ];
 
+//食欲程度类型
+export const appetiteArray = [
+  {name: "胃口很好", value: "1"},
+  {name: "胃口一般", value: "2"},
+  {name: "不太想吃", value: "3"},
+  {name: "完全吃不下", value: "4"}
+];
+
+//生产类型
+export const productionStatusArray = [
+  {name: "顺产", value: "1" },
+  {name: "剖宫产", value: "2"},
+  {name: "早产", value: "3"}
+];
+
+//孕期疾病类型
+export const pregnancyDiseaseArray = [
+  {name: "妊娠高血糖", value: "1" },
+  {name: "妊娠高血压", value: "2"},
+  {name: "妊娠甲减", value: "3"}
+];
+
+//喂养方式
+export const feedingMethodsArray = [
+  {name: "纯母乳", value: "1" },
+  {name: "混合喂养", value: "2" },
+  {name: "纯人工喂养", value: "3" }
+];
+
+//乳汁状态
+export const milkStateArray = [
+  {name: "良好", value: "1" },
+  {name: "乳汁不足", value: "2"},
+  {name: "乳汁稀薄", value: "3"}
+];
+
+//产后症状状态
+export const postpartumSymptomsArray = [
+  {name: "贫血", value: "1" },
+  {name: "缺钙（抽筋/腿软）", value: "2"},
+  {name: "抑郁", value: "3"},
+  {name: "焦虑", value: "4" },
+  {name: "脱发", value: "5"},
+  {name: "失眠", value: "6"},
+  {name: "漏尿", value: "7" },
+  {name: "腹直肌分离", value: "8"},
+  {name: "大汗不止", value: "9"},
+  {name: "恶露不尽", value: "10"},
+  {name: "虚弱怕冷", value: "11"}
+]
+
+
 //需要将数组转成字符串的属性名称，包含对象数组、字符串数组
 export const arrayName = [
   "condiment",
@@ -567,7 +619,9 @@ export const needJSONFieldName = [
   "bloodPressureMessage",
   "anxietyStateMessage",
   "depressedStateMessage",
-  "menstruationMessage"
+  "menstruationMessage",
+  "gastrointestinalMessage",
+  "postpartumConditioningMessage"
 ];
 
 //健康信息处理，将数组转为字符串
@@ -753,22 +807,23 @@ export function dealHealthy(customerHealthy) {
   return customerHealthy;
 }
 
-export const extendHealthyTitle = {"0":"减脂","5":"降血压","6":"降血糖","3": "备孕营养", "1": "月经不调", "2": "多囊调理", "11":"心脑血管调理"};
-export const projectName = {"0":"减脂","5":"高血压","6":"高血糖","3": "备孕营养", "1":"月经不调", "2":"多囊卵巢综合症"};
+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 extendHealthyIndex = [5, 6, 1, 2];
+export const extendHealthyIndex = [5, 6, 1, 2, 13,4];
 //跳过减脂经历问卷的项目
-export const notExperienceIndex = [3,1,2];
+export const notExperienceIndex = [3,1,2,13,4];
 
 export function getTitleKey(projectId){
     return extendHealthyTitle[projectId+""] != null ? extendHealthyTitle[projectId+""] : extendHealthyTitle["0"];
 }
 
-export function getTitle(projectId, index , flag){
+//添加问卷信息时获取标题方法
+export function getTitle(projectId, index){
     if(extendHealthyIndex.includes(projectId)){
       //跳过了减脂经历
       if(notExperienceIndex.includes(projectId)){
-          if(index > 1){
+          if(index > 1 && index < 8){
             return titleNumArray[index-1] + titleArray[index];
           }else{
             return titleNumArray[index]+titleArray[index];
@@ -776,7 +831,7 @@ export function getTitle(projectId, index , flag){
       }else{
         if(index == 1){
           return titleNumArray[index]+getTitleKey(projectId)+"经历评估";
-        }else if(index == 8 && flag != 1){
+        }else if(index == 8){
             return titleNumArray[index+1] + titleArray[index];
         }else{
             return titleNumArray[index]+titleArray[index];
@@ -792,6 +847,16 @@ export function getTitle(projectId, index , flag){
     }
 }
 
+//展示问卷信息时获取标题方法
+export function getShowTitle(projectId, index){
+  //跳过了减脂经历
+  if(notExperienceIndex.includes(projectId) && index > 1){
+    return titleNumArray[index-1] + titleArray[index];
+  }else{
+   return titleNumArray[index]+titleArray[index];
+  }
+}
+
 
 
 //获取展示时，根据项目不同返回不同标题
@@ -843,8 +908,12 @@ export const extendedYesNoAttrName = [
   {"targetAttrName": "sameRoomBleed", "healthyAttrName": "menstruationMessage,sameRoomBleed"},
 
   {"targetAttrName": "ovulationBleed", "healthyAttrName": "menstruationMessage,ovulationBleed"},
-  {"targetAttrName": "insulinResistanceFlag", "healthyAttrName": "menstruationMessage,insulinResistanceFlag"}
+  {"targetAttrName": "insulinResistanceFlag", "healthyAttrName": "menstruationMessage,insulinResistanceFlag"},
 
+  {"targetAttrName": "chemotherapyFlag", "healthyAttrName": "gastrointestinalMessage,chemotherapyFlag"},
+  {"targetAttrName": "foodIntoleranceFlag", "healthyAttrName": "gastrointestinalMessage,foodIntoleranceFlag"},
+
+  {"targetAttrName": "resumeMenstruationFlag", "healthyAttrName": "postpartumConditioningMessage,resumeMenstruationFlag"} 
 ]
 
 //单选的value转成对应name
@@ -930,6 +999,70 @@ export function dealHealthyExtend(detailHealthy){
   detailHealthy.menstrualType = getStringBySigleValue(menstrualTypeArray, detailHealthy.healthyExtend.menstruationMessage.menstrualType);
   detailHealthy.medication = detailHealthy.medicationFlag + "，具体药物：" + nullToString(detailHealthy.healthyExtend.menstruationMessage.medication);
   detailHealthy.otherDescriptions = detailHealthy.healthyExtend.menstruationMessage.otherDescriptions;
+
+  //胃肠肿瘤信息
+  detailHealthy.weightChangeDescribe = detailHealthy.healthyExtend.gastrointestinalMessage.weightChangeDescribe;
+  let eatingHabits = "一餐：";
+  let riceNum = nullToString(detailHealthy.healthyExtend.gastrointestinalMessage.riceNum);
+  if(riceNum  != ""){
+    eatingHabits +=  riceNum  + "碗饭，";
+  }
+  let dishNum = nullToString(detailHealthy.healthyExtend.gastrointestinalMessage.dishNum);
+  if(dishNum != ""){
+    eatingHabits += dishNum  + "个菜，";
+  }
+  let soupNum = nullToString(detailHealthy.healthyExtend.gastrointestinalMessage.soupNum);
+  if(soupNum != ""){
+    eatingHabits += soupNum  + "个汤";
+  }
+  detailHealthy.eatingHabits = eatingHabits;
+  detailHealthy.dailyFoodIntake = detailHealthy.healthyExtend.gastrointestinalMessage.dailyFoodIntake;
+  detailHealthy.appetite = getStringBySigleValue(appetiteArray, detailHealthy.healthyExtend.gastrointestinalMessage.appetite);
+  detailHealthy.appetite += (detailHealthy.appetite != "" ? '，' : '') + detailHealthy.healthyExtend.gastrointestinalMessage.otherAppetite;
+  detailHealthy.appetite = removeEnd(detailHealthy.appetite);
+  let sleepStatus = "";
+  let sleepTime = nullToString(detailHealthy.healthyExtend.gastrointestinalMessage.sleepTime);
+  if(sleepTime != ""){
+    sleepStatus += "睡觉时间：" + sleepTime;
+  }
+  let upTime = nullToString(detailHealthy.healthyExtend.gastrointestinalMessage.upTime);
+  if(upTime != ""){
+    sleepStatus += (sleepStatus != "" ? "，" : "") + "睡觉时间：" + upTime;
+  }
+  let lunchBreak = nullToString(detailHealthy.healthyExtend.gastrointestinalMessage.lunchBreak);
+  if(lunchBreak != ""){
+    sleepStatus += (sleepStatus != "" ? "，" : "") + "午休时间：" + lunchBreak;
+  }
+  detailHealthy.sleepStatus = sleepStatus;
+  detailHealthy.chemotherapy = detailHealthy.chemotherapyFlag + "，具体情况：" + detailHealthy.healthyExtend.gastrointestinalMessage.chemotherapy;
+  detailHealthy.foodIntolerance = detailHealthy.foodIntoleranceFlag + "，具体情况：" + detailHealthy.healthyExtend.gastrointestinalMessage.foodIntolerance;
+
+  //产后调理信息
+  detailHealthy.weightGain = detailHealthy.healthyExtend.postpartumConditioningMessage.weightGain;
+  detailHealthy.postpartumMonth = detailHealthy.healthyExtend.postpartumConditioningMessage.postpartumMonth;
+
+  detailHealthy.productionStatus = getStringBySigleValue(productionStatusArray,detailHealthy.healthyExtend.postpartumConditioningMessage.productionStatus);
+  detailHealthy.productionStatus += (detailHealthy.productionStatus != "" ? "，" : "") + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.otherProductionStatus);
+  detailHealthy.productionStatus = removeEnd(detailHealthy.productionStatus);
+
+  detailHealthy.pregnancyDisease = getStringBySigleValue(pregnancyDiseaseArray,detailHealthy.healthyExtend.postpartumConditioningMessage.pregnancyDisease);
+  detailHealthy.pregnancyDisease += (detailHealthy.pregnancyDisease != "" ? "，" : "") + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.otherPregnancyDisease);
+  detailHealthy.pregnancyDisease = removeEnd(detailHealthy.pregnancyDisease);
+
+  detailHealthy.feedingMethods = getStringBySigleValue(feedingMethodsArray,detailHealthy.healthyExtend.postpartumConditioningMessage.feedingMethods);
+  detailHealthy.feedingMethods += (detailHealthy.feedingMethods != "" ? "，" : "") + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.otherFeedingMethods);
+  detailHealthy.feedingMethods = removeEnd(detailHealthy.feedingMethods);
+
+  detailHealthy.milkState = getStringBySigleValue(milkStateArray,detailHealthy.healthyExtend.postpartumConditioningMessage.milkState);
+  detailHealthy.milkState += (detailHealthy.milkState != "" ? "，" : "") + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.otherMilkState);
+  detailHealthy.milkState = removeEnd(detailHealthy.milkState);
+  detailHealthy.postpartumSymptoms = getStringByMuchValue(postpartumSymptomsArray,detailHealthy.healthyExtend.postpartumConditioningMessage.postpartumSymptoms);
+  
+  detailHealthy.postpartumSymptoms += (detailHealthy.postpartumSymptoms != "" ? "，" : "") + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.otherPostpartumSymptoms);
+  detailHealthy.postpartumSymptoms = removeEnd(detailHealthy.postpartumSymptoms);
+
+  detailHealthy.productionNum = "生产次数：" + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.productionNum);
+  detailHealthy.productionNum += "，流产次数：" + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.abortionNum);
 }
 
 export function nullToString(val){
@@ -1022,6 +1155,16 @@ export const healthyTitleData = [
     ["月经形状","痛经情况","痛经类型"],
     ["用药情况","是否有生育计划","是否同房出血"],
     ["是否排卵期出血","是否出现胰岛素抵抗","其他补充"]
+  ],
+  [
+    ["三个月内体重变化","饮食习惯","一天食量"],
+    ["食欲情况","睡眠状况","是否放化疗以及情况"],
+    ["食物不耐受情况","",""]
+  ],
+  [
+    ["孕期增长","产后几个月","生产状况"],
+    ["孕期疾病","喂养方式","乳汁状态"],
+    ["产后症状","恢复月经","生育史"]
   ]
 ]
 
@@ -1099,6 +1242,16 @@ export const healthyValueData = [
     ["menstrualCharacter","menstrualNature","menstrualType"],
     ["medication","familyPlann","sameRoomBleed"],
     ["ovulationBleed","insulinResistanceFlag","otherDescriptions"]
+  ],
+  [
+    ["weightChangeDescribe","eatingHabits","dailyFoodIntake"],
+    ["appetite","sleepStatus","chemotherapy"],
+    ["foodIntolerance","",""]
+  ],
+  [
+    ["weightGain","postpartumMonth","productionStatus"],
+    ["pregnancyDisease","feedingMethods","milkState"],
+    ["postpartumSymptoms","resumeMenstruationFlag","productionNum"]
   ]
 ]
 
diff --git a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
index 6e0c16c50..b87bdfd74 100644
--- a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
+++ b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
@@ -95,6 +95,7 @@ export default {
         name: null,
         phone: null,
         conditioningProjectId: 0,
+        projectDisabledFlag: false,
         sex: 1,
         age: null,
         tall: null,
@@ -211,51 +212,51 @@ export default {
             longEatDrugMessage:[],
             //高血糖评估
             bloodSugarMessage: {
-              "beforeMealBloodSugar": null,
-              "afterMealBloodSugar": null,
-              "measureBloodSugarFlag": 0,
-              "measureBloodSugarTime": null,
-              "nearBloodSugar": null,
-              "lowBloodSugarFlag": 0,
-              "lowBloodSugarTime": null,
-              "complicationFlag": 0,
-              "complication": null,
-              "inferiorSymptomFlag": 0,
-              "inferiorSymptom": [],
-              "weightChangeFlag": 0,
+              beforeMealBloodSugar: null,
+              afterMealBloodSugar: null,
+              measureBloodSugarFlag: 0,
+              measureBloodSugarTime: null,
+              nearBloodSugar: null,
+              lowBloodSugarFlag: 0,
+              lowBloodSugarTime: null,
+              complicationFlag: 0,
+              complication: null,
+              inferiorSymptomFlag: 0,
+              inferiorSymptom: [],
+              weightChangeFlag: 0,
               //糖化血红蛋白
-              "sugarHemoglobin": null,
+              sugarHemoglobin: null,
               //体重变化描述
-              "weightChangeDescribe": null
+              weightChangeDescribe: null
             },
             //高血压评估
             bloodPressureMessage:{
-              "beforeMealBloodPressure": null,
-              "afterMealBloodPressure": null,
-              "measureBloodPressureFlag": 0,
-              "measureBloodPressureTime": null,
-              "nearBloodPressure": null,
-              "lowBloodPressureFlag": 0,
-              "lowBloodPressureTime": null,
-              "complicationFlag": 0,
-              "complication": null,
-              "inferiorSymptomFlag": 0,
-              "inferiorSymptom": [],
-              "weightChangeFlag": 0
+              beforeMealBloodPressure: null,
+              afterMealBloodPressure: null,
+              measureBloodPressureFlag: 0,
+              measureBloodPressureTime: null,
+              nearBloodPressure: null,
+              lowBloodPressureFlag: 0,
+              lowBloodPressureTime: null,
+              complicationFlag: 0,
+              complication: null,
+              inferiorSymptomFlag: 0,
+              inferiorSymptom: [],
+              weightChangeFlag: 0
             },
             //焦虑情绪评估
             anxietyStateMessage:{
-                "easyAnxiousFlag": 0,
-                "upsetRecently": 0,
-                "nervousOnSpecialOccasionsFlag": 0,
-                "terrifiedFlag":0
+                easyAnxiousFlag: 0,
+                upsetRecently: 0,
+                nervousOnSpecialOccasionsFlag: 0,
+                terrifiedFlag:0
             },
             //郁抑情绪评估
             depressedStateMessage:{
-                "listlessRecentlyFlag": 0,
-                "cryRecentlyFlag":0,
-                "wakeUpEarlyRecentlyFlag":0,
-                "noFunLiving":0
+                listlessRecentlyFlag: 0,
+                cryRecentlyFlag:0,
+                wakeUpEarlyRecentlyFlag:0,
+                noFunLiving:0
             },
             //月经不调/多囊问卷信息
             menstruationMessage:{
@@ -301,6 +302,60 @@ export default {
                 insulinResistanceFlag: 0,
                 //其他补充描述
                 otherDescriptions: null
+            },
+            //胃肠肿瘤信息
+            gastrointestinalMessage:{
+                //三个月体重变化描述
+                weightChangeDescribe: null,
+                //几碗饭、几个菜、几个汤
+                riceNum: null,
+                dishNum: null,
+                soupNum: null,
+                //一天食量
+                dailyFoodIntake: null,
+                //食欲
+                appetite: null,
+                otherAppetite: null,
+                //睡觉时间、起床时间
+                sleepTime: null,
+                upTime: null,
+                //午休时间
+                lunchBreak: null,
+                //是否化疗
+                chemotherapyFlag: 0,
+                chemotherapy: null,
+                //食物不耐受
+                foodIntoleranceFlag: 0,
+                foodIntolerance: null
+            },
+            //产后调信息
+            postpartumConditioningMessage:{
+              //增长几斤
+                weightGain: null,
+                //产后几个月
+                postpartumMonth: null,
+                //生产状况
+                productionStatus: null,
+                otherProductionStatus: null,
+                //孕期疾病
+                pregnancyDisease: null,
+                otherPregnancyDisease: null,
+                //喂养方式
+                feedingMethods: null,
+                otherFeedingMethods: null,
+                //乳汁状态
+                milkState: null,
+                otherMilkState: null,
+                //产后症状
+                postpartumSymptoms: [],
+                //其他产后症状
+                otherPostpartumSymptoms: null,
+                //是否恢复月经
+                resumeMenstruationFlag: 0,
+                //生产几次
+                productionNum: null,
+                //流产次数
+                abortionNum: null
             }
         }
       },
@@ -368,6 +423,10 @@ export default {
               this.customerExistFlag = true;
               this.form.name = response.data.name;
               this.form.phone = response.data.phone;
+              this.form.conditioningProjectId = response.data.projectId == null ? 0 : response.data.projectId;
+              if(response.data.projectId != null){
+                 this.form.projectDisabledFlag = true;
+              }
             }
           }
         })