From ca75d199ce417df84188a4cff3ee9c2fc100d68c Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sun, 5 May 2024 20:48:34 +0800
Subject: [PATCH 01/18] bill with price

---
 api/contracts/func.py                   | 10 +--
 api/contracts/views.py                  | 17 +++--
 contracts/admin.py                      |  2 +-
 contracts/models.py                     | 13 ++--
 directions/models.py                    |  2 +-
 l2-frontend/src/pages/Billing/index.vue | 97 +++++++++++++++----------
 statistic/sql_func.py                   |  6 +-
 7 files changed, 89 insertions(+), 58 deletions(-)

diff --git a/api/contracts/func.py b/api/contracts/func.py
index 8917aa0d85..cafa5fd75a 100644
--- a/api/contracts/func.py
+++ b/api/contracts/func.py
@@ -6,17 +6,15 @@
 from statistic.views import get_price_hospital
 
 
-def researches_for_billing(type_price, company_id, date_start, date_end):
+def researches_for_billing(type_price, company_id, date_start, date_end, price_id):
     sql_result = None
     research_coast = {}
-    price = None
     if type_price == "Заказчик":
         hospital_id = company_id
-        price = get_price_hospital(hospital_id, date_start, date_end)
         base = CardBase.objects.filter(internal_type=True).first()
         finsource = IstochnikiFinansirovaniya.objects.filter(base=base, title__in=["Договор"], hide=False).first()
-        sql_result = statistics_research_by_hospital_for_external_orders(date_start, date_end, hospital_id, finsource.pk)
-        coast_research_price = get_research_coast_by_prce((price.pk,))
+        sql_result = statistics_research_by_hospital_for_external_orders(date_start, date_end, hospital_id, finsource.pk, price_id)
+        coast_research_price = get_research_coast_by_prce((price_id,))
         research_coast = {coast.research_id: float(coast.coast) for coast in coast_research_price}
     result = {}
     iss_data = set()
@@ -39,7 +37,7 @@ def researches_for_billing(type_price, company_id, date_start, date_end):
                 result[i.patient_card_num] = [current_data.copy()]
             else:
                 result[i.patient_card_num].append(current_data.copy())
-    return {"result": result, "issIds": list(iss_data), "priceId": price.pk}
+    return {"result": result, "issIds": list(iss_data), "priceId": price_id}
 
 
 def get_confirm_data_for_billing(price_id, billing_id):
diff --git a/api/contracts/views.py b/api/contracts/views.py
index 71927e00d7..36ea004d17 100644
--- a/api/contracts/views.py
+++ b/api/contracts/views.py
@@ -19,8 +19,9 @@ def create_billing(request):
     hospital_id = body.get("hospitalId")
     date_start = body.get("dateStart")
     date_end = body.get("dateEnd")
+    price_id = body.get("priceId")
     info = body.get("info")
-    billing_id = BillingRegister.create_billing(company_id, hospital_id, date_start, date_end, info)
+    billing_id = BillingRegister.create_billing(company_id, hospital_id, date_start, date_end, info, price_id)
     return JsonResponse({"ok": True, "billingInfo": billing_id})
 
 
@@ -33,9 +34,10 @@ def update_billing(request):
     date_end = body.get("dateEnd")
     billing_id = body.get("id")
     info = body.get("info")
-    billing_info = BillingRegister.update_billing(billing_id, date_start, date_end, info)
+    price_id = body.get("priceId")
+    billing_info = BillingRegister.update_billing(billing_id, date_start, date_end, info, price_id)
     type_price = body.get("typeCompany")
-    data = researches_for_billing(type_price, hospital_id, date_start, date_end)
+    data = researches_for_billing(type_price, hospital_id, date_start, date_end, price_id)
     structure_data = structure_table(data)
     return JsonResponse({"ok": True, "billingInfo": billing_info, **structure_data})
 
@@ -63,8 +65,11 @@ def get_hospital_prices(request):
     hospital_id = body.get("hospitalId")
     date_start = body.get("dateStart")
     date_end = body.get("dateEnd")
-    prices = PriceName.get_hospital_many_prices_by_date(hospital_id, date_start, date_end, is_subcontract=True)
-    prices_data = [{"id": i.pk, "label": i.title} for i in prices]
+    if not(date_start) or not(date_end):
+        prices_data = []
+    else:
+        prices = PriceName.get_hospital_many_prices_by_date(hospital_id, date_start, date_end, is_subcontract=True)
+        prices_data = [{"id": i.pk, "label": i.title} for i in prices]
     return JsonResponse({"data": prices_data})
 
 
@@ -94,6 +99,6 @@ def get_billing(request):
     billing_id = request_data.get("billingId")
     result = BillingRegister.get_billing(billing_id)
     type_price = request_data.get("typeCompany")
-    data = researches_for_billing(type_price, result["hospitalId"], result["dateStart"], result["dateEnd"])
+    data = researches_for_billing(type_price, result["hospitalId"], result["dateStart"], result["dateEnd"], result["priceId"])
     structure_data = structure_table(data)
     return JsonResponse({"result": result, **structure_data})
diff --git a/contracts/admin.py b/contracts/admin.py
index 2d026100f6..4cbc32871f 100644
--- a/contracts/admin.py
+++ b/contracts/admin.py
@@ -95,7 +95,7 @@ class ResMedicalExamination(admin.ModelAdmin):
 
 
 class ResBillingRegister(admin.ModelAdmin):
-    list_display = ('company', 'hospital',)
+    list_display = ('company', 'hospital', 'date_start', 'date_end', 'price',)
     list_display_links = ('company', 'hospital',)
     list_filter = ('hospital', 'create_at',)
 
diff --git a/contracts/models.py b/contracts/models.py
index 6cb38bfa5b..44955ca3f8 100644
--- a/contracts/models.py
+++ b/contracts/models.py
@@ -364,26 +364,28 @@ class BillingRegister(models.Model):
     date_end = models.DateField(help_text="Дата окончания периода", default=None, blank=True, null=True, db_index=True)
     info = models.CharField(max_length=128, help_text="Информация по счет", default=None, blank=True, null=True)
     is_confirmed = models.BooleanField(default=False, help_text="Сформирован счет")
-    price_name = models.ForeignKey(PriceName, on_delete=models.DO_NOTHING, default=None, blank=True, null=True, db_index=True)
+    price = models.ForeignKey(PriceName, on_delete=models.DO_NOTHING, default=None, blank=True, null=True, db_index=True)
 
     def __str__(self):
-        return f"{self.company} - {self.date_start} - {self.date_end}"
+        return f"{self.company} - {self.date_start} - {self.date_end} - {self.price}"
 
     @staticmethod
-    def update_billing(billing_id, date_start, date_end, info):
+    def update_billing(billing_id, date_start, date_end, info, price_id):
         current_billing = BillingRegister.objects.filter(id=billing_id).first()
         if current_billing:
             current_billing.date_start = date_start
             current_billing.date_end = date_end
             current_billing.info = info
+            current_billing.price_id = price_id
             current_billing.save()
             return info
         else:
             return False
 
     @staticmethod
-    def create_billing(company_id, hospital_id, date_start, date_end, info):
-        current_billing = BillingRegister(hospital_id=hospital_id, company_id=company_id, date_start=date_start, date_end=date_end, info=info)
+    def create_billing(company_id, hospital_id, date_start, date_end, info, price_id):
+        current_billing = BillingRegister(hospital_id=hospital_id, company_id=company_id, date_start=date_start, date_end=date_end, info=info,
+                                          price_name_id=price_id)
         current_billing.save()
         return current_billing.pk
 
@@ -420,6 +422,7 @@ def as_json(self):
             "dateEnd": self.date_end,
             "info": self.info,
             "isConfirmed": self.is_confirmed,
+            "priceId": self.price_id,
         }
         return result
 
diff --git a/directions/models.py b/directions/models.py
index 5399b04e67..f1feca8176 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -2385,7 +2385,7 @@ def gen_after_confirm(self, user: User):
         )
 
     def __str__(self):
