diff --git a/etc/db/DealStatusInTestReport.txt b/etc/db/DealStatusInTestReport.txt
new file mode 100644
index 0000000..6f8d54b
--- /dev/null
+++ b/etc/db/DealStatusInTestReport.txt
@@ -0,0 +1 @@
+Предлагаю показывать в отчете статус верхней сделки контрагента, на сейчас. Может быть, с датой последней активности? Может быть, надо фильтровать по типу ресурса и матчить с сервисом, но тогда будет теряться Other и все такое
\ No newline at end of file
diff --git a/test_storage_rpt.cfm b/test_storage_rpt.cfm
index d1cf286..fb60bda 100644
--- a/test_storage_rpt.cfm
+++ b/test_storage_rpt.cfm
@@ -59,6 +59,28 @@ SELECT upper(k.id_klienta) as wz, k.__id as id, c.__name as responsible, c.email
LEFT OUTER JOIN elma.comp_users_ext c on (k.responsible=c.__id)
+
+WITH
+ status(status, status_id, probability_pc)
+ AS (VALUES
+ ('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70),
+ ('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0)
+ )
+select z.id_Klienta as wz, z.__name as company,
+d.__id as deal_uid, d.__status_status as status_id, s.status, d.__index as deal_index, d.__name as deal --, d.kommentarii_k_sdelke, d."__statusComment"
+from elma.companies z
+join (select
+ __id, _companies, __status_status, __index, __name, kommentarii_k_sdelke, "__statusComment", "__deletedAt", is_corrective_transaction
+ ,ROW_NUMBER() OVER (PARTITION BY _companies ORDER BY __index desc) rn
+from elma.deals) d on (z.__id=d._companies AND d.rn=1)
+join status s on (d.__status_status=s.status_id)
+
+where z."__deletedAt" IS NULL AND d."__deletedAt" IS NULL
+AND NOT coalesce(d.is_corrective_transaction, false)
+AND NOT d.__status_status=7
+order by z.id_Klienta, d.__index DESC
+
+
@@ -75,6 +97,7 @@ SELECT upper(k.id_klienta) as wz, k.__id as id, c.__name as responsible, c.email
+
select
@@ -94,9 +117,16 @@ SELECT upper(k.id_klienta) as wz, k.__id as id, c.__name as responsible, c.email
r.responsibler.responsible_emailr.responsible_status
+
+ d.deal_uid
+ d.deal_index
+ d.deal
+ d.status_id
+ d.status as deal_status
from qStorage s
LEFT OUTER JOIN qResponsible r ON (s.wz=r.wz)
+LEFT OUTER JOIN qLastDeal d ON (s.wz=d.wz)
ORDER BY
@@ -133,12 +163,16 @@ ORDER BY