From 90f398c8791c5cdee9481b50c871f9707a165a6b Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Sun, 27 Jun 2021 23:45:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E7=BB=8F=E4=B8=8D=E8=B0=83=E9=97=AE?= =?UTF-8?q?=E5=8D=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysCustomerHealthyMapper.xml | 1 + .../components/HealthyForm/FormExtended.vue | 42 ++++++------- .../components/PhysicalSignsDialog/index.vue | 23 ++++--- stdiet-ui/src/utils/healthyData.js | 60 +++++++++++-------- 4 files changed, 73 insertions(+), 53 deletions(-) diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml index 0a8ce7132..38421789b 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml @@ -553,6 +553,7 @@ + diff --git a/stdiet-ui/src/components/HealthyForm/FormExtended.vue b/stdiet-ui/src/components/HealthyForm/FormExtended.vue index 0dc4ac3d0..34953375d 100644 --- a/stdiet-ui/src/components/HealthyForm/FormExtended.vue +++ b/stdiet-ui/src/components/HealthyForm/FormExtended.vue @@ -199,7 +199,7 @@ -
+

1、月经基础情况

@@ -225,7 +225,7 @@ rows="3" > - + - + 是 @@ -243,7 +243,7 @@
若存在闭经，请您描述一下闭经时长
@@ -276,7 +276,7 @@ >
- +

2、痛经情况

@@ -284,24 +284,24 @@ 否 - + - + {{ item.name }} - + - + {{ item.name }} - +
类型特点说明：
-
{{item.name}}：{{item.value}}
+
{{item.name}}：{{item.value}}

3、药物情况

@@ -312,45 +312,45 @@
若存在用药，请描述具体名称、剂量、服用时间等
- + 是 否 - + - + 是 否 - + - + 是 否 - + - + 是 否 - + @@ -362,7 +362,7 @@ show-word-limit rows="3" > - +
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue index 7231f57e9..138caf25d 100644 --- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue +++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue @@ -15,7 +15,7 @@ 下载报告
-
-
+
+

