Applications modal

api/education/urls.py

@@ -0,0 +1,19 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+    path('get-specialties', views.get_specialties),
+    path('get-pay-forms', views.get_pay_forms),
+    path('get-enrollment-orders', views.get_enrollment_orders),
+    path('get-citizenship', views.get_citizenship),
+    path('get-statement-filters', views.get_application_filters),
+    path('get-exams-filters', views.get_exams_filters),
+    path('get-achievements-filters', views.get_achievements_filters),
+    path('get-educations', views.get_education),
+    path('get-special-rights', views.get_special_rights),
+    path('get-applications-by-card', views.get_applications_by_card),
+    path('get-enrollees', views.get_enrollees),
+    path('get-columns', views.get_columns),
+    path('get-achievements-by-card', views.get_achievement_by_card),
+]

api/education/views.py

@@ -0,0 +1,103 @@
+import json
+
+from django.http import JsonResponse
+
+from clients.models import Citizenship
+from directions.models import EducationFinanceSource
+from education.models import ApplicationEducation, ExamType, Subjects, AchievementType, DocumentTypeEducation, SpecialRights, EducationSpeciality, Achievement
+from education.views import get_all_enrollees
+from laboratory.utils import current_year
+
+
+def get_specialties(request):
+    request_data = json.loads(request.body)
+    year_start_study = request_data.get('yearStartStudy')
+    if not year_start_study:
+        year_start_study = current_year()
+    else:
+        year_start_study = year_start_study.get('value')
+        year_start_study = year_start_study.get('label')
+
+    result = EducationSpeciality.get_speciality(year_start_study)
+    return JsonResponse({"result": result})
+
+
+def get_pay_forms(request):
+    result = EducationFinanceSource.get_sources()
+    return JsonResponse({"result": result})
+
+
+def get_enrollment_orders(request):
+    result = []
+    return JsonResponse({"result": result})
+
+
+def get_citizenship(request):
+    result = Citizenship.get_citizenship()
+    return JsonResponse({"result": result})
+
+
+def get_application_filters(request):
+    sources = []
+    statuses = [{"id": 1, "label": "Зачислен"}, {"id": 2, "label": "Отчислен"}]
+    stages = []
+    return JsonResponse({"sources": sources, "statuses": statuses, "stages": stages})
+
+
+def get_exams_filters(request):
+    exam_types = ExamType.get_types()
+    subjects = Subjects.get_subjects()
+    return JsonResponse({"exam_types": exam_types, "subjects": subjects})
+
+
+def get_achievements_filters(request):
+    achievements = AchievementType.get_types()
+    statuses = []
+    return JsonResponse({"achievements": achievements, "statuses": statuses})
+
+
+def get_education(request):
+    result = DocumentTypeEducation.get_education_documents_tree()
+    return JsonResponse({"result": result})
+
+
+def get_special_rights(request):
+    result = SpecialRights.get_special_rights_tree()
+    return JsonResponse({"result": result})
+
+
+def get_columns(request):
+    columns = [
+        {"field": 'card', "key": 'card', "title": 'Дело'},
+        {"field": 'fio', "key": 'fio', "title": 'ФИО'},
+        {"field": 'applicationSpeciality', "key": 'applicationSpeciality', "title": 'Специальность'},
+        {"field": 'applicationPersonNumber', "key": 'applicationPersonNumber', "title": 'Номер'},
+        {"field": 'chemistry', "key": 'chemistry', "title": 'Хим.'},
+        {"field": 'biology', "key": 'biology', "title": 'Био.'},
+        {"field": 'russian_language', "key": 'russian_language', "title": 'Рус.'},
+        {"field": 'achievementPoint', "key": 'achievementPoint', "title": 'ИД'},
+        {"field": 'achievementСhecked', "key": 'achievementСhecked', "title": 'ИД+'},
+        {"field": 'totalPoints', "key": 'totalPoint', "title": 'Сумм'},
+        {"field": 'is_original', "key": 'is_original', "title": 'Оригинал'},
+        {"field": 'researchContractId', "key": 'researchContractId', "title": 'Договор'},
+        {"field": 'status', "key": 'status', "title": 'Статус'},
+        {"field": 'create_date', "key": 'create_date', "title": 'Создано'},
+    ]
+    return JsonResponse({"result": columns})
+
+
+def get_enrollees(request):
+    data = get_all_enrollees(request)
+    return JsonResponse({"data": data})
+
+
+def get_applications_by_card(request):
+    request_data = json.loads(request.body)
+    result = ApplicationEducation.get_applications_by_card(request_data["card_pk"])
+    return JsonResponse({"result": result})
+
+
+def get_achievement_by_card(request):
+    request_data = json.loads(request.body)
+    result = Achievement.get_achievement_by_card(request_data["card_pk"])
+    return JsonResponse({"result": result})

