Merge branch 'develop' into link-history-fix

mikhailprivalov · Dec 18, 2024 · 7c1a1a9 · 7c1a1a9
2 parents 3afee7c + 8cb6764
commit 7c1a1a9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/laboratory/__init__.py b/laboratory/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "2024.12.170714+6f7024"
+__version__ = "2024.12.180556+a4c6ec"
 VERSION = __version__
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ skip-string-normalization = true
 
 [tool.poetry]
 name = "l2"
-version = "2024.12.170714+6f7024"
+version = "2024.12.180556+a4c6ec"
 description = ""
 authors = ["Mikhail Privalov <[email protected]>"]
 license = "MIT"

diff --git a/results/prepare_data.py b/results/prepare_data.py
@@ -1010,15 +1010,28 @@ def table_part_result(value, width_max_table=None):
     opinion = [[Paragraph(f"{t}", style) for t in table_titles]]
 
     table_rows = value['rows']
+    space_symbol = "&nbsp;"
     for t in table_rows:
         temp_data = []
         for value_raw in t:
             result = ""
+            result_mkb_code = ""
+            result_mkb_title = ""
+            clinic_diag_text = ""
+            is_diag_table = False
             try:
                 row_data = json.loads(value_raw)
 
                 if isinstance(row_data, list):
                     result = '<br/>'.join(row_data)
+                elif isinstance(row_data, dict):
+                    temp_data = []
+                    if row_data.get("code", None):
+                        result_mkb_code = f"{row_data.get('code')}"
+                    if row_data.get("title", None):
+                        result_mkb_title = f"{row_data.get('title')}"
+                    result = f"{result_mkb_title}; {clinic_diag_text}"
+                    is_diag_table = True
                 else:
                     if row_data.get('fio', None):
                         result = f"{row_data.get('family')} {row_data.get('name')} {row_data.get('patronymic')}"
@@ -1028,7 +1041,10 @@ def table_part_result(value, width_max_table=None):
                         result = f"{result} ({position})"
             except:
                 result = value_raw
-            temp_data.append(Paragraph(f"{result}", style))
+            if is_diag_table and result:
+                temp_data.append([Paragraph(f"<u>{result}</u>", style), Paragraph(f"код по МКБ {space_symbol * 3}<u>{result_mkb_code}</u>", style)])
+            else:
+                temp_data.append(Paragraph(f"{result}", style))
         opinion.append(temp_data)
 
     table_width = []