From b348c32200ea7b9f9e6f15c2f37257cd48178a87 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Fri, 22 Sep 2023 11:57:05 +0800
Subject: [PATCH 01/38] .

---
 api/views.py                                           | 1 +
 appconf/manager.py                                     | 1 +
 directory/models.py                                    | 3 +++
 l2-frontend/src/construct/ConstructParaclinic.vue      | 4 ++++
 l2-frontend/src/construct/ParaclinicResearchEditor.vue | 5 +++--
 podrazdeleniya/models.py                               | 2 ++
 pyproject.toml                                         | 2 +-
 7 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/api/views.py b/api/views.py
index 14e0e05ede..ac083abc07 100644
--- a/api/views.py
+++ b/api/views.py
@@ -517,6 +517,7 @@ def departments(request):
         }
         if hasattr(request, 'plain_response') and request.plain_response:
             return data
+        print(data)
         return JsonResponse(data)
 
     if can_edit:
diff --git a/appconf/manager.py b/appconf/manager.py
index c8a7484bd1..1c68eeb2fc 100644
--- a/appconf/manager.py
+++ b/appconf/manager.py
@@ -168,6 +168,7 @@ def l2_modules() -> dict:
                     "price_customer",
                     "price_externel_performer",
                     "ftp",
+                    "case",
                 ]
             },
             "consults_module": SettingManager.get("consults_module", default='false', default_type='b'),
diff --git a/directory/models.py b/directory/models.py
index 4a74e91b69..2e2081780f 100644
--- a/directory/models.py
+++ b/directory/models.py
@@ -243,6 +243,7 @@ class Researches(models.Model):
     is_monitoring = models.BooleanField(default=False, blank=True, help_text="Это мониторинг", db_index=True)
     is_expertise = models.BooleanField(default=False, blank=True, help_text="Это экспертиза", db_index=True)
     is_aux = models.BooleanField(default=False, blank=True, help_text="Это вспомогательный", db_index=True)
+    is_case = models.BooleanField(default=False, blank=True, help_text="Это случай", db_index=True)
     site_type = models.ForeignKey(ResearchSite, default=None, null=True, blank=True, help_text='Место услуги', on_delete=models.SET_NULL, db_index=True)
     need_vich_code = models.BooleanField(default=False, blank=True, help_text="Необходимость указания кода вич в направлении")
     paraclinic_info = models.TextField(blank=True, default="", help_text="Если это параклиническое исследование - здесь указывается подготовка и кабинет")
@@ -357,6 +358,8 @@ def reversed_type(self):
             return -13
         if self.is_microbiology or self.is_citology or self.is_gistology:
             return 2 - Podrazdeleniya.MORFOLOGY
+        if self.is_case:
+            return -16
         return self.podrazdeleniye_id or -2
 
     @property
diff --git a/l2-frontend/src/construct/ConstructParaclinic.vue b/l2-frontend/src/construct/ConstructParaclinic.vue
index 1b512caf80..9bb7760911 100644
--- a/l2-frontend/src/construct/ConstructParaclinic.vue
+++ b/l2-frontend/src/construct/ConstructParaclinic.vue
@@ -277,6 +277,10 @@ export default {
             d.push({ value: -8, label: '– Гистология' });
           }
         }
+
+        if (this.modules.l2_case) {
+          d.push({ value: -16, label: 'Случаи' });
+        }
       }
 
       this.departments_of_type = d;
diff --git a/l2-frontend/src/construct/ParaclinicResearchEditor.vue b/l2-frontend/src/construct/ParaclinicResearchEditor.vue
index c8f2293f2d..a8353b52e2 100644
--- a/l2-frontend/src/construct/ParaclinicResearchEditor.vue
+++ b/l2-frontend/src/construct/ParaclinicResearchEditor.vue
@@ -461,7 +461,7 @@
         </div>
       </template>
       <div
-        v-if="ex_dep === 7"
+        v-if="ex_dep === 7 || ex_dep === 16"
         class="department-select"
       >
         <Treeselect
@@ -480,7 +480,7 @@
           >
         </div>
       </div>
-      <template v-if="ex_dep !== 7">
+      <template v-if="ex_dep !== 7 || ex_dep !== 16">
         <div
           v-for="(group, gi) in orderBy(groups, 'order')"
           :key="gi"
@@ -1286,6 +1286,7 @@ export default {
           '-11': 13,
           '-12': 14,
           '-13': 15,
+          '-16': 16,
         }[this.department] || this.department
       );
     },
diff --git a/podrazdeleniya/models.py b/podrazdeleniya/models.py
index 283f387afe..34e99f4505 100644
--- a/podrazdeleniya/models.py
+++ b/podrazdeleniya/models.py
@@ -16,6 +16,7 @@ class Podrazdeleniya(models.Model):  # Модель подразделений
     DIRECTIONPARAMS = 12
     APPLICATIONS = 13
     MONITORINGS = 14
+    CASE = 16
 
     TYPES = (
         (HIDDEN, "Скрыто"),
@@ -31,6 +32,7 @@ class Podrazdeleniya(models.Model):  # Модель подразделений
         (DIRECTIONPARAMS, "Параметры для направления"),
         (APPLICATIONS, "Заявления"),
         (MONITORINGS, "Мониторинги"),
+        (CASE, "Случаи"),
     )
 
     ODII_TYPES = (
diff --git a/pyproject.toml b/pyproject.toml
index f9fa2df43d..f1de5eeebf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-psycopg2-binary = "^2.9.4"
+#psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From 7379597a180b1a19468f29d373eed88bd2e34373 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Fri, 22 Sep 2023 15:28:01 +0800
Subject: [PATCH 02/38] =?UTF-8?q?=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/researches/views.py                                | 8 +++++++-
 api/views.py                                           | 2 +-
 directory/models.py                                    | 2 ++
 l2-frontend/src/construct/ParaclinicResearchEditor.vue | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/api/researches/views.py b/api/researches/views.py
index 89498f7d83..401206cf6f 100644
--- a/api/researches/views.py
+++ b/api/researches/views.py
@@ -361,6 +361,8 @@ def researches_by_department(request):
             q = DResearches.objects.filter(is_monitoring=True).order_by("title")
         elif department_pk == -13:
             q = DResearches.objects.filter(is_expertise=True).order_by("title")
+        elif department_pk == -16:
+            q = DResearches.objects.filter(is_case=True).order_by("title")
         else:
             q = DResearches.objects.filter(podrazdeleniye__pk=department_pk).order_by("title")
 
@@ -405,6 +407,7 @@ def researches_params(request):
 def researches_update(request):
     response = {"ok": False}
     request_data = json.loads(request.body)
+    print(request_data)
     pk = request_data.get("pk", -2)
     if pk > -2:
         department_pk = request_data.get("department")
@@ -455,8 +458,9 @@ def researches_update(request):
         if tube == -1:
             tube = None
         stationar_slave = is_simple and -500 >= department_pk > -600 and main_service_pk != 1
-        desc = stationar_slave or department_pk in [-2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13]
+        desc = stationar_slave or department_pk in [-2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -16]
         if len(title) > 0 and (desc or Podrazdeleniya.objects.filter(pk=department_pk).exists()):
+            print("попал")
             department = None if desc else Podrazdeleniya.objects.filter(pk=department_pk)[0]
             res = None
             if int(hospital_research_department_pk) > -1:
@@ -484,6 +488,7 @@ def researches_update(request):
                     is_application=department_pk == -11,
                     is_monitoring=department_pk == -12,
                     is_expertise=department_pk == -13,
+                    is_case=department_pk == -16,
                     is_slave_hospital=stationar_slave,
                     microbiology_tube_id=tube if department_pk == -6 else None,
                     site_type_id=site_type,
@@ -527,6 +532,7 @@ def researches_update(request):
                 res.is_application = department_pk == -11
                 res.is_monitoring = department_pk == -12
                 res.is_expertise = department_pk == -13
+                res.is_case = department_pk == -16
                 res.microbiology_tube_id = tube if department_pk == -6 else None
                 res.paraclinic_info = info
                 res.hide = hide
diff --git a/api/views.py b/api/views.py
index ac083abc07..22427d0b94 100644
--- a/api/views.py
+++ b/api/views.py
@@ -785,7 +785,7 @@ def directive_from(request):
     data = []
     hospital = request.user.doctorprofile.hospital
     for dep in (
-        Podrazdeleniya.objects.filter(p_type__in=(Podrazdeleniya.DEPARTMENT, Podrazdeleniya.HOSP, Podrazdeleniya.PARACLINIC), hospital__in=(hospital, None))
+        Podrazdeleniya.objects.filter(p_type__in=(Podrazdeleniya.DEPARTMENT, Podrazdeleniya.HOSP, Podrazdeleniya.PARACLINIC, Podrazdeleniya.CASE), hospital__in=(hospital, None))
         .prefetch_related(
             Prefetch(
                 'doctorprofile_set',
diff --git a/directory/models.py b/directory/models.py
index 2e2081780f..323994db4e 100644
--- a/directory/models.py
+++ b/directory/models.py
@@ -82,6 +82,7 @@ class ResearchSite(models.Model):
         (4, 'Микробиология'),
         (7, 'Формы'),
         (10, 'Мониторинги'),
+        (16, 'Случаи'),
     )
 
     site_type = models.SmallIntegerField(choices=TYPES, help_text="Тип раздела", db_index=True)
@@ -371,6 +372,7 @@ def desc(self):
             or self.is_paraclinic
             or self.is_microbiology
             or self.is_hospital
+            or self.is_case
             or self.is_citology
             or self.is_gistology
             or self.is_form
diff --git a/l2-frontend/src/construct/ParaclinicResearchEditor.vue b/l2-frontend/src/construct/ParaclinicResearchEditor.vue
index a8353b52e2..c0ce583263 100644
--- a/l2-frontend/src/construct/ParaclinicResearchEditor.vue
+++ b/l2-frontend/src/construct/ParaclinicResearchEditor.vue
@@ -461,7 +461,7 @@
         </div>
       </template>
       <div
-        v-if="ex_dep === 7 || ex_dep === 16"
+        v-if="ex_dep === 7 || ex_dep ===16"
         class="department-select"
       >
         <Treeselect
@@ -480,7 +480,7 @@
           >
         </div>
       </div>
-      <template v-if="ex_dep !== 7 || ex_dep !== 16">
+      <template v-if="ex_dep !== 7 && ex_dep !== 16">
         <div
           v-for="(group, gi) in orderBy(groups, 'order')"
           :key="gi"

From 4c03c71d9a083b08176bd5f3ab187853ddf11d82 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Fri, 22 Sep 2023 19:14:40 +0800
Subject: [PATCH 03/38] =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D1=83=D0=BA=D1=82=D0=BE=D1=80=20=D1=81=D0=BB=D1=83=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/views.py        | 8 +++++++-
 appconf/manager.py  | 2 ++
 directory/models.py | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/api/views.py b/api/views.py
index 22427d0b94..642eebb1e8 100644
--- a/api/views.py
+++ b/api/views.py
@@ -517,7 +517,6 @@ def departments(request):
         }
         if hasattr(request, 'plain_response') and request.plain_response:
             return data
-        print(data)
         return JsonResponse(data)
 
     if can_edit:
@@ -722,11 +721,15 @@ def fill_settings():
                     )
 
             for e in en:
+
                 if e < 4 or not en[e] or e == 13:
                     continue
 
                 t = e - 4
                 has_def = DResearches.objects.filter(hide=False, site_type__isnull=True, **DResearches.filter_type(e)).exists()
+                if e == 16:
+                    print("has_def")
+                    print(has_def)
 
                 if has_def and e != 12:
                     d = [{"pk": None, "title": 'Общие', 'type': t, "extended": True}]
@@ -749,6 +752,7 @@ def fill_settings():
                     ret["extended_departments"][Podrazdeleniya.MORFOLOGY].append(
                         {"pk": Podrazdeleniya.MORFOLOGY + 3, "title": "Гистология", "type": Podrazdeleniya.MORFOLOGY, "extended": True, "e": Podrazdeleniya.MORFOLOGY}
                     )
+
             try:
                 connections.close_all()
             except Exception as e:
@@ -763,6 +767,8 @@ def fill_settings():
         t1.join()
         t2.join()
 
+    print(ret)
+
     if hasattr(request, 'plain_response') and request.plain_response:
         return ret
     return JsonResponse(ret)
diff --git a/appconf/manager.py b/appconf/manager.py
index 1c68eeb2fc..50fb5d6d53 100644
--- a/appconf/manager.py
+++ b/appconf/manager.py
@@ -199,6 +199,7 @@ def en():
         k = SettingManager.FULL_CACHE_EN_KEY
 
         cv = cache.get(k)
+        cv = False
         if cv:
             result = simplejson.loads(cv)
         else:
@@ -215,6 +216,7 @@ def en():
                 12: SettingManager.get("directions_params", default='false', default_type='b'),
                 13: SettingManager.l2("applications"),
                 14: SettingManager.l2("monitorings"),
+                16: SettingManager.l2("case"),
             }
 
             cache.set(k, simplejson.dumps(result), 60 * 60 * 8)
diff --git a/directory/models.py b/directory/models.py
index 323994db4e..7bfbf7ddc7 100644
--- a/directory/models.py
+++ b/directory/models.py
@@ -82,7 +82,7 @@ class ResearchSite(models.Model):
         (4, 'Микробиология'),
         (7, 'Формы'),
         (10, 'Мониторинги'),
-        (16, 'Случаи'),
+        (12, 'Случаи'),
     )
 
     site_type = models.SmallIntegerField(choices=TYPES, help_text="Тип раздела", db_index=True)
@@ -332,6 +332,7 @@ def filter_type(t):
             14: dict(is_application=True),
             15: dict(is_monitoring=True),
             16: dict(is_expertise=True),
+            17: dict(is_case=True)
         }
         return ts.get(t + 1, {})
 

From eaefd3f81d62ee6649ce1f0967364a2cc834e894 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Fri, 22 Sep 2023 19:14:57 +0800
Subject: [PATCH 04/38] fix

---
 appconf/manager.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appconf/manager.py b/appconf/manager.py
index 50fb5d6d53..8950ebcedb 100644
--- a/appconf/manager.py
+++ b/appconf/manager.py
@@ -199,7 +199,6 @@ def en():
         k = SettingManager.FULL_CACHE_EN_KEY
 
         cv = cache.get(k)
-        cv = False
         if cv:
             result = simplejson.loads(cv)
         else:

From b167f4677ad9b55b448c182d9f438b74efe14741 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Fri, 22 Sep 2023 19:21:17 +0800
Subject: [PATCH 05/38] fix

---
 api/researches/views.py | 2 --
 api/views.py            | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/api/researches/views.py b/api/researches/views.py
index 401206cf6f..ef613299a7 100644
--- a/api/researches/views.py
+++ b/api/researches/views.py
@@ -407,7 +407,6 @@ def researches_params(request):
 def researches_update(request):
     response = {"ok": False}
     request_data = json.loads(request.body)
-    print(request_data)
     pk = request_data.get("pk", -2)
     if pk > -2:
         department_pk = request_data.get("department")
@@ -460,7 +459,6 @@ def researches_update(request):
         stationar_slave = is_simple and -500 >= department_pk > -600 and main_service_pk != 1
         desc = stationar_slave or department_pk in [-2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -16]
         if len(title) > 0 and (desc or Podrazdeleniya.objects.filter(pk=department_pk).exists()):
-            print("попал")
             department = None if desc else Podrazdeleniya.objects.filter(pk=department_pk)[0]
             res = None
             if int(hospital_research_department_pk) > -1:
diff --git a/api/views.py b/api/views.py
index 642eebb1e8..310b1bfd17 100644
--- a/api/views.py
+++ b/api/views.py
@@ -727,9 +727,6 @@ def fill_settings():
 
                 t = e - 4
                 has_def = DResearches.objects.filter(hide=False, site_type__isnull=True, **DResearches.filter_type(e)).exists()
-                if e == 16:
-                    print("has_def")
-                    print(has_def)
 
                 if has_def and e != 12:
                     d = [{"pk": None, "title": 'Общие', 'type': t, "extended": True}]
@@ -767,8 +764,6 @@ def fill_settings():
         t1.join()
         t2.join()
 
-    print(ret)
-
     if hasattr(request, 'plain_response') and request.plain_response:
         return ret
     return JsonResponse(ret)

From 99e6b06a6dcfc4b0080aa6d97ad4757389bbe1c8 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Fri, 22 Sep 2023 19:26:27 +0800
Subject: [PATCH 06/38] fix

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f1de5eeebf..f9fa2df43d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-#psycopg2-binary = "^2.9.4"
+psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From 204643283996ee7dbc2ea656a103f82b11c928f7 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Fri, 22 Sep 2023 20:06:08 +0800
Subject: [PATCH 07/38] fix

---
 api/researches/views.py | 2 +-
 pyproject.toml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/researches/views.py b/api/researches/views.py
index ef613299a7..5566455641 100644
--- a/api/researches/views.py
+++ b/api/researches/views.py
@@ -177,6 +177,7 @@ def get_researches(request, last_used=False):
                     "treatment": r.is_treatment,
                     "is_hospital": r.is_hospital,
                     "is_form": r.is_form,
+                    "is_case": r.is_case,
                     "is_application": r.is_application,
                     "stom": r.is_stom,
                     "need_vich_code": r.need_vich_code,
@@ -257,7 +258,6 @@ def get_researches(request, last_used=False):
             result = {"researches": deps, "cnts": cnts}
     else:
         result = json.loads(result)
-
     if hasattr(request, 'plain_response') and request.plain_response:
         return result
     return JsonResponse(result)
diff --git a/pyproject.toml b/pyproject.toml
index f9fa2df43d..f1de5eeebf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-psycopg2-binary = "^2.9.4"
+#psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From 1667c997965fae7c49752fe68979369f3f13cd49 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Fri, 22 Sep 2023 20:09:26 +0800
Subject: [PATCH 08/38] fix

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f1de5eeebf..f9fa2df43d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-#psycopg2-binary = "^2.9.4"
+psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From e18ba813943d7a2da1ad81680c1b8f725b8cad7e Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sat, 23 Sep 2023 12:26:52 +0800
Subject: [PATCH 09/38] fix

---
 directions/views.py                                    | 1 +
 directory/models.py                                    | 2 +-
 l2-frontend/src/construct/ConstructParaclinic.vue      | 2 +-
 l2-frontend/src/construct/ParaclinicResearchEditor.vue | 2 +-
 l2-frontend/src/ui-cards/SelectedResearches.vue        | 2 +-
 pyproject.toml                                         | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/directions/views.py b/directions/views.py
index 1607b5abc5..b646fcf1af 100644
--- a/directions/views.py
+++ b/directions/views.py
@@ -566,6 +566,7 @@ def print_direction(c: Canvas, n, dir: Napravleniya, format_a6: bool = False):
                 -9: 'Формы',
                 -11: 'Заявления',
                 -12: 'Мониторинги',
+                -14: 'Случай',
             }[rtp]
             # if rtp == -6:
             #     has_micro = True
diff --git a/directory/models.py b/directory/models.py
index 7bfbf7ddc7..a134abbf33 100644
--- a/directory/models.py
+++ b/directory/models.py
@@ -361,7 +361,7 @@ def reversed_type(self):
         if self.is_microbiology or self.is_citology or self.is_gistology:
             return 2 - Podrazdeleniya.MORFOLOGY
         if self.is_case:
-            return -16
+            return -14
         return self.podrazdeleniye_id or -2
 
     @property
diff --git a/l2-frontend/src/construct/ConstructParaclinic.vue b/l2-frontend/src/construct/ConstructParaclinic.vue
index 9bb7760911..4ad4711465 100644
--- a/l2-frontend/src/construct/ConstructParaclinic.vue
+++ b/l2-frontend/src/construct/ConstructParaclinic.vue
@@ -279,7 +279,7 @@ export default {
         }
 
         if (this.modules.l2_case) {
-          d.push({ value: -16, label: 'Случаи' });
+          d.push({ value: -14, label: 'Случаи' });
         }
       }
 
diff --git a/l2-frontend/src/construct/ParaclinicResearchEditor.vue b/l2-frontend/src/construct/ParaclinicResearchEditor.vue
index c0ce583263..00d9aca0b3 100644
--- a/l2-frontend/src/construct/ParaclinicResearchEditor.vue
+++ b/l2-frontend/src/construct/ParaclinicResearchEditor.vue
@@ -1286,7 +1286,7 @@ export default {
           '-11': 13,
           '-12': 14,
           '-13': 15,
-          '-16': 16,
+          '-14': 16,
         }[this.department] || this.department
       );
     },
