diff --git a/src/components/TheRightMenu.vue b/src/components/TheRightMenu.vue
new file mode 100644
index 0000000..066ce67
--- /dev/null
+++ b/src/components/TheRightMenu.vue
@@ -0,0 +1,34 @@
+
+.sidebar.h-full.rounded.flex.flex-col.justify-between.pt-4.px-2
+ .flex.flex-col.gap-y-4
+ q-btn(
+ style="width: 48px; height: 48px",
+ id="print",
+ rounded,
+ padding="0px",
+ icon="print",
+ text-color="blue",
+ size="xl"
+ )
+
+
+
+
+
diff --git a/src/pages/newMedicalCard/TheMedicalCard.vue b/src/pages/newMedicalCard/TheMedicalCard.vue
index 2a425b8..46e5996 100644
--- a/src/pages/newMedicalCard/TheMedicalCard.vue
+++ b/src/pages/newMedicalCard/TheMedicalCard.vue
@@ -1,20 +1,10 @@
- .w-full.h-full.flex.flex-col
- .flex.w-full.gap-x-2.pb-2
- medical-header(
- v-model="currentMenuItem",
- :change-shown-remove-modal="changeShownRemoveModal",
- )
- medical-records
- component(
- v-if="currentMenuItem",
- v-bind:is="currentMenuItem",
- )
- base-modal(
- v-model="isShownRemoveModal",
- title="Удаление медкарты"
- )
- medical-remove-modal(:change-shown-remove-modal="changeShownRemoveModal")
+.w-full.fit.row.no-wrap.justify-evenly
+ .col-grow.pr-2
+ medical-card-patient-form
+ medical-base-info.mt-2
+ .h-full
+ the-right-menu
+
+
diff --git a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue
index 0056008..2da1907 100644
--- a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue
+++ b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue
@@ -58,7 +58,7 @@
:name="field.key"
width="100%",
size="M",
- :rule="field.rules"
+ :rule="field.rules"
)
diff --git a/src/pages/newMedicalCard/components/MedicalBaseInfo.vue b/src/pages/newMedicalCard/components/MedicalBaseInfo.vue
index e40dc29..f4b1b55 100644
--- a/src/pages/newMedicalCard/components/MedicalBaseInfo.vue
+++ b/src/pages/newMedicalCard/components/MedicalBaseInfo.vue
@@ -1,6 +1,6 @@
.base-info-wrapper.w-full.flex.gap-x-2.flex-1.font-medium.text-m
- medical-sidebar(v-model="currentMenuItem")
+ //- medical-sidebar(v-model="currentMenuItem")
component(
v-if="currentMenuItem",
v-bind="{...componentProps, updateCurrentItem:updateCurrentItem, clearProps:clearProps}"
diff --git a/src/pages/newMedicalCard/components/MedicalCardPatientForm.vue b/src/pages/newMedicalCard/components/MedicalCardPatientForm.vue
new file mode 100644
index 0000000..ca479cd
--- /dev/null
+++ b/src/pages/newMedicalCard/components/MedicalCardPatientForm.vue
@@ -0,0 +1,206 @@
+
+.patient-info.pt-4.pr-6.flex.flex-col.justify-between.rounded.font-medium.text-m
+ .ml-6.flex.justify-between
+ //- TODO по клику переход на предыдущую страницу
+ q-breadcrumbs
+ template(v-slot:separator)
+ q-icon.rotate(
+ size="16px",
+ name="app:long-arrow",
+ color="grey",
+ )
+ q-breadcrumbs-el(:label="routes[routingHistory.state.back]")
+ q-breadcrumbs-el(:label="`Медкарта #${medicalCardData?.number}`")
+
+ q-btn(
+ @click="toggleEditMode",
+ :style="{backgroundColor: 'var(--bg-light-grey)', color: 'blue'}",
+ padding="10px",
+ )
+ q-icon(
+ name="edit",
+ size="20px",
+ )
+ .ml-6.flex.gap-x-4
+ q-avatar(size="80px", :style="{'background-color': 'var(--border-light-grey-color)', color: 'var(--font-dark-blue-color)'}")
+ img(v-if="patientData?.photo", :src="url + patientData?.photo")
+ span.text-2xl(v-else) {{patientAvatar}}
+
+ template(v-if="!editMode")
+ .flex.gap-y-1.flex-col
+ .flex.items-center
+ span.text-xxl.font-bold.mr-3(
+ :style="{color: 'var(--font-dark-blue-color)', 'line-height': '135%'}",
+ ) {{patientName}}
+
+
+ span.text-smm.label-color Добавлен в систему:
+ span.date-color {{ patientData?.gender }}
+ span.date-color {{ patientData?.birth_date }}
+ span.text-smm.label-color Спец отметки:
+
+ template(v-else)
+ base-input(
+ v-model="fullname"
+ size="M",
+ label="Фамилия"
+ )
+ base-input(
+ v-model="fullname"
+ size="M",
+ label="Имя"
+ )
+ base-input(
+ v-model="fullname"
+ size="M",
+ label="Отчество"
+ )
+
+ .flex.justify-between.pt-4
+ .flex
+ .menu-item.px-6.py-10px.cursor-pointer.text-base.whitespace-nowrap(
+ v-for="item in menuItem",
+ @click="selectItem(item)",
+ :class="{'menu-item-active': item.component === modelValue}",
+ :key="item.id",
+ :id="item.id"
+ ) {{item.title}}
+
+
+
+
+
diff --git a/src/pages/newMedicalCard/components/MedicalHeader.vue b/src/pages/newMedicalCard/components/MedicalHeader.vue
index ec45501..e08ab74 100644
--- a/src/pages/newMedicalCard/components/MedicalHeader.vue
+++ b/src/pages/newMedicalCard/components/MedicalHeader.vue
@@ -167,10 +167,9 @@ export default {