Merge remote-tracking branch 'origin/statisticPatternXLS' into statis…

…ticPatternXLS
mikhailprivalov · Oct 20, 2024 · a100156 · a100156
2 parents d3e25e1 + d85b6a2
commit a100156
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/api/researches/views.py b/api/researches/views.py
@@ -666,7 +666,7 @@ def researches_update(request):
                                     control_param=field.get("controlParam", ""),
                                     cda_option_id=field.get("cdaOption", -1) if field.get("cdaOption", -1) != -1 else None,
                                     patient_control_param_id=field.get("patientControlParam", -1) if field.get("patientControlParam", -1) != -1 else None,
-                                    statistic_pattern_param_id = field.get("patternParam") if field.get("patternParam") != -1 else None
+                                    statistic_pattern_param_id=field.get("patternParam") if field.get("patternParam") != -1 else None,
                                 )
                                 if department_template_pk:
                                     department_template_field = ParaclinicFieldTemplateDepartment(

diff --git a/directory/models.py b/directory/models.py
@@ -1087,6 +1087,7 @@ def get_pattern_params():
         result = [{"label": p["title"], "id": p["pk"]} for p in params]
         return result
 
+
 class StatisticPatternParamSet(models.Model):
     statistic_pattern = models.ForeignKey(StatisticPattern, default=None, null=True, blank=True, help_text="Статистическая модель", on_delete=models.CASCADE)
     statistic_param = models.ForeignKey(PatternParam, default=None, null=True, blank=True, help_text="Параметр статистическая модель отчет", on_delete=models.CASCADE)

diff --git a/directory/utils.py b/directory/utils.py
@@ -3,7 +3,8 @@
     Researches as DResearches,
     ParaclinicInputGroups,
     ParaclinicInputField,
-    PatientControlParam, PatternParam,
+    PatientControlParam,
+    PatternParam,
 )
 import simplejson as json