api/patients/views.py

@@ -185,7 +185,7 @@ def patients_search_card(request):
                     | Q(card__phone__in=normalized_phones)
                     | Q(card__doctorcall__phone__in=normalized_phones)
                 )
-    if is_ecp_search or ":" in query:
+    if is_ecp_search or ":" in query[0]:
         ecp_id = query.split(':')[1]
         patient_data = search_patient_ecp_by_person_id(ecp_id)
         if patient_data and (patient_data.get('PersonSnils_Snils') or patient_data.get('enp')):

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('education/', include('api.education.urls')),
     path('get-prices', views.get_prices),
     path('get-price-data', views.get_price_data),
     path('update-price', views.update_price),

appconf/manager.py

@@ -131,6 +131,7 @@ def l2_modules() -> dict:
                     "direction_purpose",
                     "external_organizations",
                     "vaccine",
+                    "education",
                     "tfoms",
                     "doc_call",
                     "list_wait",

clients/admin.py

@@ -175,3 +175,11 @@ class ResCardMovementRoom(admin.ModelAdmin):
         'room_in',
     )
     raw_id_fields = ('card',)
+
+
+class CitizenshipAdmin(admin.ModelAdmin):
+    list_display = ('title',)
+    list_display_links = ('title',)
+
+
+admin.site.register(models.Citizenship, CitizenshipAdmin)

clients/models.py

@@ -59,6 +59,7 @@ class Individual(models.Model):
     time_add = models.DateTimeField(default=timezone.now, null=True, blank=True)
     owner = models.ForeignKey('hospitals.Hospitals', default=None, blank=True, null=True, help_text="Организация-владелец данных", db_index=True, on_delete=models.PROTECT)
     owner_patient_id = models.CharField(max_length=128, default=None, null=True, blank=True, db_index=True, help_text="Код в организации-владелеце")
+    mmis_id = models.CharField(max_length=128, default=None, null=True, blank=True, db_index=True, help_text="Код ММИС")
 
     def first(self):
         return self
