Auto create case #3238

urchinpro · 2023-11-20T06:37:37Z

Описание изменений

Auto create case, print set document for many people

# Conflicts: # api/directions/views.py # directions/models.py

github-actions · 2023-11-20T06:38:07Z

api/views.py

@@ -76,12 +77,14 @@
 from utils.common import non_selected_visible_type
 from utils.dates import try_parse_range, try_strptime
 from utils.nsi_directories import NSI
-from utils.xh import get_all_hospitals
+from utils.xh import get_all_hospitals, save_tmp_file, simple_join_two_pdf_files, simple_save_pdf_file


[flake8] <401> _{reported by reviewdog 🐶}
'utils.xh.save_tmp_file' imported but unused

github-actions · 2023-11-20T06:38:07Z

utils/xh.py

 from api.directions.sql_func import get_lab_podr
 from appconf.manager import SettingManager
 from laboratory.settings import QRCODE_OFFSET_SIZE, LEFT_QRCODE_OFFSET_SIZE
 from utils.flowable import QrCodeSite
+import datetime


[flake8] <811> _{reported by reviewdog 🐶}
redefinition of unused 'datetime' from line 1

github-actions · 2023-11-20T06:38:07Z

utils/xh.py

+
+    today = datetime.datetime.now()
+    date_now1 = datetime.datetime.strftime(today, "%y%m%d%H%M%S%f")[:-3]
+    date_now_str = str(date_now1)


[flake8] <841> _{reported by reviewdog 🐶}
local variable 'date_now_str' is assigned to but never used

api/sql_func.py

github-actions · 2023-11-20T06:38:12Z

directions/sql_func.py

+            params={'direction_numbers': direction_numbers},
+        )
+        rows = namedtuplefetchall(cursor)
+    return rows


[black-format] _{reported by reviewdog 🐶}

Suggested change

return rows

return rows

api/views.py

directions/models.py

utils/xh.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions · 2023-11-20T06:45:05Z

utils/xh.py

+
+    today = datetime.datetime.now()
+    date_now1 = datetime.datetime.strftime(today, "%y%m%d%H%M%S%f")[:-3]
+    date_now_str = str(date_now1)


[flake8] <841> _{reported by reviewdog 🐶}
local variable 'date_now_str' is assigned to but never used

github-actions · 2023-11-20T06:45:09Z

api/views.py

+                price_name=13,
+                case_id=napravleniye_case.pk,
+                case_by_direction=True,
+                plan_start_date=plan_date_start_case


[black-format] _{reported by reviewdog 🐶}

Suggested change

plan_start_date=plan_date_start_case

plan_start_date=plan_date_start_case,

github-actions · 2023-11-20T06:45:09Z

utils/xh.py

+
+
+def simple_join_two_pdf_files(files_data):
+


[black-format] _{reported by reviewdog 🐶}

Suggested change

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions · 2023-11-20T06:45:13Z

api/views.py

+                price_name=13,
+                case_id=napravleniye_case.pk,
+                case_by_direction=True,
+                plan_start_date=plan_date_start_case


[black-format] _{reported by reviewdog 🐶}

Suggested change

plan_start_date=plan_date_start_case

plan_start_date=plan_date_start_case,

github-actions · 2023-11-20T06:45:18Z

api/views.py

+                price_name=13,
+                case_id=napravleniye_case.pk,
+                case_by_direction=True,
+                plan_start_date=plan_date_start_case


[black-format] _{reported by reviewdog 🐶}

Suggested change

plan_start_date=plan_date_start_case

plan_start_date=plan_date_start_case,

github-actions · 2023-11-20T06:45:25Z

api/views.py

+                price_name=13,
+                case_id=napravleniye_case.pk,
+                case_by_direction=True,
+                plan_start_date=plan_date_start_case


[black-format] _{reported by reviewdog 🐶}

Suggested change

plan_start_date=plan_date_start_case

plan_start_date=plan_date_start_case,

directions/models.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions · 2023-11-20T06:55:28Z

api/views.py

@@ -23,7 +24,7 @@
    UNLIMIT_PERIOD_STATISTIC_GROUP,
    TITLE_REPORT_FILTER_HAS_ALL_FIN_SOURCE,
    STATISTIC_TYPE_DEPARTMENT,
-    USE_TFOMS_DISTRICT,
+    USE_TFOMS_DISTRICT, TYPE_COMPANY_SET_DIRECTION_PDF,


[black-format] _{reported by reviewdog 🐶}

Suggested change

USE_TFOMS_DISTRICT, TYPE_COMPANY_SET_DIRECTION_PDF,

USE_TFOMS_DISTRICT,

TYPE_COMPANY_SET_DIRECTION_PDF,