-        return f"{self.pk} - {self.napravleniye.pk}-{self.napravleniye.client.get_fio_w_card()}"
+        return f"{self.pk} - {self.napravleniye}"
 
     def is_get_material(self):
         """
diff --git a/l2-frontend/src/pages/Billing/index.vue b/l2-frontend/src/pages/Billing/index.vue
index 35d7b42a54..7dded19aaf 100644
--- a/l2-frontend/src/pages/Billing/index.vue
+++ b/l2-frontend/src/pages/Billing/index.vue
@@ -70,18 +70,28 @@
         </div>
         <div class="margin-item">
           <button
+            v-if="selectedBilling && selectedPrice"
             class="btn btn-blue-nb"
             @click="updateBilling"
           >
-            {{ selectedBilling ? 'Сохранить проект' : 'Новый счет' }}
+            Сохранить проект
           </button>
           <button
+            v-if="selectedPrice && !selectedBilling"
+            class="btn btn-blue-nb"
+            @click="createBilling"
+          >
+            Новый счет
+          </button>
+          <button
+            v-if="selectedBilling && selectedPrice"
             class="btn btn-blue-nb"
             @click="updateBilling"
           >
             Записать счет
           </button>
           <button
+            v-if="selectedBilling && selectedPrice"
             class="btn btn-blue-nb"
             @click="updateBilling"
           >
@@ -190,15 +200,6 @@ const getBillings = async () => {
   billings.value = result;
 };
 
-watch(selectedCompany, () => {
-  if (selectedCompany.value) {
-    selectedBilling.value = null;
-    getBillings();
-  } else {
-    selectedBilling.value = null;
-  }
-});
-
 const billingTemplate = ref({
   id: -1,
   hospitalId: null,
@@ -246,16 +247,25 @@ watch(selectedBilling, () => {
   }
 });
 
+const prices = ref([]);
+const selectedPrice = ref(null);
+const getPrices = async () => {
+  await store.dispatch(actions.INC_LOADING);
+  const billingData = { ...currentBillingData.value, typeCompany: selectedType.value, hospitalId: selectedCompany.value };
+  const { data } = await api('contracts/get-hospital-prices', { ...billingData });
+  await store.dispatch(actions.DEC_LOADING);
+  prices.value = data;
+};
+
 const updateBilling = async () => {
-  let billingData = {};
-  let apiPoint = '';
   if (selectedBilling.value) {
-    billingData = { ...currentBillingData.value, typeCompany: selectedType.value };
-    apiPoint = 'contracts/update-billing';
+    const billingData = { ...currentBillingData.value, typeCompany: selectedType.value };
+    const apiPoint = 'contracts/update-billing';
+    const priceId = selectedPrice.value;
     await store.dispatch(actions.INC_LOADING);
     const {
       ok, billingInfo, columns, tableData,
-    } = await api(apiPoint, { ...billingData });
+    } = await api(apiPoint, { ...billingData, priceId });
     await store.dispatch(actions.DEC_LOADING);
     if (ok) {
       await getBillings();
@@ -265,33 +275,30 @@ const updateBilling = async () => {
     } else {
       root.$emit('msg', 'ok', 'ошибка');
     }
-  } else {
-    const hospitalId = selectedType.value !== 'Работодатель' ? selectedCompany.value : null;
-    const companyId = selectedType.value === 'Работодатель' ? selectedCompany.value : null;
-    billingData = {
-      ...currentBillingData.value, hospitalId, companyId, typeCompany: selectedType.value,
-    };
-    apiPoint = 'contracts/create-billing';
-    await store.dispatch(actions.INC_LOADING);
-    const { ok, billingInfo } = await api(apiPoint, { ...billingData });
-    await store.dispatch(actions.DEC_LOADING);
-    if (ok) {
-      root.$emit('msg', 'ok', 'Создано');
-      selectedBilling.value = billingInfo;
-    } else {
-      root.$emit('msg', 'ok', 'ошибка');
-    }
   }
 };
 
-const prices = ref([]);
-const selectedPrice = ref(null);
-const getPrices = async () => {
+const createBilling = async () => {
+  const hospitalId = selectedType.value !== 'Работодатель' ? selectedCompany.value : null;
+  const companyId = selectedType.value === 'Работодатель' ? selectedCompany.value : null;
+  const priceId = selectedPrice.value;
+  const billingData = {
+    ...currentBillingData.value,
+    hospitalId,
+    companyId,
+    priceId,
+    typeCompany: selectedType.value,
+  };
+  const apiPoint = 'contracts/create-billing';
   await store.dispatch(actions.INC_LOADING);
-  const billingData = { ...currentBillingData.value, typeCompany: selectedType.value, hospitalId: selectedCompany.value };
-  const { data } = await api('contracts/get-hospital-prices', { ...billingData });
+  const { ok, billingInfo } = await api(apiPoint, { ...billingData });
   await store.dispatch(actions.DEC_LOADING);
-  prices.value = data;
+  if (ok) {
+    root.$emit('msg', 'ok', 'Создано');
+    selectedBilling.value = billingInfo;
+  } else {
+    root.$emit('msg', 'ok', 'ошибка');
+  }
 };
 
 watch(() => currentBillingData.value.dateStart, (newValue, oldValue) => {
@@ -300,6 +307,22 @@ watch(() => currentBillingData.value.dateStart, (newValue, oldValue) => {
   }
 });
 
+watch(() => currentBillingData.value.dateEnd, (newValue, oldValue) => {
+  if ((newValue !== oldValue) && currentBillingData.value.dateStart) {
+    getPrices();
+  }
+});
+
+watch(selectedCompany, () => {
+  if (selectedCompany.value) {
+    selectedBilling.value = null;
+    getBillings();
+    getPrices();
+  } else {
+    selectedBilling.value = null;
+  }
+});
+
 </script>
 
 <style scoped lang="scss">
diff --git a/statistic/sql_func.py b/statistic/sql_func.py
index 9f951619b5..835cf25baa 100644
--- a/statistic/sql_func.py
+++ b/statistic/sql_func.py
@@ -879,7 +879,7 @@ def statistics_by_research_sets_company(d_s, d_e, fin_source_pk, researches, com
     return rows
 
 
-def statistics_research_by_hospital_for_external_orders(d_s, d_e, hospital_id, fin_source_pk):
+def statistics_research_by_hospital_for_external_orders(d_s, d_e, hospital_id, fin_source_pk, price_id):
     with connection.cursor() as cursor:
         cursor.execute(
             """
@@ -923,11 +923,13 @@ def statistics_research_by_hospital_for_external_orders(d_s, d_e, hospital_id, f
                         ) 
                         AND
                         directions_napravleniya.hospital_id = %(hospital_id)s