diff --git a/l2-frontend/src/ui-cards/SelectedResearches.vue b/l2-frontend/src/ui-cards/SelectedResearches.vue
index 50e23e53e1..5475253c49 100644
--- a/l2-frontend/src/ui-cards/SelectedResearches.vue
+++ b/l2-frontend/src/ui-cards/SelectedResearches.vue
@@ -782,7 +782,7 @@ export default {
       for (const pk of this.researches) {
         if (this.$store.getters.researches_obj[pk]) {
           const res = this.$store.getters.researches_obj[pk];
-          const d = res.department_pk && !res.doc_refferal ? res.department_pk : -2;
+          const d = res.department_pk && !res.doc_refferal && !res.is_case ? res.department_pk : -2;
           if (!(d in r)) {
             r[d] = {
               pk: d,
diff --git a/pyproject.toml b/pyproject.toml
index f9fa2df43d..f1de5eeebf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-psycopg2-binary = "^2.9.4"
+#psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From 7768dc5cbcf710acceceee4ec9b75cb7de77db32 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Sat, 23 Sep 2023 12:27:34 +0800
Subject: [PATCH 10/38] Update directory/models.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 directory/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/directory/models.py b/directory/models.py
index a134abbf33..d5b744f8c7 100644
--- a/directory/models.py
+++ b/directory/models.py
@@ -332,7 +332,7 @@ def filter_type(t):
             14: dict(is_application=True),
             15: dict(is_monitoring=True),
             16: dict(is_expertise=True),
-            17: dict(is_case=True)
+            17: dict(is_case=True),
         }
         return ts.get(t + 1, {})
 

From b3b10d9784dd7a8d4f630dc1c3a097dfa40abc80 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Sat, 23 Sep 2023 12:27:41 +0800
Subject: [PATCH 11/38] Update api/views.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 api/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api/views.py b/api/views.py
index 310b1bfd17..fbb7826695 100644
--- a/api/views.py
+++ b/api/views.py
@@ -721,7 +721,6 @@ def fill_settings():
                     )
 
             for e in en:
-
                 if e < 4 or not en[e] or e == 13:
                     continue
 

From 7f393f45a0860c211de97fc32acce85430970af6 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sat, 23 Sep 2023 15:27:49 +0800
Subject: [PATCH 12/38] fix

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f1de5eeebf..f9fa2df43d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-#psycopg2-binary = "^2.9.4"
+psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From 1b0b7b2bdb6e58c664e817fe5fa118200dbed8d7 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Tue, 26 Sep 2023 21:43:29 +0800
Subject: [PATCH 13/38] =?UTF-8?q?=D0=A1=D0=BB=D1=83=D1=87=D0=B0=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/directions/sql_func.py                    |  4 +-
 api/directions/views.py                       | 11 ++++--
 api/researches/views.py                       |  9 +++--
 api/views.py                                  |  5 ++-
 .../construct/ParaclinicResearchEditor.vue    |  4 +-
 .../src/ui-cards/DirectionsHistory/index.vue  |  1 +
 .../src/ui-cards/SelectedResearches.vue       | 39 +++++++++++++++++++
 7 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/api/directions/sql_func.py b/api/directions/sql_func.py
index 92ec4848fd..db1679c8d4 100644
--- a/api/directions/sql_func.py
+++ b/api/directions/sql_func.py
@@ -21,6 +21,7 @@ def get_history_dir(d_s, d_e, card_id, who_create_dir, services, is_serv, iss_pk
             directory_researches.is_paraclinic,
             directory_researches.is_form,
             directory_researches.is_microbiology,
+            directory_researches.is_case,
             directory_researches.podrazdeleniye_id,
             directions_napravleniya.parent_id as dir_parent_id,
             directions_napravleniya.data_sozdaniya as dir_data_sozdaniya,
@@ -106,7 +107,8 @@ def get_history_dir(d_s, d_e, card_id, who_create_dir, services, is_serv, iss_pk
             ud.patronymic,
             directions_napravleniya.visit_date,
             directions_napravleniya.time_microbiology_receive,
-            directions_napravleniya.time_gistology_receive
+            directions_napravleniya.time_gistology_receive,
+            is_case
         FROM t_iss_tubes
         LEFT JOIN t_recive
         ON t_iss_tubes.tubesregistration_id = t_recive.id_t_recive
diff --git a/api/directions/views.py b/api/directions/views.py
index dc2792893d..7a3ea9645e 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -310,7 +310,7 @@ def directions_history(request):
     # status: 4 - выписано пользователем, 0 - только выписанные, 1 - Материал получен лабораторией. 2 - результат подтвержден, 3 - направления пациента,  -1 - отменено,
     if req_status == 4:
         user_creater = request.user.doctorprofile.pk
-    if req_status in [0, 1, 2, 3, 5]:
+    if req_status in [0, 1, 2, 3, 5, 7]:
         patient_card = pk
 
     if req_status == 5:
@@ -459,6 +459,10 @@ def directions_history(request):
             continue
         elif type_service == 'is_lab' and (i[11] or i[14] or i[15] or i[16] or i[17] or i[18] or i[19]):
             continue
+        elif req_status == 7 and not i[36]:
+            continue
+        elif i[36] and req_status != 7:
+            continue
         if i[0] != last_dir:
             status = min(status_set)
             if len(lab) > 0:
@@ -470,7 +474,7 @@ def directions_history(request):
                 if aux_researches_obj.exists():
                     aux_researches = [{"pk": i.aux_research.pk, "title": i.aux_research.title} for i in aux_researches_obj]
                     has_aux = True
-            if (req_status == 2 and status == 2) or (req_status in [3, 4] and status != -2) or (req_status == 1 and status == 1) or (req_status == 0 and status == 0):
+            if (req_status == 2 and status == 2) or (req_status in [3, 4, 7] and status != -2) or (req_status == 1 and status == 1) or (req_status == 0 and status == 0):
                 final_result.append(
                     {
                         'pk': dir,
@@ -581,7 +585,7 @@ def directions_history(request):
         if aux_researches_obj.exists():
             aux_researches = [{"pk": i.aux_research.pk, "title": i.aux_research.title} for i in aux_researches_obj]
             has_aux = True
-    if (req_status == 2 and status == 2) or (req_status in [3, 4] and status != -2) or (req_status == 1 and status == 1) or (req_status == 0 and status == 0):
+    if (req_status == 2 and status == 2) or (req_status in [3, 4, 7] and status != -2) or (req_status == 1 and status == 1) or (req_status == 0 and status == 0):
         final_result.append(
             {
                 'pk': dir,
@@ -1442,6 +1446,7 @@ def directions_paraclinic_form(request):
                         | Q(research__is_monitoring=True)
                         | Q(research__is_expertise=True)
                         | Q(research__is_aux=True)
+                        | Q(research__is_case=True)
                     )
                 )
                 .select_related('research', 'research__microbiology_tube', 'research__podrazdeleniye')
diff --git a/api/researches/views.py b/api/researches/views.py
index 5566455641..70ca8ccc71 100644
--- a/api/researches/views.py
+++ b/api/researches/views.py
@@ -361,7 +361,7 @@ def researches_by_department(request):
             q = DResearches.objects.filter(is_monitoring=True).order_by("title")
         elif department_pk == -13:
             q = DResearches.objects.filter(is_expertise=True).order_by("title")
-        elif department_pk == -16:
+        elif department_pk == -14:
             q = DResearches.objects.filter(is_case=True).order_by("title")
         else:
             q = DResearches.objects.filter(podrazdeleniye__pk=department_pk).order_by("title")
@@ -407,6 +407,7 @@ def researches_params(request):
 def researches_update(request):
     response = {"ok": False}
     request_data = json.loads(request.body)
+    print(request_data)
     pk = request_data.get("pk", -2)
     if pk > -2:
         department_pk = request_data.get("department")
@@ -457,7 +458,7 @@ def researches_update(request):
         if tube == -1:
             tube = None
         stationar_slave = is_simple and -500 >= department_pk > -600 and main_service_pk != 1
-        desc = stationar_slave or department_pk in [-2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -16]
+        desc = stationar_slave or department_pk in [-2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -16]
         if len(title) > 0 and (desc or Podrazdeleniya.objects.filter(pk=department_pk).exists()):
             department = None if desc else Podrazdeleniya.objects.filter(pk=department_pk)[0]
             res = None
@@ -486,7 +487,7 @@ def researches_update(request):
                     is_application=department_pk == -11,
                     is_monitoring=department_pk == -12,
                     is_expertise=department_pk == -13,
-                    is_case=department_pk == -16,
+                    is_case=department_pk == -14,
                     is_slave_hospital=stationar_slave,
                     microbiology_tube_id=tube if department_pk == -6 else None,
                     site_type_id=site_type,
@@ -530,7 +531,7 @@ def researches_update(request):
                 res.is_application = department_pk == -11
                 res.is_monitoring = department_pk == -12
                 res.is_expertise = department_pk == -13
-                res.is_case = department_pk == -16
+                res.is_case = department_pk == -14
                 res.microbiology_tube_id = tube if department_pk == -6 else None
                 res.paraclinic_info = info
                 res.hide = hide
diff --git a/api/views.py b/api/views.py
index fbb7826695..3f1d5cc28b 100644
--- a/api/views.py
+++ b/api/views.py
@@ -513,7 +513,7 @@ def departments(request):
         data = {
             "departments": deps,
             "can_edit": can_edit,
-            "types": [*[{"pk": str(x[0]), "title": x[1]} for x in Podrazdeleniya.TYPES if x[0] not in [8, 12] and en.get(x[0], True)], *more_types],
+            "types": [*[{"pk": str(x[0]), "title": x[1]} for x in Podrazdeleniya.TYPES if x[0] not in [8, 12, 16] and en.get(x[0], True)], *more_types],
         }
         if hasattr(request, 'plain_response') and request.plain_response:
             return data
@@ -2635,6 +2635,7 @@ def get_price_data(request):
 @group_required('Конструктор: Настройка организации')
 def update_price(request):
     request_data = json.loads(request.body)
+    print(request_data)
     current_price = None
     if request_data["id"] == -1:
         if request_data.get("typePrice") == "Работодатель":
@@ -2658,7 +2659,7 @@ def update_price(request):
         current_price.title = request_data["title"]
         current_price.date_start = request_data["start"]
         current_price.date_end = request_data["end"]
-        if request_data.get("typePrice") == "Профосмотр":
+        if request_data.get("typePrice") == "Заказчик" or request_data.get("typePrice") == "Работодатель":
             current_price.company_id = request_data["company"]
         else:
             hospital = Hospitals.objects.filter(pk=int(request_data["company"])).first()
diff --git a/l2-frontend/src/construct/ParaclinicResearchEditor.vue b/l2-frontend/src/construct/ParaclinicResearchEditor.vue
index 00d9aca0b3..2fc8327985 100644
--- a/l2-frontend/src/construct/ParaclinicResearchEditor.vue
+++ b/l2-frontend/src/construct/ParaclinicResearchEditor.vue
@@ -461,7 +461,7 @@
         </div>
       </template>
       <div
-        v-if="ex_dep === 7 || ex_dep ===16"
+        v-if="ex_dep === 7"
         class="department-select"
       >
         <Treeselect
@@ -480,7 +480,7 @@
           >
         </div>
       </div>
-      <template v-if="ex_dep !== 7 && ex_dep !== 16">
+      <template v-if="ex_dep !== 7">
         <div
           v-for="(group, gi) in orderBy(groups, 'order')"
           :key="gi"
diff --git a/l2-frontend/src/ui-cards/DirectionsHistory/index.vue b/l2-frontend/src/ui-cards/DirectionsHistory/index.vue
index 48cb640d23..f900d57ab7 100644
--- a/l2-frontend/src/ui-cards/DirectionsHistory/index.vue
+++ b/l2-frontend/src/ui-cards/DirectionsHistory/index.vue
@@ -449,6 +449,7 @@ export default {
         { pk: 4, title: 'Созданы пользователем' },
         { pk: 5, title: 'Договоры пациента' },
         { pk: 6, title: 'Регистратура пациента', module: 'rmisQueue' },
+        { pk: 7, title: 'Случаи пациента' },
       ],
       active_type: this.onlyType || 3,
       checked_obj: {},
diff --git a/l2-frontend/src/ui-cards/SelectedResearches.vue b/l2-frontend/src/ui-cards/SelectedResearches.vue
index 5475253c49..7cc732be7c 100644
--- a/l2-frontend/src/ui-cards/SelectedResearches.vue
+++ b/l2-frontend/src/ui-cards/SelectedResearches.vue
@@ -151,6 +151,23 @@
               />
             </td>
           </tr>
+          <tr v-if="needChangeCase">
+            <th :class="needSelectCase && 'has-error-message'">
+              Случай пациента:
+            </th>
+            <td class="cl-td">
+              <Treeselect
+                v-model="research_case"
+                :multiple="false"
+                :disable-branch-nodes="true"
+                class="treeselect-noborder treeselect-wide"
+                :options="patient_case"
+                :append-to-body="true"
+                placeholder="По умолчанию"
+                :clearable="false"
+              />
+            </td>
+          </tr>
           <tr v-if="direction_purpose_enabled && !hide_params">
             <th>Цель направления:</th>
             <td class="cl-td">
@@ -683,6 +700,7 @@ export default {
       hospital_department_override: -1,
       hospital_overrides: [{ id: -1, label: 'По умолчанию' }],
       hospital_override: -1,
+      research_case: -2,
       service_locations: {},
       need_update_comment: [],
       need_update_localization: [],
@@ -705,6 +723,7 @@ export default {
       researches_direction_params: {},
       tableFieldsErrors: {},
       selectedCardLocal: null,
+      patient_case: [{ id: -2, label: ' Не выбрано ' }],
     };
   },
   computed: {
@@ -763,6 +782,9 @@ export default {
     needShowPriceCategory() {
       return this.l2_price_with_categories && this.pay_source && this.priceCategories.length > 0 && this.show_additions;
     },
+    needChangeCase() {
+      return this.$store.getters.modules.l2_case;
+    },
     researches_departments() {
       const r = {};
       const deps = {
@@ -833,6 +855,10 @@ export default {
         return false;
       }
 
+      if (this.needSelectCase) {
+        return false;
+      }
+
       return !this.researches.find(pk => {
         if (!this.form_params[pk]) {
           return false;
@@ -844,6 +870,9 @@ export default {
     needSelectHospital() {
       return this.canChangeHospitalDirection && this.hospital_override === -1;
     },
+    needSelectCase() {
+      return this.needChangeCase && this.research_case === -2;
+    },
     need_update_object() {
       const r = [];
       const toUpd = [...this.need_update_comment];
@@ -1133,6 +1162,7 @@ export default {
     }
     this.load_direction_params();
     this.load_stationar_deparments();
+    this.load_patient_open_case();
     this.$root.$on('table-field:errors:set', (fieldPk, hasInvalid) => {
       this.tableFieldsErrors = {
         ...this.tableFieldsErrors,
@@ -1337,6 +1367,7 @@ export default {
       this.global_current_direction_param = -1;
       this.hospital_department_override = -1;
       this.hospital_override = -1;
+      this.research_case = -1;
       this.tableFieldsErrors = {};
     },
     clear_fin() {
@@ -1399,6 +1430,14 @@ export default {
       this.hospital_department_overrides = [{ id: -1, label: 'По умолчанию' }, ...data];
       this.hospital_overrides = [{ id: -1, label: 'По умолчанию' }, ...hospitals];
     },
+    async load_patient_open_case() {
+      const patienCases = [
+        { id: -11, label: ' Терапевт-212121' },
+        { id: -12, label: ' Травматолог -23232' },
+        { id: -13, label: ' Нвролог-4343434' },
+      ];
+      this.patient_case = [{ id: -2, label: ' Не выбрано ' }, { id: -1, label: ' Создать новый случай' }, ...patienCases];
+    },
   },
 };
 </script>

From 390a27d92bff6880b5735c36d55291da57d32505 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Tue, 26 Sep 2023 22:17:00 +0800
Subject: [PATCH 14/38] .

---
 api/directions/sql_func.py                    | 23 +++++++++++++++++++
 api/directions/urls.py                        |  1 +
 api/directions/views.py                       | 17 +++++++++++++-
 .../src/ui-cards/SelectedResearches.vue       |  3 ++-
 pyproject.toml                                |  2 +-
 5 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/api/directions/sql_func.py b/api/directions/sql_func.py
index db1679c8d4..41359707b8 100644
--- a/api/directions/sql_func.py
+++ b/api/directions/sql_func.py
@@ -507,3 +507,26 @@ def get_directions_meta_info(directions):
         )
         rows = namedtuplefetchall(cursor)
     return rows
+
+
+def get_patien_open_case_data(card_pk):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """
+                SELECT 
+                    directions_issledovaniya.napravleniye_id,
+                    directions_issledovaniya.research_id,
+                    dr.title,
+                    dr.is_case,
+                    to_char(directions_issledovaniya.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as ch_time_confirm,
+                    to_char(dn.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create
+                FROM directions_issledovaniya
+                LEFT JOIN directory_researches dr on directions_issledovaniya.research_id = dr.id
+                LEFT JOIN directions_napravleniya dn on directions_issledovaniya.napravleniye_id = dn.id
+                WHERE dn.client_id = %(card_pk)s and dr.is_case = true
+                ORDER BY directions_issledovaniya.napravleniye_id
+            """,
+            params={'card_pk': card_pk, 'tz': TIME_ZONE},
+        )
+        rows = namedtuplefetchall(cursor)
+    return rows
diff --git a/api/directions/urls.py b/api/directions/urls.py
index 4a686f7b53..9e7adcb8eb 100644
--- a/api/directions/urls.py
+++ b/api/directions/urls.py
@@ -64,4 +64,5 @@
     path('meta-info', views.meta_info),
     path('resend-results', views.resend_results),
     path('need-order-redirection', views.need_order_redirection),
+    path('patient-open-case', views.patient_open_case),
 ]
diff --git a/api/directions/views.py b/api/directions/views.py
index 7a3ea9645e..279fd69ce7 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -92,7 +92,7 @@
     get_patient_contract,
     get_directions_by_user,
     get_confirm_direction_by_hospital,
-    get_directions_meta_info,
+    get_directions_meta_info, get_patien_open_case_data,
 )
 from api.stationar.stationar_func import hosp_get_hosp_direction, hosp_get_text_iss
 from forms.forms_func import hosp_get_operation_data
@@ -4429,3 +4429,18 @@ def meta_info(request):
         index_num = res_direction.index(i['direction'])
         sort_result[index_num] = i
     return JsonResponse({"rows": sort_result})
+
+
+@login_required
+def patient_open_case(request):
+    request_data = json.loads(request.body)
+    print("request_data")
+    print(request_data)
+    card_pk = request_data.get("card_pk", None)
+    print(card_pk)
+    if card_pk:
+        result = get_patien_open_case_data(card_pk)
+        print(result)
+    data = {"data": ""}
+    return JsonResponse(data)
+
diff --git a/l2-frontend/src/ui-cards/SelectedResearches.vue b/l2-frontend/src/ui-cards/SelectedResearches.vue
index 7cc732be7c..6e3b4dfe87 100644
--- a/l2-frontend/src/ui-cards/SelectedResearches.vue
+++ b/l2-frontend/src/ui-cards/SelectedResearches.vue
@@ -940,7 +940,7 @@ export default {
         }
 
         const cardData = await this.$api(`patients/card/simple/${this.card_pk}`);
-
+        const patientOpenCase = await this.$api('directions/patient-open-case', { card_pk: this.selected_card });
         this.selectedCardLocal = cardData;
       },
       immediate: true,
@@ -1436,6 +1436,7 @@ export default {
         { id: -12, label: ' Травматолог -23232' },
         { id: -13, label: ' Нвролог-4343434' },
       ];
+      const patientOpenCase = await this.$api('directions/patient-open-case', { card_pk: this.card_pk });
       this.patient_case = [{ id: -2, label: ' Не выбрано ' }, { id: -1, label: ' Создать новый случай' }, ...patienCases];
     },
   },
diff --git a/pyproject.toml b/pyproject.toml
index f9fa2df43d..f1de5eeebf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-psycopg2-binary = "^2.9.4"
+#psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From 5a2412f979a6e16fc0976de5c1184e97f11777e0 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Tue, 26 Sep 2023 22:22:14 +0800
Subject: [PATCH 15/38] .

---
 l2-frontend/src/ui-cards/SelectedResearches.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l2-frontend/src/ui-cards/SelectedResearches.vue b/l2-frontend/src/ui-cards/SelectedResearches.vue
index 6e3b4dfe87..3bad9bca8e 100644
--- a/l2-frontend/src/ui-cards/SelectedResearches.vue
+++ b/l2-frontend/src/ui-cards/SelectedResearches.vue
@@ -933,6 +933,7 @@ export default {
     card_pk: {
       async handler() {
         this.clear_fin();
+        const patientOpenCase = await this.$api('directions/patient-open-case', { card_pk: this.card_pk });
 
         this.selectedCardLocal = null;
         if (this.card_pk === null || this.card_pk === -1 || this.selected_card) {
@@ -940,7 +941,6 @@ export default {
         }
 
         const cardData = await this.$api(`patients/card/simple/${this.card_pk}`);
-        const patientOpenCase = await this.$api('directions/patient-open-case', { card_pk: this.selected_card });
         this.selectedCardLocal = cardData;
       },
       immediate: true,

From f7f9ddc0d111feaee67d8a61bd344ca02d272dd8 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Wed, 27 Sep 2023 20:46:01 +0800
Subject: [PATCH 16/38] =?UTF-8?q?=D0=98=D1=81=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=82=D1=80=D0=B5=D0=B1=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=82=D1=8C=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B9=20=D0=B2?=
 =?UTF-8?q?=D0=BD=D1=83=D1=82=D1=80=D0=B8=20=D0=B8=D1=81=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=B1=D0=BE=D0=BB=D0=B5=D0=B7=D0=BD=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/directions/sql_func.py                      |  6 +++---
 api/directions/views.py                         | 11 ++++++++---
 l2-frontend/src/ui-cards/SelectedResearches.vue |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/api/directions/sql_func.py b/api/directions/sql_func.py
index 41359707b8..9cf44f7fec 100644
--- a/api/directions/sql_func.py
+++ b/api/directions/sql_func.py
@@ -509,21 +509,21 @@ def get_directions_meta_info(directions):
     return rows
 
 
-def get_patien_open_case_data(card_pk):
+def get_patient_open_case_data(card_pk):
     with connection.cursor() as cursor:
         cursor.execute(
             """
                 SELECT 
+                    directions_issledovaniya.id as iss_id,
                     directions_issledovaniya.napravleniye_id,
                     directions_issledovaniya.research_id,
                     dr.title,
                     dr.is_case,
-                    to_char(directions_issledovaniya.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as ch_time_confirm,
                     to_char(dn.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create
                 FROM directions_issledovaniya
                 LEFT JOIN directory_researches dr on directions_issledovaniya.research_id = dr.id
                 LEFT JOIN directions_napravleniya dn on directions_issledovaniya.napravleniye_id = dn.id
-                WHERE dn.client_id = %(card_pk)s and dr.is_case = true
+                WHERE dn.client_id = %(card_pk)s and dr.is_case = true and directions_issledovaniya.time_confirmation is Null
                 ORDER BY directions_issledovaniya.napravleniye_id
             """,
             params={'card_pk': card_pk, 'tz': TIME_ZONE},
diff --git a/api/directions/views.py b/api/directions/views.py
index 279fd69ce7..1d6626db80 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -81,6 +81,7 @@
 from utils.common import non_selected_visible_type, none_if_minus_1, values_from_structure_data
 from utils.dates import normalize_date, date_iter_range, try_strptime
 from utils.dates import try_parse_range
+from utils.tree_directions import tree_direction
 from utils.xh import check_float_is_valid, short_fio_dots
 from .sql_func import (
     get_history_dir,
@@ -92,7 +93,7 @@
     get_patient_contract,
     get_directions_by_user,
     get_confirm_direction_by_hospital,
-    get_directions_meta_info, get_patien_open_case_data,
+    get_directions_meta_info, get_patient_open_case_data,
 )
 from api.stationar.stationar_func import hosp_get_hosp_direction, hosp_get_text_iss
 from forms.forms_func import hosp_get_operation_data
@@ -4438,9 +4439,13 @@ def patient_open_case(request):
     print(request_data)
     card_pk = request_data.get("card_pk", None)
     print(card_pk)
+    data_case = {}
     if card_pk:
-        result = get_patien_open_case_data(card_pk)
-        print(result)
+        open_case = get_patient_open_case_data(card_pk)
+        for o_case in open_case:
+            data_case[o_case.iss_id] = ""
+            child_direction = tree_direction(o_case.iss_id)
+
     data = {"data": ""}
     return JsonResponse(data)
 
diff --git a/l2-frontend/src/ui-cards/SelectedResearches.vue b/l2-frontend/src/ui-cards/SelectedResearches.vue
index 3bad9bca8e..d6901e56dc 100644
--- a/l2-frontend/src/ui-cards/SelectedResearches.vue
+++ b/l2-frontend/src/ui-cards/SelectedResearches.vue
@@ -783,7 +783,7 @@ export default {
       return this.l2_price_with_categories && this.pay_source && this.priceCategories.length > 0 && this.show_additions;
     },
     needChangeCase() {
-      return this.$store.getters.modules.l2_case;
+      return this.$store.getters.modules.l2_case && this.kk !== 'stationar';
     },
     researches_departments() {
       const r = {};
@@ -871,7 +871,7 @@ export default {
       return this.canChangeHospitalDirection && this.hospital_override === -1;
     },
     needSelectCase() {
-      return this.needChangeCase && this.research_case === -2;
+      return (this.needChangeCase && this.research_case === -2);
     },
     need_update_object() {
       const r = [];

From 5486c7969543028fe2f96d70fac081511b5ec6a8 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Wed, 27 Sep 2023 20:46:32 +0800
Subject: [PATCH 17/38] fix

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f1de5eeebf..f9fa2df43d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-#psycopg2-binary = "^2.9.4"
+psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From e65f03518d8b08abe6b692e4b10691ac4052a211 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Wed, 27 Sep 2023 20:50:30 +0800
Subject: [PATCH 18/38] Update api/directions/views.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 api/directions/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 1d6626db80..dd683e28c0 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -93,7 +93,8 @@
     get_patient_contract,
     get_directions_by_user,
     get_confirm_direction_by_hospital,
-    get_directions_meta_info, get_patient_open_case_data,
+    get_directions_meta_info,
+    get_patient_open_case_data,
 )
 from api.stationar.stationar_func import hosp_get_hosp_direction, hosp_get_text_iss
 from forms.forms_func import hosp_get_operation_data

From 4d67e313579144d3aee0297616674e14cd3f4ec0 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Wed, 27 Sep 2023 20:50:37 +0800
Subject: [PATCH 19/38] Update api/directions/views.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 api/directions/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index dd683e28c0..93607206af 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -4449,4 +4449,3 @@ def patient_open_case(request):
 
     data = {"data": ""}
     return JsonResponse(data)
-

From 94c9bbb83d0f2eda2751a2b4a88f0153d8c85c5f Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Wed, 27 Sep 2023 20:55:51 +0800
Subject: [PATCH 20/38] fix

---
 api/directions/views.py | 3 ---
 api/researches/views.py | 1 -
 api/views.py            | 1 -
 3 files changed, 5 deletions(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 1d6626db80..80efc33931 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -4435,10 +4435,7 @@ def meta_info(request):
 @login_required
 def patient_open_case(request):
     request_data = json.loads(request.body)
-    print("request_data")
-    print(request_data)
     card_pk = request_data.get("card_pk", None)
-    print(card_pk)
     data_case = {}
     if card_pk:
         open_case = get_patient_open_case_data(card_pk)
diff --git a/api/researches/views.py b/api/researches/views.py
index 70ca8ccc71..48c86a7b2e 100644
--- a/api/researches/views.py
+++ b/api/researches/views.py
@@ -407,7 +407,6 @@ def researches_params(request):
 def researches_update(request):
     response = {"ok": False}
     request_data = json.loads(request.body)
-    print(request_data)
     pk = request_data.get("pk", -2)
     if pk > -2:
         department_pk = request_data.get("department")
diff --git a/api/views.py b/api/views.py
index 3f1d5cc28b..3f94593953 100644
--- a/api/views.py
+++ b/api/views.py
@@ -2635,7 +2635,6 @@ def get_price_data(request):
 @group_required('Конструктор: Настройка организации')
 def update_price(request):
     request_data = json.loads(request.body)
-    print(request_data)
     current_price = None
     if request_data["id"] == -1:
         if request_data.get("typePrice") == "Работодатель":

From 07e1bd5fdad6f9a060a82b52de3f9a705aadc4e8 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Wed, 27 Sep 2023 21:43:09 +0800
Subject: [PATCH 21/38] fix date in xlsx

---
 api/directions/views.py | 2 ++
 api/parse_file/views.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 35d3e5d691..9cb37cdba1 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -4443,6 +4443,8 @@ def patient_open_case(request):
         for o_case in open_case:
             data_case[o_case.iss_id] = ""
             child_direction = tree_direction(o_case.iss_id)
+            for child in child_direction:
+                print(child)
 
     data = {"data": ""}
     return JsonResponse(data)
diff --git a/api/parse_file/views.py b/api/parse_file/views.py
index 1db48f9fda..66e833fde4 100644
--- a/api/parse_file/views.py
+++ b/api/parse_file/views.py
@@ -207,7 +207,7 @@ def gen_commercial_offer(request):
             born_data = cells[born].split(" ")[0]
             age = -1
             if born_data != "None":
-                age = age_for_year(born_data)
+                age = age_for_year(normalize_dots_date(born_data))
                 if "м" in cells[sex]:
                     adds_harmfull = CONTROL_AGE_MEDEXAM.get("м")
                 else:

From b132d1d67b0b79e50edccae6179612f13c1f787e Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Thu, 28 Sep 2023 22:00:49 +0800
Subject: [PATCH 22/38] add fielt to Napravleniya "paren_case"

---
 api/directions/views.py                         |  1 +
 appconf/manager.py                              |  1 +
 directions/models.py                            |  3 +++
 l2-frontend/src/registerHooks.ts                |  2 ++
 l2-frontend/src/ui-cards/SelectedResearches.vue | 12 ++++++++----
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 9cb37cdba1..7198fd3f03 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -110,6 +110,7 @@ def directions_generate(request):
     result = {"ok": False, "directions": [], "directionsStationar": [], "message": ""}
     if request.method == "POST":
         p = json.loads(request.body)
+        print(p)
         card_pk = p.get("card_pk")
         card = None
         if card_pk == -1:
diff --git a/appconf/manager.py b/appconf/manager.py
index 8950ebcedb..e75d69a538 100644
--- a/appconf/manager.py
+++ b/appconf/manager.py
@@ -169,6 +169,7 @@ def l2_modules() -> dict:
                     "price_externel_performer",
                     "ftp",
                     "case",
+                    "hide_show_count_param",
                 ]
             },
             "consults_module": SettingManager.get("consults_module", default='false', default_type='b'),
diff --git a/directions/models.py b/directions/models.py
index 8511df80b1..0aabc066b8 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -500,6 +500,9 @@ class Napravleniya(models.Model):
     parent_slave_hosp = models.ForeignKey(
         'Issledovaniya', related_name='parent_slave_hosp', help_text="Из стационарного протокола", db_index=True, blank=True, null=True, default=None, on_delete=models.SET_NULL
     )
+    parent_case = models.ForeignKey(
+        'Issledovaniya', related_name='parent_case', help_text="Случай основание", db_index=True, blank=True, null=True, default=None, on_delete=models.SET_NULL
+    )
     rmis_slot_id = models.CharField(max_length=20, blank=True, null=True, default=None, help_text="РМИС слот")
     microbiology_n = models.CharField(max_length=10, blank=True, default='', help_text="Номер в микробиологической лаборатории")
     time_microbiology_receive = models.DateTimeField(null=True, blank=True, db_index=True, help_text='Дата/время приёма материала микробиологии')
diff --git a/l2-frontend/src/registerHooks.ts b/l2-frontend/src/registerHooks.ts
index 8bd902d555..bd47d5a0b3 100644
--- a/l2-frontend/src/registerHooks.ts
+++ b/l2-frontend/src/registerHooks.ts
@@ -149,6 +149,7 @@ export default (instance: Vue): void => {
       hospital_override: hospitalOverride = -1,
       monitoring = false,
       priceCategory = null,
+      caseId,
     }) => {
       if (cardPk === -1 && !monitoring) {
         instance.$root.$emit('msg', 'error', 'Не выбрана карта');
@@ -194,6 +195,7 @@ export default (instance: Vue): void => {
           hospital_department_override: hospitalDepartmentOverride,
           hospital_override: hospitalOverride,
           priceCategory,
+          caseId,
         })
         .then(data => {
           instance.$store.dispatch(actions.DEC_LOADING);
diff --git a/l2-frontend/src/ui-cards/SelectedResearches.vue b/l2-frontend/src/ui-cards/SelectedResearches.vue
index d6901e56dc..0c5a1b18d3 100644
--- a/l2-frontend/src/ui-cards/SelectedResearches.vue
+++ b/l2-frontend/src/ui-cards/SelectedResearches.vue
@@ -194,7 +194,7 @@
               />
             </td>
           </tr>
-          <tr v-if="!has_only_stationar && !hide_params">
+          <tr v-if="(!has_only_stationar && !hide_params) && !hide_show_count_param">
             <th>Кол-во повторений:</th>
             <td class="cl-td">
               <input
@@ -216,7 +216,7 @@
               </span>
             </td>
           </tr>
-          <tr v-else-if="!hide_params">
+          <tr v-else-if="!hide_params && has_only_stationar">
             <th>Отделение стационара</th>
             <td class="cl-td">
               <Treeselect
@@ -752,6 +752,9 @@ export default {
     direction_purpose_enabled() {
       return this.$store.getters.modules.l2_direction_purpose && this.kk !== 'stationar';
     },
+    hide_show_count_param() {
+      return this.$store.getters.modules.l2_hide_show_count_param;
+    },
     external_organizations_enabled() {
       return this.$store.getters.modules.l2_external_organizations && this.kk !== 'stationar';
     },
@@ -783,7 +786,7 @@ export default {
       return this.l2_price_with_categories && this.pay_source && this.priceCategories.length > 0 && this.show_additions;
     },
     needChangeCase() {
-      return this.$store.getters.modules.l2_case && this.kk !== 'stationar';
+      return this.$store.getters.modules.l2_case && this.kk !== 'stationar' && this.kk !== 'cd';
     },
     researches_departments() {
       const r = {};
@@ -1356,6 +1359,7 @@ export default {
         hospital_department_override: this.hospital_department_override,
         hospital_override: this.hospital_override,
         monitoring: this.monitoring,
+        caseId: this.research_case,
       });
     },
     clear_all() {
@@ -1367,7 +1371,7 @@ export default {
       this.global_current_direction_param = -1;
       this.hospital_department_override = -1;
       this.hospital_override = -1;
-      this.research_case = -1;
+      this.research_case = -2;
       this.tableFieldsErrors = {};
     },
     clear_fin() {

From 5efedc2bdefe221d8f6d3118837481922587fb60 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Thu, 28 Sep 2023 22:01:03 +0800
Subject: [PATCH 23/38] fix

---
 api/directions/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 7198fd3f03..9cb37cdba1 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -110,7 +110,6 @@ def directions_generate(request):
     result = {"ok": False, "directions": [], "directionsStationar": [], "message": ""}
     if request.method == "POST":
         p = json.loads(request.body)
-        print(p)
         card_pk = p.get("card_pk")
         card = None
         if card_pk == -1:

From 62387f154841011a58e6af7d8a8dd92a408cba37 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Fri, 29 Sep 2023 13:34:06 +0800
Subject: [PATCH 24/38] fix cda gen lab

---
 api/directions/views.py        | 1 +
 integration_framework/utils.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 9cb37cdba1..7198fd3f03 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -110,6 +110,7 @@ def directions_generate(request):
     result = {"ok": False, "directions": [], "directionsStationar": [], "message": ""}
     if request.method == "POST":
         p = json.loads(request.body)
+        print(p)
         card_pk = p.get("card_pk")
         card = None
         if card_pk == -1:
diff --git a/integration_framework/utils.py b/integration_framework/utils.py
index 0222da76b4..d14ab52783 100644
--- a/integration_framework/utils.py
+++ b/integration_framework/utils.py
@@ -226,7 +226,7 @@ def check_title_field(data, r):
 
 
 def get_json_labortory_data(pk):
-    result_protocol = get_laboratory_results_by_directions([pk])
+    result_protocol = get_laboratory_results_by_directions(tuple([pk]))
     document = {}
     confirmed_at = ""
     date_reiceve = ""

From 581414cdbcfa2a2539d1f86e3f9ffdb498049a65 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sat, 30 Sep 2023 22:45:25 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BB=D1=83=D1=87?=
 =?UTF-8?q?=D0=B0=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/directions/sql_func.py                    |  7 ++--
 api/directions/views.py                       | 24 +++++++----
 directions/models.py                          | 41 +++++++++++++++++++
 .../src/ui-cards/SelectedResearches.vue       | 12 ++----
 4 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/api/directions/sql_func.py b/api/directions/sql_func.py
index 9cf44f7fec..6c09ce96b1 100644
--- a/api/directions/sql_func.py
+++ b/api/directions/sql_func.py
@@ -509,7 +509,7 @@ def get_directions_meta_info(directions):
     return rows
 
 
-def get_patient_open_case_data(card_pk):
+def get_patient_open_case_data(card_pk, start_date, end_date):
     with connection.cursor() as cursor:
         cursor.execute(
             """
@@ -523,10 +523,11 @@ def get_patient_open_case_data(card_pk):
                 FROM directions_issledovaniya
                 LEFT JOIN directory_researches dr on directions_issledovaniya.research_id = dr.id
                 LEFT JOIN directions_napravleniya dn on directions_issledovaniya.napravleniye_id = dn.id
-                WHERE dn.client_id = %(card_pk)s and dr.is_case = true and directions_issledovaniya.time_confirmation is Null
+                WHERE dn.client_id = %(card_pk)s and dr.is_case = true and directions_issledovaniya.time_confirmation is Null and
+                dn.data_sozdaniya AT TIME ZONE %(tz)s BETWEEN %(d_start)s AND %(d_end)s
                 ORDER BY directions_issledovaniya.napravleniye_id
             """,
-            params={'card_pk': card_pk, 'tz': TIME_ZONE},
+            params={'card_pk': card_pk, 'tz': TIME_ZONE, 'd_start': start_date, 'd_end': end_date},
         )
         rows = namedtuplefetchall(cursor)
     return rows
diff --git a/api/directions/views.py b/api/directions/views.py
index 7198fd3f03..263a33d9d6 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -168,6 +168,7 @@ def directions_generate(request):
             hospital_department_override=p.get("hospital_department_override", -1),
             hospital_override=p.get("hospital_override", -1),
             price_category=p.get("priceCategory", -1),
+            case_id = p.get("caseId", -2),
         )
         for _ in range(p.get("directions_count", 1)):
             rc = Napravleniya.gen_napravleniya_by_issledovaniya(*args, **kwargs)
@@ -4438,14 +4439,23 @@ def meta_info(request):
 def patient_open_case(request):
     request_data = json.loads(request.body)
     card_pk = request_data.get("card_pk", None)
-    data_case = {}
+    data_case = []
+    date_start = datetime.now() - timedelta(days=60)
+    date_end = datetime.now()
+
     if card_pk:
-        open_case = get_patient_open_case_data(card_pk)
+        open_case = get_patient_open_case_data(card_pk, date_start, date_end)
+        data_case = []
         for o_case in open_case:
-            data_case[o_case.iss_id] = ""
-            child_direction = tree_direction(o_case.iss_id)
-            for child in child_direction:
-                print(child)
+            n = Napravleniya.objects.filter(parent_case_id=o_case.iss_id).first()
+            iss = Issledovaniya.objects.filter(napravleniye=n).first()
+            if iss:
+                title = iss.research.short_title if iss.research.short_title else  iss.research.title
+            else:
+                title = "Случай пустой"
+            data_case.append({"id": o_case.iss_id, "label": f"{title} от {o_case.date_create}"})
+
 
-    data = {"data": ""}
+    data = {"data": data_case}
+    print(data)
     return JsonResponse(data)
diff --git a/directions/models.py b/directions/models.py
index 0aabc066b8..c19e132310 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -1046,6 +1046,7 @@ def gen_napravleniye(
         parent_id=None,
         parent_auto_gen_id=None,
         parent_slave_hosp_id=None,
+        parent_case_id=None,
         rmis_slot=None,
         direction_purpose="NONE",
         external_organization="NONE",
@@ -1091,6 +1092,7 @@ def gen_napravleniye(
             parent_id=parent_id,
             parent_auto_gen_id=parent_auto_gen_id,
             parent_slave_hosp_id=parent_slave_hosp_id,
+            parent_case_id=parent_case_id,
             rmis_slot_id=rmis_slot,
             hospital=doc.hospital or Hospitals.get_default_hospital(),
             external_order=external_order,
@@ -1282,12 +1284,14 @@ def gen_napravleniya_by_issledovaniya(
         external_order: Optional[RegisteredOrders] = None,
         services_by_additional_order_num=None,
         price_name=None,
+        case_id=-2,
     ):
         result = {"r": False, "list_id": [], "list_stationar_id": [], "messageLimit": ""}
         if not Clients.Card.objects.filter(pk=client_id).exists():
             result["message"] = "Карта в базе не зарегистрирована, попробуйте выполнить поиск заново"
             return result
         pk_reseerches = []
+        issledovaniye_case_id = None
         for v in researches.values():
             pk_reseerches.extend(v)
         card = Clients.Card.objects.get(pk=client_id)
@@ -1515,6 +1519,41 @@ def gen_napravleniya_by_issledovaniya(
                             result["message"] = "Данный мониторинг уже создан"
                             return result
 
+                    if case_id > -2:
+                        if case_id == -1:
+                            napravleniye_case = Napravleniya.gen_napravleniye(
+                            client_id,
+                            doc_current if not for_rmis else None,
+                            finsource,
+                            diagnos,
+                            history_num,
+                            doc_current,
+                            ofname_id,
+                            ofname,
+                            for_rmis=for_rmis,
+                            rmis_data=rmis_data,
+                            parent_id=parent_iss,
+                            parent_auto_gen_id=parent_auto_gen,
+                            parent_slave_hosp_id=parent_slave_hosp,
+                            rmis_slot=rmis_slot,
+                            direction_purpose=direction_purpose,
+                            external_organization=external_organization,
+                            price_category=price_category,
+                            hospital=hospital_override,
+                            external_order=external_order,
+                            price_name_id=price_name,
+                        )
+                            research_case = directory.Researches.objects.filter(is_case=True).first()
+                            issledovaniye_case = Issledovaniya(
+                                napravleniye=napravleniye_case,
+                                research=research_case,
+                                deferred=False
+                            )
+                            issledovaniye_case.save()
+                            issledovaniye_case_id = issledovaniye_case.pk
+                        elif case_id > 0:
+                            issledovaniye_case_id = case_id
+
                     if (dir_group > -1 and dir_group not in directions_for_researches.keys()) or (dir_group == dir_group_onlylab and dir_group not in directions_for_researches.keys()):
                         directions_for_researches[dir_group] = Napravleniya.gen_napravleniye(
                             client_id,
@@ -1530,6 +1569,7 @@ def gen_napravleniya_by_issledovaniya(
                             parent_id=parent_iss,
                             parent_auto_gen_id=parent_auto_gen,
                             parent_slave_hosp_id=parent_slave_hosp,
+                            parent_case_id=issledovaniye_case_id,
                             rmis_slot=rmis_slot,
                             direction_purpose=direction_purpose,
                             external_organization=external_organization,
@@ -1560,6 +1600,7 @@ def gen_napravleniya_by_issledovaniya(
                             parent_id=parent_iss,
                             parent_auto_gen_id=parent_auto_gen,
                             parent_slave_hosp_id=parent_slave_hosp,
+                            parent_case_id=issledovaniye_case_id,
                             rmis_slot=rmis_slot,
                             direction_purpose=direction_purpose,
                             external_organization=external_organization,
diff --git a/l2-frontend/src/ui-cards/SelectedResearches.vue b/l2-frontend/src/ui-cards/SelectedResearches.vue
index 0c5a1b18d3..e146dd4297 100644
--- a/l2-frontend/src/ui-cards/SelectedResearches.vue
+++ b/l2-frontend/src/ui-cards/SelectedResearches.vue
@@ -936,7 +936,7 @@ export default {
     card_pk: {
       async handler() {
         this.clear_fin();
-        const patientOpenCase = await this.$api('directions/patient-open-case', { card_pk: this.card_pk });
+        this.load_patient_open_case();
 
         this.selectedCardLocal = null;
         if (this.card_pk === null || this.card_pk === -1 || this.selected_card) {
@@ -1165,7 +1165,6 @@ export default {
     }
     this.load_direction_params();
     this.load_stationar_deparments();
-    this.load_patient_open_case();
     this.$root.$on('table-field:errors:set', (fieldPk, hasInvalid) => {
       this.tableFieldsErrors = {
         ...this.tableFieldsErrors,
@@ -1435,13 +1434,10 @@ export default {
       this.hospital_overrides = [{ id: -1, label: 'По умолчанию' }, ...hospitals];
     },
     async load_patient_open_case() {
-      const patienCases = [
-        { id: -11, label: ' Терапевт-212121' },
-        { id: -12, label: ' Травматолог -23232' },
-        { id: -13, label: ' Нвролог-4343434' },
-      ];
       const patientOpenCase = await this.$api('directions/patient-open-case', { card_pk: this.card_pk });
-      this.patient_case = [{ id: -2, label: ' Не выбрано ' }, { id: -1, label: ' Создать новый случай' }, ...patienCases];
+      this.patient_case = [
+        { id: -2, label: ' Не выбрано ' },
+        { id: -1, label: ' Создать новый случай' }, ...patientOpenCase.data];
     },
   },
 };

From d087a088e8b031c2d5b3b6590e090dc8b83ad76f Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sat, 30 Sep 2023 22:48:05 +0800
Subject: [PATCH 26/38] fix

---
 directions/models.py | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/directions/models.py b/directions/models.py
index c19e132310..ae965813e3 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -1522,27 +1522,27 @@ def gen_napravleniya_by_issledovaniya(
                     if case_id > -2:
                         if case_id == -1:
                             napravleniye_case = Napravleniya.gen_napravleniye(
-                            client_id,
-                            doc_current if not for_rmis else None,
-                            finsource,
-                            diagnos,
-                            history_num,
-                            doc_current,
-                            ofname_id,
-                            ofname,
-                            for_rmis=for_rmis,
-                            rmis_data=rmis_data,
-                            parent_id=parent_iss,
-                            parent_auto_gen_id=parent_auto_gen,
-                            parent_slave_hosp_id=parent_slave_hosp,
-                            rmis_slot=rmis_slot,
-                            direction_purpose=direction_purpose,
-                            external_organization=external_organization,
-                            price_category=price_category,
-                            hospital=hospital_override,
-                            external_order=external_order,
-                            price_name_id=price_name,
-                        )
+                                client_id,
+                                doc_current if not for_rmis else None,
+                                finsource,
+                                diagnos,
+                                history_num,
+                                doc_current,
+                                ofname_id,
+                                ofname,
+                                for_rmis=for_rmis,
+                                rmis_data=rmis_data,
+                                parent_id=parent_iss,
+                                parent_auto_gen_id=parent_auto_gen,
+                                parent_slave_hosp_id=parent_slave_hosp,
+                                rmis_slot=rmis_slot,
+                                direction_purpose=direction_purpose,
+                                external_organization=external_organization,
+                                price_category=price_category,
+                                hospital=hospital_override,
+                                external_order=external_order,
+                                price_name_id=price_name,
+                            )
                             research_case = directory.Researches.objects.filter(is_case=True).first()
                             issledovaniye_case = Issledovaniya(
                                 napravleniye=napravleniye_case,

From cd2b61bb0ca5304247e5627eaf551dcf49364707 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sat, 30 Sep 2023 22:54:52 +0800
Subject: [PATCH 27/38] fix

---
 api/directions/views.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 263a33d9d6..29f9382aa4 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -81,7 +81,6 @@
 from utils.common import non_selected_visible_type, none_if_minus_1, values_from_structure_data
 from utils.dates import normalize_date, date_iter_range, try_strptime
 from utils.dates import try_parse_range
-from utils.tree_directions import tree_direction
 from utils.xh import check_float_is_valid, short_fio_dots
 from .sql_func import (
     get_history_dir,
@@ -110,9 +109,7 @@ def directions_generate(request):
     result = {"ok": False, "directions": [], "directionsStationar": [], "message": ""}
     if request.method == "POST":
         p = json.loads(request.body)
-        print(p)
         card_pk = p.get("card_pk")
-        card = None
         if card_pk == -1:
             hospital: Hospitals = request.user.doctorprofile.get_hospital()
             if hospital.client:
@@ -4455,7 +4452,5 @@ def patient_open_case(request):
                 title = "Случай пустой"
             data_case.append({"id": o_case.iss_id, "label": f"{title} от {o_case.date_create}"})
 
-
     data = {"data": data_case}
-    print(data)
     return JsonResponse(data)

From 2e86003383579bdc592fad11ca36a81f2e45222d Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sat, 30 Sep 2023 23:05:29 +0800
Subject: [PATCH 28/38] fix

---
 api/directions/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 29f9382aa4..4bbe3880f9 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -165,7 +165,7 @@ def directions_generate(request):
             hospital_department_override=p.get("hospital_department_override", -1),
             hospital_override=p.get("hospital_override", -1),
             price_category=p.get("priceCategory", -1),
-            case_id = p.get("caseId", -2),
+            case_id=p.get("caseId", -2),
         )
         for _ in range(p.get("directions_count", 1)):
             rc = Napravleniya.gen_napravleniya_by_issledovaniya(*args, **kwargs)
@@ -4447,7 +4447,7 @@ def patient_open_case(request):
             n = Napravleniya.objects.filter(parent_case_id=o_case.iss_id).first()
             iss = Issledovaniya.objects.filter(napravleniye=n).first()
             if iss:
-                title = iss.research.short_title if iss.research.short_title else  iss.research.title
+                title = iss.research.short_title if iss.research.short_title else iss.research.title
             else:
                 title = "Случай пустой"
             data_case.append({"id": o_case.iss_id, "label": f"{title} от {o_case.date_create}"})

From ae39ed9b9431de5e6cf6ff710eef7035272b0f72 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sun, 1 Oct 2023 22:06:17 +0800
Subject: [PATCH 29/38] =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=83?=
 =?UTF-8?q?=D1=81=D0=BB=D1=83=D0=B3=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D1=8F?=
 =?UTF-8?q?=20=D0=B2=20"=D0=98=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8"=20?=
 =?UTF-8?q?=D1=81=D0=BB=D1=83=D1=87=D0=B0=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/directions/views.py | 15 ++++++++++++---
 pyproject.toml          |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 4bbe3880f9..18a7b6639d 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -437,6 +437,7 @@ def directions_history(request):
     # is_slave_hospital, is_treatment, is_stom, is_doc_refferal, is_paraclinic, is_microbiology, parent_id, study_instance_uid, parent_slave_hosp_id, tube_number
     researches_pks = []
     researches_titles = ''
+    child_researches_titles = ''
 
     last_dir, dir, status, date, cancel, pacs, has_hosp, has_descriptive = None, None, None, None, None, None, None, None
     maybe_onco, is_application, is_expertise, expertise_status, can_has_pacs = False, False, False, False, False
@@ -480,7 +481,7 @@ def directions_history(request):
                     {
                         'pk': dir,
                         'status': status,
-                        'researches': researches_titles,
+                        'researches': f"{researches_titles} {child_researches_titles}",
                         "researches_pks": researches_pks,
                         "aux_researches": aux_researches,
                         "has_aux": has_aux,
@@ -503,6 +504,7 @@ def directions_history(request):
                         'register_number': register_number,
                     }
                 )
+                child_researches_titles = ""
                 person_contract_pk = -1
                 person_contract_dirs = ""
                 planed_doctor = ""
@@ -538,10 +540,17 @@ def directions_history(request):
                 has_hosp = True
             lab = set()
 
+        if i[36] and req_status == 7:
+            case_child_direction = Napravleniya.objects.values_list("pk", flat=True).filter(parent_case__id=i[2])
+            case_childs = Issledovaniya.objects.filter(napravleniye_id__in=case_child_direction)
+            for csh in case_childs:
+                child_researches_titles = f"{child_researches_titles} {csh.research.short_title}"
+
         if researches_titles:
             researches_titles = f'{researches_titles} | {i[5]}'
         else:
-            researches_titles = i[5]
+            researches_titles = f'{child_researches_titles} - {i[5]}'
+        child_researches_titles = ""
 
         status_val = 0
         has_descriptive = False
@@ -591,7 +600,7 @@ def directions_history(request):
             {
                 'pk': dir,
                 'status': status,
-                'researches': researches_titles,
+                'researches': f"{researches_titles} {child_researches_titles}",
                 "researches_pks": researches_pks,
                 "aux_researches": aux_researches,
                 "has_aux": has_aux,
diff --git a/pyproject.toml b/pyproject.toml
index f9fa2df43d..f1de5eeebf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-psycopg2-binary = "^2.9.4"
+#psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From ddafb376afecae117998f01751b720925b4b1df8 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sun, 1 Oct 2023 22:13:32 +0800
Subject: [PATCH 30/38] fix

---
 api/directions/views.py | 5 +++--
 pyproject.toml          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 18a7b6639d..28b01f279b 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -544,12 +544,13 @@ def directions_history(request):
             case_child_direction = Napravleniya.objects.values_list("pk", flat=True).filter(parent_case__id=i[2])
             case_childs = Issledovaniya.objects.filter(napravleniye_id__in=case_child_direction)
             for csh in case_childs:
-                child_researches_titles = f"{child_researches_titles} {csh.research.short_title}"
+                ch_title = csh.research.short_title if csh.research.short_title else csh.research.title
+                child_researches_titles = f"{child_researches_titles} {ch_title}"
 
         if researches_titles:
             researches_titles = f'{researches_titles} | {i[5]}'
         else:
-            researches_titles = f'{child_researches_titles} - {i[5]}'
+            researches_titles = f'{child_researches_titles} {i[5]}'
         child_researches_titles = ""
 
         status_val = 0
diff --git a/pyproject.toml b/pyproject.toml
index f1de5eeebf..f9fa2df43d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-#psycopg2-binary = "^2.9.4"
+psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From 6c60cd777f90544d1fe8087e871daf6351c5f646 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sun, 1 Oct 2023 22:22:19 +0800
Subject: [PATCH 31/38] fix

---
 api/directions/views.py | 12 ++++++++++--
 pyproject.toml          |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 28b01f279b..97580240d1 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -543,14 +543,22 @@ def directions_history(request):
         if i[36] and req_status == 7:
             case_child_direction = Napravleniya.objects.values_list("pk", flat=True).filter(parent_case__id=i[2])
             case_childs = Issledovaniya.objects.filter(napravleniye_id__in=case_child_direction)
+            step = 0
             for csh in case_childs:
                 ch_title = csh.research.short_title if csh.research.short_title else csh.research.title
-                child_researches_titles = f"{child_researches_titles} {ch_title}"
+                if step != 0:
+                    child_researches_titles = f"{child_researches_titles}; {ch_title}"
+                else:
+                    child_researches_titles = f"{ch_title}"
+                step += 1
 
         if researches_titles:
             researches_titles = f'{researches_titles} | {i[5]}'
+        elif child_researches_titles:
+            researches_titles = f'{child_researches_titles} - {i[5]}'
         else:
-            researches_titles = f'{child_researches_titles} {i[5]}'
+            researches_titles = i[5]
+
         child_researches_titles = ""
 
         status_val = 0
diff --git a/pyproject.toml b/pyproject.toml
index f9fa2df43d..f1de5eeebf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-psycopg2-binary = "^2.9.4"
+#psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From 47457783612ff3ad8314ca34c167ad1295578d6d Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sun, 1 Oct 2023 22:26:26 +0800
Subject: [PATCH 32/38] fix

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f1de5eeebf..f9fa2df43d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -72,7 +72,7 @@ beren = "0.7.1"
 transliterate = "1.10.2"
 imgkit = "1.2.3"
 astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"}
-#psycopg2-binary = "^2.9.4"
+psycopg2-binary = "^2.9.4"
 boto3 = "^1.26.157"
 prompt-toolkit = "^3.0.36"
 pdf2docx = "^0.5.6"

From 5014c6a6d2fe1fa3d9e96c271fdcd8c0f41d8c24 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sun, 1 Oct 2023 22:54:01 +0800
Subject: [PATCH 33/38] =?UTF-8?q?=D0=A0=D0=BE=D0=BB=D1=8C=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BB=D1=83=D1=87=D0=B0?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 l2-frontend/src/construct/ConstructParaclinic.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/l2-frontend/src/construct/ConstructParaclinic.vue b/l2-frontend/src/construct/ConstructParaclinic.vue
index 4ad4711465..5b6fc2646e 100644
--- a/l2-frontend/src/construct/ConstructParaclinic.vue
+++ b/l2-frontend/src/construct/ConstructParaclinic.vue
@@ -147,6 +147,14 @@ export default {
       }
       return false;
     },
+    can_edit_case() {
+      for (const g of this.$store.getters.user_data.groups || []) {
+        if (g === 'Редактирование случая') {
+          return true;
+        }
+      }
+      return false;
+    },
   },
   watch: {
     department: {
@@ -278,7 +286,7 @@ export default {
           }
         }
 
-        if (this.modules.l2_case) {
+        if (this.modules.l2_case && this.can_edit_case) {
           d.push({ value: -14, label: 'Случаи' });
         }
       }

From aa3cd89422d8c98565413cc070f25e4e08cfe8dd Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <monitor84@list.ru>
Date: Sun, 1 Oct 2023 22:57:16 +0800
Subject: [PATCH 34/38] =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B9=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D1=81=D0=BA=D1=80=D1=8B=D1=82=D1=8B=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 directions/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/directions/models.py b/directions/models.py
index ae965813e3..dc099d0815 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -1543,7 +1543,7 @@ def gen_napravleniya_by_issledovaniya(
                                 external_order=external_order,
                                 price_name_id=price_name,
                             )
-                            research_case = directory.Researches.objects.filter(is_case=True).first()
+                            research_case = directory.Researches.objects.filter(is_case=True, hide=False).first()
                             issledovaniye_case = Issledovaniya(
                                 napravleniye=napravleniye_case,
                                 research=research_case,

From 84c759487d5d14ee552d334227362c31926a379a Mon Sep 17 00:00:00 2001
From: Mikhail Privalov <me@prvlv.ru>
Date: Sat, 7 Oct 2023 00:25:01 +0300
Subject: [PATCH 35/38] initial case ui

---
 api/cases/__init__.py                         |   0
 api/cases/helpers.py                          |  47 ++
 api/cases/sql_func.py                         | 241 +++++++
 api/cases/stationar_func.py                   | 611 ++++++++++++++++++
 api/cases/urls.py                             |  11 +
 api/cases/views.py                            | 285 ++++++++
 api/patients/views.py                         |   5 +-
 api/urls.py                                   |   1 +
 context_processors/utils.py                   |   9 +-
 directions/admin.py                           |   1 +
 directions/models.py                          |   7 +
 l2-frontend/src/App.vue                       |  20 +-
 l2-frontend/src/{UrlData.js => UrlData.ts}    |   4 +-
 .../src/construct/ConstructEmployees.vue      | 209 +++---
 l2-frontend/src/hooks/useLoader.ts            |  15 +
 l2-frontend/src/hooks/useNotify.ts            |  17 +
 l2-frontend/src/layouts/TopBottomLayout.vue   |  20 +-
 l2-frontend/src/layouts/TwoSidedLayout.vue    |   9 +-
 l2-frontend/src/mainWithRouter.ts             |  14 +
 .../src/pages/CaseControl/Content/TopView.vue | 166 +++++
 .../src/pages/CaseControl/Content/index.vue   |  73 +++
 .../CaseControl/Sidebar/AnamnesisView.vue     | 137 ++++
 .../pages/CaseControl/Sidebar/SearchForm.vue  |  93 +++
 .../src/pages/CaseControl/Sidebar/index.vue   | 234 +++++++
 .../src/pages/CaseControl/Sidebar/menu.ts     |   8 +
 l2-frontend/src/pages/CaseControl/index.vue   |  42 ++
 l2-frontend/src/pages/CaseControl/types.ts    |   7 +
 l2-frontend/src/pages/EDS.vue                 |   2 +-
 l2-frontend/src/registerHooks.ts              |   4 +
 l2-frontend/src/shims-vue.d.ts                |   1 +
 l2-frontend/src/ui-cards/EDSSignTitle.vue     |   2 +-
 l2-frontend/src/ui-cards/EDSSigner.vue        |   2 +-
 l2-frontend/src/utils.ts                      |   2 +-
 utils/tree_directions_case.py                 | 391 +++++++++++
 34 files changed, 2563 insertions(+), 127 deletions(-)
 create mode 100644 api/cases/__init__.py
 create mode 100644 api/cases/helpers.py
 create mode 100644 api/cases/sql_func.py
 create mode 100644 api/cases/stationar_func.py
 create mode 100644 api/cases/urls.py
 create mode 100644 api/cases/views.py
 rename l2-frontend/src/{UrlData.js => UrlData.ts} (95%)
 create mode 100644 l2-frontend/src/hooks/useLoader.ts
 create mode 100644 l2-frontend/src/hooks/useNotify.ts
 create mode 100644 l2-frontend/src/pages/CaseControl/Content/TopView.vue
 create mode 100644 l2-frontend/src/pages/CaseControl/Content/index.vue
 create mode 100644 l2-frontend/src/pages/CaseControl/Sidebar/AnamnesisView.vue
 create mode 100644 l2-frontend/src/pages/CaseControl/Sidebar/SearchForm.vue
 create mode 100644 l2-frontend/src/pages/CaseControl/Sidebar/index.vue
 create mode 100644 l2-frontend/src/pages/CaseControl/Sidebar/menu.ts
 create mode 100644 l2-frontend/src/pages/CaseControl/index.vue
 create mode 100644 l2-frontend/src/pages/CaseControl/types.ts
 create mode 100644 utils/tree_directions_case.py

diff --git a/api/cases/__init__.py b/api/cases/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/api/cases/helpers.py b/api/cases/helpers.py
new file mode 100644
index 0000000000..c6fe02dcd9
--- /dev/null
+++ b/api/cases/helpers.py
@@ -0,0 +1,47 @@
+from utils import tree_directions_case as tree_directions
+from anytree import Node, RenderTree
+
+
+def get_case_direction_tree(num_dir):
+    root_dir = tree_directions.root_direction(num_dir)
+    if not root_dir or not root_dir[-1]:
+        return {}
+    num_root_dir = root_dir[-1][-3]
+    result = tree_directions.get_research_by_dir(num_root_dir)
+    num_iss = result[0][0]
+
+    # отсортировать по подчинениям - построить бинарное дерево
+    tree_dir = tree_directions.hosp_tree_direction(num_iss)
+    final_tree = {}
+
+    print(result)
+
+    node_dir = Node({'order': '-1', 'direction': '', 'research_title': '', 'correct_level': True, 'color': '', 'cancel': False, 'issledovaniye': '', 'parent_iss': ''})
+    for j in tree_dir:
+        research_title = j[12] if j[12] else j[9]
+        temp_s = {'order': '-1', 'direction': j[0], 'research_title': research_title, 'correct_level': True, 'color': '', 'cancel': j[14], 'issledovaniye': j[5], 'parent_iss': j[3]}
+        if not j[3]:
+            final_tree[j[5]] = Node(temp_s, parent=node_dir)
+        else:
+            final_tree[j[5]] = Node(temp_s, parent=final_tree.get(j[3]))
+
+    data_sort = []
+    count_level_second = 0
+    correct_level = True
+    for row in RenderTree(node_dir):
+        order = int(len(row.pre) / 4)
+        if order == 2:
+            count_level_second += 1
+            if count_level_second > 1:
+                correct_level = False
+                row.node.name['correct_level'] = correct_level
+                row.node.name['color'] = 'red'
+        if not correct_level and order > 2:
+            row.node.name['color'] = '#d35400'
+            row.node.name['correct_level'] = correct_level
+
+        row.node.name['order'] = order
+        data_sort.append(row.node.name)
+
+    data_sort.pop(0)
+    return data_sort
diff --git a/api/cases/sql_func.py b/api/cases/sql_func.py
new file mode 100644
index 0000000000..e8c4ea3afe
--- /dev/null
+++ b/api/cases/sql_func.py
@@ -0,0 +1,241 @@
+from django.db import connection
+
+from laboratory.settings import TIME_ZONE
+from utils.db import namedtuplefetchall
+
+
+def get_research(title_podr, vertical_result_display):
+    """
+    Возврат: id услуги, title-услуги
+
+    """
+
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """WITH
+        t_podr AS (
+            SELECT id as podr_id, title as podr_title FROM public.podrazdeleniya_podrazdeleniya),
+
+        t_research AS (
+            SELECT id as research_id, title as research_title, vertical_result_display, podrazdeleniye_id 
+            FROM public.directory_researches)
+
+        SELECT research_id, research_title FROM t_research
+        LEFT JOIN t_podr
+        ON t_research.podrazdeleniye_id=t_podr.podr_id
+        WHERE podr_title = %(title_podr)s and vertical_result_display = %(vertical)s
+        ORDER BY research_id
+        """,
+            params={'title_podr': title_podr, 'vertical': vertical_result_display},
+        )
+
+        row = cursor.fetchall()
+    return row
+
+
+def get_iss(list_research_id, list_dirs):
+    """
+    Возврат: id-iss
+    добавить:
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """
+        SELECT id, research_id FROM public.directions_issledovaniya
+        WHERE napravleniye_id = ANY(ARRAY[%(num_dirs)s]) AND research_id = ANY(ARRAY[%(id_researches)s]) 
+        AND time_confirmation IS NOT NULL
+        """,
+            params={'id_researches': list_research_id, 'num_dirs': list_dirs},
+        )
+        row = cursor.fetchall()
+    return row
+
+
+def get_distinct_research(list_research_id, list_dirs, is_text_research=False):
+    """
+    Возврат: уникальных research
+    добавить:
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """WITH
+        t_iss AS (SELECT id, research_id FROM public.directions_issledovaniya
+        WHERE CASE 
+        WHEN  %(is_text_research)s = TRUE THEN 
+          napravleniye_id = ANY(ARRAY[%(num_dirs)s]) AND time_confirmation IS NOT NULL         
+        WHEN  %(is_text_research)s = FALSE THEN
+          napravleniye_id = ANY(ARRAY[%(num_dirs)s]) AND research_id = ANY(ARRAY[%(id_researches)s]) AND time_confirmation IS NOT NULL
+        END)
+
+        SELECT DISTINCT ON (research_id) research_id FROM t_iss
+
+        """,
+            params={'id_researches': list_research_id, 'num_dirs': list_dirs, 'is_text_research': is_text_research},
+        )
+        row = cursor.fetchall()
+    return row
+
+
+def get_distinct_fraction(list_iss):
+    """
+    Возвращает уникальные фракци(id, title, units), которые присутствуют во всех исследованиях
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """WITH
+        t_fraction AS (SELECT id as id_frac, title as title_frac FROM public.directory_fractions ORDER BY id)
+
+        SELECT DISTINCT ON (fraction_id) fraction_id, title_frac, units FROM directions_result
+        LEFT JOIN t_fraction ON directions_result.fraction_id = t_fraction.id_frac
+        WHERE issledovaniye_id = ANY(ARRAY[%(id_iss)s])
+        ORDER by fraction_id
+        """,
+            params={'id_iss': list_iss},
+        )
+        row = cursor.fetchall()
+    return row
+
+
+def get_result_fraction(list_iss):
+    """
+    Возвращает результат: дата, фракция, значение(value)
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """WITH
+        t_fraction AS (SELECT id as id_frac, title as title_frac FROM public.directory_fractions ORDER BY id),
+        
+        t_iss AS (SELECT id as iss_id, napravleniye_id, to_char(time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YY') as date_confirm
+        FROM public.directions_issledovaniya 
+        WHERE id = ANY(ARRAY[%(id_iss)s]) AND time_confirmation IS NOT NULL)
+
+        SELECT fraction_id, issledovaniye_id, title_frac, value, date_confirm, napravleniye_id FROM directions_result
+        LEFT JOIN t_fraction ON directions_result.fraction_id = t_fraction.id_frac
+        LEFT JOIN t_iss ON directions_result.issledovaniye_id = t_iss.iss_id
+        WHERE issledovaniye_id = ANY(ARRAY[%(id_iss)s])
+        ORDER by napravleniye_id, date_confirm
+        """,
+            params={'id_iss': list_iss, 'tz': TIME_ZONE},
+        )
+        row = cursor.fetchall()
+    return row
+
+
+def get_result_text_research(research_pk, listdirs, force_all_fields=False):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """
+           WITH
+            t_research AS (SELECT id as research_id, title as research_title FROM directory_researches
+                          WHERE id = %(id_research)s),
+                                       
+            t_groups AS (SELECT id as group_id, title as group_title, "order" as group_order
+                         FROM public.directory_paraclinicinputgroups
+                         WHERE research_id = %(id_research)s),
+            
+            t_fields AS (SELECT id as field_id, title, "order" as field_order, 
+                         directory_paraclinicinputfield.group_id, group_title, group_order
+                         FROM public.directory_paraclinicinputfield
+            LEFT JOIN t_groups on directory_paraclinicinputfield.group_id = t_groups.group_id
+            WHERE (directory_paraclinicinputfield.group_id in (SELECT group_id from t_groups) and
+                    (
+                        for_extract_card = true or
+                        (%(force_all_fields)s = true and NOT (field_type = ANY(ARRAY[16,17]))))
+                    ) or
+                    (directory_paraclinicinputfield.group_id in (SELECT group_id from t_groups) and title ILIKE 'Заключение')),
+            
+            t_iss AS (SELECT directions_issledovaniya.id as iss_id, time_confirmation,
+                      to_char(time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YY') as date_confirm,
+                      napravleniye_id, t_research.research_title, ud.fio FROM directions_issledovaniya
+                LEFT JOIN t_research on t_research.research_id = directions_issledovaniya.research_id
+                LEFT JOIN users_doctorprofile ud ON
+                ud.id=directions_issledovaniya.doc_confirmation_id
+                WHERE directions_issledovaniya.research_id=%(id_research)s and napravleniye_id = ANY(ARRAY[%(id_dirs)s]) and time_confirmation is not Null)
+                     
+            SELECT research_title, date_confirm, napravleniye_id, group_title, title, "value", t_iss.iss_id, t_iss.fio, field_type  FROM directions_paraclinicresult
+            LEFT JOIN t_iss on directions_paraclinicresult.issledovaniye_id = t_iss.iss_id
+            LEFT JOIN t_fields on directions_paraclinicresult.field_id = t_fields.field_id
+            WHERE issledovaniye_id in (SELECT iss_id from t_iss) and 
+            directions_paraclinicresult.field_id in (SELECT field_id from t_fields)
+            order by time_confirmation, group_order, field_order
+
+         """,
+            params={'id_research': research_pk, 'id_dirs': listdirs, 'force_all_fields': force_all_fields, 'tz': TIME_ZONE},
+        )
+        row = cursor.fetchall()
+    return row
+
+
+def get_result_value_iss(iss_pk, research_pk, titles_field):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """
+        WITH
+           t_field AS (SELECT "id", title FROM directory_paraclinicinputfield
+           WHERE group_id in (SELECT "id" FROM directory_paraclinicinputgroups WHERE research_id=%(id_research)s)
+             AND title = ANY(ARRAY[%(titles_field)s]))
+
+            SELECT field_id, issledovaniye_id, "value", title FROM public.directions_paraclinicresult
+            LEFT JOIN t_field ON directions_paraclinicresult.field_id = t_field.id
+            where field_id in (SELECT "id" FROM t_field) and issledovaniye_id = %(id_iss)s
+
+
+         """,
+            params={'id_iss': iss_pk, 'id_research': research_pk, 'titles_field': titles_field},
+        )
+        row = cursor.fetchall()
+    return row
+
+
+def get_result_temperature_list(iss_pk_list, research_pk, titles_field):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """
+        WITH
+           t_field AS (SELECT "id", title FROM directory_paraclinicinputfield
+           WHERE group_id in (SELECT "id" FROM directory_paraclinicinputgroups WHERE research_id=%(id_research)s)
+             AND title = ANY(ARRAY[%(titles_field)s]))
+
+            SELECT field_id, issledovaniye_id, "value", title FROM public.directions_paraclinicresult
+            LEFT JOIN t_field ON directions_paraclinicresult.field_id = t_field.id
+            where field_id in (SELECT "id" FROM t_field) and issledovaniye_id = ANY(ARRAY[%(id_iss)s])
+            ORDER by issledovaniye_id
+
+
+         """,
+            params={'id_iss': iss_pk_list, 'id_research': research_pk, 'titles_field': titles_field},
+        )
+        row = cursor.fetchall()
+    return row
+
+
+def get_assignments_by_history(history_id: int):
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """
+             SELECT public.directions_napravleniya.id as napravlenie_id, public.directions_napravleniya.data_sozdaniya,
+            public.users_doctorprofile.fio as who_assigned, doc_list.fio as who_confirm, public.directions_napravleniya.total_confirmed, 
+            public.directions_issledovaniya.time_confirmation, public.directory_researches.id as research_id, public.directory_researches.title as research_title
+
+            FROM public.directions_issledovaniya
+            INNER JOIN public.directions_napravleniya
+              ON public.directions_issledovaniya.napravleniye_id = public.directions_napravleniya.id
+            INNER JOIN public.directory_researches
+              ON public.directions_issledovaniya.research_id = public.directory_researches.id
+            INNER JOIN public.users_doctorprofile
+              ON public.directions_napravleniya.doc_id = public.users_doctorprofile.id
+            LEFT JOIN (SELECT id, fio FROM public.users_doctorprofile) as doc_list
+              ON public.directions_issledovaniya.doc_confirmation_id = doc_list.id
+              
+            WHERE public.directions_napravleniya.parent_case_id = %(history_id)s
+            AND (is_paraclinic = true OR is_doc_refferal = true OR is_microbiology = true OR is_citology = true OR is_gistology = true OR 
+                 (is_paraclinic = False AND is_doc_refferal = False AND is_microbiology = False AND is_citology = False AND is_gistology = False 
+                  AND is_slave_hospital = False AND is_hospital = False AND is_case = False))
+            AND public.directions_napravleniya.cancel != true
+                  
+            ORDER BY public.directions_napravleniya.data_sozdaniya
+                  """,
+            params={"history_id": history_id},
+        )
+        rows = namedtuplefetchall(cursor)
+    return rows
diff --git a/api/cases/stationar_func.py b/api/cases/stationar_func.py
new file mode 100644
index 0000000000..a20fd8cc05
--- /dev/null
+++ b/api/cases/stationar_func.py
@@ -0,0 +1,611 @@
+from collections import OrderedDict
+from copy import deepcopy
+from typing import List
+
+from directions.models import Issledovaniya, Napravleniya
+from directory.models import Researches, HospitalService
+from podrazdeleniya.models import Podrazdeleniya
+from utils import tree_directions_case as tree_directions
+from .sql_func import (
+    get_research,
+    get_iss,
+    get_distinct_research,
+    get_distinct_fraction,
+    get_result_fraction,
+    get_result_text_research,
+    get_result_temperature_list,
+    get_assignments_by_history,
+)
+from api.dicom import search_dicom_study
+from utils.dates import normalize_date
+from anytree import Node, RenderTree
+
+
+def hosp_get_data_direction(main_direction, site_type=-1, type_service='None', level=-1):
+    # Получить данные по разделу Стационарной карты
+    # hosp_site_type=-1 - не получать ничего.
+    # level уровень подчинения. Если вернуть только дочерние для текущего направления level=2
+    result = tree_directions.get_research_by_dir(main_direction)
+    num_iss = result[0][0]
+    main_research = result[0][1]
+
+    hosp_site_type = site_type
+    hosp_level = level
+    hosp_is_paraclinic, hosp_is_doc_refferal, hosp_is_lab, hosp_is_hosp, hosp_is_all, hosp_morfology = False, False, False, False, False, False
+    if type_service == 'is_paraclinic':
+        hosp_is_paraclinic = True
+    elif type_service == 'is_doc_refferal':
+        hosp_is_doc_refferal = True
+    elif type_service == 'is_lab':
+        hosp_is_lab = True
+    elif type_service == 'is_morfology':
+        hosp_morfology = True
+    if site_type == -1 and type_service == 'None':
+        hosp_is_all = True
+
+    hosp_dirs = tree_directions.hospital_get_direction(
+        num_iss, main_research, hosp_site_type, hosp_is_paraclinic, hosp_is_doc_refferal, hosp_is_lab, hosp_is_hosp, hosp_level, hosp_is_all, hosp_morfology
+    )
+
+    data = []
+    if hosp_dirs:
+        for i in hosp_dirs:
+            if hosp_is_all and i[21] == 9:
+                continue
+            data.append(
+                {
+                    'direction': i[0],
+                    'date_create': i[1],
+                    'time_create': i[2],
+                    'iss': i[5],
+                    'date_confirm': i[6],
+                    'time_confirm': i[7],
+                    'research_id': i[8],
+                    'research_title': i[9],
+                    'podrazdeleniye_id': i[13],
+                    'is_paraclinic': i[14],
+                    'is_doc_refferal': i[15],
+                    'is_stom': i[16],
+                    'is_hospital': i[17],
+                    'is_microbiology': i[18],
+                    'podrazdeleniye_title': i[19],
+                    'site_type': i[21],
+                    'research_short_title': i[23],
+                    'is_slave_hospital': i[24],
+                    'is_cancel': i[25],
+                    "is_citology": i[26],
+                    "is_gistology": i[27],
+                }
+            )
+
+    return data
+
+
+def get_direction_attrs(direction, site_type=-1, type_service='None', level=-1):
+    # Возврат: [{pk:№, date_create:'', confirm:'', researches:[]}, {pk:№, date_create:'', confirm:'', researches:[]}]
+    data = []
+
+    main_direction = direction
+    type_serv = type_service
+    site_type_num = site_type
+    level_get = level
+    data_direction = hosp_get_data_direction(main_direction, site_type=site_type_num, type_service=type_serv, level=level_get)
+    dict_temp = {}
+
+    for dir_attr in data_direction:
+        num_dir = dir_attr.get('direction')
+        if dict_temp.get(num_dir):
+            dict_by_dir = dict_temp.get(num_dir)
+            dict_by_dir['researches'] = [*dict_by_dir['researches'], dir_attr.get('research_title')]
+            dict_by_dir['researches_short'] = [*dict_by_dir['researches_short'], dir_attr.get('researches_short')]
+            dict_temp[num_dir] = dict_by_dir.copy()
+        else:
+            type_dir = 'directions'
+            confirm = bool(dir_attr.get('date_confirm'))
+            if dir_attr.get('is_slave_hospital'):
+                type_dir = 'stationar'
+            dict_temp[num_dir] = {
+                'type': type_dir,
+                'date_create': dir_attr.get('date_create'),
+                'confirm': confirm,
+                'researches': [dir_attr.get('research_title')],
+                'researches_short': [dir_attr.get('research_short_title')],
+                'podrazdeleniye': dir_attr.get('podrazdeleniye_title'),
+            }
+
+    for k, v in dict_temp.items():
+        dict_result = {
+            'type': v['type'],
+            'pk': k,
+            'date_create': v['date_create'],
+            'confirm': v['confirm'],
+            'researches': v['researches'],
+            'researches_short': v['researches_short'],
+            'podrazdeleniye': v['podrazdeleniye'],
+        }
+        data.append(dict_result)
+
+    return data
+
+
+def hosp_get_hosp_direction(num_dir):
+    # возвращает дерево направлений-отделений, у к-рых тип улуги только is_hosp
+    # [{'direction': номер направления, 'research_title': значение}, {'direction': номер направления, 'research_title': значение}]
+    root_dir = tree_directions.root_direction(num_dir)
+    if not root_dir or not root_dir[-1]:
+        return {}
+    num_root_dir = root_dir[-1][-3]
+    result = tree_directions.get_research_by_dir(num_root_dir)
+    num_iss = result[0][0]
+
+    # отсортировать по подчинениям - построить бинарное дерево
+    tree_dir = tree_directions.hosp_tree_direction(num_iss)
+    final_tree = {}
+
+    node_dir = Node({'order': '-1', 'direction': '', 'research_title': '', 'correct_level': True, 'color': '', 'cancel': False, 'issledovaniye': '', 'parent_iss': ''})
+    for j in tree_dir:
+        research_title = j[12] if j[12] else j[9]
+        temp_s = {'order': '-1', 'direction': j[0], 'research_title': research_title, 'correct_level': True, 'color': '', 'cancel': j[14], 'issledovaniye': j[5], 'parent_iss': j[3]}
+        if not j[3]:
+            final_tree[j[5]] = Node(temp_s, parent=node_dir)
+        else:
+            final_tree[j[5]] = Node(temp_s, parent=final_tree.get(j[3]))
+
+    data_sort = []
+    count_level_second = 0
+    correct_level = True
+    for row in RenderTree(node_dir):
+        order = int(len(row.pre) / 4)
+        if order == 2:
+            count_level_second += 1
+            if count_level_second > 1:
+                correct_level = False
+                row.node.name['correct_level'] = correct_level
+                row.node.name['color'] = 'red'
+        if not correct_level and order > 2:
+            row.node.name['color'] = '#d35400'
+            row.node.name['correct_level'] = correct_level
+
+        row.node.name['order'] = order
+        data_sort.append(row.node.name)
+
+    data_sort.pop(0)
+    return data_sort
+
+
+def hosp_get_curent_hosp_dir(current_iss):
+    obj_iss = Issledovaniya.objects.get(pk=current_iss)
+    current_dir = obj_iss.napravleniye
+    if obj_iss.research.is_hospital:
+        return current_dir.pk
+    if current_dir.parent:
+        return current_dir.parent.napravleniye_id
+
+
+def hosp_get_lab_iss(current_iss, extract=False, *directions):
+    """
+    агрегация результатов исследований
+    возврат:  Если extract=True(выписка), то берем по всем hosp-dirs. Если эпикриз, то берем все исследования
+    до текущего hosp-dirs
+    Выход: {КДЛ:{vert:[{titile:'',fractions:[],results:[{date:"",values:[]}]}]},
+        {horizont:[{titile:'', results:[{date:'',value:''},{date:'',value:''}]}]}}
+    """
+    if not directions:
+        obj_iss = Issledovaniya.objects.get(pk=current_iss)
+        num_dir = obj_iss.napravleniye_id
+
+        # получить все направления в истории по типу hosp
+        hosp_dirs = hosp_get_hosp_direction(num_dir)
+
+        # получить текущее направление типа hosp из текущего исследования
+        current_dir = hosp_get_curent_hosp_dir(current_iss)
+        # проверить - это переводной эпикриз
+        epicris = False
+        if obj_iss.research.is_slave_hospital:
+            obj_hospital_service = HospitalService.objects.filter(slave_research=obj_iss.research).first().site_type
+            if obj_hospital_service == 6:
+                epicris = True
+
+        if epicris:
+            hosp_dirs = [i for i in hosp_dirs if i["direction"] <= current_dir]
+
+        num_lab_dirs = set()
+        if (not extract) and (not epicris):
+            obj_hosp_dirs = hosp_get_data_direction(current_dir, site_type=-1, type_service='is_lab', level=2)
+            for k in obj_hosp_dirs:
+                lab_dir = k.get('direction')
+                num_lab_dirs.add(lab_dir)
+
+        # получить по каждому hosp_dirs Дочерние направления по типу лаборатория
+        if extract or epicris:
+            for h in hosp_dirs:
+                obj_hosp_dirs = hosp_get_data_direction(h["direction"], site_type=-1, type_service='is_lab', level=2)
+                for k in obj_hosp_dirs:
+                    lab_dir = k.get('direction')
+                    num_lab_dirs.add(lab_dir)
+    if directions:
+        num_lab_dirs = directions
+
+    num_lab_dirs = list(num_lab_dirs)
+    if len(num_lab_dirs) == 0:
+        return {}
+
+    # Получить титл подразделений типа Лаборатория
+    departs_obj = Podrazdeleniya.objects.filter(p_type=2).order_by('title')
+    departs = OrderedDict()
+    result = OrderedDict()
+
+    for i in departs_obj:
+        departs[i.pk] = i.title
+        # получить research_id по лаборатории и vertical_result_display = True
+        vertical = {}
+        vertical_result = []
+        result[i.title] = {'vertical': {}, 'horizontal': {}}
+        horizontal_result = []
+        vertical_research = get_research(i.title, True)
+        id_research_vertical = [i[0] for i in vertical_research]
+        if len(id_research_vertical) > 0:
+            # получить уникальные research_id по направления
+            get_research_id = get_distinct_research(id_research_vertical, num_lab_dirs, is_text_research=False)
+            research_distinct = [d[0] for d in get_research_id]
+            if research_distinct:
+                for id_research_vertical in research_distinct:
+                    # получить исследования по направлениям и соответсвующим research_id
+                    get_iss_id = get_iss(id_research_vertical, num_lab_dirs)
+                    iss_id_vertical = [i[0] for i in get_iss_id]
+
+                    research_fraction_vertical = get_distinct_fraction(iss_id_vertical)
+                    fraction_title = []
+                    fraction_title_units = []
+                    for f in research_fraction_vertical:
+                        fraction_title.append(f[1])
+                        title_unit = f', {f[2]}' if f[2] else ''
+                        fraction_title_units.append(f'{f[1]}{title_unit}')
+                    fraction_template = [''] * len(fraction_title)  # заготовка для value-резульлтатов
+                    fraction_result = get_result_fraction(iss_id_vertical)
+                    vertical_temp_results = {}
+                    for f in fraction_result:
+                        key = f'{f[4]} {str(f[5])}'
+                        if key in vertical_temp_results.keys():
+                            position_element = fraction_title.index(f[2])
+                            tmp_list = vertical_temp_results.get(key)
+                            tmp_list_vert = deepcopy(tmp_list)
+                            tmp_list_vert[position_element] = f[3]
+                            vertical_temp_results[key] = tmp_list_vert
+                        else:
+                            vertical_temp_results[key] = fraction_template
+                            position_element = fraction_title.index(f[2])
+                            tmp_list = vertical_temp_results.get(key)
+                            tmp_list_vert = deepcopy(tmp_list)
+                            tmp_list_vert[position_element] = f[3]
+                            vertical_temp_results[key] = tmp_list_vert
+                    vertical['title_research'] = Researches.objects.get(pk=id_research_vertical).title
+                    vertical['title_fracions'] = fraction_title_units
+                    vertical['result'] = vertical_temp_results
+                    vertical1 = deepcopy(vertical)
+                    vertical_result.append(vertical1)
+                result[i.title]['vertical'] = vertical_result
+
+        # получить research_id по лаборатории и vertical_result_display = False
+        horizontal = {}
+        horizontal_research = get_research(i.title, False)
+        id_research_horizontal = [i[0] for i in horizontal_research]
+        if len(id_research_horizontal) > 0:
+            # получить исследования по направлениям и соответсвующим research_id для horizontal
+            get_iss_id = get_iss(id_research_horizontal, num_lab_dirs)
+            iss_id_horizontal = [i[0] for i in get_iss_id]
+            # получить уникальные фракции по исследованиям для хоризонтал fraction_title: [], units: []
+            if iss_id_horizontal:
+                fraction_horizontal = get_distinct_fraction(iss_id_horizontal)
+                fraction_title = []
+                fraction_title_units = []
+                for f in fraction_horizontal:
+                    fraction_title.append(f[1])
+                    title_unit = f', {f[2]}' if f[2] else ''
+                    fraction_title_units.append(f'{f[1]}{title_unit}')
+
+                fraction_template = [''] * len(fraction_title)  # заготовка для value-резульлтатов
+                fraction_result = get_result_fraction(iss_id_horizontal)
+
+                temp_results = {}
+                for f in fraction_result:
+                    key = f'{f[4]} {str(f[5])}'
+                    if key in temp_results.keys():
+                        position_element = fraction_title.index(f[2])
+                        tmp_list = temp_results.get(key)
+                        tmp_list2 = deepcopy(tmp_list)
+                        tmp_list2[position_element] = f[3]
+                        temp_results[key] = tmp_list2
+                    else:
+                        temp_results[key] = fraction_template
+                        position_element = fraction_title.index(f[2])
+                        tmp_list = temp_results.get(key)
+                        tmp_list2 = deepcopy(tmp_list)
+                        tmp_list2[position_element] = f[3]
+                        temp_results[key] = tmp_list2
+
+                horizontal['title_fracions'] = fraction_title_units
+                horizontal['result'] = temp_results
+                horizontal_result.append(horizontal)
+                result[i.title]['horizontal'] = horizontal_result
+    result_filtered = {}
+    for k in result:
+        if result[k]['horizontal'] or result[k]['vertical']:
+            result_filtered[k] = result[k]
+    return result_filtered
+
+
+def hosp_get_text(current_iss, extract=False, mode=None, directions=None):
+    # # Возврат стр-ра:
+    # {'paraclinic': [{'title_research': 'Проведение электрокардиографических исследований ( ЭКГ )', 'result': [
+    #                 {'date': '05.01.20 117', 'data': [{'group_title': '', 'fields': [{'title_field': 'Заключение',
+    #                       'value': 'Повышение пучка Гиса'}]}]},
+    #                 {'date': '05.01.20 119', 'data': [{'group_title': '', 'fields': [{'title_field': 'Заключение',
+    #                       'value': 'Диффузные нарушения'}]}]}]} ]}]
+    #                                                                                                                     ]}
+    if directions is None:
+        directions = []
+    if directions:
+        num_paraclinic_dirs = directions
+    else:
+        if mode is None:
+            return {}
+        num_dir = Issledovaniya.objects.get(pk=current_iss).napravleniye_id
+        # получить все направления в истории по типу hosp
+        hosp_dirs = hosp_get_hosp_direction(num_dir)
+
+        # получить текущее направление типа hosp из текущего эпикриза
+        current_dir = hosp_get_curent_hosp_dir(current_iss)
+        if not extract:
+            hosp_dirs = [i for i in hosp_dirs if i["direction"] <= current_dir]
+
+        # получить по каждому hosp_dirs Дочерние направления по типу is_paraclinic, is_doc_refferal, is_morfology
+        num_paraclinic_dirs = set()
+        for h in hosp_dirs:
+            obj_hosp_dirs = hosp_get_data_direction(h["direction"], site_type=-1, type_service=mode, level=2)
+            if not obj_hosp_dirs:
+                continue
+            for k in obj_hosp_dirs:
+                paraclinic_dir = k.get('direction')
+                num_paraclinic_dirs.add(paraclinic_dir)
+
+    num_paraclinic_dirs = list(num_paraclinic_dirs)
+
+    return desc_to_data(num_paraclinic_dirs)
+
+
+def desc_to_data(num_dirs: List[int], force_all_fields: bool = False):
+    # [0] - заглушка для запроса. research c id =0 не бывает
+    get_research_id = get_distinct_research([0], num_dirs, is_text_research=True) if num_dirs else []
+    result = []
+    for research_base in get_research_id:
+        research = research_base[0]
+        field_result = get_result_text_research(research, num_dirs, force_all_fields)
+        last_group = None
+        last_date = None
+        data_in = []
+        new_date_data = {}
+        for i in field_result:
+            date = f'{i[1]} {i[2]}'
+            link_dicom = search_dicom_study(i[2]) if not force_all_fields else None
+            group = i[3]
+            if not i[5]:
+                continue
+            fields = {'title_field': i[4], 'value': i[5], 'field_type': i[8]}
+
+            if date != last_date:
+                if new_date_data:
+                    data_in.append(new_date_data.copy())
+
+                new_date_data = dict()
+                new_date_data['date'] = date
+                new_date_data['link_dicom'] = link_dicom if link_dicom else ''
+                new_date_data['iss_id'] = i[6]
+                new_date_data['docConfirm'] = i[7]
+                new_date_data['data'] = [{'group_title': group, 'fields': [fields.copy()]}]
+                last_date = date
+                last_group = group
+                continue
+
+            if group != last_group and date == last_date:
+                current_data = new_date_data.get('data')
+                current_data.append({'group_title': group, 'fields': [fields.copy()]})
+                new_date_data['data'] = current_data.copy()
+                last_group = group
+                continue
+
+            current_data = new_date_data.get('data')
+            get_last_group = current_data.pop()
+            last_fields = get_last_group.get('fields')
+            last_fields.append(fields)
+            get_last_group['fields'] = last_fields.copy()
+            current_data.append(get_last_group.copy())
+            new_date_data['data'] = current_data.copy()
+
+        data_in.append(new_date_data)
+
+        temp_result = {}
+        temp_result['title_research'] = Researches.objects.get(pk=research).title
+        temp_result['result'] = data_in
+        result.append(temp_result)
+
+    return result
+
+
+def hosp_get_text_iss(current_iss, is_extract, mode):
+    if mode is None:
+        return []
+    if mode == 'desc':
+        modes = ['is_paraclinic', 'is_doc_refferal', 'is_morfology']
+    else:
+        modes = [mode]
+
+    v = []
+    for m in modes:
+        v.extend(hosp_get_text(current_iss, is_extract, mode=m))
+
+    return v
+
+
+def forbidden_edit_dir(num_dir):
+    """
+    Проверяет подтверждена ли выписка, или переводной эпикриз. И возвращает True|False - для редактирвоания протколов
+    """
+    # (если услуга имеет тип is_doc_refferal, или is_paraclinic) и направление не имеет parent услугу типа hosp вернуть False
+    obj_iss = Issledovaniya.objects.filter(napravleniye_id=num_dir).first()
+    if obj_iss.research.is_gistology:
+        return False
+    parent = Napravleniya.objects.get(pk=num_dir).parent
+    if not parent and (obj_iss.research.is_doc_refferal or obj_iss.research.is_paraclinic):
+        return False
+
+    if parent:
+        parent_is_hospital = parent.research.is_hospital
+        if (obj_iss.research.is_doc_refferal or obj_iss.research.is_paraclinic) and not parent_is_hospital:
+            return False
+
+    hosp_nums_obj = hosp_get_hosp_direction(num_dir)
+    hosp_last_num = hosp_nums_obj[-1].get('direction') if hosp_nums_obj else None
+    if not hosp_last_num:
+        return False
+    hosp_extract = hosp_get_data_direction(hosp_last_num, site_type=7, type_service='None', level=2)
+    if hosp_extract and hosp_extract[0].get('date_confirm'):
+        return True
+
+    # if not hosp_extract or not hosp_extract[0].get('date_confirm'):
+    #     # Проверить подтверждение переводного эпикриза
+    #     # Получить hosp_dir для текужего направления
+    #     current_iss = Issledovaniya.objects.get(napravleniye_id=num_dir)
+    #     current_dir_hosp_dir = num_dir
+    #     if not current_iss.research.is_hospital:
+    #         current_dir_hosp_dir = hosp_get_curent_hosp_dir(current_iss.pk)
+    #     # получить для текущего hosp_dir эпикриз с title - перевод.....
+    #     epicrisis_data = hosp_get_data_direction(current_dir_hosp_dir, site_type=6, type_service='None', level=2)
+    #     if epicrisis_data:
+    #         result_check = check_transfer_epicrisis(epicrisis_data)
+    #         return result_check['is_transfer']
+    return False
+
+
+def check_transfer_epicrisis(data):
+    for i in data:
+        if i.get("research_title").lower().find('перевод') != -1:
+            if i.get('date_confirm'):
+                return {'is_transfer': True, 'iss': i.get('iss'), 'research_id': i.get('research_id')}
+    return {'is_transfer': False, 'iss': None, 'research_id': None}
+
+
+def get_temperature_list(hosp_num_dir):
+    """
+    :param num_dir:
+    :return:
+    {
+    temperature: {data: [36.6, 36.7, 37.1 итд], xtext: ['21.01.20 13:30', '21.01.20 20:00', '22.01.20 12:10' итд],},
+    systolic: {data[], xtext :[]}, diastolic: {data[], xtext :[]},
+    pulse: {data[], xtext :[]}
+    }
+    """
+    # tl - temperature list
+    tl_objs = hosp_get_data_direction(hosp_num_dir, site_type=9, type_service='None', level=2)
+    tl_iss = [i['iss'] for i in tl_objs]
+    research_id = None
+    for i in tl_objs:
+        research_id = i['research_id']
+        break
+    if research_id is None:
+        return {}
+    final_data = {}
+    title_list = ['Температура', 'Пульс (уд/м)', 'Дата измерения', 'Время измерения', 'Систолическое давление (мм рт.с)', 'Диастолическое давление (мм рт.с)']
+    a = get_result_temperature_list(tl_iss, research_id, title_list)
+    data = {}
+    for i in a:
+        value = i[2]
+        field = i[3]
+        if field.lower().find('дата') != -1:
+            value = normalize_date(value)
+        in_data = {field: value}
+        key = i[1]
+        if not data.get(key):
+            data.update({key: {}})
+        t_data = data.get(key)
+        t_data.update(in_data)
+        data[key] = t_data
+
+    for k, v in data.items():
+        date_time = get_date_time_tl(v)
+        for title, value in v.items():
+            if not value or value == '0':
+                continue
+            if not final_data.get(title):
+                final_data[title] = {'data': [], 'xtext': []}
+            t_final_data = final_data.get(title)
+            t_data = t_final_data['data']
+            t_data.append(value)
+            t_xtext = t_final_data['xtext']
+            t_xtext.append(date_time)
+            final_data[title] = {'data': t_data, 'xtext': t_xtext}
+    final_data.pop('Дата измерения', None)
+    final_data.pop('Время измерения', None)
+    for k, v in final_data.items():
+        if 'температура' in k.lower() or 'давление' in k.lower() or 'пульс' in k.lower():
+            number_data = list(map(force_to_number, v['data']))
+            v['data'] = number_data
+            v['min_max'] = [min(number_data), max(number_data)]
+            final_data[k] = v
+    if 'Температура' in final_data:
+        final_data['Температура (°C)'] = final_data.pop('Температура')
+    return final_data
+
+
+def get_date_time_tl(dict_data):
+    import re
+
+    time = dict_data.get('Время измерения', 'Нет поля "Время измерения"')
+    date = dict_data.get('Дата измерения', 'Нет поля "Дата измерения"')
+    date = re.sub(r'.\d{4}', '', date)
+    return f'{date} {time}'
+
+
+def force_to_number(val):
+    return float(''.join(c for c in val if c.isdigit() or c == '.') or 0)
+
+
+def get_assignments(direction_id: int):
+    if direction_id is None:
+        return []
+    results = []
+    issledovanie_id = Issledovaniya.objects.get(napravleniye_id=direction_id).pk
+    assignments = get_assignments_by_history(issledovanie_id)
+    prev_directions_id = -1
+    for i in assignments:
+        if prev_directions_id != i.napravlenie_id:
+            who_assigned = i.who_assigned.split(" ")
+            family_assigned = who_assigned[0]
+            name_assigned = who_assigned[1][0]
+            patronymic_assigned = ""
+            if len(who_assigned) > 2:
+                patronymic_assigned = who_assigned[2][0]
+            tmp_res = {
+                "direction_id": i.napravlenie_id,
+                "research_id": [i.research_id],
+                "research_title": [f"{i.research_title}; "],
+                "create_date": i.data_sozdaniya.strftime("%d.%m.%Y"),
+                "who_assigned": f"{family_assigned} {name_assigned}.{patronymic_assigned}.",
+                "time_confirmation": "",
+                "who_confirm": "",
+            }
+            if i.total_confirmed:
+                who_confirm = i.who_confirm.split(" ")
+                family_confirm = who_confirm[0]
+                name_confirm = who_confirm[1][0]
+                patronymic_confirm = ""
+                if len(who_confirm) > 2:
+                    patronymic_confirm = who_confirm[2][0]
+                tmp_res["time_confirmation"] = i.time_confirmation.strftime("%d.%m.%Y %H:%M")
+                tmp_res["who_confirm"] = f"{family_confirm} {name_confirm}.{patronymic_confirm}."
+            results.append(tmp_res)
+        else:
+            results[-1]["research_id"].append(i.research_id)
+            results[-1]["research_title"].append(f"{i.research_title}; ")
+        prev_directions_id = i.napravlenie_id
+    return results
diff --git a/api/cases/urls.py b/api/cases/urls.py
new file mode 100644
index 0000000000..7767b1b9e9
--- /dev/null
+++ b/api/cases/urls.py
@@ -0,0 +1,11 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+    path('search', views.search),
+    path('hosp-services-by-type', views.hosp_services_by_type),
+    path('make-service', views.make_service),
+    path('directions-by-key', views.directions_by_key),
+    path('aggregate', views.aggregate),
+]
diff --git a/api/cases/views.py b/api/cases/views.py
new file mode 100644
index 0000000000..77e03f5442
--- /dev/null
+++ b/api/cases/views.py
@@ -0,0 +1,285 @@
+import simplejson as json
+from django.contrib.auth.decorators import login_required
+from django.http import JsonResponse
+
+from api.cases.helpers import get_case_direction_tree
+from api.cases.stationar_func import (
+    get_direction_attrs,
+    hosp_get_lab_iss,
+)
+from clients.models import Card
+from directions.models import Issledovaniya, Napravleniya
+from directory.models import HospitalService
+from laboratory.decorators import group_required
+from appconf.manager import SettingManager
+from django.db.models import Q
+
+from laboratory.utils import strfdatetime
+from pharmacotherapy.models import ProcedureList
+
+
+@login_required
+@group_required('Врач параклиники', 'Врач консультаций')
+def search(request):
+    data = json.loads(request.body)
+    pk = int(data["q"])
+    if pk >= 4600000000000:
+        pk -= 4600000000000
+        pk //= 10
+    result = {"ok": False, "message": "Не найдено", "data": {}}
+    original_direction = None
+    original_view = None
+    need_to_open_original = False
+
+    for i in Issledovaniya.objects.filter(napravleniye__pk=pk, research__is_case=False):
+        direction: Napravleniya = i.napravleniye
+        if direction.parent_case:
+            if direction.parent_case.napravleniye_id:
+                if i.research.is_doc_refferal:
+                    original_view = 'consultation'
+                elif i.research.is_paraclinic:
+                    original_view = 'paraclinical'
+                elif i.research.podrazdeleniye and i.research.podrazdeleniye.p_type == 2:
+                    original_view = 'laboratory'
+                elif i.research.is_microbiology:
+                    original_view = 'morfology'
+                elif i.research.is_citology:
+                    original_view = 'morfology'
+                elif i.research.is_gistology:
+                    original_view = 'morfology'
+                if original_view:
+                    original_direction = pk
+                need_to_open_original = True
+                pk = direction.parent_case.napravleniye_id
+        break
+
+    tree_direction = get_case_direction_tree(pk)
+    i: Issledovaniya
+    for i in Issledovaniya.objects.filter(napravleniye__pk=pk, research__is_case=True):
+        direction: Napravleniya = i.napravleniye
+        card: Card = direction.client
+        result["ok"] = True
+        result["message"] = ""
+        if direction.cancel:
+            result["message"] = "Направление было отменено"
+        forbidden_edit = False  # make true for closed case
+        child_issledovaniye, child_research_title, child_direction = '', '', ''
+        for iss in tree_direction:
+            if i.pk == iss['parent_iss']:
+                child_issledovaniye = iss['issledovaniye']
+                iss_obj = Issledovaniya.objects.filter(pk=child_issledovaniye).first()
+                if iss_obj:
+                    child_direction = iss_obj.napravleniye.pk
+                    child_research_title = iss_obj.research.title
+                    if not original_view:
+                        if iss_obj.research.is_doc_refferal:
+                            original_view = 'consultation'
+                        elif iss_obj.research.is_paraclinic:
+                            original_view = 'paraclinical'
+                        elif iss_obj.research.podrazdeleniye and iss_obj.research.podrazdeleniye.p_type == 2:
+                            original_view = 'laboratory'
+                        elif iss_obj.research.is_microbiology:
+                            original_view = 'morfology'
+                        elif iss_obj.research.is_citology:
+                            original_view = 'morfology'
+                        elif iss_obj.research.is_gistology:
+                            original_view = 'morfology'
+                break
+
+        if not child_research_title or child_research_title == '-1':
+            first_child: Napravleniya = Napravleniya.objects.filter(parent_case=i).order_by('id').first()
+            if first_child:
+                child_direction = first_child.pk
+                iss: Issledovaniya = first_child.issledovaniya_set.first()
+                if iss:
+                    child_issledovaniye = iss.pk
+                    child_research_title = iss.research.title
+
+        result["data"] = {
+            "direction": direction.pk,
+            "cancel": direction.cancel,
+            "fin_pk": direction.istochnik_f_id,
+            "iss": i.pk,
+            "parentIssledovaniye": direction.parent.pk if direction.parent else '-1',
+            "caseTitle": i.research.title,
+            "childResearch": None,
+            "forbiddenToEdit": forbidden_edit,
+            "originalDirection": {
+                'id': original_direction or child_direction,
+                'view': original_view,
+                'open': need_to_open_original,
+            },
+            "patient": {
+                "fioWithAge": card.individual.fio(full=True),
+                "card": card.number_with_type(),
+                "base": card.base_id,
+                "cardPk": card.pk,
+                "individualPk": card.individual_id,
+            },
+            "tree": list(
+                map(
+                    lambda dirc: {
+                        **dirc,
+                        "research_title": dirc["research_title"],
+                        "isCurrent": int(dirc["direction"]) == pk,
+                        "cancel": Napravleniya.objects.get(pk=dirc["direction"]).cancel,
+                        "correct_level": dirc["correct_level"],
+                        "color": dirc["color"],
+                        "issledovaniye": dirc["issledovaniye"],
+                        "order": dirc["order"],
+                    },
+                    tree_direction,
+                )
+            ),
+            "counts": {
+                'laboratory': 0,
+                'paraclinical': 0,
+                'consultation': 0,
+                'morfology': 0,
+                'pharmacotherapy': 0,
+                'all': 0,
+            },
+        }
+
+        if child_issledovaniye and child_direction and child_research_title:
+            result['data']['childResearch'] = {
+                "issledovaniye": child_issledovaniye,
+                "direction": child_direction,
+                "title": child_research_title,
+            }
+
+        for i in Issledovaniya.objects.filter(napravleniye__pk=pk, research__is_case=True).distinct():
+            result['data']['counts']["laboratory"] += Napravleniya.objects.filter(parent_case=i, issledovaniya__research__podrazdeleniye__p_type=2).distinct().count()
+            result['data']['counts']["paraclinical"] += Napravleniya.objects.filter(parent_case=i, issledovaniya__research__is_paraclinic=True).distinct().count()
+            result['data']['counts']["consultation"] += Napravleniya.objects.filter(parent_case=i, issledovaniya__research__is_doc_refferal=True).distinct().count()
+            result['data']['counts']["morfology"] += (
+                Napravleniya.objects.filter(parent_case=i)
+                .filter(Q(issledovaniya__research__is_microbiology=True) | Q(issledovaniya__research__is_citology=True) | Q(issledovaniya__research__is_gistology=True))
+                .distinct()
+                .count()
+            )
+            result['data']['counts']["pharmacotherapy"] = ProcedureList.objects.filter(history=i.napravleniye, cancel=False, diary__issledovaniya__time_confirmation__isnull=False).count()
+            result['data']['counts']["all"] += Napravleniya.objects.filter(parent_case=i).count()
+        break
+    return JsonResponse(result)
+
+
+@login_required
+@group_required('Врач параклиники', 'Врач консультаций')
+def hosp_services_by_type(request):
+    data = json.loads(request.body)
+    base_direction_pk = int(data["direction"] or 0)
+    r_type = data["r_type"]
+    result = []
+    type_by_key = HospitalService.TYPES_BY_KEYS.get(r_type, -1)
+    for i in Issledovaniya.objects.filter(napravleniye__pk=base_direction_pk, research__is_case=True):
+        hosp_research = i.research
+        if int(data['hospResearch']) > -1:
+            hosp_research = int(data['hospResearch'])
+        for hs in HospitalService.objects.filter(site_type=type_by_key, main_research=hosp_research, hide=False):
+            result.append(
+                {
+                    "pk": hs.pk,
+                    "title": hs.slave_research.title,
+                    "short_title": hs.slave_research.short_title,
+                    "main_title": hs.main_research.title,
+                }
+            )
+    return JsonResponse({"data": result})
+
+
+@login_required
+@group_required('Врач параклиники', 'Врач консультаций')
+def make_service(request):
+    data = json.loads(request.body)
+    main_direction = Napravleniya.objects.get(pk=data["main_direction"])
+    parent_iss = Issledovaniya.objects.filter(napravleniye=main_direction, research__is_case=True).first()
+    service = HospitalService.objects.get(pk=data["service"])
+    TADP = SettingManager.get("tadp", default='Температура', default_type='s')
+    if "Врач стационара" not in [str(x) for x in request.user.groups.all()] and TADP not in service.slave_research.title:
+        return JsonResponse({"pk": None})
+    result = Napravleniya.gen_napravleniya_by_issledovaniya(
+        main_direction.client_id,
+        "",
+        None,
+        "",
+        None,
+        request.user.doctorprofile,
+        {-1: [service.slave_research_id]},
+        {},
+        False,
+        {},
+        vich_code="",
+        count=1,
+        discount=0,
+        parent_iss=parent_iss.pk,
+        rmis_slot=None,
+    )
+    pk = result["list_id"][0]
+    return JsonResponse({"pk": pk})
+
+
+@login_required
+def directions_by_key(request):
+    data = json.loads(request.body)
+    pk = data["caseId"]
+    view = data["view"]
+    directions = Napravleniya.objects.filter(parent_case__napravleniye_id=pk)
+
+    if view == 'laboratory':
+        directions = directions.filter(issledovaniya__research__podrazdeleniye__p_type=2)
+    elif view == 'morfology':
+        directions = directions.filter(Q(issledovaniya__research__is_microbiology=True) | Q(issledovaniya__research__is_citology=True) | Q(issledovaniya__research__is_gistology=True))
+    elif view == 'paraclinical':
+        directions = directions.filter(issledovaniya__research__is_paraclinic=True)
+    elif view == 'consultation':
+        directions = directions.filter(issledovaniya__research__is_doc_refferal=True)
+
+    directions = directions.distinct().order_by('id')
+
+    x: Napravleniya
+    return JsonResponse({'rows': [
+        {
+            'pk': x.pk,
+            'confirm': x.total_confirmed,
+            'date_create': strfdatetime(x.data_sozdaniya_local, "%d.%m.%Y"),
+            'researches_short': [y.short_title for y in x.services],
+            'researches': [y.title for y in x.services],
+        }
+        for x in directions
+    ]})
+
+
+@login_required
+def aggregate_laboratory(request):
+    data = json.loads(request.body)
+    pk = data.get('caseId', -1)
+    result = hosp_get_lab_iss(pk, False)
+    return JsonResponse(result)
+
+
+@login_required
+def aggregate(request):
+    data = json.loads(request.body)
+    pk = data.get('caseId', -1)
+    view = data.get("view")
+
+    directions = Napravleniya.objects.filter(parent_case__napravleniye_id=pk)
+
+    if view == 'laboratory':
+        directions = directions.filter(issledovaniya__research__podrazdeleniye__p_type=2)
+    elif view == 'morfology':
+        directions = directions.filter(Q(issledovaniya__research__is_microbiology=True) | Q(issledovaniya__research__is_citology=True) | Q(issledovaniya__research__is_gistology=True))
+    elif view == 'paraclinical':
+        directions = directions.filter(issledovaniya__research__is_paraclinic=True)
+    elif view == 'consultation':
+        directions = directions.filter(issledovaniya__research__is_doc_refferal=True)
+
+    directions = directions.distinct().order_by('id')
+
+    return JsonResponse({'rows': [
+        {
+            'confirm': x.total_confirmed,
+        }
+        for x in directions
+    ]})
diff --git a/api/patients/views.py b/api/patients/views.py
index 374cf1176c..eb6b8148c5 100644
--- a/api/patients/views.py
+++ b/api/patients/views.py
@@ -1533,7 +1533,7 @@ def load_anamnesis(request):
     request_data = json.loads(request.body)
     card = Card.objects.get(pk=request_data["card_pk"])
     history = []
-    for a in AnamnesisHistory.objects.filter(card=card).order_by('-pk'):
+    for a in AnamnesisHistory.objects.filter(card=card).order_by('-pk') if not request_data.get('skipHistory') else []:
         history.append(
             {
                 "pk": a.pk,
@@ -1549,6 +1549,9 @@ def load_anamnesis(request):
         "text": card.anamnesis_of_life,
         "history": history,
     }
+    if request_data.get('withPatient'):
+        data['patient'] = card.get_fio_w_card()
+
     return JsonResponse(data)
 
 
diff --git a/api/urls.py b/api/urls.py
index 6f362b41ee..d9b4676aa8 100644
--- a/api/urls.py
+++ b/api/urls.py
@@ -101,6 +101,7 @@
     path('transfer-document/', include('api.transfer_document.urls')),
     path('edit-forms/', include('api.edit_forms.urls')),
     path('hospitals/', include('api.hospitals.urls')),
+    path('cases/', include('api.cases.urls')),
     path('get-prices', views.get_prices),
     path('get-price-data', views.get_price_data),
     path('update-price', views.update_price),
diff --git a/context_processors/utils.py b/context_processors/utils.py
index 01ecfb2789..fadd87f06c 100644
--- a/context_processors/utils.py
+++ b/context_processors/utils.py
@@ -29,7 +29,7 @@ def menu(request):
     if request.user.is_authenticated and request.headers.get('X-Requested-With') != 'XMLHttpRequest':
         groups = [str(x) for x in request.user.groups.all()] if hasattr(request.user, 'groups') else []
 
-        k = f'menu:{VERSION}:{get_md5(";".join(groups))}:{SettingManager.l2_modules_md5_of_values()}:6'
+        k = f'menu:{VERSION}:{get_md5(";".join(groups))}:{SettingManager.l2_modules_md5_of_values()}:7'
         data = cache.get(k)
         if not data:
             pages = [
@@ -117,6 +117,13 @@ def menu(request):
                     "access": ["Врач параклиники", "Врач консультаций", "Свидетельство о смерти-доступ"],
                     "module": "paraclinic_module",
                 },
+                {
+                    "url": "/ui/case-control",
+                    "title": "Случаи обслуживания",
+                    "nt": False,
+                    "access": ['Врач параклиники', 'Врач консультаций'],
+                    "module": "l2_case",
+                },
                 {"url": '/ui/stationar', "title": "Стационар", "nt": False, "access": ["Врач стационара", "t, ad, p"], "module": "l2_hosp"},
                 {
                     "url": '/ui/plan-operations',
diff --git a/directions/admin.py b/directions/admin.py
index c07b3bc416..d539210d9c 100644
--- a/directions/admin.py
+++ b/directions/admin.py
@@ -47,6 +47,7 @@ class NapravleniyaAdmin(admin.ModelAdmin):
         'parent',
         'parent_auto_gen',
         'parent_slave_hosp',
+        'parent_case',
     )
     search_fields = (
         'pk',
diff --git a/directions/models.py b/directions/models.py
index ae965813e3..54d36928ce 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -787,6 +787,13 @@ def data_sozdaniya_local(self):
     def visit_date_local(self):
         return localtime(self.visit_date)
 
+    @property
+    def services(self) -> List[directory.Researches]:
+        result = []
+        for iss in self.issledovaniya_set.all().order_by('research__title'):
+            result.append(iss.research)
+        return result
+
     def __str__(self):
         return "%d для пациента %s (врач %s, выписал %s, %s, %s, %s, par: [%s])" % (
             self.pk,
diff --git a/l2-frontend/src/App.vue b/l2-frontend/src/App.vue
index d563f8eec2..215dd5e597 100644
--- a/l2-frontend/src/App.vue
+++ b/l2-frontend/src/App.vue
@@ -3,15 +3,18 @@
     <Navbar v-if="!embedded && !hideHeaderWithoutLogin && !isEmptyLayout" />
 
     <div
+      v-if="!isFullPageLayout"
       :class="[
         isNarrowLayout && 'container',
-        isFullPageLayout && 'full-page-layout',
         isEmptyLayout && 'empty-layout',
         isWideNarrowLayout && 'wide-narrow-layout',
       ]"
     >
       <router-view />
     </div>
+    <PageInnerLayout v-else>
+      <router-view />
+    </PageInnerLayout>
 
     <div
       v-if="inLoading"
@@ -66,10 +69,15 @@ import CheckBackend from '@/ui-cards/CheckBackend.vue';
 import ChatsDialogs from '@/ui-cards/Chat/ChatsDialogs.vue';
 import * as actions from '@/store/action-types';
 import notifyAudioSrc from '@/assets/notify.mp3';
+import PageInnerLayout from '@/layouts/PageInnerLayout.vue';
 
 @Component({
   components: {
-    CheckBackend, Navbar, ChatsDialogs, ModalForm,
+    PageInnerLayout,
+    CheckBackend,
+    Navbar,
+    ChatsDialogs,
+    ModalForm,
   },
   computed: mapGetters(['inLoading', 'fullPageLoader', 'authenticated', 'editId']),
   metaInfo() {
@@ -314,14 +322,6 @@ export default class App extends Vue {
   }
 }
 
-.full-page-layout {
-  position: absolute;
-  top: 36px;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
 .empty-layout {
   position: absolute;
   top: 0;
diff --git a/l2-frontend/src/UrlData.js b/l2-frontend/src/UrlData.ts
similarity index 95%
rename from l2-frontend/src/UrlData.js
rename to l2-frontend/src/UrlData.ts
index 8edd8e8413..c8cdc184f7 100644
--- a/l2-frontend/src/UrlData.js
+++ b/l2-frontend/src/UrlData.ts
@@ -1,7 +1,7 @@
 const titleSplitter = ' > ';
 
 export default class UrlData {
-  static set(data) {
+  static set(data: any) {
     if (!data || (typeof data === 'object' && Object.keys(data).length === 0)) {
       window.history.pushState('', '/', window.location.pathname);
       return false;
@@ -32,7 +32,7 @@ export default class UrlData {
     return null;
   }
 
-  static title(newTitle) {
+  static title(newTitle: string) {
     const baseTitleSplit = window.document.title.split(titleSplitter);
     const baseTitle = baseTitleSplit.length > 1 ? baseTitleSplit[1] : baseTitleSplit[0];
     if (newTitle) {
diff --git a/l2-frontend/src/construct/ConstructEmployees.vue b/l2-frontend/src/construct/ConstructEmployees.vue
index 434d3a9e65..87a4a9f7d7 100644
--- a/l2-frontend/src/construct/ConstructEmployees.vue
+++ b/l2-frontend/src/construct/ConstructEmployees.vue
@@ -1,121 +1,118 @@
 <template>
-  <PageInnerLayout>
-    <TwoSidedLayout>
-      <template #left>
-        <SimpleSelectableList
-          v-model="activeSection"
-          :rows="sections"
-        />
-      </template>
-      <template #right>
-        <TwoSidedLayout
-          v-if="activeSection === 'positions'"
-          key="positions"
-        >
-          <template #left>
-            <EditFormList
-              form-type="employeePosition"
-              loading-text="загрузка должностей..."
-              add-text="Добавить должность"
-              with-creating
-              with-name-filter
-            />
-          </template>
-        </TwoSidedLayout>
-        <TwoSidedLayout
-          v-else-if="activeSection === 'people'"
-          key="people"
-        >
-          <template #left>
-            <EditFormList
-              form-type="employeeEmployee"
-              loading-text="загрузка сотрудников..."
-              add-text="Добавить сотрудника"
-              with-creating
-              with-name-filter
-            />
-          </template>
-        </TwoSidedLayout>
-        <TwoSidedLayout
-          v-else-if="activeSection === 'departments'"
-          key="departments"
-        >
-          <template #left>
-            <EditFormList
-              v-model="selectedDepartmentId"
-              form-type="employeeDepartment"
-              loading-text="загрузка подразделений..."
-              add-text="Добавить подразделение"
-              with-creating
-              with-name-filter
-              selectable
-            />
-          </template>
-          <template #right>
-            <ContentCenterLayout v-if="selectedDepartmentId === null">
-              <span :class="$style.notSelected">подразделение не выбрано</span>
-            </ContentCenterLayout>
-            <TopBottomLayout
-              v-else
-              :top-height-px="80"
-            >
-              <template #top>
-                <FetchComponent
-                  :id="selectedDepartmentId"
-                  v-slot="slotProps"
-                  form-type="employeeDepartment"
-                  with-loader
+  <TwoSidedLayout>
+    <template #left>
+      <SimpleSelectableList
+        v-model="activeSection"
+        :rows="sections"
+      />
+    </template>
+    <template #right>
+      <TwoSidedLayout
+        v-if="activeSection === 'positions'"
+        key="positions"
+      >
+        <template #left>
+          <EditFormList
+            form-type="employeePosition"
+            loading-text="загрузка должностей..."
+            add-text="Добавить должность"
+            with-creating
+            with-name-filter
+          />
+        </template>
+      </TwoSidedLayout>
+      <TwoSidedLayout
+        v-else-if="activeSection === 'people'"
+        key="people"
+      >
+        <template #left>
+          <EditFormList
+            form-type="employeeEmployee"
+            loading-text="загрузка сотрудников..."
+            add-text="Добавить сотрудника"
+            with-creating
+            with-name-filter
+          />
+        </template>
+      </TwoSidedLayout>
+      <TwoSidedLayout
+        v-else-if="activeSection === 'departments'"
+        key="departments"
+      >
+        <template #left>
+          <EditFormList
+            v-model="selectedDepartmentId"
+            form-type="employeeDepartment"
+            loading-text="загрузка подразделений..."
+            add-text="Добавить подразделение"
+            with-creating
+            with-name-filter
+            selectable
+          />
+        </template>
+        <template #right>
+          <ContentCenterLayout v-if="selectedDepartmentId === null">
+            <span :class="$style.notSelected">подразделение не выбрано</span>
+          </ContentCenterLayout>
+          <TopBottomLayout
+            v-else
+            :top-height-px="80"
+          >
+            <template #top>
+              <FetchComponent
+                :id="selectedDepartmentId"
+                v-slot="slotProps"
+                form-type="employeeDepartment"
+                with-loader
+              >
+                <div
+                  v-if="slotProps.data"
+                  :class="$style.departmentHeader"
                 >
-                  <div
-                    v-if="slotProps.data"
-                    :class="$style.departmentHeader"
-                  >
-                    <div class="row">
-                      <div class="col-xs-6">
-                        <div>Подразделение: {{ slotProps.data.name }}</div>
-                        <div>Сотрудников: {{ slotProps.data.childrenElementsCount }}</div>
-                        <div>
-                          Скрыто: {{ slotProps.data.isActive ? 'нет' : 'да' }}
-                        </div>
+                  <div class="row">
+                    <div class="col-xs-6">
+                      <div>Подразделение: {{ slotProps.data.name }}</div>
+                      <div>Сотрудников: {{ slotProps.data.childrenElementsCount }}</div>
+                      <div>
+                        Скрыто: {{ slotProps.data.isActive ? 'нет' : 'да' }}
                       </div>
-                      <div class="col-xs-6">
-                        <div>
-                          Создано: {{ slotProps.data.createdAt }}<span v-if="slotProps.data.whoCreate">,
-                            {{ slotProps.data.whoCreate }}</span>
-                        </div>
-                        <div
-                          v-if="
-                            slotProps.data.whoUpdate
-                              || (slotProps.data.updatedAt && slotProps.data.updatedAt !== slotProps.data.createdAt)
-                          "
-                        >
-                          Обновлено: {{ slotProps.data.updatedAt }}<span v-if="slotProps.data.whoUpdate">,
-                            {{ slotProps.data.whoUpdate }}</span>
-                        </div>
+                    </div>
+                    <div class="col-xs-6">
+                      <div>
+                        Создано: {{ slotProps.data.createdAt }}<span v-if="slotProps.data.whoCreate">,
+                          {{ slotProps.data.whoCreate }}</span>
+                      </div>
+                      <div
+                        v-if="
+                          slotProps.data.whoUpdate
+                            || (slotProps.data.updatedAt && slotProps.data.updatedAt !== slotProps.data.createdAt)
+                        "
+                      >
+                        Обновлено: {{ slotProps.data.updatedAt }}<span v-if="slotProps.data.whoUpdate">,
+                          {{ slotProps.data.whoUpdate }}</span>
                       </div>
                     </div>
                   </div>
-                </FetchComponent>
-              </template>
-              <template #bottom>
-                <EditFormTable
-                  form-type="employeeEmployeePosition"
-                  :filters="employeeEmployeePositionFilters"
-                />
-              </template>
-            </TopBottomLayout>
-          </template>
-        </TwoSidedLayout>
-      </template>
-    </TwoSidedLayout>
-  </PageInnerLayout>
+                </div>
+              </FetchComponent>
+            </template>
+            <template #bottom>
+              <EditFormTable
+                form-type="employeeEmployeePosition"
+                :filters="employeeEmployeePositionFilters"
+              />
+            </template>
+          </TopBottomLayout>
+        </template>
+      </TwoSidedLayout>
+    </template>
+  </TwoSidedLayout>
 </template>
 
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 
 import TwoSidedLayout from '@/layouts/TwoSidedLayout.vue';
-import PageInnerLayout from '@/layouts/PageInnerLayout.vue';
 import ContentCenterLayout from '@/layouts/ContentCenterLayout.vue';
 import TopBottomLayout from '@/layouts/TopBottomLayout.vue';
 import SimpleSelectableList, { ListElementSimple } from '@/components/SimpleSelectableList.vue';
diff --git a/l2-frontend/src/hooks/useLoader.ts b/l2-frontend/src/hooks/useLoader.ts
new file mode 100644
index 0000000000..492551ff9a
--- /dev/null
+++ b/l2-frontend/src/hooks/useLoader.ts
@@ -0,0 +1,15 @@
+import { useStore } from '@/store';
+import * as actions from '@/store/action-types';
+
+export default () => {
+  const store = useStore();
+
+  return {
+    inc() {
+      store.dispatch(actions.INC_LOADING).then();
+    },
+    dec() {
+      store.dispatch(actions.DEC_LOADING).then();
+    },
+  };
+};
diff --git a/l2-frontend/src/hooks/useNotify.ts b/l2-frontend/src/hooks/useNotify.ts
new file mode 100644
index 0000000000..aac986fbfb
--- /dev/null
+++ b/l2-frontend/src/hooks/useNotify.ts
@@ -0,0 +1,17 @@
+import { getCurrentInstance } from 'vue';
+
+export default () => {
+  const root = getCurrentInstance().proxy.$root;
+
+  return {
+    error(message: string, timeout: number | void | null) {
+      root.$error(message, timeout);
+    },
+    info(message: string, timeout: number | void | null) {
+      root.$info(message, timeout);
+    },
+    ok(message: string, timeout: number | void | null) {
+      root.$ok(message, timeout);
+    },
+  };
+};
diff --git a/l2-frontend/src/layouts/TopBottomLayout.vue b/l2-frontend/src/layouts/TopBottomLayout.vue
index 478b4e3cd7..3b8b3335f6 100644
--- a/l2-frontend/src/layouts/TopBottomLayout.vue
+++ b/l2-frontend/src/layouts/TopBottomLayout.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="$style.root">
     <div
-      :class="$style.top"
+      :class="[$style.top, props.topScrollable && $style.scrollable]"
       :style="topStyle"
     >
       <slot name="top" />
@@ -20,9 +20,19 @@ import { computed } from 'vue';
 
 const props = withDefaults(defineProps<{
   topHeightPx?: number,
+  topPaddingPx?: number,
+  topScrollable?: boolean,
 }>(), { topHeightPx: 100 });
 
-const topStyle = computed(() => ({ height: `${props.topHeightPx}px` }));
+const topStyle = computed(() => {
+  const style = { height: `${props.topHeightPx}px` };
+
+  if (props.topPaddingPx) {
+    style.padding = `${props.topPaddingPx}px`;
+  }
+
+  return style;
+});
 const bottomStyle = computed(() => ({ top: topStyle.value.height }));
 </script>
 
@@ -44,6 +54,12 @@ const bottomStyle = computed(() => ({ top: topStyle.value.height }));
 .top {
   border-bottom: 1px solid #646d78;
   top: 0;
+
+  &.scrollable {
+    overflow-x: auto;
+    overflow-y: visible;
+    white-space: nowrap;
+  }
 }
 
 .bottom {
diff --git a/l2-frontend/src/layouts/TwoSidedLayout.vue b/l2-frontend/src/layouts/TwoSidedLayout.vue
index 2d08697d9f..70944e6e4f 100644
--- a/l2-frontend/src/layouts/TwoSidedLayout.vue
+++ b/l2-frontend/src/layouts/TwoSidedLayout.vue
@@ -3,13 +3,16 @@
     <div :class="$style.left">
       <slot name="left" />
     </div>
-    <div :class="$style.right">
+    <div :class="[$style.right, props.lightRight && $style.light]">
       <slot name="right" />
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
+const props = defineProps<{
+  lightRight?: boolean;
+}>();
 </script>
 
 <style module lang="scss">
@@ -22,6 +25,10 @@
   display: flex;
 }
 
+.light {
+  background: #fff;
+}
+
 .left, .right {
   height: 100%;
   position: relative;
diff --git a/l2-frontend/src/mainWithRouter.ts b/l2-frontend/src/mainWithRouter.ts
index 1a2dc58926..49c2b4d1b5 100644
--- a/l2-frontend/src/mainWithRouter.ts
+++ b/l2-frontend/src/mainWithRouter.ts
@@ -120,6 +120,7 @@ const router = new Router({
       meta: {
         title: 'Управление сотрудниками',
         groups: ['Конструктор: Настройка организации'],
+        fullPageLayout: true,
       },
     },
     {
@@ -245,6 +246,18 @@ const router = new Router({
         showExpertiseStatus: true,
       },
     },
+    {
+      path: '/ui/case-control',
+      name: 'cases',
+      component: () => import('@/pages/CaseControl/index.vue'),
+      meta: {
+        title: 'Случаи обслуживания',
+        fullPageLayout: true,
+        showPrintQueue: true,
+        groups: ['Врач параклиники', 'Врач консультаций'],
+        module: 'l2_case',
+      },
+    },
     {
       path: '/ui/search',
       name: 'search',
@@ -363,6 +376,7 @@ const router = new Router({
         ],
       },
     },
+    // DEPRECATED
     {
       path: '/ui/cases',
       name: 'cases',
diff --git a/l2-frontend/src/pages/CaseControl/Content/TopView.vue b/l2-frontend/src/pages/CaseControl/Content/TopView.vue
new file mode 100644
index 0000000000..d2971139e0
--- /dev/null
+++ b/l2-frontend/src/pages/CaseControl/Content/TopView.vue
@@ -0,0 +1,166 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
+import useLoader from '@/hooks/useLoader';
+import { menuItems } from '@/pages/CaseControl/Sidebar/menu';
+import DisplayDirection from '@/pages/Stationar/DisplayDirection.vue';
+import api from '@/api';
+
+// eslint-disable-next-line no-spaced-func,func-call-spacing
+const emit = defineEmits<{
+  (e: 'open-direction', id: number): void
+  (e: 'close-view', view: string): void
+}>();
+const props = defineProps<{
+  caseId?: number | null;
+  view?: string | null;
+  selectedDirection?: number | null;
+}>();
+
+const loader = useLoader();
+const mainItem = computed(() => menuItems[props.view]);
+const directions = ref<any[]>([]);
+
+watch([() => props.view, () => props.caseId], async () => {
+  if (!props.caseId || !props.view) {
+    return;
+  }
+  loader.inc();
+  const { rows } = await api('cases/directions-by-key', { caseId: props.caseId, view: props.view });
+  directions.value = rows;
+  loader.dec();
+}, {
+  immediate: true,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const printAll = () => {
+};
+const close = () => {
+  emit('close-view');
+};
+const openDirection = (id: number) => {
+  emit('open-direction', id);
+};
+</script>
+
+<template>
+  <div v-frag>
+    <div :class="[$style.block, $style.title]">
+      <span>
+        {{ mainItem }}
+        <br>
+        <a
+          href="#"
+          class="a-under"
+          @click.prevent="printAll"
+        ><i class="fa fa-print" /> результатов</a>
+      </span>
+      <i
+        class="fa fa-times"
+        :class="$style.topRight"
+        @click="close"
+      />
+    </div>
+    <div
+      v-for="d in directions"
+      :key="d.pk"
+      :class="[
+        Boolean(d.totalConfirmed) && $style.confirmed,
+        props.selectedDirection === d.pk && $style.active,
+        $style.block,
+        $style.direction,
+      ]"
+      @click="openDirection(d.pk)"
+    >
+      <span>
+        <DisplayDirection :direction="d" />
+      </span>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'TopView',
+};
+</script>
+
+<style module lang="scss">
+.block {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+
+  span {
+    align-self: center;
+    display: inline-block;
+    text-align: center;
+  }
+
+  vertical-align: top;
+  height: 100%;
+  white-space: normal;
+  width: 130px;
+  padding: 3px;
+  margin-right: 3px;
+  border-radius: 3px;
+  border: 1px solid rgba(0, 0, 0, 0.14);
+  background: linear-gradient(to bottom, rgba(0, 0, 0, 0.01) 0%, rgba(0, 0, 0, 0.07) 100%);
+}
+
+.title {
+  position: relative;
+}
+
+.topRight {
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 3px;
+  color: lightgray;
+  cursor: pointer;
+
+  &:hover {
+    color: #000;
+  }
+}
+
+.direction {
+  cursor: pointer;
+  transition: all 0.2s cubic-bezier(0.25, 0.8, 0.25, 1);
+  position: relative;
+
+  span {
+    display: block;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+  }
+
+  &:hover {
+    z-index: 1;
+    transform: translateY(-1px);
+  }
+
+  &:not(.confirmed):hover {
+    box-shadow: 0 7px 14px rgba(0, 0, 0, 0.1), 0 5px 5px rgba(0, 0, 0, 0.12);
+  }
+
+  &.confirmed {
+    border-color: #049372;
+    background: linear-gradient(to bottom, #04937254 0%, #049372ba 100%);
+
+    &:hover {
+      box-shadow: 0 7px 14px #04937254, 0 5px 5px #049372ba;
+    }
+  }
+
+  &.active {
+    background-image: linear-gradient(#6c7a89, #56616c) !important;
+    color: #fff !important;
+  }
+}
+</style>
diff --git a/l2-frontend/src/pages/CaseControl/Content/index.vue b/l2-frontend/src/pages/CaseControl/Content/index.vue
new file mode 100644
index 0000000000..741b76f833
--- /dev/null
+++ b/l2-frontend/src/pages/CaseControl/Content/index.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+
+import TopBottomLayout from '@/layouts/TopBottomLayout.vue';
+import TopView from '@/pages/CaseControl/Content/TopView.vue';
+
+const props = defineProps<{
+  caseId?: number | null;
+  view?: string | null;
+  value?: number | null;
+}>();
+
+// eslint-disable-next-line no-spaced-func,func-call-spacing
+const emit = defineEmits<{
+  (e: 'input', value: number): void
+  (e: 'close-view'): void
+}>();
+
+const openedDirection = ref<number | null>(null);
+
+watch(() => props.view, () => {
+  openedDirection.value = null;
+});
+watch(() => props.caseId, () => {
+  openedDirection.value = null;
+});
+
+watch(() => props.value, () => {
+  openedDirection.value = props.value;
+});
+
+watch(openedDirection, () => {
+  emit('input', openedDirection.value);
+});
+
+const openDirection = pk => {
+  openedDirection.value = pk;
+};
+</script>
+
+<template>
+  <div>
+    <TopBottomLayout
+      v-if="props.caseId && props.view"
+      :top-height-px="80"
+      :top-padding-px="5"
+      top-scrollable
+    >
+      <template #top>
+        <TopView
+          :case-id="props.caseId"
+          :view="props.view"
+          :selected-direction="openedDirection"
+          @close-view="emit('close-view')"
+          @open-direction="openDirection"
+        />
+      </template>
+      <template #bottom>
+        {{ openedDirection }}
+      </template>
+    </TopBottomLayout>
+  </div>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'CaseContent',
+};
+</script>
+
+<style module lang="scss">
+
+</style>
diff --git a/l2-frontend/src/pages/CaseControl/Sidebar/AnamnesisView.vue b/l2-frontend/src/pages/CaseControl/Sidebar/AnamnesisView.vue
new file mode 100644
index 0000000000..5c4f357473
--- /dev/null
+++ b/l2-frontend/src/pages/CaseControl/Sidebar/AnamnesisView.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+
+import patientsPoint from '@/api/patients-point';
+import useLoader from '@/hooks/useLoader';
+import useNotify from '@/hooks/useNotify';
+import Modal from '@/ui-cards/Modal.vue';
+
+const props = defineProps<{
+  cardPk: number;
+}>();
+const loader = useLoader();
+const notify = useNotify();
+const isLoading = ref<boolean>(false);
+const isEditing = ref<boolean>(false);
+const anamnesisData = ref<any>({ text: '' });
+
+const loadAnamnesis = async () => {
+  isLoading.value = true;
+  anamnesisData.value = await patientsPoint.loadAnamnesis({ card_pk: props.cardPk, skipHistory: true, withPatient: true });
+  isLoading.value = false;
+};
+
+const editAnamnesis = async () => {
+  loader.inc();
+  anamnesisData.value = await patientsPoint.loadAnamnesis({ card_pk: props.cardPk, skipHistory: true, withPatient: true });
+  loader.dec();
+  isEditing.value = true;
+};
+
+const hideModalAnamnesisEdit = () => {
+  isEditing.value = false;
+};
+
+const saveAnamnesis = async () => {
+  loader.inc();
+  await patientsPoint.saveAnamnesis({ card_pk: props.cardPk, text: anamnesisData.value.text });
+  loader.dec();
+  hideModalAnamnesisEdit();
+  notify.ok('Сохранено');
+};
+</script>
+
+<template>
+  <div v-frag>
+    <a
+      v-tippy="{
+        placement: 'right',
+        arrow: true,
+        reactive: true,
+        popperOptions: {
+          modifiers: {
+            preventOverflow: {
+              boundariesElement: 'window',
+            },
+            hide: {
+              enabled: false,
+            },
+          },
+        },
+        interactive: true,
+        html: '#template-anamnesis',
+      }"
+      href="#"
+      class="a-under"
+      @show="loadAnamnesis"
+      @click.prevent="editAnamnesis"
+    >Анамнез жизни</a>
+
+    <div id="template-anamnesis">
+      <strong>Анамнез жизни</strong><br>
+      <span v-if="isLoading">загрузка...</span>
+      <pre
+        v-else
+        :class="$style.anamnesisText"
+      >{{ anamnesisData.text || 'нет данных' }}</pre>
+    </div>
+
+    <Modal
+      v-if="isEditing"
+      ref="modalAnamnesisEdit"
+      show-footer="true"
+      white-bg="true"
+      max-width="710px"
+      width="100%"
+      margin-left-right="auto"
+      margin-top
+      @close="hideModalAnamnesisEdit"
+    >
+      <span slot="header">Редактор анамнеза жизни – {{ anamnesisData.patient }}</span>
+      <div
+        slot="body"
+        style="min-height: 140px"
+        class="registry-body"
+      >
+        <textarea
+          v-model="anamnesisData.text"
+          rows="14"
+          class="form-control"
+          placeholder="Анамнез жизни"
+        />
+      </div>
+      <div slot="footer">
+        <div class="row">
+          <div class="col-xs-4">
+            <button
+              class="btn btn-primary-nb btn-blue-nb"
+              type="button"
+              @click="hideModalAnamnesisEdit"
+            >
+              Отмена
+            </button>
+          </div>
+          <div class="col-xs-4">
+            <button
+              class="btn btn-primary-nb btn-blue-nb"
+              type="button"
+              @click="saveAnamnesis"
+            >
+              Сохранить
+            </button>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<style module lang="scss">
+.anamnesisText {
+  padding: 5px;
+  text-align: left;
+  white-space: pre-wrap;
+  word-break: keep-all;
+  max-width: 600px;
+}
+</style>
diff --git a/l2-frontend/src/pages/CaseControl/Sidebar/SearchForm.vue b/l2-frontend/src/pages/CaseControl/Sidebar/SearchForm.vue
new file mode 100644
index 0000000000..bb573a39f5
--- /dev/null
+++ b/l2-frontend/src/pages/CaseControl/Sidebar/SearchForm.vue
@@ -0,0 +1,93 @@
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+
+import useNotify from '@/hooks/useNotify';
+import UrlData from '@/UrlData';
+
+const notify = useNotify();
+const q = ref<string>('');
+
+// eslint-disable-next-line no-spaced-func,func-call-spacing
+const emit = defineEmits<{
+  (e: 'search', q: string, onResult: (ok: boolean, message: string) => void): void
+}>();
+
+const onSearch = (pk?: string) => {
+  emit('search', pk || q.value, (ok, message) => {
+    if (!ok) {
+      notify.error(message || 'Ошибка');
+      UrlData.set(null);
+    } else {
+      notify.ok(message || 'Найдено');
+      UrlData.set({ pk: pk || q.value });
+      q.value = '';
+    }
+  });
+};
+
+onMounted(() => {
+  const storedData = UrlData.get();
+  console.log(storedData);
+  if (storedData && typeof storedData === 'object' && storedData.pk) {
+    onSearch(storedData.pk);
+  }
+});
+</script>
+
+<template>
+  <div :class="$style.form">
+    <input
+      v-model.trim.number="q"
+      type="text"
+      class="form-control"
+      autofocus
+      placeholder="Случай или направление"
+      @keyup.enter="onSearch()"
+    >
+    <button
+      class="btn btn-blue-nb"
+      :disabled="q === ''"
+      @click="onSearch()"
+    >
+      Поиск
+    </button>
+  </div>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'SearchForm',
+};
+</script>
+
+<style module lang="scss">
+.form {
+  flex: 0 0 34px;
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+  flex-wrap: nowrap;
+  justify-content: stretch;
+}
+</style>
+
+<style scoped lang="scss">
+.form-control,
+.btn {
+  align-self: stretch;
+  border: none;
+  border-radius: 0;
+}
+
+.form-control {
+  border-bottom: 1px solid #b1b1b1;
+  width: 226px !important;
+  flex: 2 226px;
+  min-width: 0;
+}
+
+.btn {
+  flex: 3 94px;
+  width: 94px;
+}
+</style>
diff --git a/l2-frontend/src/pages/CaseControl/Sidebar/index.vue b/l2-frontend/src/pages/CaseControl/Sidebar/index.vue
new file mode 100644
index 0000000000..2d22bf5834
--- /dev/null
+++ b/l2-frontend/src/pages/CaseControl/Sidebar/index.vue
@@ -0,0 +1,234 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+
+import SearchForm from '@/pages/CaseControl/Sidebar/SearchForm.vue';
+import AnamnesisView from '@/pages/CaseControl/Sidebar/AnamnesisView.vue';
+import useLoader from '@/hooks/useLoader';
+import useNotify from '@/hooks/useNotify';
+import api from '@/api';
+import { Patient } from '@/pages/CaseControl/types';
+import directionsPoint from '@/api/directions-point';
+
+import { menuItems } from './menu';
+
+const loader = useLoader();
+const notify = useNotify();
+
+const caseTitle = ref<string>('');
+const cancel = ref<boolean>(false);
+const direction = ref<number | null>(null);
+const openedPatient = ref<Patient | null>(null);
+const openedTree = ref<any | null>(null);
+const childResearch = ref<any | null>(null);
+const originalDirection = ref<any | null>(null);
+const counts = ref<Record<string, number>>({});
+
+// eslint-disable-next-line no-spaced-func,func-call-spacing
+const emit = defineEmits<{
+  (e: 'open-case', id: number): void
+  (e: 'open-direction', view: string, id: number): void
+  (e: 'open-view', view: string): void
+}>();
+
+const onSearch = async (q: string, onResult: (ok, message) => void) => {
+  loader.inc();
+  const { ok, message, data } = await api('cases/search', { q });
+  if (!ok) {
+    onResult(false, message || `${q}: не найдено`);
+  } else {
+    const { patient, tree } = data;
+    onResult(true, `Загружен случай ${data.direction}${Number(q) === data.direction ? '' : ` (поиск по направлению ${q})`}`);
+    if (message) {
+      notify.info(message);
+    }
+    caseTitle.value = data.caseTitle;
+    direction.value = data.direction;
+    cancel.value = data.cancel;
+    childResearch.value = data.childResearch;
+    openedPatient.value = patient;
+    openedTree.value = tree;
+    counts.value = data.counts;
+    originalDirection.value = data.originalDirection;
+    emit('open-case', data.direction);
+
+    if (data.originalDirection?.id) {
+      setTimeout(() => {
+        emit('open-direction', data.originalDirection.view, data.originalDirection.id);
+      }, 0);
+    }
+  }
+  loader.dec();
+};
+
+const toggleCancel = async () => {
+  loader.inc();
+  const { cancel: result } = await directionsPoint.cancelDirection({ pk: direction.value });
+  cancel.value = result;
+  loader.dec();
+};
+
+const openView = (view: string) => {
+  emit('open-view', view);
+};
+const openDirection = (view: string, id: number) => {
+  emit('open-direction', view, id);
+};
+</script>
+
+<template>
+  <div :class="$style.root">
+    <SearchForm @search="onSearch" />
+    <div
+      v-if="openedPatient"
+      :class="$style.sidebarContent"
+    >
+      <div :class="$style.innerCard">
+        {{ caseTitle }}
+        <del v-if="cancel"> {{ direction }}</del>
+        <span v-else> <code>{{ direction }}</code></span>
+        &nbsp;
+        <a
+          v-if="!cancel"
+          href="#"
+          :class="{ cancel_color: !cancel }"
+          class="a-under"
+          @click.prevent="toggleCancel"
+        >
+          Отменить
+        </a>
+        <a
+          v-if="cancel"
+          href="#"
+          :class="{ active_color: cancel }"
+          class="a-under"
+          @click.prevent="toggleCancel"
+        >
+          Вернуть
+        </a>
+      </div>
+      <div
+        v-if="childResearch"
+        :class="$style.innerCard"
+      >
+        Первичный приём случая:<br>
+        <a
+          href="#"
+          class="a-under"
+          @click.prevent="openDirection(originalDirection?.view || 'consultation', childResearch.direction)"
+        >
+          {{ childResearch.title }} ({{ childResearch.direction }})
+        </a>
+      </div>
+      <div
+        v-if="cancel"
+        :class="$style.innerCard"
+      >
+        <strong>Случай отменён</strong>
+      </div>
+      <div
+        :class="$style.innerCard"
+      >
+        <a
+          :href="`/ui/directions?card_pk=${openedPatient.cardPk}&base_pk=${openedPatient.base}`"
+          target="_blank"
+          class="a-under"
+        >
+          {{ openedPatient.fioWithAge }}
+        </a>
+      </div>
+      <div
+        :class="$style.innerCard"
+      >
+        <AnamnesisView :card-pk="openedPatient.cardPk" />
+      </div>
+      <div
+        v-for="(title, key) in menuItems"
+        :key="key"
+        :class="$style.sidebarBtnWrapper"
+      >
+        <button
+          class="btn btn-blue-nb"
+          :class="$style.sidebarBtn"
+          @click="openView(key)"
+        >
+          <span
+            v-if="Boolean(counts[key])"
+            :class="$style.counts"
+          >{{ counts[key] }} шт.</span> {{ title }}
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'CaseSidebar',
+};
+</script>
+
+<style module lang="scss">
+.root {
+  display: flex;
+  flex-direction: column;
+}
+
+.sidebarContent {
+  position: relative;
+  height: calc(100% - 34px);
+}
+
+.inner {
+  height: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+
+  &Card {
+    width: 100%;
+    background: #fff;
+    border-bottom: 1px solid #b1b1b1 !important;
+    padding: 4px 12px;
+
+    &Select {
+      font-size: 12px;
+      padding: 0;
+    }
+  }
+}
+
+.sidebarBtnWrapper {
+  display: flex;
+  flex-direction: row;
+
+  .sidebarBtn:first-child {
+    flex: 1 1 auto;
+  }
+}
+
+.sidebarBtn {
+  border-radius: 0;
+  text-align: left;
+
+  border-top: none !important;
+  border-right: none !important;
+  border-left: none !important;
+  padding: 0 12px;
+  height: 24px;
+
+  &:not(:hover):not(.colorBad) {
+    cursor: default;
+    background-color: rgba(#000, 0.02) !important;
+    color: #000;
+    border-bottom: 1px solid #b1b1b1 !important;
+  }
+}
+
+.colorBad {
+  background-color: lightblue !important;
+  color: #d35400;
+}
+
+.counts {
+  float: right;
+}
+</style>
diff --git a/l2-frontend/src/pages/CaseControl/Sidebar/menu.ts b/l2-frontend/src/pages/CaseControl/Sidebar/menu.ts
new file mode 100644
index 0000000000..441ec9c7ee
--- /dev/null
+++ b/l2-frontend/src/pages/CaseControl/Sidebar/menu.ts
@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/prefer-default-export
+export const menuItems = Object.freeze({
+  consultation: 'Консультации',
+  paraclinical: 'Параклинические',
+  laboratory: 'Лабораторные',
+  morfology: 'Морфология',
+  all: 'Показать всё',
+});
diff --git a/l2-frontend/src/pages/CaseControl/index.vue b/l2-frontend/src/pages/CaseControl/index.vue
new file mode 100644
index 0000000000..57773d7a59
--- /dev/null
+++ b/l2-frontend/src/pages/CaseControl/index.vue
@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+
+import TwoSidedLayout from '@/layouts/TwoSidedLayout.vue';
+import Sidebar from '@/pages/CaseControl/Sidebar/index.vue';
+import Content from '@/pages/CaseControl/Content/index.vue';
+
+const caseId = ref<number | null>(null);
+const view = ref<string | null>(null);
+const direction = ref<number | null>(null);
+
+watch(caseId, () => {
+  direction.value = null;
+  view.value = null;
+});
+</script>
+
+<template>
+  <TwoSidedLayout light-right>
+    <template #left>
+      <Sidebar
+        @open-case="id => caseId = id"
+        @open-view="v => view = v"
+        @open-direction="(v, d) => {view = v; direction = d;}"
+      />
+    </template>
+    <template #right>
+      <Content
+        v-model="direction"
+        :case-id="caseId"
+        :view="view"
+        @close-view="view = null"
+      />
+    </template>
+  </TwoSidedLayout>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'CaseControl',
+};
+</script>
diff --git a/l2-frontend/src/pages/CaseControl/types.ts b/l2-frontend/src/pages/CaseControl/types.ts
new file mode 100644
index 0000000000..6b0123c24e
--- /dev/null
+++ b/l2-frontend/src/pages/CaseControl/types.ts
@@ -0,0 +1,7 @@
+export type Patient = {
+    fioWithAge: string,
+    card: string,
+    base: number,
+    cardPk: number,
+    individualPk: number,
+};
diff --git a/l2-frontend/src/pages/EDS.vue b/l2-frontend/src/pages/EDS.vue
index 4124cb703e..b1d2db6fae 100644
--- a/l2-frontend/src/pages/EDS.vue
+++ b/l2-frontend/src/pages/EDS.vue
@@ -565,7 +565,7 @@ export default class EDS extends Vue {
   get certificatesDisplay() {
     return this.certificates.map(c => ({
       thumbprint: c.thumbprint,
-      name: convertSubjectNameToTitle(null, c.subjectName, c.name),
+      name: convertSubjectNameToTitle(null, c.subjectName),
     }));
   }
 
diff --git a/l2-frontend/src/registerHooks.ts b/l2-frontend/src/registerHooks.ts
index bd47d5a0b3..9a66191bd5 100644
--- a/l2-frontend/src/registerHooks.ts
+++ b/l2-frontend/src/registerHooks.ts
@@ -241,6 +241,10 @@ export default (instance: Vue): void => {
     instance.$root.$emit('msg', 'error', message, timeout);
   };
 
+  Vue.prototype.$info = (message, timeout: number | void | null) => {
+    instance.$root.$emit('msg', 'info', message, timeout);
+  };
+
   Vue.prototype.$ok = (message, timeout: number | void | null) => {
     instance.$root.$emit('msg', 'ok', message, timeout);
   };
diff --git a/l2-frontend/src/shims-vue.d.ts b/l2-frontend/src/shims-vue.d.ts
index 0cc42ed413..0a239055bb 100644
--- a/l2-frontend/src/shims-vue.d.ts
+++ b/l2-frontend/src/shims-vue.d.ts
@@ -12,6 +12,7 @@ declare module '*.vue' {
       $msg: (type, message, timeout?: number | void | null, payload: any | void) => void;
       $error: (message, timeout?: number | void | null) => void;
       $ok: (message, timeout?: number | void | null) => void;
+      $info: (message, timeout?: number | void | null) => void;
     }
   }
 
diff --git a/l2-frontend/src/ui-cards/EDSSignTitle.vue b/l2-frontend/src/ui-cards/EDSSignTitle.vue
index 2545903b8e..668fd36b12 100644
--- a/l2-frontend/src/ui-cards/EDSSignTitle.vue
+++ b/l2-frontend/src/ui-cards/EDSSignTitle.vue
@@ -46,7 +46,7 @@ export default {
           const cert = yield s1.Certificate;
           const sn = yield cert.SubjectName;
 
-          this.title = convertSubjectNameToTitle(null, sn, this.executor);
+          this.title = convertSubjectNameToTitle(null, sn);
         }).bind(this));
       });
     } catch (error) {
diff --git a/l2-frontend/src/ui-cards/EDSSigner.vue b/l2-frontend/src/ui-cards/EDSSigner.vue
index 76476f2b1b..70923675db 100644
--- a/l2-frontend/src/ui-cards/EDSSigner.vue
+++ b/l2-frontend/src/ui-cards/EDSSigner.vue
@@ -157,7 +157,7 @@ export default {
     certificatesDisplay() {
       return this.certificates.map(c => ({
         thumbprint: c.thumbprint,
-        name: convertSubjectNameToTitle(null, c.subjectName, c.name),
+        name: convertSubjectNameToTitle(null, c.subjectName),
       }));
     },
     isDocAllowedSign() {
diff --git a/l2-frontend/src/utils.ts b/l2-frontend/src/utils.ts
index 3c2ba8fa7f..4226306bf7 100644
--- a/l2-frontend/src/utils.ts
+++ b/l2-frontend/src/utils.ts
@@ -361,7 +361,7 @@ export const convertSubjectNameToCertObject = (subjectName: string): any => {
   return result;
 };
 
-export const convertSubjectNameToTitle = (object: any, subjectName: string | null, name: string) => {
+export const convertSubjectNameToTitle = (object: any, subjectName: string | null) => {
   const obj = object || convertSubjectNameToCertObject(subjectName);
 
   // eslint-disable-next-line no-console
diff --git a/utils/tree_directions_case.py b/utils/tree_directions_case.py
new file mode 100644
index 0000000000..bc0520e009
--- /dev/null
+++ b/utils/tree_directions_case.py
@@ -0,0 +1,391 @@
+from django.db import connection
+
+from laboratory.settings import TIME_ZONE
+from utils.db import namedtuplefetchall
+
+
+def root_direction(napravleniye):
+    """
+    парам: napravleniye
+
+    Вернуть корневой узел среди Направлений:
+    id-направления, дата создания, id-услуг(и) относящейся к данному направлению, уровень поиска. 1(корень)
+    в SQL:
+    nn - directions_napravleniya
+    ii - directions_issledovaniya
+    """
+
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """WITH RECURSIVE r AS (
+               SELECT nn.id, 
+               to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+               to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI:SS') as time_create,
+               nn.parent_case_id, 
+               ii.napravleniye_id,
+               ii.id, 1 AS level
+               FROM directions_issledovaniya ii 
+               LEFT JOIN directions_napravleniya nn 
+               ON ii.napravleniye_id=nn.id
+                   WHERE nn.id = %(num_direction)s
+               
+               UNION ALL
+              
+               SELECT n.id, 
+                      to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+                      to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI:SS') as time_create,
+                      n.parent_case_id,
+                      i.napravleniye_id,
+                      i.id, r.level + 1 AS level
+               FROM directions_issledovaniya i 
+               LEFT JOIN directions_napravleniya n 
+               ON i.napravleniye_id=n.id
+               JOIN r
+               ON r.parent_case_id = i.id
+            )
+            
+            SELECT * FROM r;""",
+            params={'num_direction': napravleniye, 'tz': TIME_ZONE},
+        )
+
+        row = cursor.fetchall()
+    return row
+
+
+def tree_direction(iss):
+    """
+    парам: услуга
+
+    Вернуть стуркутру Направлений:
+    id-направления, дата создания, id-услуг(и) относящейся к данному направлению, уровень поиска.
+    в SQL:
+    nn - directions_napravleniya
+    ii - directions_issledovaniya
+    """
+
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """WITH RECURSIVE r AS (
+            SELECT nn.id, 
+            to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+            to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI') as time_create,
+            nn.parent_case_id, 
+            ii.napravleniye_id,
+            ii.id as iss, 
+            to_char(ii.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_confirm, 
+            to_char(ii.time_confirmation AT TIME ZONE %(tz)s, 'HH24:MI') as time_confirm, 
+            ii.research_id, ddrr.title,
+            ii.diagnos, 1 AS level
+            FROM directions_issledovaniya ii 
+            LEFT JOIN directions_napravleniya nn 
+            ON ii.napravleniye_id=nn.id
+            LEFT JOIN directory_researches ddrr
+            ON ii.research_id = ddrr.id
+            
+            WHERE ii.id = %(num_issledovaniye)s
+            
+            UNION ALL
+            
+            SELECT n.id, 
+                  to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+                  to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI') as time_create,
+                  n.parent_case_id,
+                  i.napravleniye_id,
+                  i.id, 
+                  to_char(i.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_confirm, 
+                  to_char(i.time_confirmation AT TIME ZONE %(tz)s, 'HH24:MI') as time_confirm,
+                  i.research_id, dr.title,
+                  i.diagnos, 
+                  r.level + 1 AS level
+            FROM directions_issledovaniya i 
+            LEFT JOIN directions_napravleniya n 
+            ON i.napravleniye_id=n.id
+            LEFT JOIN directory_researches dr
+            ON i.research_id = dr.id
+            JOIN r
+            ON r.iss = n.parent_case_id
+            )
+            
+            SELECT * FROM r;""",
+            params={'num_issledovaniye': iss, 'tz': TIME_ZONE},
+        )
+
+        row = cursor.fetchall()
+    return row
+
+
+def hosp_tree_direction(iss):
+    """
+    парам: услуга
+
+    Вернуть стуркутру Направлений:
+    id-направления, дата создания, id-услуг(и) относящейся к данному направлению, уровень поиска.
+    в SQL:
+    nn - directions_napravleniya
+    ii - directions_issledovaniya
+    """
+
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """WITH RECURSIVE r AS (
+            SELECT nn.id, 
+            to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+            to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI') as time_create,
+            nn.parent_case_id, 
+            ii.napravleniye_id,
+            ii.id as iss, 
+            to_char(ii.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_confirm, 
+            to_char(ii.time_confirmation AT TIME ZONE %(tz)s, 'HH24:MI') as time_confirm, 
+            ii.research_id, 
+            ddrr.title,
+            ii.diagnos, 1 AS level, 
+            ddrr.short_title,
+            ddrr.is_case,
+            nn.cancel
+            FROM directions_issledovaniya ii 
+            LEFT JOIN directions_napravleniya nn 
+            ON ii.napravleniye_id=nn.id
+            LEFT JOIN directory_researches ddrr
+            ON ii.research_id = ddrr.id
+
+            WHERE ii.id = %(num_issledovaniye)s
+
+            UNION ALL
+
+            SELECT n.id, 
+                  to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+                  to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI') as time_create,
+                  n.parent_case_id,
+                  i.napravleniye_id,
+                  i.id, 
+                  to_char(i.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_confirm, 
+                  to_char(i.time_confirmation AT TIME ZONE %(tz)s, 'HH24:MI') as time_confirm,
+                  i.research_id, 
+                  dr.title,
+                  i.diagnos, 
+                  r.level + 1 AS level, 
+                  dr.short_title,
+                  dr.is_case,
+                  n.cancel
+            FROM directions_issledovaniya i 
+            LEFT JOIN directions_napravleniya n 
+            ON i.napravleniye_id=n.id
+            LEFT JOIN directory_researches dr
+            ON i.research_id = dr.id
+            JOIN r
+            ON r.iss = n.parent_case_id
+            )
+
+            SELECT * FROM r WHERE r.is_case = TRUE;""",
+            params={'num_issledovaniye': iss, 'tz': TIME_ZONE},
+        )
+
+        row = cursor.fetchall()
+    return row
+
+
+def hospital_get_direction(iss, main_research, hosp_site_type, hosp_is_paraclinic, hosp_is_doc_refferal, hosp_is_lab, hosp_is_hosp, hosp_level, hosp_is_all, hosp_morfology):
+    """
+    парам: услуга
+    Вернуть стуркутру в след порядке:
+    num_dir, date_creat, time_create, parent_iss, num_dir,
+    issled_id, date_confirm, time_confirm, id_research, title_research,
+    diagnos, Level-подчинения, id_research, id_podrazde, is_paraclinic,
+    is_doc, is_stom, is_case, is_micrbiology, title_podr,
+    p_type_podr, site_type_hospital, slave_research_id
+    в SQL:
+    nn - directions_napravleniya
+    ii - directions_issledovaniya
+    """
+
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """WITH RECURSIVE r AS (
+            SELECT nn.id,
+            to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+            to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI') as time_create,
+            nn.parent_case_id, nn.cancel,
+            ii.napravleniye_id,
+            ii.id as iss, 
+            to_char(ii.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_confirm, 
+            to_char(ii.time_confirmation AT TIME ZONE %(tz)s, 'HH24:MI') as time_confirm, 
+            ii.research_id, ddrr.title, ddrr.short_title,
+            ii.diagnos, 1 AS level
+            FROM directions_issledovaniya ii 
+            LEFT JOIN directions_napravleniya nn 
+            ON ii.napravleniye_id=nn.id
+            LEFT JOIN directory_researches ddrr
+            ON ii.research_id = ddrr.id
+            WHERE ii.id = %(num_issledovaniye)s
+            UNION ALL
+            SELECT n.id, 
+                  to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+                  to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI') as time_create,
+                  n.parent_case_id, n.cancel,
+                  i.napravleniye_id,
+                  i.id, 
+                  to_char(i.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_confirm, 
+                  to_char(i.time_confirmation AT TIME ZONE %(tz)s, 'HH24:MI') as time_confirm,
+                  i.research_id, dr.title, dr.short_title,
+                  i.diagnos, 
+                  r.level + 1 AS level
+            FROM directions_issledovaniya i 
+            LEFT JOIN directions_napravleniya n 
+            ON i.napravleniye_id=n.id
+            LEFT JOIN directory_researches dr
+            ON i.research_id = dr.id
+            JOIN r
+            ON r.iss = n.parent_case_id
+            ),
+            
+            t_podrazdeleniye AS (SELECT podrazdeleniya_podrazdeleniya.id, title, p_type FROM podrazdeleniya_podrazdeleniya),
+            
+            t_research AS (SELECT directory_researches.id as research_iddir, podrazdeleniye_id, is_paraclinic, is_doc_refferal, 
+            is_stom, is_case, is_microbiology, is_slave_hospital, is_citology, is_gistology, t_podrazdeleniye.title as podr_title, 
+            t_podrazdeleniye.p_type FROM directory_researches
+                LEFT JOIN t_podrazdeleniye ON t_podrazdeleniye.id = directory_researches.podrazdeleniye_id),
+
+            t_hospital_service AS (SELECT site_type, slave_research_id FROM directory_hospitalservice
+            WHERE 
+              CASE 
+               WHEN %(hosp_level)s > -1 THEN 
+                    EXISTS (SELECT id FROM r)
+               WHEN %(hosp_level)s = -1 THEN 
+                  EXISTS (SELECT id FROM r)
+              END),
+            
+            t_all AS (SELECT * FROM r
+            LEFT JOIN t_research ON r.research_id = t_research.research_iddir
+            LEFT JOIN t_hospital_service ON r.research_id = t_hospital_service.slave_research_id
+            WHERE 
+            CASE when %(hosp_site_type)s > -1 THEN 
+            site_type = %(hosp_site_type)s
+            when %(hosp_is_paraclinic)s = TRUE THEN
+            is_paraclinic = true and site_type is NULL
+            when %(hosp_is_hosp)s = TRUE THEN
+            is_case = true and site_type is NULL
+            when %(hosp_is_doc_refferal)s = TRUE THEN
+            is_doc_refferal = true and site_type is NULL
+            when %(hosp_morfology)s = TRUE THEN
+            (is_microbiology = true or is_citology = true or is_gistology = true) and site_type is NULL
+            when %(hosp_is_lab)s = TRUE THEN
+            is_paraclinic = FALSE and is_doc_refferal = FALSE and is_stom = FALSE and is_case = FALSE and is_microbiology = FALSE 
+                and is_citology = FALSE and is_gistology = FALSE and site_type is NULL AND is_slave_hospital = FALSE
+            when %(hosp_site_type)s = -1 and %(hosp_is_all)s = TRUE THEN
+                EXISTS (SELECT id FROM r)
+            END       
+
+            ORDER BY napravleniye_id, p_type, site_type)
+
+            SELECT DISTINCT "id", date_create, time_create, parent_case_id, napravleniye_id, iss, date_confirm, time_confirm, research_id, title,
+            diagnos, "level", research_iddir, podrazdeleniye_id, is_paraclinic, is_doc_refferal, is_stom, is_case, 
+            is_microbiology, podr_title, p_type, site_type, slave_research_id, short_title, is_slave_hospital, cancel, is_citology, is_gistology FROM t_all WHERE 
+                CASE 
+                WHEN %(hosp_level)s > -1 THEN 
+                    level = %(hosp_level)s
+                WHEN %(hosp_level)s = -1 THEN 
+                EXISTS (SELECT id FROM r)
+                END
+            ORDER BY napravleniye_id
+           ;""",
+            params={
+                'num_issledovaniye': iss,
+                'main_research': main_research,
+                'hosp_site_type': hosp_site_type,
+                'hosp_is_paraclinic': hosp_is_paraclinic,
+                'hosp_is_doc_refferal': hosp_is_doc_refferal,
+                'hosp_is_lab': hosp_is_lab,
+                'hosp_is_hosp': hosp_is_hosp,
+                'hosp_level': hosp_level,
+                'hosp_is_all': hosp_is_all,
+                'hosp_morfology': hosp_morfology,
+                'tz': TIME_ZONE,
+            },
+        )
+        row = cursor.fetchall()
+    return row
+
+
+def get_research_by_dir(numdir):
+    """Выход стр-ра:
+    issledovaniya.id - для последующего поиска подчинений по исследованию
+    directions_issledovaniya.research_id - является main_research
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """
+            SELECT directions_issledovaniya.id, directions_issledovaniya.research_id 
+            FROM directions_issledovaniya where napravleniye_id = %(num_dir)s
+            """,
+            params={'num_dir': numdir},
+        )
+
+        row = cursor.fetchall()
+    return row
+
+
+def expertise_tree_direction(iss):
+    """
+    парам: услуга
+
+    Вернуть стуркутру Направлений:
+    id-направления, дата создания, id-услуг(и) относящейся к данному направлению, уровень поиска.
+    в SQL:
+    nn - directions_napravleniya
+    ii - directions_issledovaniya
+    """
+
+    with connection.cursor() as cursor:
+        cursor.execute(
+            """WITH RECURSIVE r AS (
+            SELECT nn.id, 
+            to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+            to_char(nn.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI') as time_create,
+            nn.parent_case_id, 
+            ii.napravleniye_id,
+            ii.id as iss, 
+            to_char(ii.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_confirm, 
+            to_char(ii.time_confirmation AT TIME ZONE %(tz)s, 'HH24:MI') as time_confirm, 
+            ii.research_id, 
+            ddrr.title,
+            ii.diagnos, 
+            1 AS level,
+            ddrr.is_expertise
+            FROM directions_issledovaniya ii 
+            LEFT JOIN directions_napravleniya nn
+            ON ii.napravleniye_id=nn.id
+            LEFT JOIN directory_researches ddrr
+            ON ii.research_id = ddrr.id
+
+            WHERE ii.id = %(num_issledovaniye)s
+
+            UNION ALL
+
+            SELECT n.id, 
+                  to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_create,
+                  to_char(n.data_sozdaniya AT TIME ZONE %(tz)s, 'HH24:MI') as time_create,
+                  n.parent_case_id,
+                  i.napravleniye_id,
+                  i.id, 
+                  to_char(i.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') as date_confirm, 
+                  to_char(i.time_confirmation AT TIME ZONE %(tz)s, 'HH24:MI') as time_confirm,
+                  i.research_id, 
+                  dr.title,
+                  i.diagnos, 
+                  r.level + 1 AS level,
+                  dr.is_expertise
+            FROM directions_issledovaniya i 
+            LEFT JOIN directions_napravleniya n 
+            ON i.napravleniye_id=n.id
+            LEFT JOIN directory_researches dr
+            ON i.research_id = dr.id
+            JOIN r
+            ON r.iss = n.parent_case_id
+            )
+
+            SELECT * FROM r;""",
+            params={'num_issledovaniye': iss, 'tz': TIME_ZONE},
+        )
+
+        rows = namedtuplefetchall(cursor)
+    return rows

From 288c71a67885cc198e64ad35121e69c7a3fc3ac2 Mon Sep 17 00:00:00 2001
From: Mikhail Privalov <n5250@ya.ru>
Date: Sun, 8 Oct 2023 00:50:22 +0300
Subject: [PATCH 36/38] History case link

---
 .../src/ui-cards/DirectionsHistory/index.vue       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/l2-frontend/src/ui-cards/DirectionsHistory/index.vue b/l2-frontend/src/ui-cards/DirectionsHistory/index.vue
index f900d57ab7..59f4e0d713 100644
--- a/l2-frontend/src/ui-cards/DirectionsHistory/index.vue
+++ b/l2-frontend/src/ui-cards/DirectionsHistory/index.vue
@@ -84,7 +84,10 @@
             <th class="text-center">
               Дата
             </th>
-            <th v-if="active_type !== 5 && active_type !== 6">
+            <th v-if="active_type === 7">
+              № случ.
+            </th>
+            <th v-else-if="active_type !== 5 && active_type !== 6">
               № напр.
             </th>
             <th v-else-if="active_type === 5">
@@ -169,6 +172,15 @@
                   {{ row.pk }}
                 </a>
               </span>
+              <span v-else-if="active_type === 7">
+                <a
+                  :href="`/ui/case-control#{%22pk%22:${row.pk}}`"
+                  target="_blank"
+                  class="a-under"
+                >
+                  {{ row.pk }}
+                </a>
+              </span>
               <span v-else>{{ row.pk }}</span>
               <span v-if="row.has_aux">
                 <AuxResearch

From 80d83e4fb25eb1cbe904ae99e763740d1c45dd83 Mon Sep 17 00:00:00 2001
From: Mikhail Privalov <n5250@ya.ru>
Date: Sun, 8 Oct 2023 03:08:30 +0300
Subject: [PATCH 37/38] case directions ui

---
 api/directions/views.py                       |  1 +
 directions/models.py                          |  8 ++++
 l2-frontend/src/hooks/useOn.ts                |  7 +++
 .../src/pages/CaseControl/Content/TopView.vue | 22 +++++----
 .../src/pages/CaseControl/Content/index.vue   | 42 ++++++++++------
 .../pages/CaseControl/Sidebar/SearchForm.vue  | 13 +++--
 .../src/pages/CaseControl/Sidebar/index.vue   | 48 ++++++++++++++-----
 l2-frontend/src/pages/CaseControl/index.vue   | 35 ++++++++++----
 l2-frontend/src/pages/ResultsParaclinic.vue   | 37 ++++++++++++--
 .../src/ui-cards/SelectedResearches.vue       | 13 ++++-
 10 files changed, 172 insertions(+), 54 deletions(-)
 create mode 100644 l2-frontend/src/hooks/useOn.ts

diff --git a/api/directions/views.py b/api/directions/views.py
index 97580240d1..4cec30e353 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -166,6 +166,7 @@ def directions_generate(request):
             hospital_override=p.get("hospital_override", -1),
             price_category=p.get("priceCategory", -1),
             case_id=p.get("caseId", -2),
+            case_by_direction=p.get("caseByDirection", -2),
         )
         for _ in range(p.get("directions_count", 1)):
             rc = Napravleniya.gen_napravleniya_by_issledovaniya(*args, **kwargs)
diff --git a/directions/models.py b/directions/models.py
index 51e44df223..d5e49845bf 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -1292,8 +1292,16 @@ def gen_napravleniya_by_issledovaniya(
         services_by_additional_order_num=None,
         price_name=None,
         case_id=-2,
+        case_by_direction=False,
     ):
         result = {"r": False, "list_id": [], "list_stationar_id": [], "messageLimit": ""}
+        if case_id > -1 and case_by_direction:
+            iss = Napravleniya.objects.get(pk=case_id).issledovaniya_set.all().first()
+            if iss:
+                case_id = iss.pk
+            else:
+                result["message"] = "Ошибка привязки к случаю"
+                return result
         if not Clients.Card.objects.filter(pk=client_id).exists():
             result["message"] = "Карта в базе не зарегистрирована, попробуйте выполнить поиск заново"
             return result
diff --git a/l2-frontend/src/hooks/useOn.ts b/l2-frontend/src/hooks/useOn.ts
new file mode 100644
index 0000000000..936c215e35
--- /dev/null
+++ b/l2-frontend/src/hooks/useOn.ts
@@ -0,0 +1,7 @@
+import { getCurrentInstance } from 'vue';
+
+export default (event: string, callback: () => void) => {
+  const root = getCurrentInstance().proxy.$root;
+
+  root.$on(event, callback);
+};
diff --git a/l2-frontend/src/pages/CaseControl/Content/TopView.vue b/l2-frontend/src/pages/CaseControl/Content/TopView.vue
index d2971139e0..523e832c07 100644
--- a/l2-frontend/src/pages/CaseControl/Content/TopView.vue
+++ b/l2-frontend/src/pages/CaseControl/Content/TopView.vue
@@ -2,26 +2,27 @@
 import { computed, ref, watch } from 'vue';
 
 import useLoader from '@/hooks/useLoader';
+import useOn from '@/hooks/useOn';
 import { menuItems } from '@/pages/CaseControl/Sidebar/menu';
 import DisplayDirection from '@/pages/Stationar/DisplayDirection.vue';
 import api from '@/api';
 
 // eslint-disable-next-line no-spaced-func,func-call-spacing
 const emit = defineEmits<{
-  (e: 'open-direction', id: number): void
-  (e: 'close-view', view: string): void
+  (e: 'input', value: number): void
+  (e: 'close-view'): void
 }>();
 const props = defineProps<{
   caseId?: number | null;
   view?: string | null;
-  selectedDirection?: number | null;
+  value?: number | null;
 }>();
 
 const loader = useLoader();
 const mainItem = computed(() => menuItems[props.view]);
 const directions = ref<any[]>([]);
 
-watch([() => props.view, () => props.caseId], async () => {
+const loadDirections = async () => {
   if (!props.caseId || !props.view) {
     return;
   }
@@ -29,10 +30,15 @@ watch([() => props.view, () => props.caseId], async () => {
   const { rows } = await api('cases/directions-by-key', { caseId: props.caseId, view: props.view });
   directions.value = rows;
   loader.dec();
-}, {
+};
+
+watch([() => props.view, () => props.caseId], loadDirections, {
   immediate: true,
 });
 
+useOn('result-saved', loadDirections);
+useOn('researches-picker:directions_createdcd', loadDirections);
+
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 const printAll = () => {
 };
@@ -40,7 +46,7 @@ const close = () => {
   emit('close-view');
 };
 const openDirection = (id: number) => {
-  emit('open-direction', id);
+  emit('input', id);
 };
 </script>
 
@@ -66,8 +72,8 @@ const openDirection = (id: number) => {
       v-for="d in directions"
       :key="d.pk"
       :class="[
-        Boolean(d.totalConfirmed) && $style.confirmed,
-        props.selectedDirection === d.pk && $style.active,
+        Boolean(d.confirm) && $style.confirmed,
+        props.value === d.pk && $style.active,
         $style.block,
         $style.direction,
       ]"
diff --git a/l2-frontend/src/pages/CaseControl/Content/index.vue b/l2-frontend/src/pages/CaseControl/Content/index.vue
index 741b76f833..4b7e283532 100644
--- a/l2-frontend/src/pages/CaseControl/Content/index.vue
+++ b/l2-frontend/src/pages/CaseControl/Content/index.vue
@@ -3,6 +3,8 @@ import { ref, watch } from 'vue';
 
 import TopBottomLayout from '@/layouts/TopBottomLayout.vue';
 import TopView from '@/pages/CaseControl/Content/TopView.vue';
+import ResultsParaclinic from '@/pages/ResultsParaclinic.vue';
+import UrlData from '@/UrlData';
 
 const props = defineProps<{
   caseId?: number | null;
@@ -18,24 +20,30 @@ const emit = defineEmits<{
 
 const openedDirection = ref<number | null>(null);
 
-watch(() => props.view, () => {
-  openedDirection.value = null;
-});
-watch(() => props.caseId, () => {
-  openedDirection.value = null;
-});
+const updateData = () => {
+  UrlData.set({ pk: props.caseId, childrenDirection: openedDirection.value, view: props.view });
+};
 
 watch(() => props.value, () => {
-  openedDirection.value = props.value;
+  const pk = props.value;
+  setTimeout(() => {
+    openedDirection.value = pk;
+  }, 10);
+}, {
+  immediate: true,
 });
 
-watch(openedDirection, () => {
-  emit('input', openedDirection.value);
+watch(() => props.view, (prevView) => {
+  if (prevView) {
+    openedDirection.value = null;
+  }
+  updateData();
 });
 
-const openDirection = pk => {
-  openedDirection.value = pk;
-};
+watch(() => openedDirection.value, () => {
+  emit('input', openedDirection.value);
+  updateData();
+});
 </script>
 
 <template>
@@ -48,15 +56,19 @@ const openDirection = pk => {
     >
       <template #top>
         <TopView
+          v-model="openedDirection"
           :case-id="props.caseId"
           :view="props.view"
-          :selected-direction="openedDirection"
           @close-view="emit('close-view')"
-          @open-direction="openDirection"
         />
       </template>
       <template #bottom>
-        {{ openedDirection }}
+        <ResultsParaclinic
+          v-if="openedDirection"
+          :key="openedDirection"
+          :direction-id-to-open="openedDirection"
+          :case-id="props.caseId"
+        />
       </template>
     </TopBottomLayout>
   </div>
diff --git a/l2-frontend/src/pages/CaseControl/Sidebar/SearchForm.vue b/l2-frontend/src/pages/CaseControl/Sidebar/SearchForm.vue
index bb573a39f5..ea82b751b6 100644
--- a/l2-frontend/src/pages/CaseControl/Sidebar/SearchForm.vue
+++ b/l2-frontend/src/pages/CaseControl/Sidebar/SearchForm.vue
@@ -19,7 +19,9 @@ const onSearch = (pk?: string) => {
       UrlData.set(null);
     } else {
       notify.ok(message || 'Найдено');
-      UrlData.set({ pk: pk || q.value });
+      if (!pk) {
+        UrlData.set({ pk: pk || q.value });
+      }
       q.value = '';
     }
   });
@@ -27,9 +29,12 @@ const onSearch = (pk?: string) => {
 
 onMounted(() => {
   const storedData = UrlData.get();
-  console.log(storedData);
-  if (storedData && typeof storedData === 'object' && storedData.pk) {
-    onSearch(storedData.pk);
+  if (storedData && typeof storedData === 'object') {
+    if (storedData.childrenDirection) {
+      onSearch(storedData.childrenDirection);
+    } else if (storedData.pk) {
+      onSearch(storedData.pk);
+    }
   }
 });
 </script>
diff --git a/l2-frontend/src/pages/CaseControl/Sidebar/index.vue b/l2-frontend/src/pages/CaseControl/Sidebar/index.vue
index 2d22bf5834..2cd4375bd3 100644
--- a/l2-frontend/src/pages/CaseControl/Sidebar/index.vue
+++ b/l2-frontend/src/pages/CaseControl/Sidebar/index.vue
@@ -3,6 +3,7 @@ import { ref } from 'vue';
 
 import SearchForm from '@/pages/CaseControl/Sidebar/SearchForm.vue';
 import AnamnesisView from '@/pages/CaseControl/Sidebar/AnamnesisView.vue';
+import useOn from '@/hooks/useOn';
 import useLoader from '@/hooks/useLoader';
 import useNotify from '@/hooks/useNotify';
 import api from '@/api';
@@ -26,18 +27,15 @@ const counts = ref<Record<string, number>>({});
 // eslint-disable-next-line no-spaced-func,func-call-spacing
 const emit = defineEmits<{
   (e: 'open-case', id: number): void
-  (e: 'open-direction', view: string, id: number): void
+  (e: 'open-direction', data: {case: number, view: string, id: number}): void
   (e: 'open-view', view: string): void
 }>();
 
-const onSearch = async (q: string, onResult: (ok, message) => void) => {
+const loadData = async (q?: string) => {
   loader.inc();
-  const { ok, message, data } = await api('cases/search', { q });
-  if (!ok) {
-    onResult(false, message || `${q}: не найдено`);
-  } else {
+  const { ok, message, data } = await api('cases/search', { q: q || direction.value });
+  if (ok) {
     const { patient, tree } = data;
-    onResult(true, `Загружен случай ${data.direction}${Number(q) === data.direction ? '' : ` (поиск по направлению ${q})`}`);
     if (message) {
       notify.info(message);
     }
@@ -49,17 +47,39 @@ const onSearch = async (q: string, onResult: (ok, message) => void) => {
     openedTree.value = tree;
     counts.value = data.counts;
     originalDirection.value = data.originalDirection;
-    emit('open-case', data.direction);
+  }
+  loader.dec();
+
+  return { ok, message, data };
+};
+
+const onSearch = async (q: string, onResult: (ok, message) => void) => {
+  const { ok, message, data } = await loadData(q);
+  if (!ok) {
+    onResult(false, message || `${q}: не найдено`);
+  } else {
+    onResult(true, `Загружен случай ${direction.value}${Number(q) === direction.value ? '' : ` (поиск по направлению ${q})`}`);
+    if (message) {
+      notify.info(message);
+    }
 
-    if (data.originalDirection?.id) {
+    if (data.originalDirection?.id && data.originalDirection?.open) {
       setTimeout(() => {
-        emit('open-direction', data.originalDirection.view, data.originalDirection.id);
+        emit('open-direction', {
+          case: data.direction,
+          view: data.originalDirection.view,
+          id: data.originalDirection.id,
+        });
       }, 0);
+    } else {
+      emit('open-case', direction.value);
     }
   }
-  loader.dec();
 };
 
+useOn('result-saved', loadData);
+useOn('researches-picker:directions_createdcd', loadData);
+
 const toggleCancel = async () => {
   loader.inc();
   const { cancel: result } = await directionsPoint.cancelDirection({ pk: direction.value });
@@ -71,7 +91,11 @@ const openView = (view: string) => {
   emit('open-view', view);
 };
 const openDirection = (view: string, id: number) => {
-  emit('open-direction', view, id);
+  emit('open-direction', {
+    case: direction.value,
+    view,
+    id,
+  });
 };
 </script>
 
diff --git a/l2-frontend/src/pages/CaseControl/index.vue b/l2-frontend/src/pages/CaseControl/index.vue
index 57773d7a59..c7acd5330e 100644
--- a/l2-frontend/src/pages/CaseControl/index.vue
+++ b/l2-frontend/src/pages/CaseControl/index.vue
@@ -4,24 +4,43 @@ import { ref, watch } from 'vue';
 import TwoSidedLayout from '@/layouts/TwoSidedLayout.vue';
 import Sidebar from '@/pages/CaseControl/Sidebar/index.vue';
 import Content from '@/pages/CaseControl/Content/index.vue';
+import UrlData from '@/UrlData';
 
-const caseId = ref<number | null>(null);
-const view = ref<string | null>(null);
-const direction = ref<number | null>(null);
+let initialView = null;
+let initialDirection = null;
+let initialCase = null;
 
-watch(caseId, () => {
-  direction.value = null;
-  view.value = null;
+const storedData = UrlData.get();
+if (storedData && typeof storedData === 'object') {
+  initialView = storedData.view || null;
+  initialDirection = storedData.childrenDirection || null;
+  initialCase = storedData.pk || null;
+}
+
+const caseId = ref<number | null>(initialCase);
+const view = ref<string | null>(initialView);
+const direction = ref<number | null>(initialDirection);
+const inited = ref<boolean>(!initialCase && !initialDirection);
+
+watch(() => caseId.value, () => {
+  if (inited.value) {
+    direction.value = null;
+    view.value = null;
+  } else {
+    inited.value = true;
+  }
 });
 </script>
 
 <template>
-  <TwoSidedLayout light-right>
+  <TwoSidedLayout
+    light-right
+  >
     <template #left>
       <Sidebar
         @open-case="id => caseId = id"
         @open-view="v => view = v"
-        @open-direction="(v, d) => {view = v; direction = d;}"
+        @open-direction="({case: c, view: v, id}) => {caseId = c; view = v; direction = id;}"
       />
     </template>
     <template #right>
diff --git a/l2-frontend/src/pages/ResultsParaclinic.vue b/l2-frontend/src/pages/ResultsParaclinic.vue
index 36496b3f73..0306ad495c 100644
--- a/l2-frontend/src/pages/ResultsParaclinic.vue
+++ b/l2-frontend/src/pages/ResultsParaclinic.vue
@@ -1160,7 +1160,7 @@
             </div>
           </div>
           <div
-            v-if="row.children_directions && row.children_directions.length > 0"
+            v-if="!directionFormProps && row.children_directions && row.children_directions.length > 0"
             class="group"
           >
             <div class="group-title">
@@ -1607,6 +1607,8 @@
               :parent_iss="create_directions_for"
               :clear_after_gen="true"
               style="border-top: 1px solid #eaeaea; border-bottom: 1px solid #eaeaea"
+              :parent-case="caseId"
+              :case-by-direction="true"
             />
           </div>
         </div>
@@ -1863,6 +1865,16 @@ export default {
 
     next();
   },
+  props: {
+    directionIdToOpen: {
+      type: Number,
+      required: false,
+    },
+    caseId: {
+      type: Number,
+      required: false,
+    },
+  },
   data() {
     return {
       pk: '',
@@ -1929,6 +1941,9 @@ export default {
     };
   },
   computed: {
+    directionFormProps() {
+      return !!this.directionIdToOpen;
+    },
     currentYear() {
       return moment(this.currentDate).format('YYYY');
     },
@@ -2190,6 +2205,10 @@ export default {
       },
     },
     navState() {
+      if (this.directionFormProps) {
+        return;
+      }
+
       if (this.inited) {
         UrlData.set(this.navState);
       }
@@ -2221,7 +2240,11 @@ export default {
     });
 
     const storedData = UrlData.get();
-    if (storedData && typeof storedData === 'object' && storedData.pk) {
+    if (this.directionFormProps) {
+      this.load_pk(this.directionIdToOpen).then(() => {
+        this.inited = true;
+      });
+    } else if (storedData && typeof storedData === 'object' && storedData.pk) {
       this.load_pk(storedData.pk).then(() => {
         this.inited = true;
       });
@@ -2243,8 +2266,8 @@ export default {
     });
 
     const urlParams = new URLSearchParams(window.location.search);
-    this.embedded = urlParams.get('embedded') === '1';
-    this.embeddedFull = urlParams.get('embeddedFull') === '1';
+    this.embedded = !!this.directionIdToOpen || urlParams.get('embedded') === '1';
+    this.embeddedFull = !!this.directionIdToOpen || urlParams.get('embeddedFull') === '1';
     window.$(window).on('beforeunload', this.unload);
 
     try {
@@ -2328,7 +2351,7 @@ export default {
       }
     },
     unload() {
-      if (!this.has_changed) {
+      if (!this.has_changed || this.directionFormProps) {
         return undefined;
       }
 
@@ -2493,6 +2516,9 @@ export default {
         });
     },
     load_history() {
+      if (this.directionFormProps) {
+        return;
+      }
       this.directions_history = [];
       this.$store.dispatch(actions.INC_LOADING);
       directionsPoint
@@ -2646,6 +2672,7 @@ export default {
             this.data.direction.amd_number = data.amd_number;
             this.reload_if_need();
             this.changed = false;
+            this.$root.$emit('result-saved');
           } else {
             this.$root.$emit('msg', 'error', data.message);
           }
diff --git a/l2-frontend/src/ui-cards/SelectedResearches.vue b/l2-frontend/src/ui-cards/SelectedResearches.vue
index e146dd4297..12d666e8c0 100644
--- a/l2-frontend/src/ui-cards/SelectedResearches.vue
+++ b/l2-frontend/src/ui-cards/SelectedResearches.vue
@@ -684,6 +684,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    parentCase: {
+      type: Number,
+      required: false,
+    },
+    caseByDirection: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -874,7 +882,7 @@ export default {
       return this.canChangeHospitalDirection && this.hospital_override === -1;
     },
     needSelectCase() {
-      return (this.needChangeCase && this.research_case === -2);
+      return (!this.parentCase && this.needChangeCase && this.research_case === -2);
     },
     need_update_object() {
       const r = [];
@@ -1358,7 +1366,8 @@ export default {
         hospital_department_override: this.hospital_department_override,
         hospital_override: this.hospital_override,
         monitoring: this.monitoring,
-        caseId: this.research_case,
+        caseId: this.parentCase || this.research_case,
+        caseByDirection: !!this.parentCase && this.caseByDirection,
       });
     },
     clear_all() {

From 44c2d2bcce8733f463ac866126a3901c8964ce9b Mon Sep 17 00:00:00 2001
From: Mikhail Privalov <n5250@ya.ru>
Date: Sun, 8 Oct 2023 19:32:39 +0300
Subject: [PATCH 38/38] aggregate base

---
 api/cases/helpers.py                          |  2 -
 api/cases/stationar_func.py                   | 98 ++-----------------
 api/cases/views.py                            | 48 ++++-----
 l2-frontend/src/fields/AggregateDesc.vue      |  7 +-
 .../src/fields/AggregateLaboratory.vue        |  7 +-
 l2-frontend/src/hooks/usePrint.ts             | 14 +++
 l2-frontend/src/modals/ResultsViewer.vue      |  1 +
 .../src/pages/CaseControl/Content/TopView.vue | 50 ++++++++--
 .../src/pages/CaseControl/Content/index.vue   | 28 +++++-
 l2-frontend/src/pages/CaseControl/index.vue   |  1 +
 10 files changed, 126 insertions(+), 130 deletions(-)
 create mode 100644 l2-frontend/src/hooks/usePrint.ts

diff --git a/api/cases/helpers.py b/api/cases/helpers.py
index c6fe02dcd9..58700c57e3 100644
--- a/api/cases/helpers.py
+++ b/api/cases/helpers.py
@@ -14,8 +14,6 @@ def get_case_direction_tree(num_dir):
     tree_dir = tree_directions.hosp_tree_direction(num_iss)
     final_tree = {}
 
-    print(result)
-
     node_dir = Node({'order': '-1', 'direction': '', 'research_title': '', 'correct_level': True, 'color': '', 'cancel': False, 'issledovaniye': '', 'parent_iss': ''})
     for j in tree_dir:
         research_title = j[12] if j[12] else j[9]
diff --git a/api/cases/stationar_func.py b/api/cases/stationar_func.py
index a20fd8cc05..6a0e32319e 100644
--- a/api/cases/stationar_func.py
+++ b/api/cases/stationar_func.py
@@ -3,7 +3,7 @@
 from typing import List
 
 from directions.models import Issledovaniya, Napravleniya
-from directory.models import Researches, HospitalService
+from directory.models import Researches
 from podrazdeleniya.models import Podrazdeleniya
 from utils import tree_directions_case as tree_directions
 from .sql_func import (
@@ -182,49 +182,8 @@ def hosp_get_curent_hosp_dir(current_iss):
         return current_dir.parent.napravleniye_id
 
 
-def hosp_get_lab_iss(current_iss, extract=False, *directions):
-    """
-    агрегация результатов исследований
-    возврат:  Если extract=True(выписка), то берем по всем hosp-dirs. Если эпикриз, то берем все исследования
-    до текущего hosp-dirs
-    Выход: {КДЛ:{vert:[{titile:'',fractions:[],results:[{date:"",values:[]}]}]},
-        {horizont:[{titile:'', results:[{date:'',value:''},{date:'',value:''}]}]}}
-    """
-    if not directions:
-        obj_iss = Issledovaniya.objects.get(pk=current_iss)
-        num_dir = obj_iss.napravleniye_id
-
-        # получить все направления в истории по типу hosp
-        hosp_dirs = hosp_get_hosp_direction(num_dir)
-
-        # получить текущее направление типа hosp из текущего исследования
-        current_dir = hosp_get_curent_hosp_dir(current_iss)
-        # проверить - это переводной эпикриз
-        epicris = False
-        if obj_iss.research.is_slave_hospital:
-            obj_hospital_service = HospitalService.objects.filter(slave_research=obj_iss.research).first().site_type
-            if obj_hospital_service == 6:
-                epicris = True
-
-        if epicris:
-            hosp_dirs = [i for i in hosp_dirs if i["direction"] <= current_dir]
-
-        num_lab_dirs = set()
-        if (not extract) and (not epicris):
-            obj_hosp_dirs = hosp_get_data_direction(current_dir, site_type=-1, type_service='is_lab', level=2)
-            for k in obj_hosp_dirs:
-                lab_dir = k.get('direction')
-                num_lab_dirs.add(lab_dir)
-
-        # получить по каждому hosp_dirs Дочерние направления по типу лаборатория
-        if extract or epicris:
-            for h in hosp_dirs:
-                obj_hosp_dirs = hosp_get_data_direction(h["direction"], site_type=-1, type_service='is_lab', level=2)
-                for k in obj_hosp_dirs:
-                    lab_dir = k.get('direction')
-                    num_lab_dirs.add(lab_dir)
-    if directions:
-        num_lab_dirs = directions
+def hosp_get_lab_iss(directions):
+    num_lab_dirs = directions
 
     num_lab_dirs = list(num_lab_dirs)
     if len(num_lab_dirs) == 0:
@@ -335,43 +294,11 @@ def hosp_get_lab_iss(current_iss, extract=False, *directions):
     return result_filtered
 
 
-def hosp_get_text(current_iss, extract=False, mode=None, directions=None):
-    # # Возврат стр-ра:
-    # {'paraclinic': [{'title_research': 'Проведение электрокардиографических исследований ( ЭКГ )', 'result': [
-    #                 {'date': '05.01.20 117', 'data': [{'group_title': '', 'fields': [{'title_field': 'Заключение',
-    #                       'value': 'Повышение пучка Гиса'}]}]},
-    #                 {'date': '05.01.20 119', 'data': [{'group_title': '', 'fields': [{'title_field': 'Заключение',
-    #                       'value': 'Диффузные нарушения'}]}]}]} ]}]
-    #                                                                                                                     ]}
-    if directions is None:
-        directions = []
-    if directions:
-        num_paraclinic_dirs = directions
-    else:
-        if mode is None:
-            return {}
-        num_dir = Issledovaniya.objects.get(pk=current_iss).napravleniye_id
-        # получить все направления в истории по типу hosp
-        hosp_dirs = hosp_get_hosp_direction(num_dir)
-
-        # получить текущее направление типа hosp из текущего эпикриза
-        current_dir = hosp_get_curent_hosp_dir(current_iss)
-        if not extract:
-            hosp_dirs = [i for i in hosp_dirs if i["direction"] <= current_dir]
-
-        # получить по каждому hosp_dirs Дочерние направления по типу is_paraclinic, is_doc_refferal, is_morfology
-        num_paraclinic_dirs = set()
-        for h in hosp_dirs:
-            obj_hosp_dirs = hosp_get_data_direction(h["direction"], site_type=-1, type_service=mode, level=2)
-            if not obj_hosp_dirs:
-                continue
-            for k in obj_hosp_dirs:
-                paraclinic_dir = k.get('direction')
-                num_paraclinic_dirs.add(paraclinic_dir)
-
+def hosp_get_text(directions):
+    num_paraclinic_dirs = directions
     num_paraclinic_dirs = list(num_paraclinic_dirs)
 
-    return desc_to_data(num_paraclinic_dirs)
+    return desc_to_data(num_paraclinic_dirs, force_all_fields=True)
 
 
 def desc_to_data(num_dirs: List[int], force_all_fields: bool = False):
@@ -432,18 +359,9 @@ def desc_to_data(num_dirs: List[int], force_all_fields: bool = False):
     return result
 
 
-def hosp_get_text_iss(current_iss, is_extract, mode):
-    if mode is None:
-        return []
-    if mode == 'desc':
-        modes = ['is_paraclinic', 'is_doc_refferal', 'is_morfology']
-    else:
-        modes = [mode]
-
+def hosp_get_text_iss(directions):
     v = []
-    for m in modes:
-        v.extend(hosp_get_text(current_iss, is_extract, mode=m))
-
+    v.extend(hosp_get_text(directions))
     return v
 
 
diff --git a/api/cases/views.py b/api/cases/views.py
index 77e03f5442..cdb7d1ff48 100644
--- a/api/cases/views.py
+++ b/api/cases/views.py
@@ -4,8 +4,8 @@
 
 from api.cases.helpers import get_case_direction_tree
 from api.cases.stationar_func import (
-    get_direction_attrs,
     hosp_get_lab_iss,
+    hosp_get_text_iss,
 )
 from clients.models import Card
 from directions.models import Issledovaniya, Napravleniya
@@ -237,33 +237,28 @@ def directions_by_key(request):
 
     directions = directions.distinct().order_by('id')
 
-    x: Napravleniya
-    return JsonResponse({'rows': [
+    return JsonResponse(
         {
-            'pk': x.pk,
-            'confirm': x.total_confirmed,
-            'date_create': strfdatetime(x.data_sozdaniya_local, "%d.%m.%Y"),
-            'researches_short': [y.short_title for y in x.services],
-            'researches': [y.title for y in x.services],
+            'rows': [
+                {
+                    'pk': x.pk,
+                    'confirm': x.total_confirmed,
+                    'date_create': strfdatetime(x.data_sozdaniya_local, "%d.%m.%Y"),
+                    'researches_short': [y.short_title for y in x.services],
+                    'researches': [y.title for y in x.services],
+                    'showResults': x.issledovaniya_set.all().filter(research__podrazdeleniye__p_type=2).exists(),
+                }
+                for x in directions
+            ]
         }
-        for x in directions
-    ]})
-
-
-@login_required
-def aggregate_laboratory(request):
-    data = json.loads(request.body)
-    pk = data.get('caseId', -1)
-    result = hosp_get_lab_iss(pk, False)
-    return JsonResponse(result)
+    )
 
 
 @login_required
 def aggregate(request):
     data = json.loads(request.body)
-    pk = data.get('caseId', -1)
-    view = data.get("view")
-
+    pk = data.get('caseDirection', -1)
+    view = data["view"]
     directions = Napravleniya.objects.filter(parent_case__napravleniye_id=pk)
 
     if view == 'laboratory':
@@ -277,9 +272,8 @@ def aggregate(request):
 
     directions = directions.distinct().order_by('id')
 
-    return JsonResponse({'rows': [
-        {
-            'confirm': x.total_confirmed,
-        }
-        for x in directions
-    ]})
+    if view == 'laboratory':
+        result = hosp_get_lab_iss([x.pk for x in directions])
+    else:
+        result = hosp_get_text_iss([x.pk for x in directions])
+    return JsonResponse(result, safe=False)
diff --git a/l2-frontend/src/fields/AggregateDesc.vue b/l2-frontend/src/fields/AggregateDesc.vue
index e9ef7a0ee3..3fe5f2d0fe 100644
--- a/l2-frontend/src/fields/AggregateDesc.vue
+++ b/l2-frontend/src/fields/AggregateDesc.vue
@@ -91,6 +91,7 @@ const makeKey = (t, group) => `${group}${delimiter}${t}`;
 export default {
   props: {
     pk: {},
+    caseDirection: {},
     extract: {
       type: Boolean,
       default: false,
@@ -171,7 +172,11 @@ export default {
       return s.split(delimiter)[1];
     },
     async load() {
-      this.data = await stationarPoint.aggregateDesc(this, ['pk', 'extract', 'r_type']);
+      if (this.caseDirection) {
+        this.data = await this.$api('cases/aggregate', this, ['caseDirection'], { view: this.r_type });
+      } else {
+        this.data = await stationarPoint.aggregateDesc(this, ['pk', 'extract', 'r_type']);
+      }
     },
     fix_html(v) {
       let lv = v;
diff --git a/l2-frontend/src/fields/AggregateLaboratory.vue b/l2-frontend/src/fields/AggregateLaboratory.vue
index 824212afd2..df4f572046 100644
--- a/l2-frontend/src/fields/AggregateLaboratory.vue
+++ b/l2-frontend/src/fields/AggregateLaboratory.vue
@@ -203,6 +203,7 @@ const makeKey = (t, group) => `${group}${delimiter}${t}`;
 export default {
   props: {
     pk: {},
+    caseDirection: {},
     extract: {
       type: Boolean,
       default: false,
@@ -297,7 +298,11 @@ export default {
     async load() {
       this.excluded.dateDir = [];
       this.excluded.titles = [];
-      this.data = await stationarPoint.aggregateLaboratory(this, ['pk', 'extract']);
+      if (this.caseDirection) {
+        this.data = await this.$api('cases/aggregate', this, ['caseDirection'], { view: 'laboratory' });
+      } else {
+        this.data = await stationarPoint.aggregateLaboratory(this, ['pk', 'extract']);
+      }
     },
     excludedTitle(t, group) {
       const title = makeKey(t, group);
diff --git a/l2-frontend/src/hooks/usePrint.ts b/l2-frontend/src/hooks/usePrint.ts
new file mode 100644
index 0000000000..fce16f1fbe
--- /dev/null
+++ b/l2-frontend/src/hooks/usePrint.ts
@@ -0,0 +1,14 @@
+import { getCurrentInstance } from 'vue';
+
+export default () => {
+  const root = getCurrentInstance().proxy.$root;
+
+  return {
+    printResults(ids: number[]) {
+      root.$emit(
+        'print:results',
+        ids,
+      );
+    },
+  };
+};
diff --git a/l2-frontend/src/modals/ResultsViewer.vue b/l2-frontend/src/modals/ResultsViewer.vue
index 900172ae14..0e3a700768 100644
--- a/l2-frontend/src/modals/ResultsViewer.vue
+++ b/l2-frontend/src/modals/ResultsViewer.vue
@@ -362,6 +362,7 @@ export default {
   methods: {
     hide_modal() {
       this.$root.$emit('hide_results');
+      this.$emit('hide');
       if (this.$refs.modal) {
         this.$refs.modal.$el.style.display = 'none';
       }
diff --git a/l2-frontend/src/pages/CaseControl/Content/TopView.vue b/l2-frontend/src/pages/CaseControl/Content/TopView.vue
index 523e832c07..92e4861d48 100644
--- a/l2-frontend/src/pages/CaseControl/Content/TopView.vue
+++ b/l2-frontend/src/pages/CaseControl/Content/TopView.vue
@@ -3,14 +3,17 @@ import { computed, ref, watch } from 'vue';
 
 import useLoader from '@/hooks/useLoader';
 import useOn from '@/hooks/useOn';
+import usePrint from '@/hooks/usePrint';
 import { menuItems } from '@/pages/CaseControl/Sidebar/menu';
 import DisplayDirection from '@/pages/Stationar/DisplayDirection.vue';
 import api from '@/api';
+import ResultsViewer from '@/modals/ResultsViewer.vue';
 
 // eslint-disable-next-line no-spaced-func,func-call-spacing
 const emit = defineEmits<{
   (e: 'input', value: number): void
   (e: 'close-view'): void
+  (e: 'close-direction'): void
 }>();
 const props = defineProps<{
   caseId?: number | null;
@@ -18,9 +21,20 @@ const props = defineProps<{
   value?: number | null;
 }>();
 
+type Direction = {
+  pk: number;
+  confirm: boolean;
+  date_create: boolean;
+  researches_short: string[];
+  researches: string[];
+  showResults: boolean;
+};
+
 const loader = useLoader();
+const { printResults } = usePrint();
 const mainItem = computed(() => menuItems[props.view]);
-const directions = ref<any[]>([]);
+const directions = ref<Direction[]>([]);
+const showResultsId = ref<number | null>(null);
 
 const loadDirections = async () => {
   if (!props.caseId || !props.view) {
@@ -41,12 +55,22 @@ useOn('researches-picker:directions_createdcd', loadDirections);
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 const printAll = () => {
+  printResults(directions.value.map((d) => d.pk));
 };
 const close = () => {
   emit('close-view');
 };
-const openDirection = (id: number) => {
-  emit('input', id);
+const closeDirection = () => {
+  emit('close-direction');
+};
+const openDirection = (d: Direction) => {
+  if (d.showResults) {
+    showResultsId.value = d.pk;
+  } else if (props.view === 'all') {
+    printResults([d.pk]);
+  } else {
+    emit('input', d.pk);
+  }
 };
 </script>
 
@@ -77,12 +101,24 @@ const openDirection = (id: number) => {
         $style.block,
         $style.direction,
       ]"
-      @click="openDirection(d.pk)"
+      @click="openDirection(d)"
     >
       <span>
         <DisplayDirection :direction="d" />
+        <i
+          v-if="props.value === d.pk"
+          class="fa fa-times"
+          :class="$style.topRight"
+          @click="closeDirection"
+        />
       </span>
     </div>
+    <ResultsViewer
+      v-if="showResultsId"
+      :pk="showResultsId"
+      no_desc
+      @hide="showResultsId = null"
+    />
   </div>
 </template>
 
@@ -146,12 +182,12 @@ export default {
     left: 0;
   }
 
-  &:hover {
+  &:hover:not(.active) {
     z-index: 1;
     transform: translateY(-1px);
   }
 
-  &:not(.confirmed):hover {
+  &:not(.confirmed):not(.active):hover {
     box-shadow: 0 7px 14px rgba(0, 0, 0, 0.1), 0 5px 5px rgba(0, 0, 0, 0.12);
   }
 
@@ -159,7 +195,7 @@ export default {
     border-color: #049372;
     background: linear-gradient(to bottom, #04937254 0%, #049372ba 100%);
 
-    &:hover {
+    &:hover:not(.active) {
       box-shadow: 0 7px 14px #04937254, 0 5px 5px #049372ba;
     }
   }
diff --git a/l2-frontend/src/pages/CaseControl/Content/index.vue b/l2-frontend/src/pages/CaseControl/Content/index.vue
index 4b7e283532..e03823d6a8 100644
--- a/l2-frontend/src/pages/CaseControl/Content/index.vue
+++ b/l2-frontend/src/pages/CaseControl/Content/index.vue
@@ -5,6 +5,8 @@ import TopBottomLayout from '@/layouts/TopBottomLayout.vue';
 import TopView from '@/pages/CaseControl/Content/TopView.vue';
 import ResultsParaclinic from '@/pages/ResultsParaclinic.vue';
 import UrlData from '@/UrlData';
+import AggregateLaboratory from '@/fields/AggregateLaboratory.vue';
+import AggregateDesc from '@/fields/AggregateDesc.vue';
 
 const props = defineProps<{
   caseId?: number | null;
@@ -14,8 +16,9 @@ const props = defineProps<{
 
 // eslint-disable-next-line no-spaced-func,func-call-spacing
 const emit = defineEmits<{
-  (e: 'input', value: number): void
+  (e: 'input', value: number | null): void
   (e: 'close-view'): void
+  (e: 'close-direction'): void
 }>();
 
 const openedDirection = ref<number | null>(null);
@@ -60,6 +63,7 @@ watch(() => openedDirection.value, () => {
           :case-id="props.caseId"
           :view="props.view"
           @close-view="emit('close-view')"
+          @close-direction="emit('close-direction')"
         />
       </template>
       <template #bottom>
@@ -69,6 +73,24 @@ watch(() => openedDirection.value, () => {
           :direction-id-to-open="openedDirection"
           :case-id="props.caseId"
         />
+        <div
+          v-else
+          :key="`${props.caseId}_${props.view}`"
+          :class="$style.aggregate"
+        >
+          <AggregateLaboratory
+            v-if="props.view === 'laboratory'"
+            :case-direction="props.caseId"
+            disabled
+          />
+          <AggregateDesc
+            v-else-if="['paraclinical', 'consultation', 'morfology'].includes(props.view)"
+            :key="`desc_${props.caseId}_${props.view}`"
+            :case-direction="props.caseId"
+            :r_type="props.view"
+            disabled
+          />
+        </div>
       </template>
     </TopBottomLayout>
   </div>
@@ -81,5 +103,7 @@ export default {
 </script>
 
 <style module lang="scss">
-
+.aggregate {
+  padding: 10px;
+}
 </style>
diff --git a/l2-frontend/src/pages/CaseControl/index.vue b/l2-frontend/src/pages/CaseControl/index.vue
index c7acd5330e..6f3b4e28a7 100644
--- a/l2-frontend/src/pages/CaseControl/index.vue
+++ b/l2-frontend/src/pages/CaseControl/index.vue
@@ -49,6 +49,7 @@ watch(() => caseId.value, () => {
         :case-id="caseId"
         :view="view"
         @close-view="view = null"
+        @close-direction="direction = null"
       />
     </template>
   </TwoSidedLayout>