高血糖、高血压调查问卷

stdiet-admin/src/main/java/com/stdiet/web/controller/MyApplicationRunner.java

@@ -3,8 +3,12 @@ package com.stdiet.web.controller;
 import com.stdiet.common.utils.AliyunVideoUtils;
 import com.stdiet.common.utils.StringUtils;
 import com.stdiet.common.utils.poi.ExcelUtil;
+import com.stdiet.custom.domain.SysCustomerHealthy;
+import com.stdiet.custom.domain.SysCustomerHealthyExtended;
 import com.stdiet.custom.domain.SysNutritionQuestion;
 import com.stdiet.custom.domain.SysNutritionalVideo;
+import com.stdiet.custom.mapper.SysCustomerHealthyExtendedMapper;
+import com.stdiet.custom.mapper.SysCustomerHealthyMapper;
 import com.stdiet.custom.mapper.SysWxUserInfoMapper;
 import com.stdiet.custom.mapper.SysWxUserLogMapper;
 import com.stdiet.custom.service.ISysNutritionQuestionService;
@@ -36,6 +40,11 @@ public class MyApplicationRunner implements ApplicationRunner {
     @Autowired
     private ISysNutritionalVideoService sysNutritionalVideoService;
 
+    @Autowired
+    private SysCustomerHealthyMapper sysCustomerHealthyMapper;
+
+    @Autowired
+    private SysCustomerHealthyExtendedMapper sysCustomerHealthyExtendedMapper;
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
@@ -44,6 +53,26 @@ public class MyApplicationRunner implements ApplicationRunner {
         System.out.println("--------------项目启动调用方法结束-------------");
     }
 
+    /**
+     * 给所有的健康信息加上扩展信息
+     *
+     */
+    public void addExtendedHealthy(){
+        List<SysCustomerHealthy> sysCustomerHealthies = sysCustomerHealthyMapper.selectSysCustomerHealthyList(new SysCustomerHealthy());
+        System.out.println("总条数："+sysCustomerHealthies.size());
+        int success = 0;
+        if(sysCustomerHealthies != null && sysCustomerHealthies.size() > 0){
+            for (SysCustomerHealthy sysCustomerHealthy : sysCustomerHealthies) {
+                SysCustomerHealthyExtended extended = new SysCustomerHealthyExtended();
+                extended.setHealthyId(sysCustomerHealthy.getId());
+                if(sysCustomerHealthyExtendedMapper.insertSysCustomerHealthyExtended(extended)  > 0){
+                    success++;
+                }
+            }
+        }
+        System.out.println("成功条数："+success);
+    }
+
     /**
      * 给现有视频更新截图图片
      */

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCustomerHealthyServiceImpl.java

@@ -111,7 +111,11 @@ public class SysCustomerHealthyServiceImpl implements ISysCustomerHealthyService
      */
     @Override
     public int updateSysCustomerHealthy(SysCustomerHealthy sysCustomerHealthy){
-        return sysCustomerHealthyMapper.updateSysCustomerHealthy(sysCustomerHealthy);
+        int rows = sysCustomerHealthyMapper.updateSysCustomerHealthy(sysCustomerHealthy);
+        if(rows > 0){
+            rows = sysCustomerHealthyExtendedMapper.updateSysCustomerHealthyExtended(sysCustomerHealthy.getHealthyExtend());
+        }
+        return rows;
     }
 
     /**

stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml

@@ -557,7 +557,7 @@
     </resultMap>
 
     <select id="getHealthyExtendedByHealthyId" parameterType="Long" resultMap="HealthyExtendedResult">
-       select waist, hipline, eat_fruits_message, long_eat_drug_message, blood_sugar_message, depressed_state_message, blood_pressure_message, anxiety_state_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 from sys_customer_healthy_extended where del_flag = 0 and  healthy_id = #{id} limit 1
     </select>
 
 </mapper>

stdiet-ui/src/components/HealthyForm/Form9.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="p_title_1">{{healthyData['titleArray'][8]}}</p>
+    <p class="p_title_1">{{titleNumFlag ? '十、体检报告' : healthyData['titleArray'][8]}}</p>
     <p class="p_title_2">1、体检报告</p>
     <el-form-item label="(1) 请上传相应的体检报告" prop="fileList" class="margin-left">
       <el-upload style="margin-left: 20px;"
@@ -119,7 +119,11 @@ export default {
     form: {
       type: Object,
       default: null
-    }
+    },
+      titleNumFlag:{
+        type: Boolean,
+          default: false
+      }
   },
   created() {
 

stdiet-ui/src/components/HealthyForm/FormExtended.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="p_title_1">{{projectName[form.conditioningProjectId+'']}}信息调查</p>
+    <p class="p_title_1">九、{{projectName[form.conditioningProjectId+'']}}信息评估</p>
     <!--高血糖-->
     <div v-show="form.conditioningProjectId == 6 || form.conditioningProjectId == 5">
             <div v-show="form.conditioningProjectId == 6">

stdiet-ui/src/components/PhysicalSignsDialog/index.vue

@@ -104,7 +104,7 @@
           <!-- 其他信息 -->
           <div style="height: 370px; overflow: auto">
             <div
-              v-for="(item, index) in dataList.slice(1, 10)"
+              v-for="(item, index) in dataList.slice(1, 9)"
               style="margin-bottom: 50px"
               :key="index"
             >
@@ -174,26 +174,21 @@
               </div>
             </div>
             <div
-              v-for="(item, index) in dataList.slice(10, 12)"
+              v-for="(item, index) in dataList.slice(9, 13)"
               style="margin-bottom: 50px"
-              :key="index"
+              :key="'sign'+index"
             >
-              <div v-if="index==0">
+              <div v-if="healthyData.conditioningProjectId == 5 || healthyData.conditioningProjectId == 6">
-                <p class="p_title_1" style="margin-top: 5px">
+                <div v-if="index == 2 || index == 3 || (healthyData.conditioningProjectId == 5 && index == 1) || (healthyData.conditioningProjectId == 6 && index == 0)">
-                  {{ '高血糖问卷信息' }}
+                  <p class="p_title_1" style="margin-top: 5px">
-                </p>
+                    {{ extendedTitleArray[index] }}
-                <table-detail-message
+                  </p>
-                  :data="item"
+                  <table-detail-message
-                ></table-detail-message>
+                    :data="item"
-              </div>
+                  ></table-detail-message>
-              <div v-if="index==1">
+                </div>
-                <p class="p_title_1" style="margin-top: 5px">
-                  {{ '高血压问卷信息' }}
-                </p>
-                <table-detail-message
-                  :data="item"
-                ></table-detail-message>
               </div>
+
             </div>
           </div>
         </div>
@@ -374,18 +369,21 @@ export default {
           ["餐前餐后血糖", "是否有规律测血糖", "测量血糖时间"],
           ["近期血糖水平", "是否有低血糖反应", "是否有出现并发症"],
           ["并发症情况", "存在症状", "近三个月体重是否有变化"],
-          ["你认为你是一个容易焦虑或紧张的人吗","最近一段时间，你是否比平时更感到焦虑或忐忑不安","是否有一些特殊场合或情景更容易使得你紧张、焦虑"],
+
-          ["你曾经有过惊恐发作吗.即突然发生的强烈不适感或心慌、眩晕、感到憋气或呼吸困难等症状","过去几周(或几个月)是否感觉到无精打采、伤感、或对生活的乐趣减少","除了不开心之外，是否比平时更加悲观或想哭"],
+        ],
-          ["经常有早醒吗?(事实上不需那么早醒来)","近来是否经常想到活着没有意思",""]
-        ]
         [
           ["餐前餐后血压", "是否有规律测血压", "测量血压时间"],
           ["近期血压水平", "是否有低血压反应", "是否有出现并发症"],
-          ["并发症情况", "存在症状", "近三个月体重是否有变化"],
+          ["并发症情况", "存在症状", "近三个月体重是否有变化"]
-          ["你认为你是一个容易焦虑或紧张的人吗","最近一段时间，你是否比平时更感到焦虑或忐忑不安","是否有一些特殊场合或情景更容易使得你紧张、焦虑"],
+        ],
-          ["你曾经有过惊恐发作吗.即突然发生的强烈不适感或心慌、眩晕、感到憋气或呼吸困难等症状","过去几周(或几个月)是否感觉到无精打采、伤感、或对生活的乐趣减少","除了不开心之外，是否比平时更加悲观或想哭"],
+          [
-          ["经常有早醒吗?(事实上不需那么早醒来)","近来是否经常想到活着没有意思",""]
+              ["你认为你是一个容易焦虑或紧张的人吗","最近一段时间，你是否比平时更感到焦虑或忐忑不安","是否有一些特殊场合或情景更容易使得你紧张、焦虑"],
-        ]
+              ["你曾经有过惊恐发作吗.即突然发生的强烈不适感或心慌、眩晕、感到憋气或呼吸困难等症状","",""]
+          ],
+          [
+              ["过去几周(或几个月)是否感觉到无精打采、伤感、或对生活的乐趣减少","除了不开心之外，是否比平时更加悲观或想哭","经常有早醒吗(事实上不需那么早醒来)"],
+              ["近来是否经常想到活着没有意思","",""]
+          ]
       ],
       // 健康评估属性
       healthyValueData: [
@@ -440,20 +438,24 @@ export default {
         [
           ["mealBloodSugar", "measureBloodSugarFlag", "measureBloodSugarTime"],
           ["nearBloodSugar", "lowBloodSugarFlag", "complicationFlag"],
-          ["complication", "inferiorSymptomFlag", "weightChangeFlag"],
+          ["complication", "inferiorSymptom", "weightChangeFlag"]
-          ["easyAnxiousFlag","upsetRecently","nervousOnSpecialOccasionsFlag"],
-          ["terrifiedFlag","listlessRecentlyFlag","cryRecentlyFlag"],
-          ["wakeUpEarlyRecentlyFlag","noFunLiving",""]
         ],
         [
           ["mealBloodPressure", "measureBloodPressureFlag", "measureBloodPressureTime"],
-          ["nearBloodPressure", "lowBloodPressureFlag", "complicationFlag"],
+          ["nearBloodPressure", "lowBloodPressureFlag", "pressureComplicationFlag"],
-          ["complication", "inferiorSymptomFlag", "weightChangeFlag"],
+          ["pressureComplication", "pressureInferiorSymptom", "pressureWeightChangeFlag"],
-          ["easyAnxiousFlag","upsetRecently","nervousOnSpecialOccasionsFlag"],
+        ],
-          ["terrifiedFlag","listlessRecentlyFlag","cryRecentlyFlag"],
+          [
-          ["wakeUpEarlyRecentlyFlag","noFunLiving",""]
+              ["easyAnxiousFlag","upsetRecently","nervousOnSpecialOccasionsFlag"],
-        ]
+              ["terrifiedFlag","",""]
+          ],
+          [
+              ["listlessRecentlyFlag","cryRecentlyFlag","wakeUpEarlyRecentlyFlag"],
+              ["noFunLiving","",""]
+          ]
+
       ],
+       extendedTitleArray:['十、高血糖信息评估',"十、高血压信息评估","十一、焦虑信息评估","十二、抑郁信息评估"],
       copyValue: "",
       detailHealthy: null,
       dialogWidth: "950px",
@@ -805,38 +807,39 @@ export default {
       ).toFixed(1);
       //常吃水果以及份量
       let eatFruitsMessage = "";
+      console.log(detailHealthy.healthyExtend.eatFruitsMessage);
       if(detailHealthy.healthyExtend.eatFruitsMessage != null && detailHealthy.healthyExtend.eatFruitsMessage.length > 0){
          detailHealthy.healthyExtend.eatFruitsMessage.forEach((item,index) => {
             eatFruitsMessage += (eatFruitsMessage == "" ? "" : ", ") + item.name + "/" + item.num;
          });
       }
       detailHealthy.healthyExtend.eatFruitsMessage = eatFruitsMessage;
-
+      console.log(detailHealthy.healthyExtend.bloodSugarMessage.inferiorSymptom.join(","));
-      detailHealthy.mealBloodSugar = "餐前血糖："+(detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar == null ? "" : detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar == null)+", "
+      detailHealthy.mealBloodSugar = "餐前血糖："+(detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar == null ? "" : (detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar+"mmol/L"))+", "
-          +"餐后两小时血糖："+(detailHealthy.healthyExtend.bloodSugarMessage.afterMealBloodSugar == null ? "" : detailHealthy.healthyExtend.bloodSugarMessage.afterMealBloodSugar);
+          +"餐后两小时血糖："+(detailHealthy.healthyExtend.bloodSugarMessage.afterMealBloodSugar == null ? "" : (detailHealthy.healthyExtend.bloodSugarMessage.afterMealBloodSugar+"mmol/L"));
       detailHealthy.measureBloodSugarFlag = detailHealthy.healthyExtend.bloodSugarMessage.measureBloodSugarFlag == 1 ? "是" : "否";
       detailHealthy.measureBloodSugarTime = detailHealthy.healthyExtend.bloodSugarMessage.measureBloodSugarTime;
       detailHealthy.nearBloodSugar = detailHealthy.healthyExtend.bloodSugarMessage.nearBloodSugar;
       detailHealthy.lowBloodSugarFlag = (detailHealthy.healthyExtend.bloodSugarMessage.lowBloodSugarFlag == 1 ? "是" : "否") + ", 出现时间："+detailHealthy.healthyExtend.bloodSugarMessage.lowBloodSugarTime;
       detailHealthy.complicationFlag = detailHealthy.healthyExtend.bloodSugarMessage.complicationFlag == 1 ? "是" : "否";
       detailHealthy.complication = detailHealthy.healthyExtend.bloodSugarMessage.complication;
-      detailHealthy.inferiorSymptomFlag = (detailHealthy.healthyExtend.bloodSugarMessage.inferiorSymptomFlag == 1 ? "是" : "否") + ", 具体症状："+detailHealthy.healthyExtend.bloodSugarMessage.inferiorSymptom.join(",");
+      detailHealthy.inferiorSymptom = (detailHealthy.healthyExtend.bloodSugarMessage.inferiorSymptomFlag == 1 ? "是" : "否") + ", 具体症状："+detailHealthy.healthyExtend.bloodSugarMessage.inferiorSymptom.join(",");
       detailHealthy.weightChangeFlag = detailHealthy.healthyExtend.bloodSugarMessage.weightChangeFlag == 1 ? "是" : "否";
 
-      detailHealthy.mealBloodPressure = "餐前血糖："+(detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure == null ? "" : detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure == null)+", "
+      detailHealthy.mealBloodPressure = "餐前血压："+(detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure == null ? "" : (detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure+"mmHg"))+", "
-          +"餐后两小时血糖："+(detailHealthy.healthyExtend.bloodPressureMessage.afterMealBloodPressure == null ? "" : detailHealthy.healthyExtend.bloodPressureMessage.afterMealBloodPressure);
+          +"餐后两小时血压："+(detailHealthy.healthyExtend.bloodPressureMessage.afterMealBloodPressure == null ? "" : (detailHealthy.healthyExtend.bloodPressureMessage.afterMealBloodPressure+"mmHg"));
       detailHealthy.measureBloodPressureFlag = detailHealthy.healthyExtend.bloodPressureMessage.measureBloodPressureFlag == 1 ? "是" : "否";
       detailHealthy.measureBloodPressureTime = detailHealthy.healthyExtend.bloodPressureMessage.measureBloodPressureTime;
       detailHealthy.nearBloodPressure = detailHealthy.healthyExtend.bloodPressureMessage.nearBloodPressure;
       detailHealthy.lowBloodPressureFlag = (detailHealthy.healthyExtend.bloodPressureMessage.lowBloodPressureFlag == 1 ? "是" : "否") + ", 出现时间："+detailHealthy.healthyExtend.bloodPressureMessage.lowBloodPressureTime;
-      detailHealthy.complicationFlag = detailHealthy.healthyExtend.bloodPressureMessage.complicationFlag == 1 ? "是" : "否";
+      detailHealthy.pressureComplicationFlag = detailHealthy.healthyExtend.bloodPressureMessage.complicationFlag == 1 ? "是" : "否";
-      detailHealthy.complication = detailHealthy.healthyExtend.bloodPressureMessage.complication;
+      detailHealthy.pressureComplication = detailHealthy.healthyExtend.bloodPressureMessage.complication;
-      detailHealthy.inferiorSymptomFlag = (detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptomFlag == 1 ? "是" : "否") + ", 具体症状："+detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptom.join(",");
+      detailHealthy.pressureInferiorSymptom = (detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptomFlag == 1 ? "是" : "否") + ", 具体症状："+detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptom.join(",");
-      detailHealthy.weightChangeFlag = detailHealthy.healthyExtend.bloodPressureMessage.weightChangeFlag == 1 ? "是" : "否";
+      detailHealthy.pressureWeightChangeFlag = detailHealthy.healthyExtend.bloodPressureMessage.weightChangeFlag == 1 ? "是" : "否";
 
       detailHealthy.easyAnxiousFlag = detailHealthy.healthyExtend.anxietyStateMessage.easyAnxiousFlag == 1 ? "是" : "否";
       detailHealthy.upsetRecently = detailHealthy.healthyExtend.anxietyStateMessage.upsetRecently == 1 ? "是" : "否";
-      detailHealthy.unervousOnSpecialOccasionsFlag = detailHealthy.healthyExtend.anxietyStateMessage.nervousOnSpecialOccasionsFlag == 1 ? "是" : "否";
+      detailHealthy.nervousOnSpecialOccasionsFlag = detailHealthy.healthyExtend.anxietyStateMessage.nervousOnSpecialOccasionsFlag == 1 ? "是" : "否";
       detailHealthy.terrifiedFlag = detailHealthy.healthyExtend.anxietyStateMessage.terrifiedFlag == 1 ? "是" : "否";
       detailHealthy.listlessRecentlyFlag = detailHealthy.healthyExtend.depressedStateMessage.listlessRecentlyFlag == 1 ? "是" : "否";
       detailHealthy.cryRecentlyFlag = detailHealthy.healthyExtend.depressedStateMessage.cryRecentlyFlag == 1 ? "是" : "否";
@@ -844,8 +847,10 @@ export default {
       detailHealthy.noFunLiving = detailHealthy.healthyExtend.depressedStateMessage.noFunLiving == 1 ? "是" : "否";
 
       this.detailHealthy = detailHealthy;
+      console.log("---");
       for (let i = 0; i < this.healthyTitleData.length; i++) {
         let stepArray = [];
+        console.log(i);
         for (let j = 0; j < this.healthyTitleData[i].length; j++) {
           stepArray[j] = {
             attr_name_one: this.healthyTitleData[i][j][0],

stdiet-ui/src/components/PhysicalSignsEdit/index.vue

@@ -48,6 +48,7 @@
           v-show="stepArray[7]"
           :flag="1"
           :form.sync="form"
+          @addNewDrugInput="addNewDrugInput"
         ></healthy-form8>
         <edit-file
           v-show="stepArray[8]"
@@ -195,6 +196,12 @@ export default {
         cusMessage[item] =
           cusMessage[item] != null ? cusMessage[item].join(",") : null;
       });
+        let cusMessageExtended = Object.assign({}, this.form.healthyExtend);
+        //处理healthyExtend扩展数据
+        this.healthyData["needJSONFieldName"].forEach(function (item, index) {
+            cusMessageExtended[item] = cusMessageExtended[item] != null ? JSON.stringify(cusMessageExtended[item]) : null;
+        });
+        cusMessage.healthyExtend = cusMessageExtended;
       updateHealthy(cusMessage)
         .then((response) => {
           if (response.code === 200) {
@@ -217,7 +224,46 @@ export default {
       }
       this.submitShow = allShow;
     },
+      addNewDrugInput(type){
+          let index = null;
+          this.form.healthyExtend.longEatDrugMessage.forEach((v, i) => {
+              if(v.type == type){
+                  index = i;
+              }
+          });
+          this.form.healthyExtend.longEatDrugMessage[index].drug.push({'name':'','num':'','time':''});
+      }
   },
+    watch:{
+        'form.healthyExtend.eatFruitsNameArray'(newArray, oldArray){
+            oldArray = (oldArray == undefined || oldArray == null) ? [] : oldArray;
+            newArray = (newArray == undefined || newArray == null) ? [] : newArray;
+            if(newArray.length > oldArray.length){
+                this.form.healthyExtend.eatFruitsMessage.push({'name': newArray[newArray.length-1], "num": ''});
+            }else{
+                let array = newArray.concat(oldArray).filter(function(v, i, arr) {
+                    return arr.indexOf(v) === arr.lastIndexOf(v);
+                });
+                this.form.healthyExtend.eatFruitsMessage = this.form.healthyExtend.eatFruitsMessage.filter(function(v, i, arr) {
+                    return array.indexOf(v.name) == -1;
+                });
+            }
+        },
+        'form.longEatDrugClassify'(newArray, oldArray){
+            oldArray = (oldArray == undefined || oldArray == null) ? [] : oldArray;
+            newArray = (newArray == undefined || newArray == null) ? [] : newArray;
+            if(newArray.length > oldArray.length){
+                this.form.healthyExtend.longEatDrugMessage.push({'type': newArray[newArray.length-1], 'drug': [{'name':'','num':'','time':''}]});
+            }else{
+                let array = newArray.concat(oldArray).filter(function(v, i, arr) {
+                    return arr.indexOf(v) === arr.lastIndexOf(v);
+                });
+                this.form.healthyExtend.longEatDrugMessage = this.form.healthyExtend.longEatDrugMessage.filter(function(v, i, arr) {
+                    return array.indexOf(v.name) == -1;
+                });
+            }
+        }
+    }
 };
 </script>
 

stdiet-ui/src/views/custom/subhealthy/investigation/index.vue

@@ -32,6 +32,7 @@
       <healthy-form9
         v-show="stepArray[9]"
         ref="fileForm"
+        :titleNumFlag="extendedProjectIdArray.indexOf(this.form.conditioningProjectId) != -1"
         @addOrEditHealthy="addCustomerHealthy()"
         :form.sync="form"
       ></healthy-form9>
@@ -90,6 +91,7 @@ export default {
       submitFlag: false,
       stepArray: [true, false, false, false, false, false, false, false, false, false],
       stepActive: 0,
+       extendedProjectIdArray:[5,6],
       form: {
         customerEncId: null,
         name: null,
@@ -399,6 +401,12 @@ export default {
                 }
               }
           }
+          if((this.stepActive == 7 && step > 0) || (this.stepActive == 9 && step < 0)){
+              //高血糖、高血压
+              if(this.extendedProjectIdArray.indexOf(this.form.conditioningProjectId)  == -1){
+                  step = step * 2;
+              }
+          }
           this.stepArray[this.stepActive] = false;
           this.stepActive = this.stepActive + step;
           this.stepArray[this.stepActive] = true;