+                        AND
+                        directions_napravleniya.price_name_id = %(price_id)s
                 ORDER BY 
                     directions_napravleniya.client_id, 
                     directions_issledovaniya.time_confirmation
                             """,
-            params={'d_start': d_s, 'd_end': d_e, 'tz': TIME_ZONE, 'fin_source_pk': fin_source_pk, 'hospital_id': hospital_id},
+            params={'d_start': d_s, 'd_end': d_e, 'tz': TIME_ZONE, 'fin_source_pk': fin_source_pk, 'hospital_id': hospital_id, 'price_id': price_id},
         )
         rows = namedtuplefetchall(cursor)
     return rows

From 295e8b1947ab8133bb9e638e833a615d6e0dae4a Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sun, 5 May 2024 21:00:16 +0800
Subject: [PATCH 02/18] current price in billing

---
 l2-frontend/src/pages/Billing/index.vue | 30 ++++++++++++++-----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/l2-frontend/src/pages/Billing/index.vue b/l2-frontend/src/pages/Billing/index.vue
index 7dded19aaf..279e6f35ef 100644
--- a/l2-frontend/src/pages/Billing/index.vue
+++ b/l2-frontend/src/pages/Billing/index.vue
@@ -224,6 +224,20 @@ const currentBillingData = ref({
   isConfirmed: '',
 });
 
+const clearBilling = () => {
+  currentBillingData.value = { ...billingTemplate.value };
+};
+
+const prices = ref([]);
+const selectedPrice = ref(null);
+const getPrices = async () => {
+  await store.dispatch(actions.INC_LOADING);
+  const billingData = { ...currentBillingData.value, typeCompany: selectedType.value, hospitalId: selectedCompany.value };
+  const { data } = await api('contracts/get-hospital-prices', { ...billingData });
+  await store.dispatch(actions.DEC_LOADING);
+  prices.value = data;
+};
+
 const getBilling = async () => {
   await store.dispatch(actions.INC_LOADING);
   const { result, columns, tableData } = await api('contracts/get-billing', {
@@ -234,9 +248,9 @@ const getBilling = async () => {
   currentBillingData.value = result;
   colTable.value = columns;
   services.value = tableData;
-};
-const clearBilling = () => {
-  currentBillingData.value = { ...billingTemplate.value };
+  const { data } = await api('contracts/get-hospital-prices', { ...currentBillingData });
+  prices.value = data;
+  selectedPrice.value = result.priceId;
 };
 
 watch(selectedBilling, () => {
@@ -247,16 +261,6 @@ watch(selectedBilling, () => {
   }
 });
 
-const prices = ref([]);
-const selectedPrice = ref(null);
-const getPrices = async () => {
-  await store.dispatch(actions.INC_LOADING);
-  const billingData = { ...currentBillingData.value, typeCompany: selectedType.value, hospitalId: selectedCompany.value };
-  const { data } = await api('contracts/get-hospital-prices', { ...billingData });
-  await store.dispatch(actions.DEC_LOADING);
-  prices.value = data;
-};
-
 const updateBilling = async () => {
   if (selectedBilling.value) {
     const billingData = { ...currentBillingData.value, typeCompany: selectedType.value };

From cca6bfd111a8fb62cd52fc8202b7a81316303103 Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sun, 5 May 2024 21:17:27 +0800
Subject: [PATCH 03/18] fir title billing

---
 api/contracts/views.py |  1 +
 contracts/models.py    | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/api/contracts/views.py b/api/contracts/views.py
index 36ea004d17..2568ed8d24 100644
--- a/api/contracts/views.py
+++ b/api/contracts/views.py
@@ -20,6 +20,7 @@ def create_billing(request):
     date_start = body.get("dateStart")
     date_end = body.get("dateEnd")
     price_id = body.get("priceId")
+    print(price_id)
     info = body.get("info")
     billing_id = BillingRegister.create_billing(company_id, hospital_id, date_start, date_end, info, price_id)
     return JsonResponse({"ok": True, "billingInfo": billing_id})
diff --git a/contracts/models.py b/contracts/models.py
index 44955ca3f8..474cc49cf9 100644
--- a/contracts/models.py
+++ b/contracts/models.py
@@ -384,8 +384,7 @@ def update_billing(billing_id, date_start, date_end, info, price_id):
 
     @staticmethod
     def create_billing(company_id, hospital_id, date_start, date_end, info, price_id):
-        current_billing = BillingRegister(hospital_id=hospital_id, company_id=company_id, date_start=date_start, date_end=date_end, info=info,
-                                          price_name_id=price_id)
+        current_billing = BillingRegister(hospital_id=hospital_id, company_id=company_id, date_start=date_start, date_end=date_end, info=info, price_id=price_id)
         current_billing.save()
         return current_billing.pk
 
@@ -401,7 +400,12 @@ def get_billings(hospital_id=None, company_id=None):
         if hospital_id:
             billings = BillingRegister.objects.filter(hospital_id=hospital_id).select_related("hospital")
             result = [
-                {"id": billing.pk, "label": f"{billing.hospital.short_title}-{billing.date_start.strftime('%d.%m.%Y')}-{billing.date_end.strftime('%d.%m.%Y')}"} for billing in billings
+                {
+                    "id": billing.pk,
+                    "label": f"{billing.date_start.strftime('%d.%m.%Y')}"
+                             f"-{billing.date_end.strftime('%d.%m.%Y')} - {'Закрыт' if billing.is_confirmed else 'Проект'}"
+                }
+                for billing in billings
             ]
         else:
             billings = BillingRegister.objects.filter(company_id=company_id).select_related("company")

From 387e7d1c024278ad89115fcd513ffef7041c7783 Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sun, 5 May 2024 21:33:44 +0800
Subject: [PATCH 04/18] =?UTF-8?q?fix=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84-=D1=86=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/contracts/func.py | 5 ++---
 contracts/models.py   | 4 ++--
 contracts/sql_func.py | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/api/contracts/func.py b/api/contracts/func.py
index cafa5fd75a..899964b089 100644
--- a/api/contracts/func.py
+++ b/api/contracts/func.py
@@ -1,9 +1,8 @@
 from clients.models import CardBase
 from contracts.models import BillingRegister
-from contracts.sql_func import get_research_coast_by_prce, get_data_for_conform_billing
+from contracts.sql_func import get_research_coast_by_prce, get_data_for_confirm_billing
 from directions.models import IstochnikiFinansirovaniya
 from statistic.sql_func import statistics_research_by_hospital_for_external_orders
-from statistic.views import get_price_hospital
 
 
 def researches_for_billing(type_price, company_id, date_start, date_end, price_id):
@@ -41,7 +40,7 @@ def researches_for_billing(type_price, company_id, date_start, date_end, price_i
 
 
 def get_confirm_data_for_billing(price_id, billing_id):
-    sql_result = get_data_for_conform_billing(billing_id)
+    sql_result = get_data_for_confirm_billing(billing_id)
     coast_research_price = get_research_coast_by_prce((price_id,))
     research_coast = {coast.research_id: float(coast.coast) for coast in coast_research_price}
     result = {}
diff --git a/contracts/models.py b/contracts/models.py
index 474cc49cf9..1d77abf756 100644
--- a/contracts/models.py
+++ b/contracts/models.py
@@ -402,8 +402,8 @@ def get_billings(hospital_id=None, company_id=None):
             result = [
                 {
                     "id": billing.pk,
-                    "label": f"{billing.date_start.strftime('%d.%m.%Y')}"
-                             f"-{billing.date_end.strftime('%d.%m.%Y')} - {'Закрыт' if billing.is_confirmed else 'Проект'}"
+                    "label": f"{billing.date_start.strftime('%d.%m.%Y')} "
+                             f" - {billing.date_end.strftime('%d.%m.%Y')} - {'Закрыт' if billing.is_confirmed else 'Проект'}"
                 }
                 for billing in billings
             ]
diff --git a/contracts/sql_func.py b/contracts/sql_func.py
index 0e8ccba0cb..f0f67616e7 100644
--- a/contracts/sql_func.py
+++ b/contracts/sql_func.py
@@ -64,7 +64,7 @@ def get_research_coast_by_prce(price_id):
     return rows
 
 
-def get_data_for_conform_billing(billing_id):
+def get_data_for_confirm_billing(billing_id):
     with connection.cursor() as cursor:
         cursor.execute(
             """

From 31ffd772a7c1d00988a60d8c8f18bc851b45ce61 Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Fri, 10 May 2024 22:39:08 +0800
Subject: [PATCH 05/18] =?UTF-8?q?fix=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84-=D1=86=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/contracts/func.py                         |  8 +++-
 api/contracts/views.py                        | 46 +++++++++++--------
 contracts/admin.py                            |  3 +-
 contracts/models.py                           | 13 ++++--
 contracts/sql_func.py                         |  9 ++--
 directions/models.py                          |  4 +-
 l2-frontend/src/pages/Billing/index.vue       | 29 ++++++++++--
 .../src/ui-cards/SelectedResearches.vue       | 40 ++++++++++++++++
 statistic/sql_func.py                         |  2 +
 9 files changed, 121 insertions(+), 33 deletions(-)

diff --git a/api/contracts/func.py b/api/contracts/func.py
index 899964b089..d188aa66f3 100644
--- a/api/contracts/func.py
+++ b/api/contracts/func.py
@@ -5,14 +5,18 @@
 from statistic.sql_func import statistics_research_by_hospital_for_external_orders
 
 
-def researches_for_billing(type_price, company_id, date_start, date_end, price_id):
+def researches_for_billing(type_price, company_id, date_start, date_end, price_id, is_confirmed, billing_id):
     sql_result = None
     research_coast = {}
     if type_price == "Заказчик":
         hospital_id = company_id
         base = CardBase.objects.filter(internal_type=True).first()
         finsource = IstochnikiFinansirovaniya.objects.filter(base=base, title__in=["Договор"], hide=False).first()
-        sql_result = statistics_research_by_hospital_for_external_orders(date_start, date_end, hospital_id, finsource.pk, price_id)
+        if not is_confirmed:
+            sql_result = statistics_research_by_hospital_for_external_orders(date_start, date_end, hospital_id, finsource.pk, price_id)
+        else:
+            sql_result = get_data_for_confirm_billing(billing_id)
+            print("isConfirmed")
         coast_research_price = get_research_coast_by_prce((price_id,))
         research_coast = {coast.research_id: float(coast.coast) for coast in coast_research_price}
     result = {}
diff --git a/api/contracts/views.py b/api/contracts/views.py
index 2568ed8d24..c9e633e810 100644
--- a/api/contracts/views.py
+++ b/api/contracts/views.py
@@ -20,7 +20,6 @@ def create_billing(request):
     date_start = body.get("dateStart")
     date_end = body.get("dateEnd")
     price_id = body.get("priceId")
