From 1304a1d4255164c62382de68a93d6356b9c73631 Mon Sep 17 00:00:00 2001
From: DwCay <duminalexei@gmail.com>
Date: Thu, 15 Jun 2023 18:28:26 +0300
Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82=D0=B2?=
 =?UTF-8?q?=D1=83=D1=8E=D1=89=D0=B8=D1=85=20=D0=B7=D1=83=D0=B1=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ToothFormula/DentalConditionForm.vue      |   4 +-
 .../Forms/ToothFormula/DetailedToothSvg.vue   | 122 +++++++-----
 .../Forms/ToothFormula/ToothFormulaCell.vue   | 148 +++++++--------
 .../Forms/ToothFormula/ToothFormulaTable.vue  |   3 +-
 .../Forms/ToothFormula/tooths/IncorsTooth.vue | 108 ++++++-----
 .../Forms/ToothFormula/tooths/MolarsTooth.vue | 179 +++++++++++-------
 .../tooths/PreMolarsFangsTooth.vue            | 108 ++++++-----
 .../newMedicalCard/utils/medicalConfig.js     |   2 +-
 8 files changed, 395 insertions(+), 279 deletions(-)

diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue
index 1075ae8..36292e4 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue
@@ -7,7 +7,7 @@
         :tooth-config="cellConfig",
         :jaw-position="jawPosition",
         :oversized="20",
-        :view="data.general === 'ИЗ' ? 'artificial': 'native'",
+        :view="data.general === 'И' ? 'artificial': 'native'",
         :data="data",
         editable
         )
@@ -15,7 +15,7 @@
         part-tooth="crown",
         :click-part="clickPart",
         :oversized="10",
