@@ -198,8 +198,7 @@ export default {
},
data() {
return {
- healthyData:healthyData,
- projectName:{'0':'减脂','5':'高血压','6':'高血糖'}
+ healthyData:healthyData
};
},
methods: {
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
index 70c1dcbd9..ff8b2fb65 100644
--- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
+++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
@@ -25,7 +25,7 @@
v-show="dataType == 0"
@click="handleEditGuidanceClick"
plain
- >减脂指导{{guidanceButtonNmae ? guidanceButtonNmae : '减脂指导'}}
- {{ titleArray[index] }}
+ {{ getTitle(index) }}
@@ -110,15 +110,15 @@
>
- {{ titleArray[index + 1] }}
+ {{ getTitle(index+1) }}
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+"mmol/L"))+", "
+"餐后两小时血糖："+(detailHealthy.healthyExtend.bloodSugarMessage.afterMealBloodSugar == null ? "" : (detailHealthy.healthyExtend.bloodSugarMessage.afterMealBloodSugar+"mmol/L"));
detailHealthy.measureBloodSugarFlag = detailHealthy.healthyExtend.bloodSugarMessage.measureBloodSugarFlag == 1 ? "是" : "否";
@@ -847,10 +854,8 @@ 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],
diff --git a/stdiet-ui/src/components/PhysicalSignsEdit/index.vue b/stdiet-ui/src/components/PhysicalSignsEdit/index.vue
index 956eeb9b5..1c17cafcf 100644
--- a/stdiet-ui/src/components/PhysicalSignsEdit/index.vue
+++ b/stdiet-ui/src/components/PhysicalSignsEdit/index.vue
@@ -18,7 +18,7 @@
v-for="(item, index) in healthyData['titleArray']"
:label="index"
:key="index"
- >{{ item }}{{ getTitle(index) }}
@@ -232,7 +232,10 @@ export default {
}
});
this.form.healthyExtend.longEatDrugMessage[index].drug.push({'name':'','num':'','time':''});
- }
+ },
+ getTitle(index){
+ return this.healthyData.getTitle(this.form.conditioningProjectId, index);
+ },
},
watch:{
'form.healthyExtend.eatFruitsNameArray'(newArray, oldArray){
diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js
index 7d61f253a..06a7a9db2 100644
--- a/stdiet-ui/src/utils/healthyData.js
+++ b/stdiet-ui/src/utils/healthyData.js
@@ -328,7 +328,7 @@ export const syndromeNameArray = [
{ name: "麻木", value: "4" },
{ name: "皮肤瘙痒", value: "5" },
{ name: "性欲减退", value: "6" },
- { name: "海男性勃起功能障碍", value: "7" },
+ { name: "男性勃起功能障碍", value: "7" },
{ name: "视力下降", value: "8" }
];
@@ -697,3 +697,34 @@ export function dealHealthy(customerHealthy) {
return customerHealthy;
}
+
+export const extendHealthyTitle = {"0":"减脂","5":"降血压","6":"降血糖"};
+export const projectName = {"0":"减脂","5":"高血压","6":"高血糖"};
+export const extendHealthyIndex = [5, 6];
+
+export function getTitleKey(projectId){
+ return extendHealthyTitle[projectId+""] ? extendHealthyTitle[projectId+""] : extendHealthyTitle["0"];
+}
+
+export function getTitle(projectId, index){
+ if(extendHealthyIndex.includes(projectId)){
+ if(index == 1){
+ return "二、"+getTitleKey(projectId)+"经历评估";
+ }else{
+ return titleArray[index];
+ }
+ }else{
+ return titleArray[index];
+ }
+}
+
+//获取展示时，根据项目不同返回不同标题
+export function getTitleShowArray(projectId){
+ let keyName = getTitleKey(projectId);
+ let array = [
+ [keyName+"经历", keyName+"遇到的困难", keyName+"是否反弹"],
+ ["是否意识到生活习惯是"+keyName+"关键", "", ""],
+ ];
+ return array;
+}
+
diff --git a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
index 86c4e8053..efa46efb3 100644
--- a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
+++ b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
@@ -32,7 +32,6 @@
@@ -91,7 +90,6 @@ 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,
@@ -402,8 +400,8 @@ export default {
}
}
if((this.stepActive == 7 && step > 0) || (this.stepActive == 9 && step < 0)){
- //高血糖、高血压
- if(this.extendedProjectIdArray.indexOf(this.form.conditioningProjectId) == -1){
+ //
+ if(this.healthyData.extendHealthyIndex.indexOf(this.form.conditioningProjectId) == -1){
step = step * 2;
}
}