From 8e29bc5993d95afba9da0ee9af66679ef28b410e Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 22 May 2020 11:04:02 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E3=80=90=E8=87=AA=E5=8A=A9=E5=85=A5?=
 =?UTF-8?q?=E5=8F=B8=E4=BC=98=E5=8C=96=E3=80=91=E5=81=A5=E5=BA=B7=E5=91=8A?=
 =?UTF-8?q?=E7=9F=A5=E5=8F=8D=E6=98=BE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agentEenter/AgentEenterBasicHealth.vue    | 74 ++++++++++++-------
 1 file changed, 47 insertions(+), 27 deletions(-)

diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue b/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue
index dec116775..cd97c039b 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue
@@ -107,32 +107,14 @@ export default {
       })
       agentAll({}).then(res => {
         if (res.result == '0') {
-          if (res.content.ebizItemDtoLst.length == 0) {
-            this.getImpart()
-          } else {
-            res.content.ebizItemDtoLst.map((item, index) => {
-              item.bigCode = 'A' + index + 1 //添加大标题标识
-              if (item.itemDtoLst) {
-                item.itemDtoLst.map((it, index) => {
-                  it.impartAnswer = ''
-                  it.smallCode = item.bigCode + index //添加小题目标识
-                })
-              }
-            })
-            if (localStorage.agentSex == 0) {
-              // //姓别为男不显示该题
-              // this.isDisabled = true
-              // res.content.ebizItemDtoLst.splice(7, 1)
-            }
-            this.impartDTOS = res.content.ebizItemDtoLst
-          }
+          this.getImpart(res.content.ebizItemDtoLst)
         } else {
           this.$toast(res.resultMessage)
         }
       })
     },
     //获取健康告知列表
-    getImpart() {
+    getImpart(dataItemLst) {
       let that = this
       let data = {
         // userModel: {
@@ -150,14 +132,52 @@ export default {
         that.$toast.clear()
         console.log(res)
         res.map((item, index) => {
-          item.impartAnswer = ''
-          item.impartRemark = ''
-          item.bigCode = 'A' + index + 1 //添加大标题标识
-          if (item.itemDtoLst) {
-            item.itemDtoLst.map((it, index) => {
-              it.impartAnswer = ''
-              it.smallCode = item.bigCode + index //添加小题目标识
+          if (dataItemLst && dataItemLst.length > 0) {
+            let showLst = dataItemLst.filter(itemC => {
+              return itemC.impartId == item.impartId && itemC.impartType == item.impartType
             })
+            if (showLst && showLst.length > 0) {
+              item.impartAnswer = showLst[0].impartAnswer
+              item.impartRemark = showLst[0].impartRemark
+              item.bigCode = 'A' + index + 1
+              if (item.itemDtoLst) {
+                item.itemDtoLst.map((it, index) => {
+                  let showSubLst = showLst.filter(itemB => {
+                    return itemB.impartNo == it.impartNo && itemB.impartType == it.impartType
+                  })
+                  if (showSubLst && showSubLst.length > 0) {
+                    it.impartAnswer = showSubLst[0].impartAnswer
+                    it.impartRemark = showSubLst[0].impartRemark
+                  } else {
+                    it.impartAnswer = ''
+                    it.impartRemark = ''
+                  }
+                  it.smallCode = item.bigCode + index //添加小题目标识
+                })
+              }
+            } else {
+              item.impartAnswer = ''
+              item.impartRemark = ''
+              item.bigCode = 'A' + index + 1 //添加大标题标识
+              if (item.itemDtoLst) {
+                item.itemDtoLst.map((it, index) => {
+                  it.impartAnswer = ''
+                  it.impartRemark = ''
+                  it.smallCode = item.bigCode + index //添加小题目标识
+                })
+              }
+            }
+          } else {
+            item.impartAnswer = ''
+            item.impartRemark = ''
+            item.bigCode = 'A' + index + 1 //添加大标题标识
+            if (item.itemDtoLst) {
+              item.itemDtoLst.map((it, index) => {
+                it.impartAnswer = ''
+                it.impartRemark = ''
+                it.smallCode = item.bigCode + index //添加小题目标识
+              })
+            }
           }
         })
         if (localStorage.agentSex == 0) {