-        :view="data.general === 'ИЗ' ? 'artificial': 'native'",
+        :view="data.general === 'И' ? 'artificial': 'native'",
         :data="data",
         editable
         )
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DetailedToothSvg.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DetailedToothSvg.vue
index e5f75d6..a37266c 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DetailedToothSvg.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DetailedToothSvg.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  svg.flex.items-center(
+  svg(
     v-if="partTooth === 'crown'",
     :width="getSizeSvg.width",
     :height="getSizeSvg.height",
@@ -20,50 +20,71 @@
           fill="#D3D4DC"
           )
       g(v-else)
-        g
+        g(v-if="data.general === 'О'")
           path(
-            d="M26.1322 26.1118C22.6171 29.624 16.918 29.624 13.4029 26.1118M13.3926 26.1015C9.89147 22.5922 9.89126 16.9137 13.392 13.4041M13.4029 13.3932C16.918 9.88102 22.6171 9.88102 26.1322 13.3932M26.1431 13.4041C29.6439 16.9137 29.6437 22.5922 26.1425 26.1015M25.7788 25.7581C22.459 29.0752 17.0762 29.0752 13.7563 25.7581C10.4367 22.4413 10.4367 17.0637 13.7563 13.7469C17.0762 10.4298 22.459 10.4298 25.7788 13.7469C29.0985 17.0637 29.0985 22.4413 25.7788 25.7581ZM7.75075 32.4661L13.4121 26.8095C17.0188 30.0581 22.5164 30.0581 26.1231 26.8095L31.7844 32.4661C30.2369 33.9263 28.4346 35.0932 26.4654 35.9082C24.342 36.787 22.066 37.2394 19.7676 37.2394C17.4691 37.2394 15.1932 36.787 13.0697 35.9082C11.1006 35.0932 9.2983 33.9263 7.75075 32.4661ZM32.4919 31.7593L26.8305 26.1027C30.0813 22.4989 30.0813 17.0061 26.8305 13.4023L32.4919 7.74571C33.9536 9.29209 35.1216 11.093 35.9374 13.0607C36.8169 15.1823 37.2696 17.4561 37.2696 19.7525C37.2696 22.0488 36.8169 24.3227 35.9374 26.4443C35.1216 28.412 33.9536 30.2129 32.4919 31.7593ZM26.1231 12.6955C22.5164 9.44691 17.0188 9.44691 13.4121 12.6955L7.75075 7.03892C9.2983 5.57869 11.1006 4.41176 13.0697 3.59679C15.1932 2.71796 17.4691 2.26562 19.7676 2.26562C22.066 2.26563 24.342 2.71796 26.4654 3.59679C28.4346 4.41176 30.2369 5.57869 31.7844 7.03892L26.1231 12.6955ZM12.7047 26.1027L7.04333 31.7593C5.58161 30.2129 4.41354 28.412 3.59783 26.4443C2.71831 24.3227 2.26562 22.0488 2.26562 19.7525C2.26562 17.4561 2.7183 15.1823 3.59783 13.0607C4.41354 11.093 5.58161 9.29209 7.04333 7.74571L12.7047 13.4023C9.45391 17.0061 9.45391 22.4989 12.7047 26.1027Z",
-            stroke="#252850"
-          )
-          path(
-            @click="(el) => clickPart(el.target.id)",
-            :id="editable && 'crown_bottom'",
-            :class="{'edit-part': editable}",
-            d="M29.5234 31.7754C29.802 32.0662 29.7555 32.5373 29.4182 32.7575C26.5287 34.6441 23.1246 36.0162 19.6995 35.9394C16.2673 35.8624 12.8886 34.7337 10.0788 32.7673C9.75567 32.5412 9.72375 32.0808 10.0001 31.7996L13.1122 28.6337C13.3445 28.3973 13.7156 28.3737 13.9901 28.5594C15.7771 29.7687 17.5777 30.0976 19.8296 30.1481C22.0882 30.1988 23.8151 29.7034 25.6461 28.5283C25.9184 28.3536 26.2784 28.3877 26.5021 28.6212L29.5234 31.7754Z",
-            fill="#D3D4DC"
-          )
-          path(
-            @click="(el) => clickPart(el.target.id)",
-            :id="editable && 'crown_top'",
-            :class="{'edit-part': editable}",
-            d="M10.02 7.83259C9.73773 7.54247 9.78271 7.06817 10.1218 6.84692C13.0102 4.96209 16.4123 3.59159 19.8354 3.66837C23.2653 3.74529 26.6418 4.87262 29.4506 6.83662C29.7757 7.06395 29.8058 7.52786 29.5252 7.80822L26.2828 11.048C26.0499 11.2806 25.6816 11.3026 25.4106 11.1157C23.6415 9.89566 21.9585 9.51017 19.7053 9.45964C17.4456 9.40896 15.8222 9.95753 14.0063 11.1421C13.737 11.3177 13.3792 11.2851 13.155 11.0547L10.02 7.83259Z",
-            fill="#D3D4DC"
-          )
-          path(
-            @click="(el) => clickPart(el.target.id)",
-            :id="editable && 'crown_right'",
-            :class="{'edit-part': editable}",
-            d="M31.759 10.0672C32.0484 9.7804 32.5272 9.82331 32.75 10.1644C34.6342 13.049 36.0037 16.4456 35.9269 19.8633C35.8499 23.2903 34.7217 26.6639 32.756 29.4704C32.5285 29.7952 32.0642 29.8253 31.7836 29.5449L28.5411 26.3052C28.3083 26.0725 28.2862 25.7045 28.4733 25.4337C29.6944 23.6662 30.0802 21.9845 30.1308 19.7333C30.1815 17.4738 29.6311 15.9223 28.4438 14.1173C28.2686 13.8509 28.2992 13.4965 28.5257 13.2719L31.759 10.0672Z",
-            fill="#D3D4DC"
-          )
-          path(
-            @click="(el) => clickPart(el.target.id)",
-            :id="editable && 'crown_left'",
-            :class="{'edit-part': editable}",
-            d="M7.84119 10.0499C7.55039 9.77014 7.07763 9.81602 6.85683 10.1537C4.96938 13.0404 3.59672 16.4408 3.67359 19.8623C3.75057 23.2893 4.87885 26.663 6.8445 29.4694C7.07202 29.7943 7.53632 29.8243 7.81691 29.544L11.0594 26.3042C11.2922 26.0716 11.3143 25.7036 11.1272 25.4328C9.90611 23.6652 9.52029 21.9836 9.46972 19.7323C9.41901 17.4751 9.92564 15.7802 11.1039 13.9551C11.2789 13.684 11.2454 13.3252 11.0129 13.1015L7.84119 10.0499Z",
-            fill="#D3D4DC"
-          )
-        g
-          ellipse(
-            @click="(el) => clickPart(el.target.id)",
-            :id="editable && 'crown_centeral'",
-            :class="{'edit-part': editable}",
-            cx="19.7675",
-            cy="19.7948",
-            rx="7.0722",
-            ry="7.06627",
-            fill="#D3D4DC"
-          )
+            d="M31.1435 31.1174C29.5183 32.7413 27.5889 34.0294 25.4654 34.9082C23.342 35.787 21.066 36.2394 18.7676 36.2394C16.4691 36.2394 14.1932 35.787 12.0697 34.9082C9.94627 34.0294 8.01687 32.7413 6.39168 31.1174C4.7665 29.4936 3.47735 27.5659 2.59783 25.4443C1.71831 23.3227 1.26562 21.0488 1.26562 18.7525C1.26562 16.4561 1.7183 14.1823 2.59783 12.0607C3.47735 9.93912 4.7665 8.01138 6.39169 6.38756C8.01687 4.76373 9.94628 3.47562 12.0697 2.59679C14.1932 1.71796 16.4691 1.26562 18.7676 1.26562C21.066 1.26563 23.342 1.71796 25.4654 2.59679C27.5889 3.47562 29.5183 4.76373 31.1435 6.38756C32.7687 8.01138 34.0578 9.93912 34.9374 12.0607C35.8169 14.1823 36.2696 16.4561 36.2696 18.7525C36.2696 21.0488 35.8169 23.3227 34.9374 25.4443C34.0578 27.5659 32.7687 29.4936 31.1435 31.1174Z",
+            stroke="#9294A7"
+            )
+        g(v-else-if="['ИЗ','В','ИК'].includes(data.general)")
+          path(d="M31.4796 31.4713C29.8079 33.1415 27.8234 34.4664 25.6393 35.3704C23.4552 36.2743 21.1143 36.7395 18.7503 36.7395C16.3862 36.7395 14.0453 36.2743 11.8612 35.3704C9.6771 34.4665 7.69258 33.1415 6.02095 31.4713C4.34931 29.8011 3.02329 27.8182 2.11861 25.636C1.21393 23.4537 0.748291 21.1147 0.748291 18.7527C0.748291 16.3906 1.21393 14.0517 2.11861 11.8694C3.02329 9.68713 4.34931 7.70427 6.02095 6.03404C7.69258 4.3638 9.67711 3.0389 11.8612 2.13498C14.0453 1.23105 16.3862 0.765808 18.7503 0.765808C21.1143 0.765809 23.4552 1.23105 25.6393 2.13498C27.8234 3.0389 29.8079 4.3638 31.4796 6.03404C33.1512 7.70427 34.4772 9.68713 35.3819 11.8694C36.2866 14.0517 36.7522 16.3906 36.7522 18.7527C36.7522 21.1147 36.2866 23.4537 35.3819 25.636C34.4772 27.8182 33.1512 29.8011 31.4796 31.4713Z" fill="#252850")
+          mask(id="mask0_4460_279697" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="37" height="37")
+            path(d="M31.4796 31.4711C29.8079 33.1414 27.8234 34.4663 25.6393 35.3702C23.4552 36.2741 21.1143 36.7394 18.7503 36.7394C16.3862 36.7394 14.0453 36.2741 11.8612 35.3702C9.6771 34.4663 7.69258 33.1414 6.02095 31.4711C4.34931 29.8009 3.02329 27.818 2.11861 25.6358C1.21393 23.4535 0.748291 21.1146 0.748291 18.7525C0.748291 16.3904 1.21393 14.0515 2.11861 11.8692C3.02329 9.68695 4.34931 7.70409 6.02095 6.03386C7.69258 4.36362 9.67711 3.03872 11.8612 2.13479C14.0453 1.23087 16.3862 0.765625 18.7503 0.765625C21.1143 0.765625 23.4552 1.23087 25.6393 2.13479C27.8234 3.03872 29.8079 4.36362 31.4796 6.03386C33.1512 7.70409 34.4772 9.68695 35.3819 11.8692C36.2866 14.0515 36.7522 16.3904 36.7522 18.7525C36.7522 21.1146 36.2866 23.4535 35.3819 25.6358C34.4772 27.818 33.1512 29.8009 31.4796 31.4711Z" fill="#252850")
+          g(mask="url(#mask0_4460_279697)")
+            rect(x="20.9553" y="48.1551" width="2" height="49" transform="rotate(-150 20.9553 48.1551)" fill="white" fill-opacity="0.3")
+            rect(x="17.9912" y="45.2891" width="2" height="48" transform="rotate(-150 17.9912 45.2891)" fill="white" fill-opacity="0.3")
+            rect(x="14.0271" y="44.1551" width="2" height="49" transform="rotate(-150 14.0271 44.1551)" fill="white" fill-opacity="0.3")
+            rect(x="11.063" y="41.2891" width="2" height="48" transform="rotate(-150 11.063 41.2891)" fill="white" fill-opacity="0.3")
+            rect(x="7.59888" y="39.2891" width="2" height="48" transform="rotate(-150 7.59888 39.2891)" fill="white" fill-opacity="0.3")
+            rect(x="4.13477" y="37.2891" width="2" height="48" transform="rotate(-150 4.13477 37.2891)" fill="white" fill-opacity="0.3")
+            rect(x="0.670654" y="35.2891" width="2" height="48" transform="rotate(-150 0.670654 35.2891)" fill="white" fill-opacity="0.3")
+            rect(x="-2.79346" y="33.2891" width="2" height="48" transform="rotate(-150 -2.79346 33.2891)" fill="white" fill-opacity="0.3")
+            rect(x="-6.25757" y="31.2891" width="2" height="48" transform="rotate(-150 -6.25757 31.2891)" fill="white" fill-opacity="0.3")
+            path(d="M31.1262 31.1174C29.501 32.7413 27.5716 34.0294 25.4481 34.9082C23.3246 35.787 21.0487 36.2394 18.7503 36.2394C16.4518 36.2394 14.1759 35.787 12.0524 34.9082C9.92894 34.0294 7.99954 32.7413 6.37435 31.1174C4.74916 29.4936 3.46001 27.5659 2.58049 25.4443C1.70097 23.3227 1.24829 21.0488 1.24829 18.7525C1.24829 16.4561 1.70097 14.1823 2.58049 12.0607C3.46001 9.93912 4.74916 8.01138 6.37435 6.38756C7.99954 4.76373 9.92894 3.47562 12.0524 2.59679C14.1759 1.71796 16.4518 1.26562 18.7503 1.26562C21.0487 1.26563 23.3246 1.71796 25.4481 2.59679C27.5716 3.47562 29.501 4.76373 31.1262 6.38756C32.7514 8.01138 34.0405 9.93912 34.92 12.0607C35.7995 14.1823 36.2522 16.4561 36.2522 18.7525C36.2522 21.0488 35.7995 23.3227 34.92 25.4443C34.0405 27.5659 32.7514 29.4936 31.1262 31.1174Z" stroke="#252850")
+        g(v-else)
+          g
+            path(
+              d="M26.1322 26.1118C22.6171 29.624 16.918 29.624 13.4029 26.1118M13.3926 26.1015C9.89147 22.5922 9.89126 16.9137 13.392 13.4041M13.4029 13.3932C16.918 9.88102 22.6171 9.88102 26.1322 13.3932M26.1431 13.4041C29.6439 16.9137 29.6437 22.5922 26.1425 26.1015M25.7788 25.7581C22.459 29.0752 17.0762 29.0752 13.7563 25.7581C10.4367 22.4413 10.4367 17.0637 13.7563 13.7469C17.0762 10.4298 22.459 10.4298 25.7788 13.7469C29.0985 17.0637 29.0985 22.4413 25.7788 25.7581ZM7.75075 32.4661L13.4121 26.8095C17.0188 30.0581 22.5164 30.0581 26.1231 26.8095L31.7844 32.4661C30.2369 33.9263 28.4346 35.0932 26.4654 35.9082C24.342 36.787 22.066 37.2394 19.7676 37.2394C17.4691 37.2394 15.1932 36.787 13.0697 35.9082C11.1006 35.0932 9.2983 33.9263 7.75075 32.4661ZM32.4919 31.7593L26.8305 26.1027C30.0813 22.4989 30.0813 17.0061 26.8305 13.4023L32.4919 7.74571C33.9536 9.29209 35.1216 11.093 35.9374 13.0607C36.8169 15.1823 37.2696 17.4561 37.2696 19.7525C37.2696 22.0488 36.8169 24.3227 35.9374 26.4443C35.1216 28.412 33.9536 30.2129 32.4919 31.7593ZM26.1231 12.6955C22.5164 9.44691 17.0188 9.44691 13.4121 12.6955L7.75075 7.03892C9.2983 5.57869 11.1006 4.41176 13.0697 3.59679C15.1932 2.71796 17.4691 2.26562 19.7676 2.26562C22.066 2.26563 24.342 2.71796 26.4654 3.59679C28.4346 4.41176 30.2369 5.57869 31.7844 7.03892L26.1231 12.6955ZM12.7047 26.1027L7.04333 31.7593C5.58161 30.2129 4.41354 28.412 3.59783 26.4443C2.71831 24.3227 2.26562 22.0488 2.26562 19.7525C2.26562 17.4561 2.7183 15.1823 3.59783 13.0607C4.41354 11.093 5.58161 9.29209 7.04333 7.74571L12.7047 13.4023C9.45391 17.0061 9.45391 22.4989 12.7047 26.1027Z",
+              stroke="#252850"
+            )
+            path(
+              @click="(el) => clickPart(el.target.id)",
+              :id="editable && 'crown_bottom'",
+              :class="{'edit-part': editable}",
+              d="M29.5234 31.7754C29.802 32.0662 29.7555 32.5373 29.4182 32.7575C26.5287 34.6441 23.1246 36.0162 19.6995 35.9394C16.2673 35.8624 12.8886 34.7337 10.0788 32.7673C9.75567 32.5412 9.72375 32.0808 10.0001 31.7996L13.1122 28.6337C13.3445 28.3973 13.7156 28.3737 13.9901 28.5594C15.7771 29.7687 17.5777 30.0976 19.8296 30.1481C22.0882 30.1988 23.8151 29.7034 25.6461 28.5283C25.9184 28.3536 26.2784 28.3877 26.5021 28.6212L29.5234 31.7754Z",
+              fill="#D3D4DC"
+            )
+            path(
+              @click="(el) => clickPart(el.target.id)",
+              :id="editable && 'crown_top'",
+              :class="{'edit-part': editable}",
+              d="M10.02 7.83259C9.73773 7.54247 9.78271 7.06817 10.1218 6.84692C13.0102 4.96209 16.4123 3.59159 19.8354 3.66837C23.2653 3.74529 26.6418 4.87262 29.4506 6.83662C29.7757 7.06395 29.8058 7.52786 29.5252 7.80822L26.2828 11.048C26.0499 11.2806 25.6816 11.3026 25.4106 11.1157C23.6415 9.89566 21.9585 9.51017 19.7053 9.45964C17.4456 9.40896 15.8222 9.95753 14.0063 11.1421C13.737 11.3177 13.3792 11.2851 13.155 11.0547L10.02 7.83259Z",
+              fill="#D3D4DC"
+            )
+            path(
+              @click="(el) => clickPart(el.target.id)",
+              :id="editable && 'crown_right'",
+              :class="{'edit-part': editable}",
+              d="M31.759 10.0672C32.0484 9.7804 32.5272 9.82331 32.75 10.1644C34.6342 13.049 36.0037 16.4456 35.9269 19.8633C35.8499 23.2903 34.7217 26.6639 32.756 29.4704C32.5285 29.7952 32.0642 29.8253 31.7836 29.5449L28.5411 26.3052C28.3083 26.0725 28.2862 25.7045 28.4733 25.4337C29.6944 23.6662 30.0802 21.9845 30.1308 19.7333C30.1815 17.4738 29.6311 15.9223 28.4438 14.1173C28.2686 13.8509 28.2992 13.4965 28.5257 13.2719L31.759 10.0672Z",
+              fill="#D3D4DC"
+            )
+            path(
+              @click="(el) => clickPart(el.target.id)",
+              :id="editable && 'crown_left'",
+              :class="{'edit-part': editable}",
+              d="M7.84119 10.0499C7.55039 9.77014 7.07763 9.81602 6.85683 10.1537C4.96938 13.0404 3.59672 16.4408 3.67359 19.8623C3.75057 23.2893 4.87885 26.663 6.8445 29.4694C7.07202 29.7943 7.53632 29.8243 7.81691 29.544L11.0594 26.3042C11.2922 26.0716 11.3143 25.7036 11.1272 25.4328C9.90611 23.6652 9.52029 21.9836 9.46972 19.7323C9.41901 17.4751 9.92564 15.7802 11.1039 13.9551C11.2789 13.684 11.2454 13.3252 11.0129 13.1015L7.84119 10.0499Z",
+              fill="#D3D4DC"
+            )
+          g
+            ellipse(
+              @click="(el) => clickPart(el.target.id)",
+              :id="editable && 'crown_centeral'",
+              :class="{'edit-part': editable}",
+              cx="19.7675",
+              cy="19.7948",
+              rx="7.0722",
+              ry="7.06627",
+              fill="#D3D4DC"
+            )
   svg(
     v-if="partTooth === 'general'",
     :class="{'rotate-180': rotateSvg}",
@@ -153,11 +174,18 @@ export default {
       if (this.partTooth === "general" && this.view === "native") {
         size = size[this.toothConfig?.type];
       }
-      return {
-        width: `${size.width + this.oversized}`,
-        height: `${size.height + this.oversized}`,
+      let resultSize = {
+        width: size.width + this.oversized,
+        height: size.height + this.oversized,
         viewBox: `0 0 ${size.width} ${size.height}`,
       };
+      if (
+        this.partTooth === "general" &&
+        ["ИК", "ИЗ"].includes(this.data.general)
+      ) {
+        resultSize.width += 20;
+      }
+      return resultSize;
     },
   },
 };
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaCell.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaCell.vue
index 8c6604b..8af701a 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaCell.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaCell.vue
@@ -1,84 +1,84 @@
 <template lang="pug">