{{ extendedTitleArray[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) + return healthyData.getTitle(this.healthyData.conditioningProjectId, index, 1) }, getImgUrl(idx) { return `${window.location.origin}${this.medicalReportPathArray[idx]}`; @@ -679,9 +679,8 @@ export default { (detailHealthy.tall / 100) ).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++) { @@ -697,6 +696,14 @@ export default { this.dataList[i] = stepArray; } }, + isShowModule(index){ + if(this.healthyData.conditioningProjectId == 5 || this.healthyData.conditioningProjectId == 6){ + 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; + } + return false; + }, //健康信息处理，将数组转为字符串 dealHealthy(customerHealthy) { let array = healthyData["needAttrName"]; diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js index b3fdb6434..1c19c397e 100644 --- a/stdiet-ui/src/utils/healthyData.js +++ b/stdiet-ui/src/utils/healthyData.js @@ -764,7 +764,7 @@ export function getTitleKey(projectId){ return extendHealthyTitle[projectId+""] != null ? extendHealthyTitle[projectId+""] : extendHealthyTitle["0"]; } -export function getTitle(projectId, index){ +export function getTitle(projectId, index , flag){ if(extendHealthyIndex.includes(projectId)){ //跳过了减脂经历 if(notExperienceIndex.includes(projectId)){ @@ -776,7 +776,7 @@ export function getTitle(projectId, index){ }else{ if(index == 1){ return titleNumArray[index]+getTitleKey(projectId)+"经历评估"; - }else if(index == 8){ + }else if(index == 8 && flag != 1){ return titleNumArray[index+1] + titleArray[index]; }else{ return titleNumArray[index]+titleArray[index]; @@ -792,6 +792,8 @@ export function getTitle(projectId, index){ } } + + //获取展示时，根据项目不同返回不同标题 export function getTitleShowArray(projectId){ let keyName = getTitleKey(projectId); @@ -836,8 +838,12 @@ export const extendedYesNoAttrName = [ {"targetAttrName": "amenorrhoeaFlag", "healthyAttrName": "menstruationMessage,amenorrhoeaFlag"}, + {"targetAttrName": "medicationFlag", "healthyAttrName": "menstruationMessage,medicationFlag"}, + {"targetAttrName": "familyPlann", "healthyAttrName": "menstruationMessage,familyPlann"}, + {"targetAttrName": "sameRoomBleed", "healthyAttrName": "menstruationMessage,sameRoomBleed"}, - + {"targetAttrName": "ovulationBleed", "healthyAttrName": "menstruationMessage,ovulationBleed"}, + {"targetAttrName": "insulinResistanceFlag", "healthyAttrName": "menstruationMessage,insulinResistanceFlag"} ] @@ -883,7 +889,7 @@ export function dealHealthyExtend(detailHealthy){ eatFruitsMessage += (eatFruitsMessage == "" ? "" : ", ") + item.name + "/" + item.num; }); } - + //高血糖 detailHealthy.healthyExtend.eatFruitsMessage = eatFruitsMessage; detailHealthy.mealBloodSugar = "餐前血糖："+(detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar == null ? "" : (detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar+"mmol/L"))+", " @@ -908,33 +914,39 @@ export function dealHealthyExtend(detailHealthy){ detailHealthy.pressureInferiorSymptom = (detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptomFlag == 1 ? "是" : "否") + ", 具体症状："+getStringByMuchValue(syndromeNameArray,detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptom); detailHealthy.pressureWeightChangeFlag = detailHealthy.healthyExtend.bloodPressureMessage.weightChangeFlag == 1 ? "是" : "否"; - - detailHealthy.menstrualCycle = "生理周期：" + detailHealthy.healthyExtend.menstruationMessage.menstrualCycle + "，生理天数：" + detailHealthy.healthyExtend.menstruationMessage.menstrualDays; - + //月经不调、多囊 + detailHealthy.menstrualCycle = "生理周期：" + nullToString(detailHealthy.healthyExtend.menstruationMessage.menstrualCycle) + "，生理天数：" + nullToString(detailHealthy.healthyExtend.menstruationMessage.menstrualDays); detailHealthy.menstrualForecast = detailHealthy.healthyExtend.menstruationMessage.menstrualForecast; - - dealHealthy.menstrualDelayDays = dealHealthy.healthyExtend.menstruationMessage.menstrualForecast; - - dealHealthy.menstrualAdvanceDays = dealHealthy.healthyExtend.menstruationMessage.menstrualAdvanceDays; - - dealHealthy.amenorrhoeaDays = dealHealthy.amenorrhoeaFlag + "，痛经时长：" + dealHealthy.healthyExtend.menstruationMessage.amenorrhoeaDays; - - dealHealthy.amenorrhoeaDays = dealHealthy.amenorrhoeaFlag + "，痛经时长：" + dealHealthy.healthyExtend.menstruationMessage.amenorrhoeaDays; - - dealHealthy.menstrualColor = getStringBySigleValue(menstrualColorArray, dealHealthy.healthyExtend.menstruationMessage.menstrualColor); - dealHealthy.menstrualColor += dealHealthy.menstrualColor != "" ? ("，"+ dealHealthy.healthyExtend.menstruationMessage.otherMenstrualColor) : dealHealthy.healthyExtend.menstruationMessage.otherMenstrualColor; - - dealHealthy.menstrualCharacter = getStringBySigleValue(menstrualCharacterArray, dealHealthy.healthyExtend.menstruationMessage.menstrualCharacter); - dealHealthy.menstrualCharacter += dealHealthy.menstrualCharacter != "" ? ("，"+dealHealthy.healthyExtend.menstruationMessage.otherMenstrualCharacter) : dealHealthy.healthyExtend.menstruationMessage.otherMenstrualCharacter; - - dealHealthy.menstrualNature = getStringBySigleValue(menstrualNatureArray, dealHealthy.healthyExtend.menstruationMessage.menstrualNature); - + detailHealthy.menstrualDelayDays = detailHealthy.healthyExtend.menstruationMessage.menstrualDelayDays; + detailHealthy.menstrualAdvanceDays = detailHealthy.healthyExtend.menstruationMessage.menstrualAdvanceDays; + detailHealthy.amenorrhoeaDays = detailHealthy.amenorrhoeaFlag + "，痛经时长：" + nullToString(detailHealthy.healthyExtend.menstruationMessage.amenorrhoeaDays); + detailHealthy.menstrualColor = getStringBySigleValue(menstrualColorArray, detailHealthy.healthyExtend.menstruationMessage.menstrualColor); + detailHealthy.menstrualColor += (detailHealthy.menstrualColor != "" ? "，" : "") + nullToString(detailHealthy.healthyExtend.menstruationMessage.otherMenstrualColor); + detailHealthy.menstrualColor = removeEnd(detailHealthy.menstrualColor); + detailHealthy.menstrualCharacter = getStringBySigleValue(menstrualCharacterArray, detailHealthy.healthyExtend.menstruationMessage.menstrualCharacter); + detailHealthy.menstrualCharacter += (detailHealthy.menstrualCharacter != "" ? "，" : "") + nullToString(detailHealthy.healthyExtend.menstruationMessage.otherMenstrualCharacter); + detailHealthy.menstrualCharacter = removeEnd(detailHealthy.menstrualCharacter); + detailHealthy.menstrualNature = getStringBySigleValue(menstrualNatureArray, detailHealthy.healthyExtend.menstruationMessage.menstrualNature); + detailHealthy.menstrualType = getStringBySigleValue(menstrualTypeArray, detailHealthy.healthyExtend.menstruationMessage.menstrualType); + detailHealthy.medication = detailHealthy.medicationFlag + "，具体药物：" + nullToString(detailHealthy.healthyExtend.menstruationMessage.medication); + detailHealthy.otherDescriptions = detailHealthy.healthyExtend.menstruationMessage.otherDescriptions; } export function nullToString(val){ return (val == undefined || val == null) ? "" : val; } +export function removeEnd(val){ + if(val == undefined || val == null){ + return ""; + } + let lastChar = val.substr(val.length-1, 1); + if(lastChar == "," || lastChar == "，"){ + return val.substring(0, val.length-1); + } + return val; +} + // 健康评估标题 export const healthyTitleData = [ [