From dbc1883eaf0b71a4210ad3e37a04b0f54113aa43 Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Tue, 7 Jul 2026 17:12:01 +0900
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=9E=D1=82=D0=BA=D1=83=D0=B4=D0=B0=20=D0=B4=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B8=20=D0=BF=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=83=D0=BF=D0=B8=D0=BB=20=D0=BE=D1=82=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B0=D0=BB=D0=B0=20=D0=B7=D0=B0=D0=B1=D0=BE=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20(=D0=B4=D0=B0=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=B8=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                                  |  3 ++
 app/Http/Controllers/Api/FiasController.php   | 29 +++++++++++++
 config/fias.php                               |  5 +++
 resources/js/Components/AppSearchAddress.vue  | 41 ++++++++++++++++++
 .../Components/AddMedicalHistoryModal.vue     | 41 ++++++++++++++++--
 .../Components/EditMedicalHistoryModal.vue    | 42 +++++++++++++++++--
 routes/api.php                                |  3 ++
 7 files changed, 157 insertions(+), 7 deletions(-)
 create mode 100644 app/Http/Controllers/Api/FiasController.php
 create mode 100644 config/fias.php
 create mode 100644 resources/js/Components/AppSearchAddress.vue

diff --git a/.env.example b/.env.example
index f63ede8..47b4cbc 100644
--- a/.env.example
+++ b/.env.example
@@ -74,4 +74,7 @@ VITE_APP_TAG="${APP_TAG}"
 
 VITE_SENTRY_DNS=
 
+SYNCIO_BASE_URL=
 SYNCIO_SECRET=
+SYNCIO_TOKEN=
+FIAS_URL=
\ No newline at end of file
diff --git a/app/Http/Controllers/Api/FiasController.php b/app/Http/Controllers/Api/FiasController.php
new file mode 100644
index 0000000..d8df7cc
--- /dev/null
+++ b/app/Http/Controllers/Api/FiasController.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+use Inertia\Inertia;
+
+class FiasController extends Controller
+{
+    public function index(Request $request)
+    {
+        $search = $request->input('search');
+
+        $response = Http::post(config('fias.url') . '/find', [
+            'search' => $search,
+            'filter_by' => [
+                'level' => '[5,6]',
+                'isactive' => 1
+            ],
+            'sort_by' => [
+                'level' => 'asc'
+            ]
+        ]);
+
+        return $response->json();
+    }
+}
\ No newline at end of file
diff --git a/config/fias.php b/config/fias.php
new file mode 100644
index 0000000..3a2cd7b
--- /dev/null
+++ b/config/fias.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'url' => env('FIAS_URL'),
+];
\ No newline at end of file
diff --git a/resources/js/Components/AppSearchAddress.vue b/resources/js/Components/AppSearchAddress.vue
new file mode 100644
index 0000000..4a39aa5
--- /dev/null
+++ b/resources/js/Components/AppSearchAddress.vue
@@ -0,0 +1,41 @@
+<script setup>
+import { useDebounceFn } from '@vueuse/core'
+import {ref, defineModel} from 'vue'
+import { NSelect } from 'naive-ui'
+
+const value = defineModel('value')
+const objectId = defineModel('objectid')
+const options = ref()
+const loading = ref(false)
+
+const debounceSearch = useDebounceFn((query) => {
+    axios.post('/api/fias', {
+        search: query
+    }).then((res) => {
+        options.value = res.data
+        loading.value = false
+    })
+}, 1000, { maxWait: 5000 })
+
+const handleSearch = async (query) => {
+    if (!query.length) {
+        options.value = []
+        return
+    }
+
+    loading.value = true
+
+    await debounceSearch(query)
+}
+
+const updateValue = (selectedValue) => {
+    const oId = options.value.find((itm) => itm.full_name === selectedValue)
+    objectId.value = oId.objectid
+}
+</script>
+
+<template>
+    <NSelect v-model:value="value" @update-value="(v) => updateValue(v)" filterable placeholder="" :options="options"
+        label-field="full_name" value-field="full_name" :loading="loading" clearable remote
+        :clear-filter-after-select="false" @search="handleSearch" />
+</template>
\ No newline at end of file
diff --git a/resources/js/Pages/Nurse/Components/AddMedicalHistoryModal.vue b/resources/js/Pages/Nurse/Components/AddMedicalHistoryModal.vue
index ce3def0..7399983 100644
--- a/resources/js/Pages/Nurse/Components/AddMedicalHistoryModal.vue
+++ b/resources/js/Pages/Nurse/Components/AddMedicalHistoryModal.vue
@@ -1,11 +1,12 @@
 <script setup>
