notebookvb

Knihovny/medicus_db.py

@@ -70,13 +70,21 @@ class MedicusDB:
             kar.prijmeni,
             kar.jmeno,
             kar.poj
-        FROM registr
-        JOIN kar ON registr.idpac = kar.idpac
-        WHERE registr.datum_zruseni IS NULL
-          AND registr.priznak IN ('A','D','V')
+        FROM kar
+        WHERE kar.vyrazen = 'N'
           AND kar.rodcis IS NOT NULL
           AND kar.rodcis <> ''
-          AND kar.vyrazen <> 'A'
+          AND EXISTS (
+              SELECT r.id FROM registr r
+              JOIN icp i ON r.idicp = i.idicp
+              WHERE r.idpac = kar.idpac
+                AND r.datum <= CURRENT_DATE
+                AND (r.datum_zruseni IS NULL OR r.datum_zruseni >= CURRENT_DATE)
+                AND r.priznak IN ('V','D','A')
+                AND i.icp = '09305001'
+                AND i.odb = '001'
+          )
+        ORDER BY kar.prijmeni, kar.rodcis
         """
         if as_dict:
             return self.query_dict(sql)