Case amb

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

api/views.py

@@ -721,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}]
@@ -748,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:
@@ -762,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)
@@ -784,7 +791,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',

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'),
@@ -198,6 +199,7 @@ def en():
         k = SettingManager.FULL_CACHE_EN_KEY
 
         cv = cache.get(k)
+        cv = False
         if cv:
             result = simplejson.loads(cv)
         else:
@@ -214,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)

directory/models.py

@@ -82,6 +82,7 @@ class ResearchSite(models.Model):
         (4, 'Микробиология'),
         (7, 'Формы'),
         (10, 'Мониторинги'),
+        (12, 'Случаи'),
     )
 
     site_type = models.SmallIntegerField(choices=TYPES, help_text="Тип раздела", db_index=True)
@@ -243,6 +244,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="Если это параклиническое исследование - здесь указывается подготовка и кабинет")
@@ -330,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, {})
 
@@ -357,6 +360,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
@@ -368,6 +373,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

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;

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
       );
     },

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 = (

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"