Json for zip pc #3239
Merged
Json for zip pc #3239
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
integration_framework/views.py
Outdated
| @api_view(["POST"]) | ||
| def send_cpp_result(request): | ||
| pk = request.GET.get("pk") | ||
| research_pks = request.GET.get("research", "*") |
There was a problem hiding this comment.
[flake8] <841> reported by reviewdog 🐶
local variable 'research_pks' is assigned to but never used
integration_framework/views.py
Outdated
| "EmployeePositionUUID": "" | ||
| } | ||
|
|
||
| position = { |
There was a problem hiding this comment.
[flake8] <841> reported by reviewdog 🐶
local variable 'position' is assigned to but never used
integration_framework/views.py
Outdated
| "RiskGroup": "справочник", | ||
| "PMORecommendations": "справочник", | ||
| "result": "medexam", | ||
| "FactorsUUID": ["uuid", "uuid"], |
There was a problem hiding this comment.
🚫 [flake8] <241> reported by reviewdog 🐶
multiple spaces after ','
integration_framework/views.py
Outdated
| "gender": individual.sex.lower(), | ||
| "birthdate": individual.birthday.strftime("%Y%m%d"), | ||
| "EmployeeSubdivisionCode": "", | ||
| "EmployeePositionUUID": "" |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| "EmployeePositionUUID": "" | |
| "EmployeePositionUUID": "", |
integration_framework/views.py
Outdated
Comment on lines
3378
to
3392
| position = { | ||
| "uuid": "uuid", | ||
| "title": "" | ||
| } | ||
|
|
||
| contract = { | ||
| "ContraсtUUID": "", | ||
| "ContragentUUID": "", | ||
| "ResultUUID": "a755e6ab-296c-11eb-9451-00505683bb6c", | ||
| "number": "", | ||
| "uuid": "", | ||
| "date_start": "", | ||
| "date_end": "", | ||
| "company": "" | ||
| } |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| position = { | |
| "uuid": "uuid", | |
| "title": "" | |
| } | |
| contract = { | |
| "ContraсtUUID": "", | |
| "ContragentUUID": "", | |
| "ResultUUID": "a755e6ab-296c-11eb-9451-00505683bb6c", | |
| "number": "", | |
| "uuid": "", | |
| "date_start": "", | |
| "date_end": "", | |
| "company": "" | |
| } | |
| position = {"uuid": "uuid", "title": ""} | |
| contract = {"ContraсtUUID": "", "ContragentUUID": "", "ResultUUID": "a755e6ab-296c-11eb-9451-00505683bb6c", "number": "", "uuid": "", "date_start": "", "date_end": "", "company": ""} |
integration_framework/views.py
Outdated
| "departments": [ | ||
| {"title": "", "uuid": ""}, | ||
| {"title": "", "uuid": ""}, | ||
| ] |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| ] | |
| ], |
integration_framework/views.py
Outdated
| "RiskGroup": "справочник", | ||
| "PMORecommendations": "справочник", | ||
| "result": "medexam", | ||
| "FactorsUUID": ["uuid", "uuid"], |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| "FactorsUUID": ["uuid", "uuid"], | |
| "FactorsUUID": ["uuid", "uuid"], |
integration_framework/views.py
Outdated
| "result": "medexam", | ||
| "FactorsUUID": ["uuid", "uuid"], | ||
| "CertificateNumber": "", | ||
| "CertificateDate": "" |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| "CertificateDate": "" | |
| "CertificateDate": "", |
integration_framework/views.py
Outdated
Comment on lines
3421
to
3426
| result = { | ||
| "patient": patient, | ||
| "company": company, | ||
| "contract": contract, | ||
| "result": result | ||
| } |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| result = { | |
| "patient": patient, | |
| "company": company, | |
| "contract": contract, | |
| "result": result | |
| } | |
| result = {"patient": patient, "company": company, "contract": contract, "result": result} |
api/directions/views.py
Outdated
| @@ -1536,7 +1536,7 @@ def directions_paraclinic_form(request): | |||
| card_documents = d.client.get_card_documents(check_has_type=['СНИЛС']) | |||
|
|
|||
| has_snils = bool(card_documents) | |||
|
|
|||
| print(d.doc) | |||
There was a problem hiding this comment.
[flake8] <201> reported by reviewdog 🐶
print found.
xml_generate/views.py
Outdated
| env = Environment(loader=file_loader, trim_blocks=True, lstrip_blocks=True) | ||
| tm = env.get_template('cpp_result.xml') | ||
| msg = tm.render(data=data) | ||
| print(msg) |
There was a problem hiding this comment.
[flake8] <201> reported by reviewdog 🐶
print found.
xml_generate/views.py
Outdated
|
|
||
| def gen_resul_cpp2(): | ||
| str_addr = "templates/cpp/" | ||
| result_file_name= "cpp_result.xml" |
There was a problem hiding this comment.
🚫 [flake8] <225> reported by reviewdog 🐶
missing whitespace around operator
xml_generate/views.py
Outdated
| env = Environment(loader=file_loader, trim_blocks=True, lstrip_blocks=True) | ||
| tm = env.get_template(result_file_name) | ||
| msg = tm.render(data=data) | ||
| print(msg) |
There was a problem hiding this comment.
[flake8] <201> reported by reviewdog 🐶
print found.
xml_generate/views.py
Outdated
|
|
||
| def gen_resul_cpp2(): | ||
| str_addr = "templates/cpp/" | ||
| result_file_name= "cpp_result.xml" |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| result_file_name= "cpp_result.xml" | |
| result_file_name = "cpp_result.xml" |
# Conflicts: # poetry.lock
* Настройка необходимости отправки в ЦПП для компании * Добавление колонки статуса отправки в ЦПП по пациенту
Comment on lines
+2417
to
+2421
| data = { | ||
| "company": Company.as_json(company), | ||
| "contract": PriceName.as_json(price), | ||
| "patient": patient | ||
| } |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| data = { | |
| "company": Company.as_json(company), | |
| "contract": PriceName.as_json(price), | |
| "patient": patient | |
| } | |
| data = {"company": Company.as_json(company), "contract": PriceName.as_json(price), "patient": patient} |
Comment on lines
+1199
to
+1200
|
|
||
|
|
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
xml_generate/views.py
Outdated
Comment on lines
94
to
95
|
|
||
|
|
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
# Conflicts: # api/views.py # directions/models.py # xml_generate/views.py
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
forms/views.py
Outdated
|
|
||
|
|
||
| def generate_xml(request): | ||
|
|
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
utils/nsi_directories.py
Outdated
| 'низкий риск': '0330c6cd-d54d-4caf-b2b4-46790b3cfda4', | ||
| 'умеренный риск': 'be2dddf1-70b8-40a2-acc0-9dfdc6bf29d0', | ||
| 'высокий риск': 'b077b932-d429-4534-bda3-323776b0e3a8', | ||
| 'очень высокий риск': '5a961da8-b430-48af-83f6-f827297f087c' |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| 'очень высокий риск': '5a961da8-b430-48af-83f6-f827297f087c' | |
| 'очень высокий риск': '5a961da8-b430-48af-83f6-f827297f087c', |
utils/nsi_directories.py
Outdated
| 'Низкий': 'bff9f99c-8b01-4ac9-afbf-6e8b6e6d25fc', | ||
| 'Средний': 'c57b87e8-d195-47f4-bbe3-5a3056b9bbcc', | ||
| 'Высокий': '820e43db-54c1-46ce-9c08-85dc0aae8204', | ||
| 'Очень высокий': '50b7894e-d990-4c40-a1e1-19b043f0c5ff' |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| 'Очень высокий': '50b7894e-d990-4c40-a1e1-19b043f0c5ff' | |
| 'Очень высокий': '50b7894e-d990-4c40-a1e1-19b043f0c5ff', |
utils/nsi_directories.py
Outdated
| 'низкий риск': '0330c6cd-d54d-4caf-b2b4-46790b3cfda4', | ||
| 'умеренный риск': 'be2dddf1-70b8-40a2-acc0-9dfdc6bf29d0', | ||
| 'высокий риск': 'b077b932-d429-4534-bda3-323776b0e3a8', | ||
| 'очень высокий риск': '5a961da8-b430-48af-83f6-f827297f087c' |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| 'очень высокий риск': '5a961da8-b430-48af-83f6-f827297f087c' | |
| 'очень высокий риск': '5a961da8-b430-48af-83f6-f827297f087c', |
utils/nsi_directories.py
Outdated
| 'Низкий': 'bff9f99c-8b01-4ac9-afbf-6e8b6e6d25fc', | ||
| 'Средний': 'c57b87e8-d195-47f4-bbe3-5a3056b9bbcc', | ||
| 'Высокий': '820e43db-54c1-46ce-9c08-85dc0aae8204', | ||
| 'Очень высокий': '50b7894e-d990-4c40-a1e1-19b043f0c5ff' |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| 'Очень высокий': '50b7894e-d990-4c40-a1e1-19b043f0c5ff' | |
| 'Очень высокий': '50b7894e-d990-4c40-a1e1-19b043f0c5ff', |
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
utils/nsi_directories.py
Outdated
| 'Низкий': 'bff9f99c-8b01-4ac9-afbf-6e8b6e6d25fc', | ||
| 'Средний': 'c57b87e8-d195-47f4-bbe3-5a3056b9bbcc', | ||
| 'Высокий': '820e43db-54c1-46ce-9c08-85dc0aae8204', | ||
| 'Очень высокий': '50b7894e-d990-4c40-a1e1-19b043f0c5ff' |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| 'Очень высокий': '50b7894e-d990-4c40-a1e1-19b043f0c5ff' | |
| 'Очень высокий': '50b7894e-d990-4c40-a1e1-19b043f0c5ff', |
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
api/directions/views.py
Outdated
| "patient": patient | ||
| } | ||
| field_titles = [ | ||
| "СНИЛС", "Дата осмотра", "Результат медицинского осмотра", "Группы риска", "Группы риска по SCORE", |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| "СНИЛС", "Дата осмотра", "Результат медицинского осмотра", "Группы риска", "Группы риска по SCORE", | |
| "СНИЛС", | |
| "Дата осмотра", | |
| "Результат медицинского осмотра", | |
| "Группы риска", | |
| "Группы риска по SCORE", |
api/directions/views.py
Outdated
| field_titles = [ | ||
| "СНИЛС", "Дата осмотра", "Результат медицинского осмотра", "Группы риска", "Группы риска по SCORE", | ||
| "Дата присвоения группы здоровья", | ||
| "Вредные факторы", "Группа здоровья", "Номер справки", "Дата выдачи справки" |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| "Вредные факторы", "Группа здоровья", "Номер справки", "Дата выдачи справки" | |
| "Вредные факторы", | |
| "Группа здоровья", | |
| "Номер справки", | |
| "Дата выдачи справки", |
utils/nsi_directories.py
Outdated
| 'values': { | ||
| 'Медицинские противопоказания к работе не выявлены': '17988ff4-fed9-4c95-b03d-6da09aa9e895', | ||
| 'Медицинские противопоказания к работе выявлены': '9eda5102-80fe-4444-afcc-4464f6d43a71', | ||
| 'Выдана справка о необходимости дополнительного медицинского обследования': '20487f06-1140-4659-aa61-7fa8a93eeaa7' |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| 'Выдана справка о необходимости дополнительного медицинского обследования': '20487f06-1140-4659-aa61-7fa8a93eeaa7' | |
| 'Выдана справка о необходимости дополнительного медицинского обследования': '20487f06-1140-4659-aa61-7fa8a93eeaa7', |
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
api/directions/views.py
Outdated
| "Группы риска", | ||
| "Группы риска по SCORE", | ||
| "Дата присвоения группы здоровья", | ||
| "Вредные факторы", "Группа здоровья", "Номер справки", "Дата выдачи справки" |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| "Вредные факторы", "Группа здоровья", "Номер справки", "Дата выдачи справки" | |
| "Вредные факторы", | |
| "Группа здоровья", | |
| "Номер справки", | |
| "Дата выдачи справки", |
utils/nsi_directories.py
Outdated
| 'values': { | ||
| 'Медицинские противопоказания к работе не выявлены': '17988ff4-fed9-4c95-b03d-6da09aa9e895', | ||
| 'Медицинские противопоказания к работе выявлены': '9eda5102-80fe-4444-afcc-4464f6d43a71', | ||
| 'Выдана справка о необходимости дополнительного медицинского обследования': '20487f06-1140-4659-aa61-7fa8a93eeaa7' |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| 'Выдана справка о необходимости дополнительного медицинского обследования': '20487f06-1140-4659-aa61-7fa8a93eeaa7' | |
| 'Выдана справка о необходимости дополнительного медицинского обследования': '20487f06-1140-4659-aa61-7fa8a93eeaa7', |
api/directions/views.py
Outdated
| "Группы риска", | ||
| "Группы риска по SCORE", | ||
| "Дата присвоения группы здоровья", | ||
| "Вредные факторы", "Группа здоровья", "Номер справки", "Дата выдачи справки" |
There was a problem hiding this comment.
[black-format] reported by reviewdog 🐶
Suggested change
| "Вредные факторы", "Группа здоровья", "Номер справки", "Дата выдачи справки" | |
| "Вредные факторы", | |
| "Группа здоровья", | |
| "Номер справки", | |
| "Дата выдачи справки", |
mikhailprivalov
approved these changes
Dec 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание изменений
cpp заготовка