From 741bb9cc46bc1add8a66dcb531686136f386c8bf Mon Sep 17 00:00:00 2001 From: sergei kasianenko Date: Sat, 23 Mar 2024 22:57:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?003/=D1=83-=20530?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/dashboards/views.py | 2 +- l2-frontend/src/pages/Stationar/index.vue | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/api/dashboards/views.py b/api/dashboards/views.py index a21e185d5a..ec7e5577ae 100644 --- a/api/dashboards/views.py +++ b/api/dashboards/views.py @@ -123,7 +123,7 @@ def cash_register(request): data[f"Терминал {qr.department_id}"][qr.char_day] = f"{qr.received_terminal:,.2f}" data[f"Возврат нал {qr.department_id}"][qr.char_day] = f"{qr.return_cash:,.2f}" data[f"Возврат терм {qr.department_id}"][qr.char_day] = f"{qr.return_terminal:,.2f}" - data[f"Итого {qr.department_id}"][qr.char_day] = qr.received_cash + qr.received_terminal - qr.return_cash - qr.return_terminal + data[f"Итого {qr.department_id}"][qr.char_day] = f"{(qr.received_cash + qr.received_terminal - qr.return_cash - qr.return_terminal):,.2f}" table_data = [v for v in data.values()] return JsonResponse({"columns": columns, "tableData": table_data}) diff --git a/l2-frontend/src/pages/Stationar/index.vue b/l2-frontend/src/pages/Stationar/index.vue index a1b543b875..12529ec0f3 100644 --- a/l2-frontend/src/pages/Stationar/index.vue +++ b/l2-frontend/src/pages/Stationar/index.vue @@ -89,6 +89,15 @@ target="_blank" > 003/у +
+ 530 +
Date: Sat, 23 Mar 2024 23:04:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?003/=D1=83-=20530?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- l2-frontend/src/pages/Stationar/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l2-frontend/src/pages/Stationar/index.vue b/l2-frontend/src/pages/Stationar/index.vue index 12529ec0f3..36829ab05a 100644 --- a/l2-frontend/src/pages/Stationar/index.vue +++ b/l2-frontend/src/pages/Stationar/index.vue @@ -96,7 +96,7 @@ :href="`/forms/pdf?type=106.02&dir_pk=${direction}`" class="a-under" target="_blank" - > 530 + > 530 (003/у)
Date: Sun, 24 Mar 2024 00:26:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?80mm=20-=20form.=20=D0=92=D1=81=D0=B5=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- directions/forms/forms580.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/directions/forms/forms580.py b/directions/forms/forms580.py index 64d52ae7c9..93510b2975 100644 --- a/directions/forms/forms580.py +++ b/directions/forms/forms580.py @@ -19,11 +19,11 @@ from laboratory.utils import strdate, strtime from podrazdeleniya.models import Podrazdeleniya from utils import xh -from utils.xh import translation_number_from_decimal from reportlab.graphics.barcode import qr from reportlab.graphics.barcode import createBarcodeDrawing -from django.utils.text import Truncator + from django.core.paginator import Paginator +from reportlab.platypus.flowables import HRFlowable def form_01(request_data): @@ -276,6 +276,7 @@ def form_01(request_data): objs.append(tbl) if is_laboratory: objs.append(Spacer(1, 8 * cm)) + objs.append(Spacer(1, 7 * mm)) if not dir.imported_from_rmis: if dir.doc_who_create and dir.doc_who_create != dir.doc: objs.append(Paragraph(f"Выписал:{dir.doc_who_create.get_fio()} {dir.doc_who_create.podrazdeleniye.title}", style)) @@ -283,6 +284,10 @@ def form_01(request_data): if dir.doc: objs.append(Paragraph(f"Отделение: {dir.get_doc_podrazdeleniye_title}", style)) objs.append(Paragraph(f"Л/врач: {dir.doc.get_fio()}", style)) + objs.append(Spacer(1, 7 * mm)) + objs.append(Paragraph("Всего назначено: " + str(len(issledovaniya)), style)) + objs.append(Spacer(1, 3 * mm)) + objs.append(HRFlowable(width=80 * mm, spaceAfter=3 * mm, spaceBefore=3 * mm, color=colors.black)) objs.append(PageBreak()) doc.build(objs)