From 0e74ac9e1a8db8de58438079b1c4a23ba0ad5c73 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Fri, 30 Jun 2023 12:48:42 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=B0=20=D1=81=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=B8=D0=BD=D0=B4=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B2=20=D0=B8=20ASTRA-132?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Forms/ClinicalForm.vue                    | 20 +++++++++++++----
 .../Forms/IndexForm.vue                       |  2 +-
 .../newMedicalCard/utils/medicalConfig.js     | 22 +++++++------------
 src/store/modules/medicalCard.js              |  2 +-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ClinicalForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ClinicalForm.vue
index aeac2ac..42379af 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ClinicalForm.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ClinicalForm.vue
@@ -13,10 +13,10 @@
             .tag-wrap.flex.gap-x-1.gap-y-1
               .tag.flex.items-center.px-3.text-smm(
                 v-if="protocolData[data.state]",
-                v-for="item in protocolData[data.state]",
+                v-for="item in findData(data.results.diseases)",
                 :key="item.id"
                 :class="{'pointer': change || fillInspection}"
-              ) {{item.label + " - " + item.text}}
+              ) {{item.label + " - " + item.value}}
           .filter.flex.flex-col.gap-y-4.relative(v-if="change || fillInspection")
             .flex.gap-x-2
               base-input(placeholder="Поиск", outlined, :width="452", iconLeft)
@@ -40,9 +40,9 @@
             .field.flex.flex-col.overflow-y-scroll.gap-y-1(v-if="data.results.diseases")
               .letter.flex.items-center.font-bold.text-base Некоторые инфекционные и паразитарные болезни
               .checkbox.flex.gap-x-2.items-center(v-for="disease in data.results.diseases")
-                q-checkbox(dense, v-model="protocolData[data.state]", :val="disease")
+                q-checkbox(dense, v-model="protocolData[data.state]", :val="disease.label")
                 .name.font-semibold.text-smm {{ disease.label }}
-                .name.font-medium.text-smm {{ disease.text }}
+                .name.font-medium.text-smm {{ disease.value }}
 </template>
 
 <script>
@@ -66,6 +66,18 @@ export default {
     }),
   },
   methods: {
+    findData(data) {
+      let arr = [];
+      if (!data) return;
+      this.protocolData[this.data.state].forEach((e) => {
+        data.forEach((el) => {
+          if (e === el.label) {
+            arr.push(el);
+          }
+        });
+      });
+      return arr;
+    },
     openCard() {
       this.change = true;
     },
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue
index c1b5da9..aa1da6e 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue
@@ -110,7 +110,7 @@ export default {
     modelValue: {
       immediate: true,
       handler(value) {
-        this.protocolData[this.data.state] = value;
+        if (this.fillInspection) this.protocolData[this.data.state] = value;
       },
     },
     state: {
diff --git a/src/pages/newMedicalCard/utils/medicalConfig.js b/src/pages/newMedicalCard/utils/medicalConfig.js
index 1b7aa54..b6db4bd 100644
--- a/src/pages/newMedicalCard/utils/medicalConfig.js
+++ b/src/pages/newMedicalCard/utils/medicalConfig.js
@@ -1267,40 +1267,34 @@ export const protocolForms = [
     state: "clinical",
     results: {
       diseases: [
+        { label: "В00.09", value: "Простой герпес" },
         {
-          id: 1,
           label: "В00.10",
-          text: "Простой герпес лица",
+          value: "Простой герпес лица",
         },
         {
-          id: 2,
           label: "В00.11",
-          text: "Простой герпес губы",
+          value: "Простой герпес губы",
         },
         {
-          id: 3,
           label: "В00.2Х",
-          text: "Герпетический гингивостоматит",
+          value: "Герпетический гингивостоматит",
         },
         {
-          id: 4,
           label: "В02.20",
-          text: "Постгерпетическая невралгия тройничного нерва",
+          value: "Постгерпетическая невралгия тройничного нерва",
         },
         {
-          id: 5,
           label: "В02.21",
-          text: "Постгерпетическая невралгия других черепных нервов",
+          value: "Постгерпетическая невралгия других черепных нервов",
         },
         {
-          id: 6,
           label: "В02.22",
-          text: "Постгерпетическая невралгия двойного нерва",
+          value: "Постгерпетическая невралгия двойного нерва",
         },
         {
-          id: 7,
           label: "В02.23",
-          text: "Простой герпес нижней губы",
+          value: "Простой герпес нижней губы",
         },
       ],
     },
diff --git a/src/store/modules/medicalCard.js b/src/store/modules/medicalCard.js
index 7931366..ceca573 100644
--- a/src/store/modules/medicalCard.js
+++ b/src/store/modules/medicalCard.js
@@ -341,7 +341,7 @@ const getters = {
           { name: "Сканы", data: [] },
         ],
       },
-      clinical: [{ id: 0, label: "В00.09", text: "Простой герпес" }],
+      clinical: ["В00.09"],
     };
   },
   getInitProtocol() {