-.cell.flex(
-  :key="`${jawPosition}_${config.tooth_number}`"
-  :style="{'width': '5%'}",
-  :class="{'cursor-pointer': isEdit}"
-  )
-  .flex.h-full.w-full.justify-center.items-center.h-full.p-1(v-if="filtredTooths.includes(config.tooth_number)")
-    .edit-cell.flex.h-full.w-full.rounded.justify-center.items-center(
-      v-if="isEdit && rowKey !== 'tooth_number'"
-      @click.stop="()=>{isEditCondition=!isEditCondition}",
-      :class="{'open-edit': isEditCondition}"
-      )
-      q-icon(
-        v-if="!isEditCondition",
-        name="add",
-        size="25px",
-      )
-      q-icon(
-        v-else
-        name="close",
-        size="25px",
-      )
-    .flex.flex-col.gap-y-5px.items-center(
-      v-if="rowKey === 'tooth_number'",
-      )
-      simple-tooth-svg(
-        :opacity="value.dental_condition.general === 'О' ? 0.2 : 1",
-        :type="config.type",
-        :position="config?.position",
-        :jaw="jawPosition"
+  .cell.flex(
+    :key="`${jawPosition}_${config.tooth_number}`"
+    :style="{'width': '5%'}",
+    :class="{'cursor-pointer': isEdit}"
+    )
+    .flex.h-full.w-full.justify-center.items-center.h-full.p-1(v-if="filtredTooths.includes(config.tooth_number)")
+      .edit-cell.flex.h-full.w-full.rounded.justify-center.items-center(
+        v-if="isEdit && rowKey !== 'tooth_number'"
+        @click.stop="()=>{isEditCondition=!isEditCondition}",
+        :class="{'open-edit': isEditCondition}"
         )
-      span.font-medium.text-smm {{ config.tooth_number }}
-    .flex.flex-col.gap-y-1.items-center(
-      v-if="rowKey === 'dental_condition' && !isEditCondition",
-      :class="{'cell-info': isEdit}"
-      )
-      span.text-smm.font-medium {{getFilledConditions(value[rowKey]).map((el) => el.value).flat()[0]}}
-      .conditions.flex.justify-center.items-center.w-27px.h-6.rounded.cursor-pointer(
-        v-if="getFilledConditions(value[rowKey]).map((el) => el.value).flat().length-1 > 0",
-        @click="()=>openConditionsInfo()",
-        :class="{'active': isOpenConditionsInfo}"
+        q-icon(
+          v-if="!isEditCondition",
+          name="add",
+          size="25px",
         )
-        span.text-xsx.font-medium {{`+${getFilledConditions(value[rowKey]).map((el) => el.value).flat().length - 1}`}}
-        tooth-conditions-info(
-          v-model="isOpenConditionsInfo",
-          :conditions="getFilledConditions(value[rowKey]).map((el) => el.value).flat()"
-          :config="conditionConfig"
+        q-icon(
+          v-else
+          name="close",
+          size="25px",
+        )
+      .flex.flex-col.gap-y-5px.items-center(
+        v-if="rowKey === 'tooth_number'",
+        )
+        simple-tooth-svg(
+          :opacity="value.dental_condition.general === 'О' ? 0.2 : 1",
+          :type="config.type",
+          :position="config?.position",
+          :jaw="jawPosition"
           )
-    span.text-smm.font-medium(
-      v-if="rowKey === 'tooth_mobility' && !isEditCondition",
-      :class="{'cell-info': isEdit}"
-      ) {{ mobilityConfig.find((el) => el.id === value[rowKey])?.label || null }}
-    q-menu(
-      v-if="isEdit && rowKey === 'tooth_mobility'",
-      v-model="isEditCondition",
-      anchor="top left",
-      :offset="[0,168]",
-      )
-      .flex.flex-col.p-2.w-40.gap-y-1
-        .mobility-item.flex.justify-between.items-center.py-7px.pl-7px.pr-3.rounded.cursor-pointer(
-          v-for="mobility in mobilityConfig",
-          @click="()=>chooseMobility(mobility.id)"
+        span.font-medium.text-smm {{ config.tooth_number }}
+      .flex.flex-col.gap-y-1.items-center(
+        v-if="rowKey === 'dental_condition' && !isEditCondition",
+        :class="{'cell-info': isEdit}"
+        )
+        span.text-smm.font-medium {{getFilledConditions(value[rowKey]).map((el) => el.value).flat()[0]}}
+        .conditions.flex.justify-center.items-center.w-27px.h-6.rounded.cursor-pointer(
+          v-if="getFilledConditions(value[rowKey]).map((el) => el.value).flat().length-1 > 0",
+          @click="()=>openConditionsInfo()",
+          :class="{'active': isOpenConditionsInfo}"
           )
-          span.text-smm.font-medium {{ `${mobility.label} степень` }}
-          q-icon.check(
-            name="check",
-            size="12px"
+          span.text-xsx.font-medium {{`+${getFilledConditions(value[rowKey]).map((el) => el.value).flat().length - 1}`}}
+          tooth-conditions-info(
+            v-model="isOpenConditionsInfo",
+            :conditions="getFilledConditions(value[rowKey]).map((el) => el.value).flat()"
+            :config="conditionConfig"
             )
-    q-menu(
-      v-if="isEdit && rowKey === 'dental_condition'",
-      v-model="isEditCondition",
-      anchor="top left",
-      self="bottom left",
-      :offset="[20,8]",
-      )
-      dental-condition-form(
-        :data="value.dental_condition"
-        :cell-config="config",
-        :form-config="formConfig",
-        :jaw-position="jawPosition"
+      span.text-smm.font-medium(
+        v-if="rowKey === 'tooth_mobility' && !isEditCondition",
+        :class="{'cell-info': isEdit}"
+        ) {{ mobilityConfig.find((el) => el.id === value[rowKey])?.label || null }}
+      q-menu(
+        v-if="isEdit && rowKey === 'tooth_mobility'",
+        v-model="isEditCondition",
+        anchor="top left",
+        :offset="[0,168]",
         )
+        .flex.flex-col.p-2.w-40.gap-y-1
+          .mobility-item.flex.justify-between.items-center.py-7px.pl-7px.pr-3.rounded.cursor-pointer(
+            v-for="mobility in mobilityConfig",
+            @click="()=>chooseMobility(mobility.id)"
+            )
+            span.text-smm.font-medium {{ `${mobility.label} степень` }}
+            q-icon.check(
+              name="check",
+              size="12px"
+              )
+      q-menu(
+        v-if="isEdit && rowKey === 'dental_condition'",
+        v-model="isEditCondition",
+        anchor="top left",
+        self="bottom left",
+        :offset="[20,8]",
+        )
+        dental-condition-form(
+          :data="value.dental_condition"
+          :cell-config="config",
+          :form-config="formConfig",
+          :jaw-position="jawPosition"
+          )
 </template>
 
 <script>
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaTable.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaTable.vue
index fdee25d..4be0c1c 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaTable.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaTable.vue
@@ -34,10 +34,11 @@
             part-tooth="crown",
             :tooth-config="cell",
             :data="data.formula[cell.tooth_number].dental_condition"
+            :view="data.formula[cell.tooth_number].dental_condition.general === 'И' ? 'artificial': 'native'",
             )
         detailed-tooth-svg(
           part-tooth="general",
-          :view="data.formula[cell.tooth_number].dental_condition.general === 'ИЗ' ? 'artificial': 'native'",
+          :view="data.formula[cell.tooth_number].dental_condition.general === 'И' ? 'artificial': 'native'",
           :tooth-config="cell",
           :jaw-position="config.name",
           :data="data.formula[cell.tooth_number].dental_condition"
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/IncorsTooth.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/IncorsTooth.vue
index 7a41585..5d78786 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/IncorsTooth.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/IncorsTooth.vue
@@ -44,54 +44,76 @@
       stroke="#252850"
       )
   g(v-else)
-    path(
-      d="M37.8045 21.8282C37.7267 24.3241 37.089 27.8166 36.0628 31.7134C34.9686 35.8679 33.4425 40.4466 31.7173 44.7036C29.9906 48.9641 28.072 52.8836 26.1978 55.7292C25.2598 57.1533 24.3453 58.2893 23.4856 59.0636C22.615 59.8478 21.8654 60.2031 21.25 60.2031C20.6346 60.2031 19.885 59.8478 19.0144 59.0636C18.1547 58.2892 17.2402 57.1533 16.3022 55.7291C14.428 52.8836 12.5094 48.9641 10.7827 44.7036C9.05748 40.4465 7.53135 35.8678 6.43725 31.7133C5.41102 27.8165 4.77328 24.3241 4.69554 21.8282L5.52833 21.8282L9.18497 21.8284L21.25 21.8286L33.315 21.8284L36.9717 21.8282L37.8045 21.8282Z",
-      fill="white",
-      stroke="#252850"
-    )
-    path(
-      d="M38.7973 19.3594C38.7973 17.1778 38.8488 15.2799 38.8969 13.6327C38.9003 13.5151 38.9037 13.3989 38.9071 13.2839C38.9511 11.7848 38.9886 10.5089 38.9768 9.41334C38.951 7.01994 38.6835 5.6581 37.9037 4.8089C37.1244 3.96035 35.7199 3.50281 33.0292 3.29267C30.7528 3.11489 27.6757 3.11846 23.4964 3.1233C22.7807 3.12413 22.0326 3.125 21.2507 3.125C20.8514 3.125 20.461 3.12489 20.0791 3.12478C15.3488 3.12343 11.9416 3.12246 9.47669 3.33842C6.79044 3.57378 5.38278 4.05918 4.6005 4.92826C3.81627 5.7995 3.54946 7.17611 3.52364 9.55182C3.51178 10.6437 3.54948 11.9116 3.59365 13.3972C3.59688 13.5059 3.60015 13.6157 3.60343 13.7267C3.65149 15.3514 3.70294 17.2187 3.70294 19.3594C3.70294 22.7019 5.5742 26.0144 8.73114 28.508C11.8833 30.9978 16.2852 32.6406 21.2507 32.6406C26.2161 32.6406 30.6177 30.9978 33.7696 28.508C36.9263 26.0144 38.7973 22.702 38.7973 19.3594Z",
-      fill="white",
-      stroke="#252850"
-    )
-    path(
-      @click="(el) => clickPart(el.target.id)",
-      :id="editable && 'crown'",
-      :class="{'edit-part': editable}",
-      d="M36.1934 18.8948C36.1934 5.05857 38.9103 5.5807 21.2504 5.5807C3.59053 5.5807 6.3065 5.31963 6.3065 18.8948C6.3065 24.5178 12.8475 29.8594 21.2504 29.8594C29.6533 29.8594 36.1934 24.5178 36.1934 18.8948Z",
-      fill="#D3D4DC"
-    )
-    path(
-      @click="(el) => clickPart(el.target.id)",
-      :id="editable && 'root_central'",
-      :class="{'edit-part': editable}",
-      d="M30.1106 33.75C30.4904 33.5726 31.0857 33.8793 31.0671 34.2981C30.693 42.7601 26.4204 56.7656 21.25 56.7656C16.0796 56.7656 11.807 42.7601 11.4329 34.2981C11.4143 33.8793 12.0096 33.5726 12.3894 33.75C13.6266 34.3282 16.2275 35.1094 21.25 35.1094C26.2725 35.1094 28.8734 34.3282 30.1106 33.75Z",
-      fill="#D3D4DC"
-    )
-    g(v-if="Object.values(data.crown).find((el) => el.injury)")
+    g(v-if="data.general === 'О'")
       mask(
-        id="mask0_4460_281746",
-        style="mask-type:alpha",
-        maskUnits="userSpaceOnUse",
-        x="3",
-        y="2",
-        width="37",
-        height="32"
+        id="path-1-inside-1_4460_281688",
+        fill="white"
         )
         path(
-          d="M39.2973 19.3594C39.2973 17.1778 39.3487 15.2799 39.3968 13.6327C39.4002 13.5151 39.4036 13.3989 39.407 13.2839C39.451 11.7848 39.4885 10.5089 39.4767 9.41334C39.451 7.01994 39.1835 5.65809 38.4036 4.8089C37.6243 3.96035 36.2199 3.50281 33.5292 3.29267C31.2528 3.11489 28.1757 3.11846 23.9964 3.1233C23.2807 3.12413 22.5326 3.125 21.7507 3.125C21.3514 3.125 20.961 3.12489 20.5791 3.12478C15.8488 3.12343 12.4416 3.12246 9.97672 3.33842C7.29048 3.57378 5.88282 4.05918 5.10055 4.92826C4.31632 5.7995 4.04951 7.17611 4.02369 9.55182C4.01183 10.6437 4.04953 11.9116 4.0937 13.3972C4.09693 13.5059 4.1002 13.6157 4.10348 13.7267C4.15154 15.3514 4.20298 17.2187 4.20298 19.3594C4.20298 22.7019 6.07424 26.0144 9.23117 28.508C12.3834 30.9978 16.7852 32.6406 21.7507 32.6406C26.7161 32.6406 31.1177 30.9978 34.2696 28.508C37.4263 26.0144 39.2973 22.702 39.2973 19.3594Z",
-          fill="white",
-          stroke="#252850"
+          fill-rule="evenodd",
+          clip-rule="evenodd",
+          d="M4.87696 24.081C4.11687 22.5765 3.70294 20.9772 3.70294 19.3594C3.70294 10.9652 2.90905 6.78006 4.64197 4.69424C6.43147 2.54031 10.9155 2.625 21.7507 2.625C32.5846 2.625 37.0685 2.45567 38.8582 4.5685C40.5917 6.61501 39.7973 10.8027 39.7973 19.3594C39.7973 20.9776 39.3832 22.5772 38.6229 24.082C37.166 36.0398 27.6466 60.7031 21.75 60.7031C15.8532 60.7031 6.33345 36.0384 4.87696 24.081Z"
           )
-      g(mask="url(#mask0_4460_281746)")
-        circle(
-          cx="9",
-          cy="9",
-          r="9",
-          transform="matrix(1 0 0 -1 13 17)",
-          fill="#252850",
-          stroke="white"
+      path(
+        fill-rule="evenodd",
+        clip-rule="evenodd",
+        d="M4.87696 24.081C4.11687 22.5765 3.70294 20.9772 3.70294 19.3594C3.70294 10.9652 2.90905 6.78006 4.64197 4.69424C6.43147 2.54031 10.9155 2.625 21.7507 2.625C32.5846 2.625 37.0685 2.45567 38.8582 4.5685C40.5917 6.61501 39.7973 10.8027 39.7973 19.3594C39.7973 20.9776 39.3832 22.5772 38.6229 24.082C37.166 36.0398 27.6466 60.7031 21.75 60.7031C15.8532 60.7031 6.33345 36.0384 4.87696 24.081Z",
+        fill="white"
+        )
+      path(
+        d="M4.87701 24.081L5.76956 23.63L5.8485 23.7863L5.86967 23.96L4.87701 24.081ZM4.64202 4.69424L5.41119 5.33328H5.41119L4.64202 4.69424ZM38.8582 4.5685L39.6213 3.92216L38.8582 4.5685ZM38.623 24.082L37.6303 23.961L37.6515 23.7872L37.7304 23.631L38.623 24.082ZM4.70298 19.3594C4.70298 20.8042 5.07237 22.25 5.76956 23.63L3.98445 24.5319C3.16147 22.9029 2.70298 21.1502 2.70298 19.3594H4.70298ZM5.41119 5.33328C4.79693 6.07263 4.54091 7.29491 4.52263 9.66886C4.51374 10.8236 4.55795 12.1756 4.60558 13.7905C4.65298 15.3977 4.70298 17.2453 4.70298 19.3594H2.70298C2.70298 17.2763 2.65375 15.453 2.60645 13.8494C2.55938 12.2535 2.51343 10.855 2.52269 9.65346C2.54069 7.31485 2.75419 5.40167 3.87284 4.0552L5.41119 5.33328ZM21.7507 3.625C16.3043 3.625 12.5364 3.605 9.89575 3.8477C7.21224 4.09434 6.02501 4.59446 5.41119 5.33328L3.87284 4.0552C5.04852 2.6401 6.99804 2.10559 9.71271 1.85609C12.4702 1.60266 16.362 1.625 21.7507 1.625V3.625ZM38.0952 5.21483C37.4875 4.49737 36.3072 4.02236 33.6142 3.80108C30.9685 3.58369 27.2004 3.625 21.7507 3.625V1.625C27.1349 1.625 31.0258 1.58165 33.778 1.8078C36.4829 2.03006 38.4394 2.52679 39.6213 3.92216L38.0952 5.21483ZM38.7974 19.3594C38.7974 17.205 38.8474 15.3269 38.8948 13.6971C38.9425 12.0598 38.9867 10.6933 38.9779 9.53025C38.9596 7.13581 38.702 5.93121 38.0952 5.21483L39.6213 3.92216C40.748 5.2523 40.9599 7.16479 40.9778 9.515C40.987 10.7243 40.9411 12.137 40.894 13.7553C40.8466 15.3813 40.7974 17.2354 40.7974 19.3594H38.7974ZM37.7304 23.631C38.4279 22.2507 38.7974 20.8046 38.7974 19.3594H40.7974C40.7974 21.1506 40.3387 22.9037 39.5155 24.5329L37.7304 23.631ZM39.6156 24.2029C38.8719 30.3075 36.0918 39.5585 32.7699 47.2723C31.1075 51.1324 29.2883 54.6577 27.4892 57.235C26.5911 58.5216 25.6727 59.6089 24.7529 60.3845C23.8489 61.1468 22.8303 61.7031 21.75 61.7031V59.7031C22.1439 59.7031 22.7127 59.4887 23.4636 58.8555C24.1988 58.2357 25.0029 57.3027 25.8492 56.0903C27.539 53.6695 29.2963 50.2816 30.933 46.4812C34.2091 38.8738 36.9172 29.8143 37.6303 23.961L39.6156 24.2029ZM21.75 61.7031C20.6697 61.7031 19.6511 61.1468 18.7471 60.3844C17.8273 59.6088 16.9089 58.5215 16.0108 57.2348C14.2116 54.6573 12.3924 51.1319 10.73 47.2716C7.40797 39.5576 4.6279 30.3063 3.88434 24.2019L5.86967 23.96C6.5826 29.8131 9.29066 38.8729 12.5669 46.4806C14.2036 50.2811 15.9609 53.6692 17.6507 56.0901C18.4971 57.3025 19.3013 58.2356 20.0364 58.8555C20.7873 59.4887 21.3562 59.7031 21.75 59.7031V61.7031Z",
+        fill="#9294A7",
+        mask="url(#path-1-inside-1_4460_281688)"
+        )
+    g(v-else)
+      path(
+        d="M37.8045 21.8282C37.7267 24.3241 37.089 27.8166 36.0628 31.7134C34.9686 35.8679 33.4425 40.4466 31.7173 44.7036C29.9906 48.9641 28.072 52.8836 26.1978 55.7292C25.2598 57.1533 24.3453 58.2893 23.4856 59.0636C22.615 59.8478 21.8654 60.2031 21.25 60.2031C20.6346 60.2031 19.885 59.8478 19.0144 59.0636C18.1547 58.2892 17.2402 57.1533 16.3022 55.7291C14.428 52.8836 12.5094 48.9641 10.7827 44.7036C9.05748 40.4465 7.53135 35.8678 6.43725 31.7133C5.41102 27.8165 4.77328 24.3241 4.69554 21.8282L5.52833 21.8282L9.18497 21.8284L21.25 21.8286L33.315 21.8284L36.9717 21.8282L37.8045 21.8282Z",
+        fill="white",
+        stroke="#252850"
+      )
+      path(
+        d="M38.7973 19.3594C38.7973 17.1778 38.8488 15.2799 38.8969 13.6327C38.9003 13.5151 38.9037 13.3989 38.9071 13.2839C38.9511 11.7848 38.9886 10.5089 38.9768 9.41334C38.951 7.01994 38.6835 5.6581 37.9037 4.8089C37.1244 3.96035 35.7199 3.50281 33.0292 3.29267C30.7528 3.11489 27.6757 3.11846 23.4964 3.1233C22.7807 3.12413 22.0326 3.125 21.2507 3.125C20.8514 3.125 20.461 3.12489 20.0791 3.12478C15.3488 3.12343 11.9416 3.12246 9.47669 3.33842C6.79044 3.57378 5.38278 4.05918 4.6005 4.92826C3.81627 5.7995 3.54946 7.17611 3.52364 9.55182C3.51178 10.6437 3.54948 11.9116 3.59365 13.3972C3.59688 13.5059 3.60015 13.6157 3.60343 13.7267C3.65149 15.3514 3.70294 17.2187 3.70294 19.3594C3.70294 22.7019 5.5742 26.0144 8.73114 28.508C11.8833 30.9978 16.2852 32.6406 21.2507 32.6406C26.2161 32.6406 30.6177 30.9978 33.7696 28.508C36.9263 26.0144 38.7973 22.702 38.7973 19.3594Z",
+        fill="white",
+        stroke="#252850"
+      )
+      path(
+        @click="(el) => clickPart(el.target.id)",
+        :id="editable && 'crown'",
+        :class="{'edit-part': editable}",
+        d="M36.1934 18.8948C36.1934 5.05857 38.9103 5.5807 21.2504 5.5807C3.59053 5.5807 6.3065 5.31963 6.3065 18.8948C6.3065 24.5178 12.8475 29.8594 21.2504 29.8594C29.6533 29.8594 36.1934 24.5178 36.1934 18.8948Z",
+        fill="#D3D4DC"
+      )
+      path(
+        @click="(el) => clickPart(el.target.id)",
+        :id="editable && 'root_central'",
+        :class="{'edit-part': editable}",
+        d="M30.1106 33.75C30.4904 33.5726 31.0857 33.8793 31.0671 34.2981C30.693 42.7601 26.4204 56.7656 21.25 56.7656C16.0796 56.7656 11.807 42.7601 11.4329 34.2981C11.4143 33.8793 12.0096 33.5726 12.3894 33.75C13.6266 34.3282 16.2275 35.1094 21.25 35.1094C26.2725 35.1094 28.8734 34.3282 30.1106 33.75Z",
+        fill="#D3D4DC"
+      )
+      g(v-if="Object.values(data.crown).find((el) => el.injury)")
+        mask(
+          id="mask0_4460_281746",
+          style="mask-type:alpha",
+          maskUnits="userSpaceOnUse",
+          x="3",
+          y="2",
+          width="37",
+          height="32"
           )
+          path(
+            d="M39.2973 19.3594C39.2973 17.1778 39.3487 15.2799 39.3968 13.6327C39.4002 13.5151 39.4036 13.3989 39.407 13.2839C39.451 11.7848 39.4885 10.5089 39.4767 9.41334C39.451 7.01994 39.1835 5.65809 38.4036 4.8089C37.6243 3.96035 36.2199 3.50281 33.5292 3.29267C31.2528 3.11489 28.1757 3.11846 23.9964 3.1233C23.2807 3.12413 22.5326 3.125 21.7507 3.125C21.3514 3.125 20.961 3.12489 20.5791 3.12478C15.8488 3.12343 12.4416 3.12246 9.97672 3.33842C7.29048 3.57378 5.88282 4.05918 5.10055 4.92826C4.31632 5.7995 4.04951 7.17611 4.02369 9.55182C4.01183 10.6437 4.04953 11.9116 4.0937 13.3972C4.09693 13.5059 4.1002 13.6157 4.10348 13.7267C4.15154 15.3514 4.20298 17.2187 4.20298 19.3594C4.20298 22.7019 6.07424 26.0144 9.23117 28.508C12.3834 30.9978 16.7852 32.6406 21.7507 32.6406C26.7161 32.6406 31.1177 30.9978 34.2696 28.508C37.4263 26.0144 39.2973 22.702 39.2973 19.3594Z",
+            fill="white",
+            stroke="#252850"
+            )
+        g(mask="url(#mask0_4460_281746)")
+          circle(
+            cx="9",
+            cy="9",
+            r="9",
+            transform="matrix(1 0 0 -1 13 17)",
+            fill="#252850",
+            stroke="white"
+            )
 </template>
 
 <script>
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/MolarsTooth.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/MolarsTooth.vue
index a2c2be8..cb08ba0 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/MolarsTooth.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/MolarsTooth.vue
@@ -44,72 +44,123 @@
         stroke="#252850"
         )
     g(v-else)
-      path(
-        d="M36.2801 11.7305C36.7934 24.8374 35.8401 55.1414 32.5406 55.1426C27.5631 55.1444 30.5612 27.6442 25.5018 27.6424C20.3477 27.6406 22.4222 41.5053 18.6826 41.5053C14.9431 41.5053 17.0173 27.6372 11.8632 27.6389C6.80382 27.6407 9.80148 55.1426 4.82406 55.1408C1.5246 55.1396 0.571265 24.8384 1.08438 11.7305H18.6822H36.2801Z",
-        fill="white"
-        )
-      path(
-        d="M1.08451 11.7287C0.57124 24.8357 1.52446 55.1396 4.82406 55.1408M4.82406 55.1408C9.80148 55.1426 6.80382 27.6407 11.8632 27.6389C17.0173 27.6372 14.9431 41.5053 18.6826 41.5053C22.4222 41.5053 20.3477 27.6406 25.5018 27.6424C30.5612 27.6442 27.5631 55.1444 32.5406 55.1426C35.8402 55.1414 36.7934 24.8374 36.2801 11.7305H18.6822H1.08438C0.571265 24.8384 1.5246 55.1396 4.82406 55.1408Z",
-        stroke="#252850",
-        stroke-linecap="square"
-        )
-      path(
-        d="M19.0714 4.25161L18.6827 4.73195L18.2941 4.25161C16.5099 2.04667 13.7835 0.638338 10.7278 0.638338C5.35529 0.638338 1 4.9937 1 10.3663V13.5484C1 15.8368 2.82085 18.036 6.05365 19.6928C9.25995 21.3361 13.7242 22.3672 18.6827 22.3672C23.6412 22.3672 28.1055 21.3361 31.3118 19.6928C34.5446 18.036 36.3655 15.8368 36.3655 13.5484V10.3663C36.3655 4.9937 32.0102 0.638338 26.6377 0.638338C23.582 0.638338 20.8556 2.04667 19.0714 4.25161Z",
-        fill="white",
-        stroke="#252850"
-        )
-      path(
-        @click="(el) => clickPart(el.target.id)",
-        :id="editable && 'crown'",
-        :class="{'edit-part': editable}",
-        d="M34.5713 13.3113C34.5713 17.2416 27.0496 20.4277 18.8213 20.4277C10.593 20.4277 3.07129 17.2416 3.07129 13.3113V10.8813C3.07129 6.56757 6.95639 3.07059 11.5848 3.07059C14.2175 3.07059 17.2849 5.80103 18.8213 7.57059C20.3577 5.80103 23.4251 3.07059 26.0578 3.07059C30.6862 3.07059 34.5713 6.56757 34.5713 10.8813V13.3113Z",
-        fill="#D3D4DC"
-        )
-      path(
-        @click="(el) => clickPart(el.target.id)",
-        :id="editable && 'root_left'",
-        :class="{'edit-part': editable}",
-        d="M4.81804 51.5043C3.25298 49.9392 3.08382 32.4872 3.07204 22.6833C3.07152 22.2535 3.68699 22.002 4.03135 22.2593C4.96781 22.9589 6.28013 23.7063 7.28315 24.161C7.45558 24.2392 7.56669 24.4067 7.55941 24.5959C7.17711 34.5275 6.43755 53.1238 4.81804 51.5043Z",
-        fill="#D3D4DC"
-        )
-      path(
-        @click="(el) => clickPart(el.target.id)",
-        :id="editable && 'root_right'",
-        :class="{'edit-part': editable}",
-        d="M32.3199 51.5043C33.8853 49.9389 34.5356 31.7491 34.5891 21.8825C34.5915 21.4526 34.0164 21.2387 33.7092 21.5394C32.7619 22.4667 31.3903 23.6221 30.3561 24.1534C30.1877 24.2399 30.0761 24.4067 30.0831 24.5959C30.4552 34.5275 30.7004 53.1238 32.3199 51.5043Z",
-        fill="#D3D4DC"
-        )
-      path(
-        @click="(el) => clickPart(el.target.id)",
-        :id="editable && 'root_central'",
-        :class="{'edit-part': editable}",
-        d="M16.669 25.9951C17.4383 32.3528 16.9336 38.7773 18.6832 38.7773C20.4366 38.7773 20.1845 32.3251 20.9795 25.9541C21.0207 25.6243 20.7074 25.3586 20.3838 25.4346C18.9844 25.7636 18.0072 25.6611 17.2903 25.4763C16.9589 25.3908 16.6278 25.6553 16.669 25.9951Z",
-        fill="#D3D4DC"
-        )
-      g(v-if="Object.values(data.crown).find((el) => el.injury)")
-        mask(
-          id="mask0_4460_279217",
-          style="mask-type:alpha",
-          maskUnits="userSpaceOnUse",
-          x="0",
-          y="0",
-          width="37",
-          height="23"
+      g(v-if="data.general === 'О'")
+        path(
+          d="M36.7806 11.7305C37.2939 24.8374 36.3406 55.1414 33.041 55.1426C28.0636 55.1444 31.0617 27.6442 26.0023 27.6424C20.8481 27.6406 22.9227 41.5053 19.1831 41.5053C15.4436 41.5053 17.5178 27.6372 12.3637 27.6389C7.3043 27.6407 10.302 55.1426 5.32454 55.1408C2.02509 55.1396 1.07175 24.8384 1.58487 11.7305H19.1827H36.7806Z",
+          fill="white"
           )
+        path(
+          d="M1.585 11.7287C1.07173 24.8357 2.02495 55.1396 5.32454 55.1408M5.32454 55.1408C10.302 55.1426 7.3043 27.6407 12.3637 27.6389C17.5178 27.6372 15.4436 41.5053 19.1831 41.5053C22.9227 41.5053 20.8481 27.6406 26.0023 27.6424C31.0617 27.6442 28.0636 55.1444 33.041 55.1426C36.3406 55.1414 37.2939 24.8374 36.7806 11.7305H19.1827H1.58487C1.07175 24.8384 2.02509 55.1396 5.32454 55.1408Z",
+          stroke="#9294A7",
+          stroke-linecap="square"
+          )
+        path(
+          d="M19.5714 4.25231L19.1827 4.73265L18.7941 4.25231C17.0099 2.04738 14.2835 0.63904 11.2278 0.63904C5.85529 0.63904 1.5 4.9944 1.5 10.367V13.5491C1.5 15.8375 3.32085 18.0367 6.55365 19.6935C9.75995 21.3368 14.2242 22.3679 19.1827 22.3679C24.1412 22.3679 28.6055 21.3368 31.8118 19.6935C35.0446 18.0367 36.8655 15.8375 36.8655 13.5491V10.367C36.8655 4.9944 32.5102 0.63904 27.1377 0.63904C24.082 0.63904 21.3556 2.04738 19.5714 4.25231Z",
+          fill="white",
+          stroke="#9294A7"
+          )
+        rect(x="1.9" y="12.5" width="34" height="11.418" fill="white")
+      g(v-else)
+        path(
+          d="M36.2801 11.7305C36.7934 24.8374 35.8401 55.1414 32.5406 55.1426C27.5631 55.1444 30.5612 27.6442 25.5018 27.6424C20.3477 27.6406 22.4222 41.5053 18.6826 41.5053C14.9431 41.5053 17.0173 27.6372 11.8632 27.6389C6.80382 27.6407 9.80148 55.1426 4.82406 55.1408C1.5246 55.1396 0.571265 24.8384 1.08438 11.7305H18.6822H36.2801Z",
+          fill="white"
+          )
+        path(
+          d="M1.08451 11.7287C0.57124 24.8357 1.52446 55.1396 4.82406 55.1408M4.82406 55.1408C9.80148 55.1426 6.80382 27.6407 11.8632 27.6389C17.0173 27.6372 14.9431 41.5053 18.6826 41.5053C22.4222 41.5053 20.3477 27.6406 25.5018 27.6424C30.5612 27.6442 27.5631 55.1444 32.5406 55.1426C35.8402 55.1414 36.7934 24.8374 36.2801 11.7305H18.6822H1.08438C0.571265 24.8384 1.5246 55.1396 4.82406 55.1408Z",
+          stroke="#252850",
+          stroke-linecap="square"
+          )
+        g(v-if="['ИЗ','ИК'].includes(data.general)" transform="translate(-9 -4)")
+            rect(y="14" width="56" height="4" rx="2" fill="#252850")
+            mask(id="mask0_4460_278655" style="mask-type:alpha" maskUnits="userSpaceOnUse" y="14" width="56" height="4")
+              rect(y="14" width="56" height="4" rx="2" fill="#252850")
+            g(mask="url(#mask0_4460_278655)")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 9.42188 43.8603)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 12.8855 41.8605)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 16.3503 39.8605)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 19.8135 37.8589)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 23.2771 35.8591)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 26.7419 33.859)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 30.2056 31.8593)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 33.6702 29.8592)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 37.1333 27.8577)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 40.5974 25.8577)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 44.0615 23.8577)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 47.5254 21.8577)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 50.9895 19.8577)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 54.4536 17.8577)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 57.9177 15.8577)" fill="white" fill-opacity="0.3")
+            path(d="M28.5714 8.25231L28.1827 8.73265L27.7941 8.25231C26.0099 6.04738 23.2835 4.63904 20.2278 4.63904C14.8553 4.63904 10.5 8.9944 10.5 14.367V17.5491C10.5 19.8375 12.3208 22.0367 15.5537 23.6935C18.76 25.3368 23.2242 26.3679 28.1827 26.3679C33.1412 26.3679 37.6055 25.3368 40.8118 23.6935C44.0446 22.0367 45.8655 19.8375 45.8655 17.5491V14.367C45.8655 8.9944 41.5102 4.63904 36.1377 4.63904C33.082 4.63904 30.3556 6.04738 28.5714 8.25231Z" fill="#252850" stroke="#252850")
+            mask(id="mask1_4460_278655" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="11" y="5" width="35" height="21")
+              path(d="M28.9601 8.56612L28.1827 9.52681L27.4054 8.56612C25.712 6.47347 23.1262 5.13834 20.2278 5.13834C15.1314 5.13834 11 9.26983 11 14.3663V17.5484C11 19.5518 12.6065 21.6205 15.7817 23.2478C18.9039 24.848 23.2868 25.8672 28.1827 25.8672C33.0787 25.8672 37.4616 24.848 40.5838 23.2478C43.759 21.6205 45.3655 19.5518 45.3655 17.5484V14.3663C45.3655 9.26983 41.234 5.13834 36.1377 5.13834C33.2393 5.13834 30.6535 6.47347 28.9601 8.56612Z" fill="#252850")
+            g(mask="url(#mask1_4460_278655)")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 21.2781 37.3571)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 24.7417 35.3573)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 28.2065 33.3573)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 31.6697 31.3556)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 35.1333 29.3558)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 38.5981 27.3558)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 42.0618 25.356)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 45.5264 23.356)" fill="white" fill-opacity="0.3")
+              rect(width="2" height="32" transform="matrix(0.866025 -0.5 -0.5 -0.866025 48.9902 21.3562)" fill="white" fill-opacity="0.3")
+        g(v-else)
           path(
-            d="M18.5714 4.25161L18.1827 4.73195L17.7941 4.25161C16.0099 2.04667 13.2835 0.638338 10.2278 0.638338C4.85529 0.638338 0.5 4.99369 0.5 10.3663V13.5484C0.5 15.8368 2.32085 18.036 5.55365 19.6928C8.75995 21.3361 13.2242 22.3672 18.1827 22.3672C23.1412 22.3672 27.6055 21.3361 30.8118 19.6928C34.0446 18.036 35.8655 15.8368 35.8655 13.5484V10.3663C35.8655 4.99369 31.5102 0.638338 26.1377 0.638338C23.082 0.638338 20.3556 2.04667 18.5714 4.25161Z",
+            d="M19.0714 4.25161L18.6827 4.73195L18.2941 4.25161C16.5099 2.04667 13.7835 0.638338 10.7278 0.638338C5.35529 0.638338 1 4.9937 1 10.3663V13.5484C1 15.8368 2.82085 18.036 6.05365 19.6928C9.25995 21.3361 13.7242 22.3672 18.6827 22.3672C23.6412 22.3672 28.1055 21.3361 31.3118 19.6928C34.5446 18.036 36.3655 15.8368 36.3655 13.5484V10.3663C36.3655 4.9937 32.0102 0.638338 26.6377 0.638338C23.582 0.638338 20.8556 2.04667 19.0714 4.25161Z",
             fill="white",
             stroke="#252850"
             )
