Правка выдачи карт

app/Repositories/MedicalHistoryRepository.php

@@ -236,7 +236,7 @@ class MedicalHistoryRepository
         WHERE NOT EXISTS (
             SELECT 1 FROM archive_infos ai
             WHERE ai.mis_history_id = mh.\"MedicalHistoryID\"
-        )
+        ) AND mh.\"DateExtract\" > CAST('01-01-1900' as date)
     ";
 
         $misConditions = $this->buildMisConditions($searchText, $status);
@@ -425,6 +425,7 @@ class MedicalHistoryRepository
                     COALESCE(mh.\"Name\", fp.im), ' ',
                     COALESCE(mh.\"OT\", fp.ot)
                 ) as full_name,
+                COALESCE(mh.\"DateRecipient\", fp.mpostdate) as date_recipient,
                 COALESCE(mh.\"DateExtract\", fp.menddate) as date_extract,
                 COALESCE(mh.\"BD\", fp.dr) as birth_date,
                 true as in_archive,
@@ -478,6 +479,7 @@ class MedicalHistoryRepository
                 mh.\"Name\" as name,
                 mh.\"OT\" as ot,
                 CONCAT(mh.\"FAMILY\", ' ', mh.\"Name\", ' ', COALESCE(mh.\"OT\", '')) as full_name,
+                mh.\"DateRecipient\" as date_recipient,
                 mh.\"DateExtract\" as date_extract,
                 mh.\"BD\" as birth_date,
                 false as in_archive,
@@ -491,6 +493,7 @@ class MedicalHistoryRepository
                 NULL as enp
             FROM stt_medicalhistory mh
             WHERE mh.\"MedicalHistoryID\" IN ({$placeholders})
+            AND mh.\"DateExtract\" > CAST('01-01-1900' AS DATE)
         ";
 
         $results = DB::select($sql, $ids);
@@ -659,7 +662,8 @@ class MedicalHistoryRepository
         // Добавляем NOT EXISTS в начало
         $allConditions = array_merge(
             ["NOT EXISTS (SELECT 1 FROM archive_infos ai WHERE ai.mis_history_id = mh.\"MedicalHistoryID\")"],
-            $conditions['conditions']
+            $conditions['conditions'],
+            ["mh.\"DateExtract\" > CAST('01-01-1900' AS DATE)"]
         );
 
         $sql = "
@@ -688,6 +692,7 @@ class MedicalHistoryRepository
             'family' => $item->family,
             'name' => $item->name,
             'ot' => $item->ot,
+            'date_recipient' => $item->date_recipient,
             'date_extract' => $item->date_extract,
             'birth_date' => $item->birth_date,
             'created_at' => $item->created_at,
@@ -886,6 +891,7 @@ class MedicalHistoryRepository
                 true as in_archive,
                 'archive' as source,
                 ai.created_at,
+                COALESCE(mh.\"DateRecipient\", fp.mpostdate) as date_recipient,
                 COALESCE(mh.\"DateExtract\", fp.menddate) as date_extract
             FROM archive_infos ai
             LEFT JOIN stt_medicalhistory mh ON ai.mis_history_id = mh.\"MedicalHistoryID\"
@@ -918,6 +924,7 @@ class MedicalHistoryRepository
                 false as in_archive,
                 'mis' as source,
                 mh.\"DateExtract\" as created_at,
+                mh.\"DateRecipient\" as date_recipient,
                 mh.\"DateExtract\" as date_extract
             FROM stt_medicalhistory mh
             WHERE mh.\"MedCardNum\" = ?