Merge pull request #4019 from mikhailprivalov/fix_form_result

Fix form result
mikhailprivalov · Jun 29, 2024 · fe2ff0d · fe2ff0d
2 parents c79885b + 353ccaa
commit fe2ff0d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/ftp_orders/main.py b/ftp_orders/main.py
@@ -425,14 +425,22 @@ def pull_result(self, file: str):
                 if ref_str:
                     ref_str = ref_str.replace('"', "'")
                     ref_str = f'{{"Все": "{ref_str}"}}'
-                Result(
-                    issledovaniye=iss,
-                    fraction=fraction,
-                    value=value,
-                    units=units,
-                    ref_f=ref_str,
-                    ref_m=ref_str,
-                ).save()
+                if Result.objects.filter(issledovaniye=iss, fraction=fraction).first():
+                    update_result = Result.objects.filter(issledovaniye=iss, fraction=fraction).first()
+                    update_result.value = value
+                    update_result.units = units
+                    update_result.ref_f = ref_str
+                    update_result.ref_m = ref_str
+                    update_result.save()
+                else:
+                    Result(
+                        issledovaniye=iss,
+                        fraction=fraction,
+                        value=value,
+                        units=units,
+                        ref_f=ref_str,
+                        ref_m=ref_str,
+                    ).save()
         else:
             iss.lab_comment = ("",)
             iss.time_confirmation = (None,)

diff --git a/results/laboratory_form.py b/results/laboratory_form.py
@@ -591,6 +591,7 @@ def lab_form_1(fwb, interactive_text_field, pw, direction, styleSheet, directory
         if iss.api_app:
             laboratory_analyzer_data.append(iss.api_app.name)
 
+        fsli_data = []
         if len(fractions) > 0:
             if len(fractions) == 1:
                 tmp = [Paragraph('<font face="FreeSans" size="8">' + iss.research.title + "</font>", styleSheet["BodyText"])]
@@ -690,6 +691,9 @@ def lab_form_1(fwb, interactive_text_field, pw, direction, styleSheet, directory
 
                 result_is_norm = []
                 for f in fractions:
+                    if f.fsli in fsli_data:
+                        continue
+                    fsli_data.append(f.fsli)
                     j += 1
 
                     tmp = []