github-actions · 2023-11-20T06:55:28Z

api/views.py

+                price_name=13,
+                case_id=case_direction_number,
+                case_by_direction=True,
+                plan_start_date=plan_date_start_case


[black-format] _{reported by reviewdog 🐶}

Suggested change

plan_start_date=plan_date_start_case

plan_start_date=plan_date_start_case,

github-actions · 2023-11-20T06:55:28Z

api/views.py

+            napravleniye_case = directions.Napravleniya.gen_napravleniye(
+                card_id,
+                doc,
+                financing_source,
+                "",
+                "",
+                doc,
+                -1,
+                doc,
+                price_name_id=13
+            )
+
+            issledovaniye_case = directions.Issledovaniya(
+                napravleniye=napravleniye_case,
+                research=research_case,
+                deferred=False,
+                plan_start_date=plan_date_start_case
+            )


[black-format] _{reported by reviewdog 🐶}

Suggested change

napravleniye_case = directions.Napravleniya.gen_napravleniye(

card_id,

doc,

financing_source,

"",

"",

doc,

-1,

doc,

price_name_id=13

)

issledovaniye_case = directions.Issledovaniya(

napravleniye=napravleniye_case,

research=research_case,

deferred=False,

plan_start_date=plan_date_start_case

)

napravleniye_case = directions.Napravleniya.gen_napravleniye(card_id, doc, financing_source, "", "", doc, -1, doc, price_name_id=13)

issledovaniye_case = directions.Issledovaniya(napravleniye=napravleniye_case, research=research_case, deferred=False, plan_start_date=plan_date_start_case)

github-actions · 2023-11-20T06:55:44Z

api/views.py

@@ -23,7 +24,7 @@
    UNLIMIT_PERIOD_STATISTIC_GROUP,
    TITLE_REPORT_FILTER_HAS_ALL_FIN_SOURCE,
    STATISTIC_TYPE_DEPARTMENT,
-    USE_TFOMS_DISTRICT,
+    USE_TFOMS_DISTRICT, TYPE_COMPANY_SET_DIRECTION_PDF,


[black-format] _{reported by reviewdog 🐶}

Suggested change

USE_TFOMS_DISTRICT, TYPE_COMPANY_SET_DIRECTION_PDF,

USE_TFOMS_DISTRICT,

TYPE_COMPANY_SET_DIRECTION_PDF,

github-actions · 2023-11-20T06:55:44Z

api/views.py

+                price_name=13,
+                case_id=case_direction_number,
+                case_by_direction=True,
+                plan_start_date=plan_date_start_case


[black-format] _{reported by reviewdog 🐶}

Suggested change

plan_start_date=plan_date_start_case

plan_start_date=plan_date_start_case,

github-actions · 2023-11-20T06:55:52Z

api/views.py

@@ -23,7 +24,7 @@
    UNLIMIT_PERIOD_STATISTIC_GROUP,
    TITLE_REPORT_FILTER_HAS_ALL_FIN_SOURCE,
    STATISTIC_TYPE_DEPARTMENT,
-    USE_TFOMS_DISTRICT,
+    USE_TFOMS_DISTRICT, TYPE_COMPANY_SET_DIRECTION_PDF,


[black-format] _{reported by reviewdog 🐶}

Suggested change

USE_TFOMS_DISTRICT, TYPE_COMPANY_SET_DIRECTION_PDF,

USE_TFOMS_DISTRICT,

TYPE_COMPANY_SET_DIRECTION_PDF,

# Conflicts: # api/views.py

github-actions · 2023-11-20T07:26:31Z

api/views.py

+                price_name=13,
+                case_id=case_direction_number,
+                case_by_direction=True,
+                plan_start_date=plan_start_date_case


[black-format] _{reported by reviewdog 🐶}

Suggested change

plan_start_date=plan_start_date_case

plan_start_date=plan_start_date_case,

github-actions · 2023-11-20T07:26:31Z

api/views.py

+            issledovaniye_case = directions.Issledovaniya(
+                napravleniye=napravleniye_case,
+                research=research_case,
+                deferred=False,
+                plan_start_date=plan_start_date_case
+            )


[black-format] _{reported by reviewdog 🐶}

Suggested change

issledovaniye_case = directions.Issledovaniya(

napravleniye=napravleniye_case,

research=research_case,

deferred=False,

plan_start_date=plan_start_date_case

)

issledovaniye_case = directions.Issledovaniya(napravleniye=napravleniye_case, research=research_case, deferred=False, plan_start_date=plan_start_date_case)

mikhailprivalov · 2023-11-20T14:02:37Z

directions/models.py