@@ -754,7 +755,7 @@ def import_from_tfoms(data: Union[dict, List], individual: Union['Individual', N
         return updated_data
 
     @staticmethod
-    def import_from_simple_data(data: dict, owner, patient_id_company, email, phone):
+    def import_from_simple_data(data: dict, owner, mmis_id, email, phone, filter_mmis_id=False):
         family = data.get('family', '').title().strip()
         name = data.get('name', '').title().strip()
         patronymic = data.get('patronymic', '').title().strip()
@@ -768,14 +769,17 @@ def import_from_simple_data(data: dict, owner, patient_id_company, email, phone)
         if family and name and sex and birthday:
             birthday = datetime.strptime(birthday, "%d.%m.%Y" if '.' in birthday else "%Y-%m-%d").date()
 
-            indv = Individual.objects.filter(
-                family=family,
-                name=name,
-                patronymic=patronymic,
-                birthday=birthday,
-                sex=sex,
-                owner=owner,
-            )
+            if filter_mmis_id:
+                indv = Individual.objects.filter(mmis_id=mmis_id)
+            else:
+                indv = Individual.objects.filter(
+                    family=family,
+                    name=name,
+                    patronymic=patronymic,
+                    birthday=birthday,
+                    sex=sex,
+                    owner=owner,
+                )
 
             if not indv or not indv.exists():
                 i = Individual(
@@ -785,7 +789,7 @@ def import_from_simple_data(data: dict, owner, patient_id_company, email, phone)
                     birthday=birthday,
                     sex=sex,
                     owner=owner,
-                    owner_patient_id=patient_id_company,
+                    mmis_id=mmis_id,
                 )
                 i.save()
             else:
@@ -1064,6 +1068,22 @@ def as_json(factor):
         return json
 
 
+class Citizenship(models.Model):
+    title = models.CharField(max_length=255, verbose_name="Наименование гражданства", help_text='Россия, Греция')
+
+    def __str__(self):
+        return self.title
+
+    @staticmethod
+    def get_citizenship() -> list[dict]:
+        citizenship = [{"id": i.pk, "label": i.title} for i in Citizenship.objects.all()]
+        return citizenship
+
+    class Meta:
+        verbose_name = 'Гражданство'
+        verbose_name_plural = 'Гражданства'
+
+
 class Card(models.Model):
     AGENT_CHOICES = (
         ('mother', "Мать"),
@@ -1131,6 +1151,8 @@ class Card(models.Model):
 
     owner = models.ForeignKey('hospitals.Hospitals', default=None, blank=True, null=True, help_text="Организация-владелец карты", db_index=True, on_delete=models.PROTECT)
 
+    citizenship = models.ForeignKey(Citizenship, default=None, blank=True, null=True, help_text="Гражданство", on_delete=models.PROTECT)
+
     @property
     def main_address_full(self):
         return json.dumps({'address': self.main_address, 'fias': self.main_address_fias, 'details': self.main_address_details})

context_processors/utils.py

@@ -204,6 +204,7 @@ def menu(request):
                     "module": "l2_send_orgs_email_results",
                 },
                 {"url": "/ui/utils", "title": "Инструменты", "nt": False, "access": ["Инструменты"]},
+                {"url": "/ui/enrollees", "title": "Абитуриенты", "nt": False, "access": ["Приемная комиссия: Абитуриенты"]},
             ]
 
             hp = SettingManager.get(key="home_page", default="false")

dashboards/models.py

@@ -23,6 +23,8 @@ class DatabaseConnectSettings(models.Model):
     database = models.CharField(max_length=255, default="", help_text='Название базы', db_index=True)
     ip_address = models.CharField(max_length=255, default="", help_text='ip-address', db_index=True)
     port = models.CharField(max_length=5, default="", help_text='Порт', db_index=False)
+    driver = models.CharField(max_length=128, default="", help_text='Драйвер', db_index=False)
+    encrypt = models.CharField(max_length=5, default="", help_text='Шифрование', db_index=False)
 
     def __str__(self):
         return f"{self.title} - {self.database}"

dashboards/views.py

@@ -21,7 +21,7 @@ def exec_query(dashboard_pk, dates_param):
     metadata_charts = get_charts_dataset(dashboard_pk)
     # обход по графикам датасетов
     for md in metadata_charts:
-        if not check_server_port(md.ip_address, md.port):
+        if not check_server_port(md.ip_address, int(md.port)):
             continue
         if not data_chart.get(md.chart_id):
             data_chart[md.chart_id] = [

directions/admin.py

@@ -2,6 +2,7 @@
 
 from .models import (
     IstochnikiFinansirovaniya,
+    EducationFinanceSource,
     Napravleniya,
     TubesRegistration,
     Issledovaniya,
@@ -315,3 +316,4 @@ class NapravleniyaHL7FilesAdmin(admin.ModelAdmin):
 admin.site.register(MicrobiologyResultPhenotype, MicrobiologyResultPhenotypeAdmin)
 admin.site.register(RegisteredOrders, RegisteredOrdersAdmin)
 admin.site.register(ExternalAdditionalOrder, ExternalAdditionalOrderAdmin)
+admin.site.register(EducationFinanceSource)

directions/models.py

@@ -342,6 +342,22 @@ class Meta:
         verbose_name_plural = 'Источники финансирования'
 
 
+class EducationFinanceSource(models.Model):
+    title = models.CharField(max_length=255, verbose_name='Наименование образовательного источника финансирования')
+
+    def __str__(self):
+        return self.title
+
+    @staticmethod
+    def get_sources() -> list[dict]:
+        sources = [{"id": source.pk, "label": source.title} for source in EducationFinanceSource.objects.all()]
+        return sources
+
+    class Meta:
+        verbose_name = 'Образовательный источник финансирования'
+        verbose_name_plural = 'Образовательные источники финансирования'
+
+
 class Diagnoses(models.Model):
     M = (
         (0, "Диапазон"),