Report with params

api/monitorings/structure_sheet.py

@@ -1,5 +1,6 @@
 from openpyxl.styles import Border, Side, Alignment, Font, NamedStyle
 from openpyxl.utils.cell import get_column_letter
+import json
 
 
 def monitoring_xlsx(ws1, monitoring_title, table_data, date):
@@ -48,15 +49,43 @@ def monitoring_xlsx(ws1, monitoring_title, table_data, date):
 
     current_column = 1
     current_row += 1
+    is_show_tables_title = False
+    json_data = {}
     for row in table_data['rows']:
         current_row += 1
         ws1.cell(row=current_row, column=current_column).value = row['hospTitle']
         ws1.cell(row=current_row, column=current_column).style = style_border
         for value in row['values']:
             for v in value:
-                current_column += 1
-                ws1.cell(row=current_row, column=current_column).value = v
-                ws1.cell(row=current_row, column=current_column).style = style_border
+                is_dict = False
+                if type(v) is str and "columns" in v:
+                    try:
+                        json_data = json.loads(v)
+                        is_dict = True
+                    except:
+                        is_dict = False
+                if not is_dict:
+                    current_column += 1
+                    ws1.cell(row=current_row, column=current_column).value = v
+                    ws1.cell(row=current_row, column=current_column).style = style_border
+                if is_dict:
+                    col_title_data = json_data.get("columns")
+                    col_title = col_title_data.get("titles")
+                    start_col = current_column
+                    if not is_show_tables_title:
+                        for c_title in col_title:
+                            start_col += 1
+                            ws1.cell(row=current_row - 1, column=start_col).value = c_title
+                            ws1.cell(row=current_row - 1, column=start_col).style = style_border
+                            is_show_tables_title = True
+                    rows_data = json_data.get("rows")
+                    for r_data in rows_data:
+                        start_col = current_column
+                        for rd in r_data:
+                            start_col += 1
+                            ws1.cell(row=current_row, column=start_col).value = rd
+                            ws1.cell(row=current_row, column=start_col).style = style_border
+                        current_row += 1
         current_column = 1
 
     current_row += 1

api/monitorings/views.py

@@ -211,6 +211,8 @@ def filexlsx(request):
         wb = openpyxl.Workbook()
         wb.remove(wb.get_sheet_by_name('Sheet'))
         ws = wb.create_sheet(f'{monitoring.title}')
+        is_table = False
+
         ws = structure_sheet.monitoring_xlsx(ws, monitoring.title, table_data, date)
 
         response['Content-Disposition'] = str.translate(f"attachment; filename=\"{monitoring.title}, {date}.xlsx\"", tr)

api/views.py

@@ -22,7 +22,7 @@
     SEARCH_PAGE_STATISTIC_PARAMS,
     UNLIMIT_PERIOD_STATISTIC_GROUP,
     TITLE_REPORT_FILTER_HAS_ALL_FIN_SOURCE,
-    STATISTIC_TYPE_DEPARTMENT,
+    STATISTIC_TYPE_DEPARTMENT, USE_TFOMS_DISTRICT,
 )
 from utils.response import status_response
 
@@ -1820,7 +1820,7 @@ def actual_districts(request):
 
     if card_pk is not None:
         card_hospital_id = -1
-        if SettingManager.l2('tfoms'):
+        if SettingManager.l2('tfoms') and USE_TFOMS_DISTRICT:
             card = Card.objects.get(pk=data['card_pk'])
             enp = card.individual.get_enp()
             if enp:

directions/models.py

@@ -1074,7 +1074,9 @@ def gen_napravleniye(
         if issledovaniya is None:
             pass
         client = Clients.Card.objects.get(pk=client_id)
-        if price_name_id is None and istochnik_f.title.lower() in ["договор"]:
+        print(price_name_id)
+        print(istochnik_f)
+        if price_name_id is None and istochnik_f and istochnik_f.title.lower() in ["договор"]:
             price_name_obj = contracts.PriceName.get_hospital_price_by_date(doc.hospital_id, current_time(only_date=True), current_time(only_date=True), True)
             price_name_id = price_name_obj.pk
 

laboratory/settings.py

@@ -388,6 +388,7 @@ def __getitem__(self, item):
 ECP_SEARCH_PATIENT = {}
 DAYS_AGO_SEARCH_RESULT = {}  # {"isLab: 90", "isInstrument: 365"}
 NEED_ORDER_DIRECTION_FOR_DEFAULT_HOSPITAL = False
+USE_TFOMS_DISTRICT = False
 
 try:
     from laboratory.local_settings import *  # noqa: F403,F401