-    print(price_id)
     info = body.get("info")
     billing_id = BillingRegister.create_billing(company_id, hospital_id, date_start, date_end, info, price_id)
     return JsonResponse({"ok": True, "billingInfo": billing_id})
@@ -36,27 +35,39 @@ def update_billing(request):
     billing_id = body.get("id")
     info = body.get("info")
     price_id = body.get("priceId")
-    billing_info = BillingRegister.update_billing(billing_id, date_start, date_end, info, price_id)
-    type_price = body.get("typeCompany")
-    data = researches_for_billing(type_price, hospital_id, date_start, date_end, price_id)
-    structure_data = structure_table(data)
-    return JsonResponse({"ok": True, "billingInfo": billing_info, **structure_data})
+    billing_data = BillingRegister.objects.filter(pk=billing_id).first()
+    if not billing_data.is_confirmed:
+        billing_info = BillingRegister.update_billing(billing_id, date_start, date_end, info, price_id)
+        type_price = body.get("typeCompany")
+        data = researches_for_billing(type_price, hospital_id, date_start, date_end, price_id, billing_data.is_confirmed, billing_id)
+        structure_data = structure_table(data)
+        return JsonResponse({"ok": True, "billingInfo": billing_info, **structure_data})
 
 
 @login_required
 @group_required("Счет: проект")
 def confirm_billing(request):
     body = json.loads(request.body)
-    billing_id = body.get("billingId")
-    iss_ids = body.get("issIds")
-    price_id = body.get("priceId")
-    with transaction.atomic():
-        is_confirm_billing = BillingRegister.confirm_billing(billing_id)
-        set_billing_id_for_iss = Issledovaniya.save_billing(billing_id, iss_ids)
-        data_confirm_billing = get_confirm_data_for_billing(price_id, billing_id)
-        raw_document_pk = RawDocumentBillingRegister.create_raw_billing_data(billing_id, data_confirm_billing)
-
-    return JsonResponse({"ok": is_confirm_billing and set_billing_id_for_iss and raw_document_pk})
+    billing_id = body.get("id")
+    type_price = body.get("typeCompany")
+    billing_data = BillingRegister.objects.filter(pk=billing_id).first()
+    if not billing_data.is_confirmed:
+        hospital_id = billing_data.hospital_id
+        date_start = billing_data.date_start
+        date_end = billing_data.date_end
+        price_id = billing_data.price_id
+
+        data = researches_for_billing(type_price, hospital_id, date_start, date_end, price_id)
+        iss_ids = data["issIds"]
+        user_who_create = request.user.doctorprofile
+
+        with transaction.atomic():
+            is_confirm_billing = BillingRegister.confirm_billing(billing_id, user_who_create)
+            set_billing_id_for_iss = Issledovaniya.save_billing(billing_id, iss_ids)
+            data_confirm_billing = get_confirm_data_for_billing(price_id, billing_id)
+            raw_document_pk = RawDocumentBillingRegister.create_raw_billing_data(billing_id, data_confirm_billing)
+        structure_data = structure_table(data)
+        return JsonResponse({"ok": is_confirm_billing and set_billing_id_for_iss and raw_document_pk, **structure_data})
 
 
 @login_required
@@ -74,7 +85,6 @@ def get_hospital_prices(request):
     return JsonResponse({"data": prices_data})
 
 
-
 @login_required
 @group_required("Счет: проект")
 def change_visibility_research(request):
@@ -100,6 +110,6 @@ def get_billing(request):
     billing_id = request_data.get("billingId")
     result = BillingRegister.get_billing(billing_id)
     type_price = request_data.get("typeCompany")
-    data = researches_for_billing(type_price, result["hospitalId"], result["dateStart"], result["dateEnd"], result["priceId"])
+    data = researches_for_billing(type_price, result["hospitalId"], result["dateStart"], result["dateEnd"], result["priceId"], result["isConfirmed"], billing_id)
     structure_data = structure_table(data)
     return JsonResponse({"result": result, **structure_data})
diff --git a/contracts/admin.py b/contracts/admin.py
index 4cbc32871f..2622b8a11c 100644
--- a/contracts/admin.py
+++ b/contracts/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import PriceName, PriceCoast, Contract, Company, PriceCategory, CompanyDepartment, MedicalExamination, BillingRegister
+from .models import PriceName, PriceCoast, Contract, Company, PriceCategory, CompanyDepartment, MedicalExamination, BillingRegister, RawDocumentBillingRegister
 
 
 class ResPriceCoast(admin.ModelAdmin):
@@ -108,3 +108,4 @@ class ResBillingRegister(admin.ModelAdmin):
 admin.site.register(PriceCoast, ResPriceCoast)
 admin.site.register(MedicalExamination, ResMedicalExamination)
 admin.site.register(BillingRegister, ResBillingRegister)
+admin.site.register(RawDocumentBillingRegister)
diff --git a/contracts/models.py b/contracts/models.py
index 1d77abf756..5e3e8c2d8c 100644
--- a/contracts/models.py
+++ b/contracts/models.py
@@ -389,9 +389,10 @@ def create_billing(company_id, hospital_id, date_start, date_end, info, price_id
         return current_billing.pk
 
     @staticmethod
-    def confirm_billing(billing_id):
+    def confirm_billing(billing_id, user_who_create):
         current_billing = BillingRegister.objects.filter(id=billing_id).first()
         current_billing.is_confirmed = True
+        current_billing.who_create = user_who_create
         current_billing.save()
         return True
 
@@ -403,14 +404,14 @@ def get_billings(hospital_id=None, company_id=None):
                 {
                     "id": billing.pk,
                     "label": f"{billing.date_start.strftime('%d.%m.%Y')} "
-                             f" - {billing.date_end.strftime('%d.%m.%Y')} - {'Закрыт' if billing.is_confirmed else 'Проект'}"
+                             f" - {billing.date_end.strftime('%d.%m.%Y')}____Прайс {billing.price.title if billing.price else ''}_____{'Закрыт' if billing.is_confirmed else 'Проект'}"
                 }
                 for billing in billings
             ]
         else:
             billings = BillingRegister.objects.filter(company_id=company_id).select_related("company")
             result = [
-                {"id": billing.pk, "label": f"{billing.info}-{billing.company.short_title}-{billing.date_start.strftime('%d.%m.%Y')}-{billing.date_end.strftime('%d.%m.%Y')}"}
+                {"id": billing.pk, "label": f"{billing.info}-{billing.price.title}-{billing.date_start.strftime('%d.%m.%Y')}-{billing.date_end.strftime('%d.%m.%Y')}"}
                 for billing in billings
             ]
         return result
@@ -449,7 +450,11 @@ class RawDocumentBillingRegister(models.Model):
 
     @staticmethod
     def create_raw_billing_data(billing_id, raw_data):
-        raw_data_billing = RawDocumentBillingRegister(billing_id=billing_id, raw_data=raw_data).save()
+        print(raw_data)
+        print(billing_id, "billing_id")
+        raw_data_billing = RawDocumentBillingRegister(billing_id=billing_id, raw_data=raw_data)
+        raw_data_billing.save()
+        print(raw_data_billing)
         return raw_data_billing.pk
 
     class Meta:
diff --git a/contracts/sql_func.py b/contracts/sql_func.py
index f0f67616e7..876ea8f885 100644
--- a/contracts/sql_func.py
+++ b/contracts/sql_func.py
@@ -1,5 +1,7 @@
 import datetime
 from django.db import connection
+
+from laboratory.settings import TIME_ZONE
 from utils.db import namedtuplefetchall
 
 
@@ -73,6 +75,8 @@ def get_data_for_confirm_billing(billing_id):
                     directions_issledovaniya.id as iss_id,
                     directions_issledovaniya.research_id,
                     directory_researches.title as research_title,
+                    directory_researches.internal_code as internal_code,
+                    directory_researches.code as code_nmu,
                     to_char(directions_issledovaniya.time_confirmation AT TIME ZONE %(tz)s, 'DD.MM.YYYY') AS date_confirm,
                     directions_issledovaniya.time_confirmation,
                     directions_napravleniya.client_id,
@@ -100,13 +104,12 @@ def get_data_for_confirm_billing(billing_id):
                 ON ci.id = cc.individual_id
 
                 WHERE 