-import {NModal, NSteps, NStep, NTabs, NTabPane, NFlex, NGrid, NGi, NButton, NRadioGroup, NSelect, NInput, NFormItemGi, NDatePicker} from 'naive-ui'
+import {NModal, NSteps, NStep, NTabs, NTabPane, NFlex, NGrid, NGi, NButton, NRadioGroup, NSelect, NInput, NFormItemGi, NDatePicker, NCheckbox} from 'naive-ui'
 import {computed, ref, watch} from "vue";
 import AppRadio from "../../../Components/AppRadio.vue";
 import {useDebounceFn} from "@vueuse/core";
 import {format} from "date-fns";
 import {router, usePage} from "@inertiajs/vue3";
 import AppPanel from "../../../Components/AppPanel.vue"
+import AppSearchAddress from '../../../Components/AppSearchAddress.vue';
 const show = defineModel('show', { default: false })
 
 const currentStep = ref(1)
@@ -24,6 +25,8 @@ const form = ref({
     recipient_date: format(new Date(), 'yyyy-MM-dd HH:mm:ss'),
     death_date: null,
     extract_date: null,
+    deliveriFromAddress: null,
+    deliveryFromObjectId: null,
     mis_id: null
 })
 
@@ -39,6 +42,8 @@ const resetForm = () => {
         recipient_date: format(new Date(), 'yyyy-MM-dd HH:mm:ss'),
         death_date: null,
         extract_date: null,
+        deliveriFromAddress: null,
+        deliveryFromObjectId: null,
         mis_id: null
     }
 }
@@ -187,6 +192,21 @@ watch(() => currentStep.value, (val) => {
     if (val === 1) resetForm()
 })
 