-        g(mask="url(#mask0_4460_279217)")
-          circle(
-            cx="8",
-            cy="8",
-            r="8.5",
-            transform="matrix(1 0 0 -1 10 13)",
-            fill="#252850",
-            stroke="white"
+          path(
+            @click="(el) => clickPart(el.target.id)",
+            :id="editable && 'crown'",
+            :class="{'edit-part': editable}",
+            d="M34.5713 13.3113C34.5713 17.2416 27.0496 20.4277 18.8213 20.4277C10.593 20.4277 3.07129 17.2416 3.07129 13.3113V10.8813C3.07129 6.56757 6.95639 3.07059 11.5848 3.07059C14.2175 3.07059 17.2849 5.80103 18.8213 7.57059C20.3577 5.80103 23.4251 3.07059 26.0578 3.07059C30.6862 3.07059 34.5713 6.56757 34.5713 10.8813V13.3113Z",
+            fill="#D3D4DC"
             )
+        path(
+          @click="(el) => clickPart(el.target.id)",
+          :id="editable && 'root_left'",
+          :class="{'edit-part': editable}",
+          d="M4.81804 51.5043C3.25298 49.9392 3.08382 32.4872 3.07204 22.6833C3.07152 22.2535 3.68699 22.002 4.03135 22.2593C4.96781 22.9589 6.28013 23.7063 7.28315 24.161C7.45558 24.2392 7.56669 24.4067 7.55941 24.5959C7.17711 34.5275 6.43755 53.1238 4.81804 51.5043Z",
+          fill="#D3D4DC"
+          )
+        path(
+          @click="(el) => clickPart(el.target.id)",
+          :id="editable && 'root_right'",
+          :class="{'edit-part': editable}",
+          d="M32.3199 51.5043C33.8853 49.9389 34.5356 31.7491 34.5891 21.8825C34.5915 21.4526 34.0164 21.2387 33.7092 21.5394C32.7619 22.4667 31.3903 23.6221 30.3561 24.1534C30.1877 24.2399 30.0761 24.4067 30.0831 24.5959C30.4552 34.5275 30.7004 53.1238 32.3199 51.5043Z",
+          fill="#D3D4DC"
+          )
+        path(
+          @click="(el) => clickPart(el.target.id)",
+          :id="editable && 'root_central'",
+          :class="{'edit-part': editable}",
+          d="M16.669 25.9951C17.4383 32.3528 16.9336 38.7773 18.6832 38.7773C20.4366 38.7773 20.1845 32.3251 20.9795 25.9541C21.0207 25.6243 20.7074 25.3586 20.3838 25.4346C18.9844 25.7636 18.0072 25.6611 17.2903 25.4763C16.9589 25.3908 16.6278 25.6553 16.669 25.9951Z",
+          fill="#D3D4DC"
+          )
+        g(v-if="Object.values(data.crown).find((el) => el.injury)")
+          mask(
+            id="mask0_4460_279217",
+            style="mask-type:alpha",
+            maskUnits="userSpaceOnUse",
+            x="0",
+            y="0",
+            width="37",
+            height="23"
+            )
+            path(
+              d="M18.5714 4.25161L18.1827 4.73195L17.7941 4.25161C16.0099 2.04667 13.2835 0.638338 10.2278 0.638338C4.85529 0.638338 0.5 4.99369 0.5 10.3663V13.5484C0.5 15.8368 2.32085 18.036 5.55365 19.6928C8.75995 21.3361 13.2242 22.3672 18.1827 22.3672C23.1412 22.3672 27.6055 21.3361 30.8118 19.6928C34.0446 18.036 35.8655 15.8368 35.8655 13.5484V10.3663C35.8655 4.99369 31.5102 0.638338 26.1377 0.638338C23.082 0.638338 20.3556 2.04667 18.5714 4.25161Z",
+              fill="white",
+              stroke="#252850"
+              )
+          g(mask="url(#mask0_4460_279217)")
+            circle(
+              cx="8",
+              cy="8",
+              r="8.5",
+              transform="matrix(1 0 0 -1 10 13)",
+              fill="#252850",
+              stroke="white"
+              )
 </template>
 
 <script>
@@ -134,14 +185,6 @@ export default {
     editable: Boolean,
     data: Object,
   },
-  // computed: {
-  //   getDefectsCrown() {
-  //     return this.data
-  //       .filter((el) => el.type === "crown")
-  //       .map((el) => el.value)
-  //       .flat();
-  //   },
-  // },
 };
 </script>
 
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/PreMolarsFangsTooth.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/PreMolarsFangsTooth.vue
index 916f923..1964eea 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/PreMolarsFangsTooth.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/tooths/PreMolarsFangsTooth.vue
@@ -44,54 +44,76 @@
       stroke="#252850"
       )
   g(v-else)