@@ -1563,7 +1557,6 @@ def gen_napravleniya_by_issledovaniya(
                                hospital=hospital_override,
                                external_order=external_order,
                                price_name_id=price_name,
-                                slot_fact_id=slot_fact_id,


Тут что то странное происходит

mikhailprivalov · 2023-11-20T14:02:42Z

directions/models.py

-        if slot_fact_id:
-            from doctor_schedule.models import SlotFact
-
-            f = SlotFact.objects.get(pk=slot_fact_id)


И тут странное

mikhailprivalov · 2023-11-20T14:05:22Z

api/views.py

+            files_data.append(saved_file_pdf)
+
+    buffer = simple_join_two_pdf_files(files_data)
+    saved_file_pdf = simple_save_pdf_file(buffer)


А в чем смысл каждый раз тут что то сохранять?
А не печатать PDF как раньше?

Почему не разделить процесс генерации случая и его печати?

Тогда не надо делать так, как сделано:

в api лежит печать

каждый раз что то сохраняем

github-actions · 2023-11-21T00:36:50Z

api/views.py

 from .dicom import search_dicom_study
 from .directions.sql_func import get_lab_podr
-from .sql_func import users_by_group, users_all, get_diagnoses, get_resource_researches, search_data_by_param, search_text_stationar
+from .sql_func import users_by_group, users_all, get_diagnoses, get_resource_researches, search_data_by_param, search_text_stationar, search_case_by_card_date


[flake8] <401> _{reported by reviewdog 🐶}
'.sql_func.search_case_by_card_date' imported but unused

github-actions · 2023-11-21T00:36:51Z

directions/views.py

@@ -26,17 +26,21 @@
 from reportlab.platypus import SimpleDocTemplate, Table, TableStyle, Paragraph, PageBreak
 from transliterate import translit

+import directions


[flake8] <401> _{reported by reviewdog 🐶}
'directions' imported but unused

github-actions · 2023-11-21T00:36:51Z

directions/views.py

@@ -1040,3 +1044,95 @@ def px(x=0.0):
 def pxr(x=0.0):
    x *= mm
    return w - x
+
+def create_case_by_cards(cards):


🚫 [flake8] <302> _{reported by reviewdog 🐶}
expected 2 blank lines, found 1

directions/views.py

utils/xh.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions · 2023-11-21T00:55:01Z

directions/views.py

+                price_name=None,
+                case_id=case_direction_number,
+                case_by_direction=True,
+                plan_start_date=plan_start_date_case


[black-format] _{reported by reviewdog 🐶}

Suggested change

plan_start_date=plan_start_date_case

plan_start_date=plan_start_date_case,

github-actions · 2023-11-21T00:55:01Z

directions/views.py

+            issledovaniye_case = Issledovaniya(
+                napravleniye=napravleniye_case,
+                research=research_case,
+                deferred=False,
+                plan_start_date=plan_start_date_case
+            )


[black-format] _{reported by reviewdog 🐶}

Suggested change

issledovaniye_case = Issledovaniya(

napravleniye=napravleniye_case,

research=research_case,

deferred=False,

plan_start_date=plan_start_date_case

)

issledovaniye_case = Issledovaniya(napravleniye=napravleniye_case, research=research_case, deferred=False, plan_start_date=plan_start_date_case)

github-actions · 2023-11-21T00:55:13Z

directions/views.py

+                price_name=None,
+                case_id=case_direction_number,
+                case_by_direction=True,
+                plan_start_date=plan_start_date_case


[black-format] _{reported by reviewdog 🐶}

Suggested change

plan_start_date=plan_start_date_case

plan_start_date=plan_start_date_case,

github-actions · 2023-11-21T00:55:21Z

directions/views.py

+
+
+
+def create_case_by_cards(cards):


🚫 [flake8] <303> _{reported by reviewdog 🐶}
too many blank lines (3)

github-actions · 2023-11-21T00:55:25Z

directions/views.py

@@ -1040,3 +1043,92 @@ def px(x=0.0):
 def pxr(x=0.0):
    x *= mm
    return w - x
+
+
+


[black-format] _{reported by reviewdog 🐶}

Suggested change

urchinpro added 7 commits November 17, 2023 18:57

проверка созданного случая

0cc5ae3

автосоздание направлений и случая

978073c

.

1bdadea

.

1397dba

print set document for many people

03539c5

Merge branch 'develop' into autoCreateCase

5888006

# Conflicts: # api/directions/views.py # directions/models.py

print set document for many people

84ca305

github-actions bot reviewed Nov 20, 2023

View reviewed changes

urchinpro and others added 5 commits November 20, 2023 14:44

Update utils/xh.py

2445ab8

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update utils/xh.py

31f5da7

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update directions/models.py

dc19770

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update directions/models.py

d5dfd19

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update api/views.py

7d5e25e

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot reviewed Nov 20, 2023

View reviewed changes

Update api/sql_func.py

2261f93

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot reviewed Nov 20, 2023

View reviewed changes

urchinpro added 2 commits November 20, 2023 14:48

print set document for many people

3adb63a

Merge remote-tracking branch 'origin/autoCreateCase' into autoCreateCase

c6ca074

github-actions bot reviewed Nov 20, 2023

View reviewed changes

directions/models.py Outdated Show resolved Hide resolved

urchinpro and others added 5 commits November 20, 2023 14:51

fix

a376901

Update directions/models.py

fade0f2

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update api/views.py

ba3be4a

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update api/views.py

ced95a8

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update api/views.py

19af03b

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot reviewed Nov 20, 2023

View reviewed changes

urchinpro added 3 commits November 20, 2023 15:16

планируемая дата начала оказания услуг

1eba55f

Merge remote-tracking branch 'origin/autoCreateCase' into autoCreateCase

a3acaaf

# Conflicts: # api/views.py

планируемая дата -fix

3817047

github-actions bot reviewed Nov 20, 2023

View reviewed changes

urchinpro requested a review from mikhailprivalov November 20, 2023 07:32

fix: price_name =None

d062dd3

mikhailprivalov reviewed Nov 20, 2023

View reviewed changes

urchinpro added 2 commits November 21, 2023 08:36

hash to file name - store in cashe

3061b84

hash to file name - store in cashe

c9c7cc8

github-actions bot reviewed Nov 21, 2023

View reviewed changes

directions/views.py Show resolved Hide resolved

directions/views.py Outdated Show resolved Hide resolved

directions/views.py Outdated Show resolved Hide resolved

utils/xh.py Outdated Show resolved Hide resolved

urchinpro and others added 5 commits November 21, 2023 08:39

fix import pep

9058714

Update utils/xh.py

eb0d8bc

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update directions/views.py

f1c5cba

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update directions/views.py

14adc33

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update directions/views.py

02902ad

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot reviewed Nov 21, 2023

View reviewed changes

urchinpro added 4 commits November 21, 2023 09:00

fix

ad10dd5

настройки хэш

199632d

pep

97c5b4a

add slot_fact_id

3fca858

mikhailprivalov merged commit 35cfdbe into develop Nov 21, 2023
6 checks passed

delete-merged-branch bot deleted the autoCreateCase branch November 21, 2023 02:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Auto create case #3238

Auto create case #3238

urchinpro commented Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

github-actions bot Nov 20, 2023

mikhailprivalov Nov 20, 2023

mikhailprivalov Nov 20, 2023

mikhailprivalov Nov 20, 2023

mikhailprivalov Nov 20, 2023

mikhailprivalov Nov 20, 2023

github-actions bot Nov 21, 2023

github-actions bot Nov 21, 2023

github-actions bot Nov 21, 2023

github-actions bot Nov 21, 2023

github-actions bot Nov 21, 2023

github-actions bot Nov 21, 2023

github-actions bot Nov 21, 2023

github-actions bot Nov 21, 2023

	plan_start_date=plan_date_start_case
	plan_start_date=plan_date_start_case,

	USE_TFOMS_DISTRICT, TYPE_COMPANY_SET_DIRECTION_PDF,
	USE_TFOMS_DISTRICT,
	TYPE_COMPANY_SET_DIRECTION_PDF,

	plan_start_date=plan_start_date_case
	plan_start_date=plan_start_date_case,

Auto create case #3238

Auto create case #3238

Conversation

urchinpro commented Nov 20, 2023

Описание изменений

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 20, 2023

Choose a reason for hiding this comment

mikhailprivalov Nov 20, 2023

Choose a reason for hiding this comment

mikhailprivalov Nov 20, 2023

Choose a reason for hiding this comment

mikhailprivalov Nov 20, 2023

Choose a reason for hiding this comment

mikhailprivalov Nov 20, 2023

Choose a reason for hiding this comment

mikhailprivalov Nov 20, 2023

Choose a reason for hiding this comment

github-actions bot Nov 21, 2023

Choose a reason for hiding this comment

github-actions bot Nov 21, 2023

Choose a reason for hiding this comment

github-actions bot Nov 21, 2023

Choose a reason for hiding this comment

github-actions bot Nov 21, 2023

Choose a reason for hiding this comment

github-actions bot Nov 21, 2023

Choose a reason for hiding this comment

github-actions bot Nov 21, 2023

Choose a reason for hiding this comment

github-actions bot Nov 21, 2023

Choose a reason for hiding this comment

github-actions bot Nov 21, 2023

Choose a reason for hiding this comment