+const canShowExtractDateField = ref(false)
+const canShowDeathDateField = ref(false)
+watch(() => form.value.visit_result_id, (newVisitResultId, oldVisitResultId) => {
+    if ([1, 2, 3, 4, 7, 8, 9, 10].includes(newVisitResultId)) {
+        canShowDeathDateField.value = false
+        canShowExtractDateField.value = true
+    } else if ([5, 6].includes(newVisitResultId)) {
+        canShowDeathDateField.value = true
+        canShowExtractDateField.value = false
+    } else {
+        canShowDeathDateField.value = false
+        canShowExtractDateField.value = false
+    }
+})
+
 const onAfterLeave = () => {
     resetForm()
     currentStep.value = 1
@@ -249,12 +269,27 @@ const onAfterLeave = () => {
                         <NFormItemGi span="1" label="Дата и время госпитализации">
                             <NDatePicker v-model:formatted-value="form.recipient_date" type="datetime" class="w-full" format="dd.MM.yyyy HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" clearable />
                         </NFormItemGi>
-                        <NFormItemGi span="1" label="Дата и время выписки">
+                        <NFormItemGi v-if="canShowExtractDateField" span="1" label="Дата и время выписки">
                             <NDatePicker v-model:formatted-value="form.extract_date" type="datetime" class="w-full" format="dd.MM.yyyy HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" clearable />
                         </NFormItemGi>
-                        <NFormItemGi span="1" label="Дата и время смерти">
+                        <NFormItemGi v-if="canShowDeathDateField" span="1" label="Дата и время смерти">
                             <NDatePicker v-model:formatted-value="form.death_date" type="datetime" class="w-full" format="dd.MM.yyyy HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" clearable />
                         </NFormItemGi>
+                        <NFormItemGi span="2" label="Поступил от начала заболевания">
+                            <NGrid cols="2" x-gap="8">
+                                <NGi>
+                                    <NDatePicker v-model:formatted-value="form.death_date" type="datetime" class="w-full" format="dd.MM.yyyy HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" clearable />
+                                </NGi>
+                                <NGi class="flex items-center">
+                                    <NCheckbox class="text-nowrap">
+                                        Неизвестно
+                                    </NCheckbox>
+                                </NGi>
+                            </NGrid>
+                        </NFormItemGi>
+                        <NFormItemGi span="2" label="Откуда доставлен">
+                            <AppSearchAddress v-model:value="form.deliveriFromAddress" v-model:objectid="form.deliveryObjectId" />
+                        </NFormItemGi>
                     </NGrid>
                 </AppPanel>
             </NTabPane>
diff --git a/resources/js/Pages/Nurse/Components/EditMedicalHistoryModal.vue b/resources/js/Pages/Nurse/Components/EditMedicalHistoryModal.vue
index 4abcce5..cbdb5bf 100644
--- a/resources/js/Pages/Nurse/Components/EditMedicalHistoryModal.vue
+++ b/resources/js/Pages/Nurse/Components/EditMedicalHistoryModal.vue
@@ -13,12 +13,14 @@ import {
     NSelect,
     NInput,
     NFormItemGi,
-    NDatePicker
+    NDatePicker,
+    NCheckbox
 } from 'naive-ui'
 import {computed, ref, watch} from "vue";
 import AppRadio from "../../../Components/AppRadio.vue";
 import axios from "axios";
 import {router} from "@inertiajs/vue3";
+import AppSearchAddress from '../../../Components/AppSearchAddress.vue';
 const show = defineModel('show', { default: false })
 const props = defineProps({
     historyId: {
@@ -44,7 +46,9 @@ const form = ref({
     birth_date: null,
     recipient_date: null,
     death_date: null,
-    extract_date: null
+    extract_date: null,
+    deliveriFromAddress: null,
+    deliveryFromObjectId: null
 })
 const loading = ref(true)
 const buttonLoading = ref(false)
@@ -152,6 +156,21 @@ const fetchPatient = async (historyId) => {
 watch(() => props.historyId, async (newHistoryId, historyId) => {
     await fetchPatient(newHistoryId)
 })
+
+const canShowExtractDateField = ref(false)
+const canShowDeathDateField = ref(false)
+watch(() => form.value.visit_result_id, (newVisitResultId, oldVisitResultId) => {
+    if ([1, 2, 3, 4, 7, 8, 9, 10].includes(newVisitResultId)) {
+        canShowDeathDateField.value = false
+        canShowExtractDateField.value = true
+    } else if ([5, 6].includes(newVisitResultId)) {
+        canShowDeathDateField.value = true
+        canShowExtractDateField.value = false
+    } else {
+        canShowDeathDateField.value = false
+        canShowExtractDateField.value = false
+    }
+})
 </script>
 
 <template>
@@ -182,12 +201,27 @@ watch(() => props.historyId, async (newHistoryId, historyId) => {
             <NFormItemGi span="1" label="Дата и время госпитализации">
                 <NDatePicker v-model:formatted-value="form.recipient_date" type="datetime" class="w-full" format="dd.MM.yyyy HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" clearable />
             </NFormItemGi>
-            <NFormItemGi span="1" label="Дата и время выписки">
+            <NFormItemGi v-if="canShowExtractDateField" span="1" label="Дата и время выписки">
                 <NDatePicker v-model:formatted-value="form.extract_date" type="datetime" class="w-full" format="dd.MM.yyyy HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" clearable />
             </NFormItemGi>
-            <NFormItemGi span="1" label="Дата и время смерти">
+            <NFormItemGi v-if="canShowDeathDateField" span="1" label="Дата и время смерти">
                 <NDatePicker v-model:formatted-value="form.death_date" type="datetime" class="w-full" format="dd.MM.yyyy HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" clearable />
             </NFormItemGi>
+            <NFormItemGi span="2" label="Поступил от начала заболевания">
+                <NGrid cols="2" x-gap="8">
+                    <NGi>
+                        <NDatePicker v-model:formatted-value="form.death_date" type="datetime" class="w-full" format="dd.MM.yyyy HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" clearable />
+                    </NGi>
+                    <NGi class="flex items-center">
+                        <NCheckbox class="text-nowrap">
+                            Неизвестно
+                        </NCheckbox>
+                    </NGi>
+                </NGrid>
+            </NFormItemGi>
+            <NFormItemGi span="2" label="Откуда доставлен">
+                <AppSearchAddress v-model:value="form.deliveriFromAddress" v-model:objectid="form.deliveryObjectId" />
+            </NFormItemGi>
         </NGrid>
         <template v-if="!loading" #action>
             <NFlex justify="end">
diff --git a/routes/api.php b/routes/api.php
index 12d7a8d..c2ed83c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -119,3 +119,6 @@ Route::middleware(['auth:sanctum'])->group(function () {
 Route::prefix('syncio')->group(function () {
     Route::post('webhook', \App\Http\Controllers\Api\Syncio\SyncioWebhookController::class);
 });
+Route::prefix('fias')->group(function () {
+    Route::post('/', [\App\Http\Controllers\Api\FiasController::class, 'index']);
+});