-    path(
-      d="M36.6163 19.8282C36.5326 22.3195 35.8468 25.8084 34.7419 29.7043C33.564 33.8575 31.9208 38.4352 30.0632 42.6914C28.2041 46.9511 26.1384 50.8698 24.1203 53.715C23.1104 55.1386 22.125 56.2756 21.1971 57.0517C20.2606 57.8351 19.4397 58.2032 18.75 58.2032C18.0603 58.2032 17.2394 57.8351 16.3029 57.0517C15.375 56.2756 14.3896 55.1386 13.3797 53.715C11.3616 50.8698 9.29587 46.9511 7.43677 42.6914C5.57916 38.4352 3.93603 33.8575 2.75813 29.7043C1.65321 25.8084 0.967415 22.3195 0.883675 19.8282L1.81897 19.8282L5.75689 19.8284L18.75 19.8286L31.7431 19.8284L35.681 19.8282L36.6163 19.8282Z",
-      fill="white",
-      stroke="#252850"
-      )
-    path(
-      @click="(el) => clickPart(el.target.id)",
-      :id="editable && 'root_central'",
-      :class="{'edit-part': editable}",
-      d="M27.6106 31.75C27.9904 31.5726 28.5857 31.8793 28.5671 32.298C28.193 40.7601 23.9204 54.7656 18.75 54.7656C13.5545 54.7656 8.9633 40.6236 8.60111 32.175C8.58393 31.7742 9.10691 31.4947 9.47075 31.6638C10.7255 32.2471 13.473 33.1093 18.75 33.1093C23.7725 33.1093 26.3734 32.3282 27.6106 31.75Z",
-      fill="#D3D4DC"
-      )
-    path(
-      d="M36.625 19.3281C36.625 17.6844 35.9524 15.7204 34.7882 13.6711C33.6289 11.6305 32.0063 9.54771 30.1651 7.67697C28.3239 5.80617 26.2763 4.15994 24.2749 2.98465C22.264 1.80382 20.3451 1.125 18.75 1.125C17.1549 1.125 15.236 1.80382 13.2251 2.98465C11.2237 4.15994 9.17611 5.80617 7.33487 7.67697C5.49369 9.54771 3.87111 11.6305 2.71184 13.6711C1.54763 15.7204 0.875 17.6844 0.875 19.3281C0.875 22.6414 2.79677 25.4533 6.02112 27.4602C9.24982 29.4698 13.7467 30.6406 18.75 30.6406C23.7533 30.6406 28.2502 29.4698 31.4789 27.4602C34.7032 25.4533 36.625 22.6414 36.625 19.3281Z",
-      fill="white",
-      stroke="#252850"
-      )
-    path(
-      @click="(el) => clickPart(el.target.id)",
-      :id="editable && 'crown'",
-      :class="{'edit-part': editable}",
-      d="M33.8438 18.8624C33.8438 13.0868 24.4102 3.57812 18.75 3.57812C13.0898 3.57812 3.65625 13.0868 3.65625 18.8624C3.65625 24.638 10.414 28.5156 18.75 28.5156C27.086 28.5156 33.8438 24.638 33.8438 18.8624Z",
-      fill="#D3D4DC"
-      )
-    g(v-if="Object.values(data.crown).find((el) => el.injury)")
+    g(v-if="data.general === 'О'")
       mask(
-        id="mask0_4460_280349",
-        style="mask-type:alpha",
-        maskUnits="userSpaceOnUse",
-        x="0",
-        y="0",
-        width="38",
-        height="32"
+        id="path-1-inside-1_4460_280116",
+        fill="white"
         )
         path(
-          d="M36.625 19.3281C36.625 17.6844 35.9524 15.7204 34.7882 13.6711C33.6289 11.6305 32.0063 9.54771 30.1651 7.67697C28.3239 5.80617 26.2763 4.15994 24.2749 2.98465C22.264 1.80382 20.3451 1.125 18.75 1.125C17.1549 1.125 15.236 1.80382 13.2251 2.98465C11.2237 4.15994 9.17611 5.80617 7.33487 7.67697C5.49369 9.54771 3.87111 11.6305 2.71184 13.6711C1.54763 15.7204 0.875 17.6844 0.875 19.3281C0.875 22.6414 2.79677 25.4533 6.02112 27.4602C9.24982 29.4698 13.7467 30.6406 18.75 30.6406C23.7533 30.6406 28.2502 29.4698 31.4789 27.4602C34.7032 25.4533 36.625 22.6414 36.625 19.3281Z",
-          fill="white",
-          stroke="#252850"
+          fill-rule="evenodd",
+          clip-rule="evenodd",
+          d="M18.75 58.7031C25.6378 58.7031 37.1156 29.6872 37.125 19.3408C37.125 19.3365 37.125 19.3323 37.125 19.328C37.125 12.2605 25.6406 0.624889 18.75 0.624889C11.8594 0.624889 0.375 12.2605 0.375 19.328C0.375 29.6633 11.8594 58.7031 18.75 58.7031Z"
           )
