Merge remote-tracking branch 'origin/tubeNumber_13symbols' into tubeN…

…umber_13symbols
mikhailprivalov · Sep 15, 2023 · 5a21df2 · 5a21df2
2 parents aad4e10 + b39354f
commit 5a21df2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/api/directions/views.py b/api/directions/views.py
@@ -275,6 +275,7 @@ def resend_results(request):
         direction.post_confirmation()
     return status_response(True)
 
+
 @login_required()
 def need_order_redirection(request):
     request_data = json.loads(request.body)

diff --git a/ftp_orders/main.py b/ftp_orders/main.py
@@ -367,8 +367,7 @@ def pull_result(self, file: str):
             is_confirm = False
 
         obxes = hl7_result.ORU_R01_RESPONSE.ORU_R01_ORDER_OBSERVATION.ORU_R01_OBSERVATION
-        fractions = {"fsli": "", "title_fraction": "", "value": "", "refs": "", "units": "", "jpeg": "", "html": "", "doc_confirm": "", "date_confirm": "",
-                     "note_data": ""}
+        fractions = {"fsli": "", "title_fraction": "", "value": "", "refs": "", "units": "", "jpeg": "", "html": "", "doc_confirm": "", "date_confirm": "", "note_data": ""}
         result = []
         for obx in obxes:
             tmp_fractions = fractions.copy()
@@ -420,13 +419,11 @@ def pull_result(self, file: str):
                     ref_m=ref_str,
                 ).save()
         else:
-            iss.lab_comment = "",
-            iss.time_confirmation = None,
+            iss.lab_comment = ("",)
+            iss.time_confirmation = (None,)
             iss.time_save = current_time()
             iss.doc_confirmation_string = ""
             iss.save()
-
-
     def push_order(self, direction: Napravleniya):
         hl7 = core.Message("ORM_O01", validation_level=VALIDATION_LEVEL.QUIET)