From fef8ce61f0187148c95e73bcbba28cc7d8f6ae0a Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Wed, 15 Nov 2023 16:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85=E6=85=A2?=
 =?UTF-8?q?=E7=97=85=E5=A4=84=E6=94=B9=E4=B8=BA=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiForm.vue | 11 ++++--
 src/views/components/resiInfo.vue | 62 +++++++++++++++++++++++++------
 src/views/modules/base/resi.vue   | 18 +++++++++
 3 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index e822e8492..2af73e933 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -693,7 +693,7 @@ export default {
             },
             {
               label: "所患慢性病",
-              itemType: "select1",
+              itemType: "checkbox",
               formName: "chronicDiseaseCode",
               opction: []
             },
@@ -1426,7 +1426,7 @@ export default {
           voluntaryEducationFlag: 1,//有无非义务教育阶段助学【有:1 无:0】
           illnessCode: '',//所患大病字典code
           illnessTime: '',//大病患病时间yyyy-MM-dd
-          chronicDiseaseCode: '',//所患慢性病code
+          chronicDiseaseCode: [],//所患慢性病code
           chronicDiseaseTime: '',//慢病患病时间
           insuredFlag: '',//是否参保【是:1 否:0】
           selfPayAmount: '',//自付金额
@@ -2437,6 +2437,11 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg);
         } else {
+
+          if (res.data) {
+            res.data.chronicDiseaseCode = res.data.chronicDiseaseCode.split(',')
+          }
+
           this.form.healthDto = res.data ? res.data : { // 健康
             disabilityCategoryCode: '',//残疾类别
             disabilityLevel: '',//残疾等级
@@ -2448,7 +2453,7 @@ export default {
             voluntaryEducationFlag: 1,//有无非义务教育阶段助学【有:1 无:0】
             illnessCode: '',//所患大病字典code
             illnessTime: '',//大病患病时间yyyy-MM-dd
-            chronicDiseaseCode: '',//所患慢性病code
+            chronicDiseaseCode: [],//所患慢性病code
             chronicDiseaseTime: '',//慢病患病时间
             insuredFlag: 1,//是否参保【是:1 否:0】
             selfPayAmount: '',//自付金额
diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index 0062dbe82..d7bfb9be9 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -357,10 +357,30 @@
                         </div>
                     </el-col>
                     <el-col :span="8">
-                        <div class="f-flex f-bto16 f-top24">
+                        <!-- <div class="f-flex f-bto16 f-top24">
                             <div class="f-labels">所患慢性病:</div>
-                            <span class="f-left8 f-font-color">{{ chronicText }}</span>
-                        </div>
+                            <div v-for="(item, index) in chronicCodeArr" :key="index" class="f-top24">
+                                <span class="f-left8 f-font-color">
+                                    {{ item }}
+                                </span>
+                            </div>
+                            <span v-show="chronicCodeArr.length == 0" class="f-left8 f-font-color">
+                                --
+                            </span>
+
+                        </div> -->
+
+                        <section class="f-flex f-flex1" style="flex: 1; flex-wrap: wrap">
+                            <div class="f-labels f-top24">所患慢性病 :</div>
+                            <div v-for="(item, index) in chronicCodeArr" :key="index" class="f-top24">
+                                <span class="f-left8 f-font-color">
+                                    {{ item }}
+                                </span>
+                            </div>
+                            <span v-show="chronicCodeArr.length == 0" class="f-left8 f-font-color">
+                                --
+                            </span>
+                        </section>
                     </el-col>
                     <el-col :span="8">
                         <div class="f-flex f-bto16 f-top24">
@@ -1606,15 +1626,33 @@ export default {
             });
             return text;
         },
-        chronicText() {
-            let text = "--";
-            this.chronicArr.forEach((item) => {
-                if (item.value == this.resiHealthInfonObj.chronicDiseaseCode) {
-                    text = item.label;
-                }
-            });
-            return text;
-        },
+        // chronicText() {
+        //     let text = "--";
+        //     this.chronicArr.forEach((item) => {
+        //         if (item.value == this.resiHealthInfonObj.chronicDiseaseCode) {
+        //             text = item.label;
+        //         }
+        //     });
+        //     return text;
+        // },
+
+        chronicCodeArr() {
+                  let arr = [];
+                  if (this.resiHealthInfonObj.chronicDiseaseCode) {
+                      let test = this.resiHealthInfonObj.chronicDiseaseCode.split(",");
+                      for (let i of this.chronicArr) {
+                          for (let j of test) {
+                              if (i.value == j) {
+                                  arr.push(i.label);
+                              }
+                          }
+                      }
+                  } else {
+                      arr = [];
+                  }
+                  return arr;
+              },
+
         householdText() {
             let text = "--";
             this.householdArr.forEach((item) => {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index e943ab73a..6d4ec6078 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1014,6 +1014,24 @@ export default {
                 }
             }
 
+            var chronicDiseaseCode = "";
+            if (_baseForm.healthDto) {
+                if (_baseForm.healthDto.chronicDiseaseCode.length === 0) {
+                    chronicDiseaseCode = "";
+                    _baseForm.healthDto.chronicDiseaseCode = chronicDiseaseCode;
+                } else {
+                    _baseForm.healthDto.chronicDiseaseCode.forEach(
+                        (element, index) => {
+                            chronicDiseaseCode =
+                                index === 0
+                                    ? element
+                                    : chronicDiseaseCode + "," + element;
+                        }
+                    );
+                    _baseForm.healthDto.chronicDiseaseCode = chronicDiseaseCode;
+                }
+            }
+
             var volunteerCategory = "";
             if (_baseForm.volunteerDto) {
                 if (_baseForm.volunteerDto.volunteerCategory.length === 0) {