-      g(mask="url(#mask0_4460_280349)")
-        circle(
-          cx="8",
-          cy="8",
-          r="8.5",
-          transform="matrix(1 0 0 -1 10.5 15)",
-          fill="#252850",
-          stroke="white"
+      path(
+        fill-rule="evenodd",
+        clip-rule="evenodd",
+        d="M18.75 58.7031C25.6378 58.7031 37.1156 29.6872 37.125 19.3408C37.125 19.3365 37.125 19.3323 37.125 19.328C37.125 12.2605 25.6406 0.624889 18.75 0.624889C11.8594 0.624889 0.375 12.2605 0.375 19.328C0.375 29.6633 11.8594 58.7031 18.75 58.7031Z",
+        fill="white"
+        )
+      path(
+        d="M37.125 19.3408L36.125 19.3399V19.339L37.125 19.3408ZM38.125 19.3417C38.1225 22.0694 37.3723 25.9301 36.1805 30.1291C34.9827 34.3495 33.3164 38.9889 31.4334 43.302C29.5533 47.6082 27.441 51.6269 25.3411 54.5864C24.2927 56.064 23.2225 57.3134 22.1582 58.2033C21.1112 59.0787 19.954 59.7031 18.75 59.7031V57.7031C19.2679 57.7031 19.9761 57.4208 20.8753 56.669C21.7571 55.9317 22.7136 54.8333 23.71 53.4291C25.6997 50.6247 27.7488 46.7428 29.6004 42.5017C31.449 38.2675 33.0844 33.7129 34.2565 29.583C35.4347 25.4316 36.1228 21.7853 36.125 19.3399L38.125 19.3417ZM36.125 19.339C36.125 19.3353 36.125 19.3317 36.125 19.328H38.125C38.125 19.3329 38.125 19.3377 38.125 19.3426L36.125 19.339ZM36.125 19.328C36.125 17.8074 35.4975 15.9319 34.3534 13.918C33.2192 11.9215 31.6249 9.87289 29.8088 8.02759C27.9925 6.18216 25.9789 4.56501 24.0217 3.4157C22.0456 2.25529 20.2175 1.62489 18.75 1.62489V-0.375111C20.7278 -0.375111 22.9192 0.448936 25.0345 1.69107C27.1686 2.94429 29.318 4.67776 31.2342 6.62468C33.1505 8.57172 34.8579 10.7572 36.0924 12.9301C37.3169 15.0856 38.125 17.3149 38.125 19.328H36.125ZM18.75 1.62489C17.2825 1.62489 15.4544 2.25529 13.4783 3.4157C11.5211 4.56501 9.5075 6.18216 7.69123 8.02759C5.87508 9.87289 4.2808 11.9215 3.14659 13.918C2.0025 15.9319 1.375 17.8074 1.375 19.328H-0.625C-0.625 17.3149 0.183051 15.0856 1.40761 12.9301C2.64206 10.7572 4.34953 8.57172 6.2658 6.62468C8.18195 4.67776 10.3314 2.94429 12.4655 1.69107C14.5808 0.448936 16.7722 -0.375111 18.75 -0.375111V1.62489ZM18.75 59.7031C17.5455 59.7031 16.3878 59.0782 15.3405 58.2022C14.2758 57.3116 13.2051 56.0614 12.1563 54.5827C10.0556 51.6212 7.94243 47.5998 6.062 43.2913C4.17859 38.976 2.51222 34.3346 1.31504 30.1134C0.12399 25.9138 -0.625 22.0534 -0.625 19.328H1.375C1.375 21.7702 2.06156 25.4156 3.23916 29.5677C4.41063 33.6983 6.04602 38.2548 7.89503 42.4913C9.74702 46.7347 11.7969 50.6192 13.7876 53.4256C14.7844 54.8309 15.7414 55.9301 16.6237 56.6681C17.5233 57.4206 18.2319 57.7031 18.75 57.7031V59.7031Z",
+        fill="#9294A7",
+        mask="url(#path-1-inside-1_4460_280116)"
+        )
+    g(v-else)
+      path(
+        d="M36.6163 19.8282C36.5326 22.3195 35.8468 25.8084 34.7419 29.7043C33.564 33.8575 31.9208 38.4352 30.0632 42.6914C28.2041 46.9511 26.1384 50.8698 24.1203 53.715C23.1104 55.1386 22.125 56.2756 21.1971 57.0517C20.2606 57.8351 19.4397 58.2032 18.75 58.2032C18.0603 58.2032 17.2394 57.8351 16.3029 57.0517C15.375 56.2756 14.3896 55.1386 13.3797 53.715C11.3616 50.8698 9.29587 46.9511 7.43677 42.6914C5.57916 38.4352 3.93603 33.8575 2.75813 29.7043C1.65321 25.8084 0.967415 22.3195 0.883675 19.8282L1.81897 19.8282L5.75689 19.8284L18.75 19.8286L31.7431 19.8284L35.681 19.8282L36.6163 19.8282Z",
+        fill="white",
+        stroke="#252850"
+        )
+      path(
+        @click="(el) => clickPart(el.target.id)",
+        :id="editable && 'root_central'",
+        :class="{'edit-part': editable}",
+        d="M27.6106 31.75C27.9904 31.5726 28.5857 31.8793 28.5671 32.298C28.193 40.7601 23.9204 54.7656 18.75 54.7656C13.5545 54.7656 8.9633 40.6236 8.60111 32.175C8.58393 31.7742 9.10691 31.4947 9.47075 31.6638C10.7255 32.2471 13.473 33.1093 18.75 33.1093C23.7725 33.1093 26.3734 32.3282 27.6106 31.75Z",
+        fill="#D3D4DC"
+        )
+      path(
+        d="M36.625 19.3281C36.625 17.6844 35.9524 15.7204 34.7882 13.6711C33.6289 11.6305 32.0063 9.54771 30.1651 7.67697C28.3239 5.80617 26.2763 4.15994 24.2749 2.98465C22.264 1.80382 20.3451 1.125 18.75 1.125C17.1549 1.125 15.236 1.80382 13.2251 2.98465C11.2237 4.15994 9.17611 5.80617 7.33487 7.67697C5.49369 9.54771 3.87111 11.6305 2.71184 13.6711C1.54763 15.7204 0.875 17.6844 0.875 19.3281C0.875 22.6414 2.79677 25.4533 6.02112 27.4602C9.24982 29.4698 13.7467 30.6406 18.75 30.6406C23.7533 30.6406 28.2502 29.4698 31.4789 27.4602C34.7032 25.4533 36.625 22.6414 36.625 19.3281Z",
+        fill="white",
+        stroke="#252850"
+        )
+      path(
+        @click="(el) => clickPart(el.target.id)",
+        :id="editable && 'crown'",
+        :class="{'edit-part': editable}",
+        d="M33.8438 18.8624C33.8438 13.0868 24.4102 3.57812 18.75 3.57812C13.0898 3.57812 3.65625 13.0868 3.65625 18.8624C3.65625 24.638 10.414 28.5156 18.75 28.5156C27.086 28.5156 33.8438 24.638 33.8438 18.8624Z",
+        fill="#D3D4DC"
+        )
+      g(v-if="Object.values(data.crown).find((el) => el.injury)")
+        mask(
+          id="mask0_4460_280349",
+          style="mask-type:alpha",
+          maskUnits="userSpaceOnUse",
+          x="0",
+          y="0",
+          width="38",
+          height="32"
           )
+          path(
+            d="M36.625 19.3281C36.625 17.6844 35.9524 15.7204 34.7882 13.6711C33.6289 11.6305 32.0063 9.54771 30.1651 7.67697C28.3239 5.80617 26.2763 4.15994 24.2749 2.98465C22.264 1.80382 20.3451 1.125 18.75 1.125C17.1549 1.125 15.236 1.80382 13.2251 2.98465C11.2237 4.15994 9.17611 5.80617 7.33487 7.67697C5.49369 9.54771 3.87111 11.6305 2.71184 13.6711C1.54763 15.7204 0.875 17.6844 0.875 19.3281C0.875 22.6414 2.79677 25.4533 6.02112 27.4602C9.24982 29.4698 13.7467 30.6406 18.75 30.6406C23.7533 30.6406 28.2502 29.4698 31.4789 27.4602C34.7032 25.4533 36.625 22.6414 36.625 19.3281Z",
+            fill="white",
+            stroke="#252850"
+            )
+        g(mask="url(#mask0_4460_280349)")
+          circle(
+            cx="8",
+            cy="8",
+            r="8.5",
+            transform="matrix(1 0 0 -1 10.5 15)",
+            fill="#252850",
+            stroke="white"
+            )
 </template>
 
 <script>
diff --git a/src/pages/newMedicalCard/utils/medicalConfig.js b/src/pages/newMedicalCard/utils/medicalConfig.js
index 0ba52ac..fc415ad 100644
--- a/src/pages/newMedicalCard/utils/medicalConfig.js
+++ b/src/pages/newMedicalCard/utils/medicalConfig.js
@@ -965,7 +965,7 @@ export const protocolForms = [
       conditions: {
         general: {
           options: (() => {
-            let arrayOptions = ["ИЗ", "И", "О", "П"];
+            let arrayOptions = ["ИЗ", "И", "О", "П", "ИК", "В"];
             return arrayOptions.map((item) => ({
               value: item,
               label: toothConditions[item],