-                    directions_issledovaniya.billing_id = %(billing)s and 
-                    directions_issledovaniya.id in %(iss_ids)s
+                    directions_issledovaniya.billing_id = %(billing_id)s
                 ORDER BY 
                     directions_napravleniya.client_id, 
                     directions_issledovaniya.time_confirmation
                             """,
-            params={'billing_id': billing_id},
+            params={'billing_id': billing_id, 'tz': TIME_ZONE},
         )
         rows = namedtuplefetchall(cursor)
     return rows
diff --git a/directions/models.py b/directions/models.py
index f1feca8176..8bdd1ca0b3 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -2316,8 +2316,8 @@ class Issledovaniya(models.Model):
     billing = models.ForeignKey(contracts.BillingRegister, db_index=True, blank=True, null=True, default=None, help_text="Принадлежит счету", on_delete=models.SET_NULL)
 
     @staticmethod
-    def save_billing(iss_ids, billing_id):
-        iss = Issledovaniya.objects.filter(id_in=iss_ids)
+    def save_billing(billing_id, iss_ids):
+        iss = Issledovaniya.objects.filter(pk__in=iss_ids)
         for i in iss:
             i.billing_id = billing_id
             i.save()
diff --git a/l2-frontend/src/pages/Billing/index.vue b/l2-frontend/src/pages/Billing/index.vue
index 279e6f35ef..0c699244f0 100644
--- a/l2-frontend/src/pages/Billing/index.vue
+++ b/l2-frontend/src/pages/Billing/index.vue
@@ -70,7 +70,7 @@
         </div>
         <div class="margin-item">
           <button
-            v-if="selectedBilling && selectedPrice"
+            v-if="selectedBilling && selectedPrice && !currentBillingData.isConfirmed"
             class="btn btn-blue-nb"
             @click="updateBilling"
           >
@@ -84,9 +84,9 @@
             Новый счет
           </button>
           <button
-            v-if="selectedBilling && selectedPrice"
+            v-if="selectedBilling && selectedPrice && !currentBillingData.isConfirmed"
             class="btn btn-blue-nb"
-            @click="updateBilling"
+            @click="confirmBilling"
           >
             Записать счет
           </button>
@@ -282,6 +282,25 @@ const updateBilling = async () => {
   }
 };
 
+const confirmBilling = async () => {
+  if (selectedBilling.value) {
+    const billingData = { ...currentBillingData.value, typeCompany: selectedType.value };
+    const apiPoint = 'contracts/confirm-billing';
+    const priceId = selectedPrice.value;
+    await store.dispatch(actions.INC_LOADING);
+    const {
+      ok, billingInfo,
+    } = await api(apiPoint, { ...billingData, priceId });
+    await store.dispatch(actions.DEC_LOADING);
+    if (ok) {
+      await getBilling();
+      root.$emit('msg', 'ok', `${billingInfo} сохранен`);
+    } else {
+      root.$emit('msg', 'ok', 'ошибка');
+    }
+  }
+};
+
 const createBilling = async () => {
   const hospitalId = selectedType.value !== 'Работодатель' ? selectedCompany.value : null;
   const companyId = selectedType.value === 'Работодатель' ? selectedCompany.value : null;
@@ -357,4 +376,8 @@ watch(selectedCompany, () => {
 .white_bg {
   background: #FFF;
 }
+.disable_color {
+  border-color: #E6E9ED;
+  background-color: #E6E9ED;
+}
 </style>
diff --git a/l2-frontend/src/ui-cards/SelectedResearches.vue b/l2-frontend/src/ui-cards/SelectedResearches.vue
index e2ea36ad4a..e73e693de8 100644
--- a/l2-frontend/src/ui-cards/SelectedResearches.vue
+++ b/l2-frontend/src/ui-cards/SelectedResearches.vue
@@ -194,6 +194,23 @@
               />
             </td>
           </tr>
+          <tr v-if="external_organizations_enabled && canChangeHospitalDirection">
+            <th :class="needSelectHospital && 'has-error-message'">
+              Прайс (выбрать):
+            </th>
+            <td class="cl-td">
+              <Treeselect
+                v-model="currentHospitalPrice"
+                :multiple="false"
+                :disable-branch-nodes="true"
+                class="treeselect-noborder treeselect-wide"
+                :options="hospital_prices"
+                :append-to-body="true"
+                placeholder="По умолчанию"
+                :clearable="false"
+              />
+            </td>
+          </tr>
           <tr v-if="(!has_only_stationar && !hide_params) && !hide_show_count_param">
             <th>Кол-во повторений:</th>
             <td class="cl-td">
@@ -592,6 +609,7 @@ import Treeselect from '@riophae/vue-treeselect';
 import '@riophae/vue-treeselect/dist/vue-treeselect.css';
 // @ts-ignore
 import TypeAhead from 'vue2-typeahead';
+import moment from 'moment';
 
 import { vField, vGroup } from '@/components/visibility-triggers';
 import directionsPoint from '@/api/directions-point';
@@ -717,6 +735,8 @@ export default {
       hospital_department_overrides: [{ id: -1, label: 'По умолчанию' }],
       hospital_department_override: -1,
       hospital_overrides: [{ id: -1, label: 'По умолчанию' }],
+      hospital_prices: [{ id: -1, label: 'По умолчанию' }],
+      currentHospitalPrice: -1,
       hospital_override: -1,
       research_case: -2,
       service_locations: {},
@@ -1179,6 +1199,15 @@ export default {
         this.global_current_direction_param = -1;
       }
     },
+    hospital_override: {
+      immediate: true,
+      handler() {
+        if (this.external_organizations_enabled) {
+          this.load_external_organizations();
+          this.getPrices();
+        }
+      },
+    },
   },
   mounted() {
     this.$root.$on(`researches-picker:clear_all${this.kk}`, this.clear_all);
@@ -1197,6 +1226,17 @@ export default {
     });
   },
   methods: {
+    async getPrices() {
+      await this.$store.dispatch(actions.INC_LOADING);
+      const currentDate = moment().format('YYYY-MM-DD');
+      const { data } = await this.$api('contracts/get-hospital-prices', {
+        hospitalId: this.hospital_override,
+        dateStart: currentDate,
+        dateEnd: currentDate,
+      });
+      this.hospital_prices = data;
+      await this.$store.dispatch(actions.DEC_LOADING);
+    },
     async loadUserGroups() {
       this.userGroups = this.$store.getters.user_data.groups || [];
     },
diff --git a/statistic/sql_func.py b/statistic/sql_func.py
index 835cf25baa..dd24042d98 100644
--- a/statistic/sql_func.py
+++ b/statistic/sql_func.py
@@ -925,6 +925,8 @@ def statistics_research_by_hospital_for_external_orders(d_s, d_e, hospital_id, f
                         directions_napravleniya.hospital_id = %(hospital_id)s
                         AND
                         directions_napravleniya.price_name_id = %(price_id)s
+                        AND
+                        directions_issledovaniya.billing_id isNull
                 ORDER BY 
                     directions_napravleniya.client_id, 
                     directions_issledovaniya.time_confirmation

From 84a54b5658ce1c9bf9e580ccfff534921eda3f1a Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sat, 11 May 2024 14:19:40 +0800
Subject: [PATCH 06/18] excel

---
 .gitignore                              |  1 +
 api/contracts/func.py                   |  3 +-
 api/contracts/urls.py                   |  1 +
 api/contracts/views.py                  | 17 +++++-
 directions/models.py                    |  8 +++
 forms/xlsx/billing/billing_func.py      | 76 +++++++++++++++++++++++++
 forms/xlsx/forms101.py                  | 20 +++++++
 l2-frontend/src/pages/Billing/index.vue | 31 +++++++++-
 8 files changed, 153 insertions(+), 4 deletions(-)
 create mode 100644 forms/xlsx/billing/billing_func.py
 create mode 100644 forms/xlsx/forms101.py

diff --git a/.gitignore b/.gitignore
index 39c5890fe9..9ba2c9749a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -243,3 +243,4 @@ external_system/settings/phones_org.json
 /ftp_orders/hl7_rule
 !/ftp_orders/hl7_rule/default.json
 /xml_generate/templates/
+/forms/xlsx/media/
diff --git a/api/contracts/func.py b/api/contracts/func.py
index d188aa66f3..c92dc0fbb6 100644
--- a/api/contracts/func.py
+++ b/api/contracts/func.py
@@ -16,7 +16,6 @@ def researches_for_billing(type_price, company_id, date_start, date_end, price_i
             sql_result = statistics_research_by_hospital_for_external_orders(date_start, date_end, hospital_id, finsource.pk, price_id)
         else:
             sql_result = get_data_for_confirm_billing(billing_id)
-            print("isConfirmed")
         coast_research_price = get_research_coast_by_prce((price_id,))
         research_coast = {coast.research_id: float(coast.coast) for coast in coast_research_price}
     result = {}
@@ -60,6 +59,8 @@ def get_confirm_data_for_billing(price_id, billing_id):
             "tube_number": i.tube_number,
             "coast": research_coast.get(i.research_id, 0),
             "execute_date": i.date_confirm,
+            "internal_code": i.internal_code,
+            "code_nmu": i.code_nmu,
         }
         if not result.get(i.patient_card_num):
             result[i.patient_card_num] = [current_data.copy()]
diff --git a/api/contracts/urls.py b/api/contracts/urls.py
index c9461af217..885f030d5c 100644
--- a/api/contracts/urls.py
+++ b/api/contracts/urls.py
@@ -6,6 +6,7 @@
     path('create-billing', views.create_billing),
     path('update-billing', views.update_billing),
     path('confirm-billing', views.confirm_billing),
+    path('cancel-billing', views.cancel_billing),
     path('get-billings', views.get_billings),
     path('get-billing', views.get_billing),
     path('get-hospital-prices', views.get_hospital_prices),
diff --git a/api/contracts/views.py b/api/contracts/views.py
index c9e633e810..e91ea7baf0 100644
--- a/api/contracts/views.py
+++ b/api/contracts/views.py
@@ -57,7 +57,7 @@ def confirm_billing(request):
         date_end = billing_data.date_end
         price_id = billing_data.price_id
 
-        data = researches_for_billing(type_price, hospital_id, date_start, date_end, price_id)
+        data = researches_for_billing(type_price, hospital_id, date_start, date_end, price_id, billing_data.is_confirmed, billing_id)
         iss_ids = data["issIds"]
         user_who_create = request.user.doctorprofile
 
@@ -70,6 +70,21 @@ def confirm_billing(request):
         return JsonResponse({"ok": is_confirm_billing and set_billing_id_for_iss and raw_document_pk, **structure_data})
 
 
+@login_required
+@group_required("Счет: проект")
+def cancel_billing(request):
+    body = json.loads(request.body)
+    billing_id = body.get("id")
+    billing_data = BillingRegister.objects.filter(pk=billing_id).first()
+    if billing_data.is_confirmed:
+        user_who_create = request.user.doctorprofile
+        with transaction.atomic():
+            billing_data.is_confirmed = False
+            billing_data.save()
+            Issledovaniya.cancel_billing(billing_id)
+            return JsonResponse({"ok": True})
+
+
 @login_required
 @group_required("Счет: проект")
 def get_hospital_prices(request):
diff --git a/directions/models.py b/directions/models.py
index 8bdd1ca0b3..3f1a3c33b7 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -2323,6 +2323,14 @@ def save_billing(billing_id, iss_ids):
             i.save()
         return True
 
+    @staticmethod
+    def cancel_billing(billing_id):
+        iss = Issledovaniya.objects.filter(billing_id=billing_id)
+        for i in iss:
+            i.billing_id = None
+            i.save()
+        return True
+
 
     @property
     def time_save_local(self):
diff --git a/forms/xlsx/billing/billing_func.py b/forms/xlsx/billing/billing_func.py
new file mode 100644
index 0000000000..b1d5bd98a9
--- /dev/null
+++ b/forms/xlsx/billing/billing_func.py
@@ -0,0 +1,76 @@
+import os
+from openpyxl.styles import Border, Side, Alignment, Font, NamedStyle
+from openpyxl.utils import get_column_letter
+from openpyxl.drawing.image import Image
+from laboratory.settings import BASE_DIR
+
+
+def billing_base(ws1, columns_headers):
+    style_border = NamedStyle(name="style_border_ca")
+    bd = Side(style='thin', color="000000")
+    style_border.border = Border(left=bd, top=bd, right=bd, bottom=bd)
+    style_border.font = Font(bold=True, size=8)
+    style_border.alignment = Alignment(wrap_text=True, horizontal='left', vertical='center')
+
+    columns = [
+        ("№", 5),
+        ("Пациент", 20),
+        ("Дата рожд.", 7),
+        ("Дата вып.", 7),
+        ("Код", 8),
+        ("Код НМУ", 11),
+        ("Наименование услуги", 19),
+        ("Лаб.номер", 13),
+        ("Цена", 5),
+        ("Кол", 5),
+        ("Стоимость, руб", 7),
+    ]
+
+    row = 13
+    for idx, column in enumerate(columns, 1):
+        ws1.cell(row=row, column=idx).value = column[0]
+        ws1.column_dimensions[get_column_letter(idx)].width = column[1]
+        ws1.cell(row=row, column=idx).style = style_border
+    return ws1
+
+
+def fill_billing(ws1, data, row=14):
+    style_border1 = NamedStyle(name="style_border1")
+    bd = Side(style="thin", color="000000")
+    style_border1.border = Border(left=bd, top=bd, right=bd, bottom=bd)
+    style_border1.font = Font(bold=False, size=8)
+    style_border1.alignment = Alignment(wrap_text=True, horizontal="left", vertical="center")
+
+
+    style_border2 = NamedStyle(name="style_border2")
+    bd = Side(style="thin", color="000000")
+    style_border2.border = Border(left=bd, top=bd, right=bd, bottom=bd)
+    style_border2.font = Font(bold=False, size=10)
+    style_border2.alignment = Alignment(wrap_text=True, horizontal="center", vertical="center")
+
+
+    logo = Image(os.path.join(BASE_DIR, 'forms', 'xlsx', 'media', 'logo.png'))
+    logo.height = 130
+    logo.width = 920
+    ws1.add_image(logo, "A1")
+    ws1.merge_cells('A9:L11')
+    megre_cell = ws1['A9']
+    megre_cell.value = "Реестр № 119/РО2024 от 31 марта 2024 года \n оказанных медицинских услуг по договору №24 - 11/01/2024 с ЛДЦ \n с 01.03.24 по 31.03.24"
+    megre_cell.style = style_border2
+    r = row
+    for val in data:
+        ws1.cell(row=r, column=1).value = val.get("serialNumber")
+        ws1.cell(row=r, column=2).value = val.get("patientFio")
+        ws1.cell(row=r, column=3).value = val.get("patientBirthDay")
+        ws1.cell(row=r, column=4).value = val.get("executeDate")
+        ws1.cell(row=r, column=5).value = val.get("internalId")
+        ws1.cell(row=r, column=6).value = val.get("codeNMU")
+        ws1.cell(row=r, column=7).value = val.get("researchTitle")
+        ws1.cell(row=r, column=8).value = val.get("tubeNumber")
+        ws1.cell(row=r, column=9).value = val.get("coast")
+        ws1.cell(row=r, column=10).value = 1
+        ws1.cell(row=r, column=11).value = val.get("summ")
+        for i in range(1, 12):
+            ws1.cell(row=r, column=i).style = style_border1
+        r += 1
+    return ws1
diff --git a/forms/xlsx/forms101.py b/forms/xlsx/forms101.py
new file mode 100644
index 0000000000..1cec8ee84c
--- /dev/null
+++ b/forms/xlsx/forms101.py
@@ -0,0 +1,20 @@
+import datetime
+from openpyxl import Workbook
+import openpyxl
+from api.contracts.func import get_confirm_data_for_billing, structure_table
+from contracts.models import PriceName, BillingRegister
+from forms.xlsx.billing import billing_func
+
+def form_01(request_data) -> Workbook:
+    billing_id = request_data.get("billingId")
+    wb = openpyxl.Workbook()
+    wb.remove(wb.get_sheet_by_name('Sheet'))
+    ws = wb.create_sheet("Счет")
+    ws.set_printer_settings('9', 'landscape')
+
+    billing_data = BillingRegister.objects.filter(pk=billing_id).first()
+    data_confirm_billing = get_confirm_data_for_billing(billing_data.price_id, billing_id)
+    structure_data = structure_table(data_confirm_billing)
+    ws = billing_func.billing_base(ws, structure_data.get("columns"))
+    ws = billing_func.fill_billing(ws, structure_data.get("tableData"))
+    return wb
diff --git a/l2-frontend/src/pages/Billing/index.vue b/l2-frontend/src/pages/Billing/index.vue
index 0c699244f0..086a303172 100644
--- a/l2-frontend/src/pages/Billing/index.vue
+++ b/l2-frontend/src/pages/Billing/index.vue
@@ -91,9 +91,16 @@
             Записать счет
           </button>
           <button
-            v-if="selectedBilling && selectedPrice"
+            v-if="currentBillingData.isConfirmed"
             class="btn btn-blue-nb"
-            @click="updateBilling"
+            @click="cancelBilling"
+          >
+            Сбросить счет
+          </button>
+          <button
+            v-if="selectedBilling && selectedPrice && currentBillingData.isConfirmed"
+            class="btn btn-blue-nb"
+            @click="downloadBillingExcel"
           >
             <i class="fa-solid fa-download" />
             Excel
@@ -301,6 +308,23 @@ const confirmBilling = async () => {
   }
 };
 
+const cancelBilling = async () => {
+  if (selectedBilling.value) {
+    const apiPoint = 'contracts/cancel-billing';
+    await store.dispatch(actions.INC_LOADING);
+    const {
+      ok, billingInfo,
+    } = await api(apiPoint, { id: selectedBilling.value });
+    await store.dispatch(actions.DEC_LOADING);
+    if (ok) {
+      await getBilling();
+      root.$emit('msg', 'ok', `${billingInfo} Отменен`);
+    } else {
+      root.$emit('msg', 'ok', 'ошибка');
+    }
+  }
+};
+
 const createBilling = async () => {
   const hospitalId = selectedType.value !== 'Работодатель' ? selectedCompany.value : null;
   const companyId = selectedType.value === 'Работодатель' ? selectedCompany.value : null;
@@ -345,6 +369,9 @@ watch(selectedCompany, () => {
     selectedBilling.value = null;
   }
 });
+const downloadBillingExcel = async () => {
+  window.open(`/forms/xlsx?type=101.01&billingId=${selectedBilling.value}`, '_blank');
+};
 
 </script>
 

From d0efe5e441f6181dd66dbbe17acdcf49943e8942 Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sat, 11 May 2024 14:22:22 +0800
Subject: [PATCH 07/18] fix pep

---
 api/contracts/views.py             |  2 +-
 contracts/models.py                |  3 ---
 forms/xlsx/billing/billing_func.py | 14 ++++++--------
 forms/xlsx/forms101.py             |  8 ++++----
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/api/contracts/views.py b/api/contracts/views.py
index e91ea7baf0..5ac44feccb 100644
--- a/api/contracts/views.py
+++ b/api/contracts/views.py
@@ -92,7 +92,7 @@ def get_hospital_prices(request):
     hospital_id = body.get("hospitalId")
     date_start = body.get("dateStart")
     date_end = body.get("dateEnd")
-    if not(date_start) or not(date_end):
+    if not (date_start) or not (date_end):
         prices_data = []
     else:
         prices = PriceName.get_hospital_many_prices_by_date(hospital_id, date_start, date_end, is_subcontract=True)
diff --git a/contracts/models.py b/contracts/models.py
index 5e3e8c2d8c..7796e75a1b 100644
--- a/contracts/models.py
+++ b/contracts/models.py
@@ -450,11 +450,8 @@ class RawDocumentBillingRegister(models.Model):
 
     @staticmethod
     def create_raw_billing_data(billing_id, raw_data):
-        print(raw_data)
-        print(billing_id, "billing_id")
         raw_data_billing = RawDocumentBillingRegister(billing_id=billing_id, raw_data=raw_data)
         raw_data_billing.save()
-        print(raw_data_billing)
         return raw_data_billing.pk
 
     class Meta:
diff --git a/forms/xlsx/billing/billing_func.py b/forms/xlsx/billing/billing_func.py
index b1d5bd98a9..e1d28bb763 100644
--- a/forms/xlsx/billing/billing_func.py
+++ b/forms/xlsx/billing/billing_func.py
@@ -5,12 +5,12 @@
 from laboratory.settings import BASE_DIR
 
 
-def billing_base(ws1, columns_headers):
+def billing_base(ws1):
     style_border = NamedStyle(name="style_border_ca")
-    bd = Side(style='thin', color="000000")
+    bd = Side(style="thin", color="000000")
     style_border.border = Border(left=bd, top=bd, right=bd, bottom=bd)
     style_border.font = Font(bold=True, size=8)
-    style_border.alignment = Alignment(wrap_text=True, horizontal='left', vertical='center')
+    style_border.alignment = Alignment(wrap_text=True, horizontal="left", vertical="center")
 
     columns = [
         ("№", 5),
@@ -41,20 +41,18 @@ def fill_billing(ws1, data, row=14):
     style_border1.font = Font(bold=False, size=8)
     style_border1.alignment = Alignment(wrap_text=True, horizontal="left", vertical="center")
 
-
     style_border2 = NamedStyle(name="style_border2")
     bd = Side(style="thin", color="000000")
     style_border2.border = Border(left=bd, top=bd, right=bd, bottom=bd)
     style_border2.font = Font(bold=False, size=10)
     style_border2.alignment = Alignment(wrap_text=True, horizontal="center", vertical="center")
 
-
-    logo = Image(os.path.join(BASE_DIR, 'forms', 'xlsx', 'media', 'logo.png'))
+    logo = Image(os.path.join(BASE_DIR, "forms", "xlsx", "media", "logo.png"))
     logo.height = 130
     logo.width = 920
     ws1.add_image(logo, "A1")
-    ws1.merge_cells('A9:L11')
-    megre_cell = ws1['A9']
+    ws1.merge_cells("A9:L11")
+    megre_cell = ws1["A9"]
     megre_cell.value = "Реестр № 119/РО2024 от 31 марта 2024 года \n оказанных медицинских услуг по договору №24 - 11/01/2024 с ЛДЦ \n с 01.03.24 по 31.03.24"
     megre_cell.style = style_border2
     r = row
diff --git a/forms/xlsx/forms101.py b/forms/xlsx/forms101.py
index 1cec8ee84c..b541fb1cfc 100644
--- a/forms/xlsx/forms101.py
+++ b/forms/xlsx/forms101.py
@@ -1,16 +1,16 @@
-import datetime
 from openpyxl import Workbook
 import openpyxl
 from api.contracts.func import get_confirm_data_for_billing, structure_table
-from contracts.models import PriceName, BillingRegister
+from contracts.models import BillingRegister
 from forms.xlsx.billing import billing_func
 
+
 def form_01(request_data) -> Workbook:
     billing_id = request_data.get("billingId")
     wb = openpyxl.Workbook()
-    wb.remove(wb.get_sheet_by_name('Sheet'))
+    wb.remove(wb.get_sheet_by_name("Sheet"))
     ws = wb.create_sheet("Счет")
-    ws.set_printer_settings('9', 'landscape')
+    ws.set_printer_settings("9", "landscape")
 
     billing_data = BillingRegister.objects.filter(pk=billing_id).first()
     data_confirm_billing = get_confirm_data_for_billing(billing_data.price_id, billing_id)

From 0d943fd252b3266aede924ab61c0fc1b47b382a4 Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sat, 11 May 2024 14:23:59 +0800
Subject: [PATCH 08/18] fix pep

---
 api/contracts/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/contracts/views.py b/api/contracts/views.py
index 5ac44feccb..5103c2dd86 100644
--- a/api/contracts/views.py
+++ b/api/contracts/views.py
@@ -80,6 +80,7 @@ def cancel_billing(request):
         user_who_create = request.user.doctorprofile
         with transaction.atomic():
             billing_data.is_confirmed = False
+            billing_data.who_create = user_who_create
             billing_data.save()
             Issledovaniya.cancel_billing(billing_id)
             return JsonResponse({"ok": True})

From 2b65fa8d970864697c97244d8049dccfafc6f129 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Sat, 11 May 2024 14:27:58 +0800
Subject: [PATCH 09/18] Update forms/xlsx/forms101.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 forms/xlsx/forms101.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forms/xlsx/forms101.py b/forms/xlsx/forms101.py
index b541fb1cfc..77ca7223b5 100644
--- a/forms/xlsx/forms101.py
+++ b/forms/xlsx/forms101.py
@@ -5,6 +5,7 @@
 from forms.xlsx.billing import billing_func
 
 
+
 def form_01(request_data) -> Workbook:
     billing_id = request_data.get("billingId")
     wb = openpyxl.Workbook()

From a760f6eb15dae1696a564db8ba7aa42f2ad5f9e9 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Sat, 11 May 2024 14:28:04 +0800
Subject: [PATCH 10/18] Update directions/models.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 directions/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/directions/models.py b/directions/models.py
index 3f1a3c33b7..62fce3bea4 100644
--- a/directions/models.py
+++ b/directions/models.py
@@ -2331,7 +2331,6 @@ def cancel_billing(billing_id):
             i.save()
         return True
 
-
     @property
     def time_save_local(self):
         return localtime(self.time_save)

From 4ccc94f2d7fe0f94097d2ae043d4010bb045b210 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Sat, 11 May 2024 14:28:13 +0800
Subject: [PATCH 11/18] Update contracts/admin.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 contracts/admin.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/contracts/admin.py b/contracts/admin.py
index 2622b8a11c..b2fd135a21 100644
--- a/contracts/admin.py
+++ b/contracts/admin.py
@@ -95,9 +95,21 @@ class ResMedicalExamination(admin.ModelAdmin):
 
 
 class ResBillingRegister(admin.ModelAdmin):
-    list_display = ('company', 'hospital', 'date_start', 'date_end', 'price',)
-    list_display_links = ('company', 'hospital',)
-    list_filter = ('hospital', 'create_at',)
+    list_display = (
+        'company',
+        'hospital',
+        'date_start',
+        'date_end',
+        'price',
+    )
+    list_display_links = (
+        'company',
+        'hospital',
+    )
+    list_filter = (
+        'hospital',
+        'create_at',
+    )
 
 
 admin.site.register(PriceCategory)

From f8235375d90ccaf8edb3647eb52bcb6981df270d Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Sat, 11 May 2024 14:28:19 +0800
Subject: [PATCH 12/18] Update forms/xlsx/billing/billing_func.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 forms/xlsx/billing/billing_func.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forms/xlsx/billing/billing_func.py b/forms/xlsx/billing/billing_func.py
index e1d28bb763..24f7d9a9e4 100644
--- a/forms/xlsx/billing/billing_func.py
+++ b/forms/xlsx/billing/billing_func.py
@@ -46,7 +46,6 @@ def fill_billing(ws1, data, row=14):
     style_border2.border = Border(left=bd, top=bd, right=bd, bottom=bd)
     style_border2.font = Font(bold=False, size=10)
     style_border2.alignment = Alignment(wrap_text=True, horizontal="center", vertical="center")
-
     logo = Image(os.path.join(BASE_DIR, "forms", "xlsx", "media", "logo.png"))
     logo.height = 130
     logo.width = 920

From e9331e110eee746bd36c77e4f69954c6494e5b09 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Sat, 11 May 2024 14:28:28 +0800
Subject: [PATCH 13/18] Update contracts/models.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 contracts/models.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contracts/models.py b/contracts/models.py
index 7796e75a1b..932b81d94a 100644
--- a/contracts/models.py
+++ b/contracts/models.py
@@ -411,8 +411,7 @@ def get_billings(hospital_id=None, company_id=None):
         else:
             billings = BillingRegister.objects.filter(company_id=company_id).select_related("company")
             result = [
-                {"id": billing.pk, "label": f"{billing.info}-{billing.price.title}-{billing.date_start.strftime('%d.%m.%Y')}-{billing.date_end.strftime('%d.%m.%Y')}"}
-                for billing in billings
+                {"id": billing.pk, "label": f"{billing.info}-{billing.price.title}-{billing.date_start.strftime('%d.%m.%Y')}-{billing.date_end.strftime('%d.%m.%Y')}"} for billing in billings
             ]
         return result
 

From 103a1b38fed5fbe91c8224728d94d40c9ba0cec7 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Sat, 11 May 2024 14:28:42 +0800
Subject: [PATCH 14/18] Update contracts/models.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 contracts/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/models.py b/contracts/models.py
index 932b81d94a..c8f0d6243f 100644
--- a/contracts/models.py
+++ b/contracts/models.py
@@ -404,7 +404,7 @@ def get_billings(hospital_id=None, company_id=None):
                 {
                     "id": billing.pk,
                     "label": f"{billing.date_start.strftime('%d.%m.%Y')} "
-                             f" - {billing.date_end.strftime('%d.%m.%Y')}____Прайс {billing.price.title if billing.price else ''}_____{'Закрыт' if billing.is_confirmed else 'Проект'}"
+                    f" - {billing.date_end.strftime('%d.%m.%Y')}____Прайс {billing.price.title if billing.price else ''}_____{'Закрыт' if billing.is_confirmed else 'Проект'}",
                 }
                 for billing in billings
             ]

From 4f7dd6105d33fc0e56b8db925d032571aaf93c65 Mon Sep 17 00:00:00 2001
From: Sergei Kasianenko <41939763+urchinpro@users.noreply.github.com>
Date: Sat, 11 May 2024 14:28:53 +0800
Subject: [PATCH 15/18] Update forms/xlsx/forms101.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 forms/xlsx/forms101.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forms/xlsx/forms101.py b/forms/xlsx/forms101.py
index 77ca7223b5..b541fb1cfc 100644
--- a/forms/xlsx/forms101.py
+++ b/forms/xlsx/forms101.py
@@ -5,7 +5,6 @@
 from forms.xlsx.billing import billing_func
 
 
-
 def form_01(request_data) -> Workbook:
     billing_id = request_data.get("billingId")
     wb = openpyxl.Workbook()

From ad8113cd6194b2a364ac199a7d33dbbb35af37b0 Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sat, 11 May 2024 14:30:06 +0800
Subject: [PATCH 16/18] fix pep

---
 forms/xlsx/forms101.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/xlsx/forms101.py b/forms/xlsx/forms101.py
index b541fb1cfc..e46e484e52 100644
--- a/forms/xlsx/forms101.py
+++ b/forms/xlsx/forms101.py
@@ -15,6 +15,6 @@ def form_01(request_data) -> Workbook:
     billing_data = BillingRegister.objects.filter(pk=billing_id).first()
     data_confirm_billing = get_confirm_data_for_billing(billing_data.price_id, billing_id)
     structure_data = structure_table(data_confirm_billing)
-    ws = billing_func.billing_base(ws, structure_data.get("columns"))
+    ws = billing_func.billing_base(ws)
     ws = billing_func.fill_billing(ws, structure_data.get("tableData"))
     return wb

From 93fb440281e8e6d35ab0e920a9c0662927d5386f Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sat, 11 May 2024 14:30:37 +0800
Subject: [PATCH 17/18] fix pep

---
 forms/xlsx/billing/billing_func.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/xlsx/billing/billing_func.py b/forms/xlsx/billing/billing_func.py
index 24f7d9a9e4..2897d761aa 100644
--- a/forms/xlsx/billing/billing_func.py
+++ b/forms/xlsx/billing/billing_func.py
@@ -52,7 +52,7 @@ def fill_billing(ws1, data, row=14):
     ws1.add_image(logo, "A1")
     ws1.merge_cells("A9:L11")
     megre_cell = ws1["A9"]
-    megre_cell.value = "Реестр № 119/РО2024 от 31 марта 2024 года \n оказанных медицинских услуг по договору №24 - 11/01/2024 с ЛДЦ \n с 01.03.24 по 31.03.24"
+    megre_cell.value = "Реестр № 119/РО2024 от 31 марта 2024 года \n оказанных медицинских услуг по договору №24 - 11/01/2024 \n с 01.03.24 по 31.03.24"
     megre_cell.style = style_border2
     r = row
     for val in data:

From f3b96ae7cba1df808f22a75ac0a930ffd65750bb Mon Sep 17 00:00:00 2001
From: sergei kasianenko <monitor84@list.ru>
Date: Sat, 11 May 2024 14:31:24 +0800
Subject: [PATCH 18/18] fix pep

---
 forms/xlsx/billing/billing_func.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/xlsx/billing/billing_func.py b/forms/xlsx/billing/billing_func.py
index 2897d761aa..3f2fd7ccdc 100644
--- a/forms/xlsx/billing/billing_func.py
+++ b/forms/xlsx/billing/billing_func.py
@@ -52,7 +52,7 @@ def fill_billing(ws1, data, row=14):
     ws1.add_image(logo, "A1")
     ws1.merge_cells("A9:L11")
     megre_cell = ws1["A9"]
-    megre_cell.value = "Реестр № 119/РО2024 от 31 марта 2024 года \n оказанных медицинских услуг по договору №24 - 11/01/2024 \n с 01.03.24 по 31.03.24"
+    megre_cell.value = "Реестр № 1YYYY от 00 марта 2024 года \n оказанных медицинских услуг по договору №00 - 00/00/2024 \n с 00.00.00 по 00.00.00"
     megre_cell.style = style_border2
     r = row
     for val in data: