healthdatalayer 1.5.4__tar.gz → 1.5.6__tar.gz

{healthdatalayer-1.5.4 → healthdatalayer-1.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: healthdatalayer
-Version: 1.5.4
+Version: 1.5.6
 Summary: Health Datalayer to access data from different sources
 Author: Jesus Martinez
 Author-email: jesusmartinez@noosds.com

{healthdatalayer-1.5.4 → healthdatalayer-1.5.6}/healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_repository.py

@@ -1,6 +1,6 @@
 from typing import Optional, List
 from uuid import UUID
-from sqlmodel import select
+from sqlmodel import select, or_
 
 from healthdatalayer.models import MedicalDiagnosis
 from healthdatalayer.config.db import engines, get_session
@@ -32,9 +32,14 @@ class MedicalDiagnosisRepository:
             medical_diagnosis = session.exec(statement).first()
             return medical_diagnosis
     
-    def get_by_name_ilike_command(self, name:str, active_only: bool = True) -> List[MedicalDiagnosis]:
+    def get_by_name_code_ilike_command(self, name:str, active_only: bool = True) -> List[MedicalDiagnosis]:
         with get_session(self.tenant) as session:
-            statement = select(MedicalDiagnosis).where(MedicalDiagnosis.name.ilike(f"%{name}%"))
+            statement = select(MedicalDiagnosis).where(
+                or_(
+                MedicalDiagnosis.name.ilike(f"%{name}%"), 
+                MedicalDiagnosis.cie_10_code.ilike(f"%{name}%")
+                )
+            )
             
             if active_only:
                 statement = statement.where(MedicalDiagnosis.is_active == True)

{healthdatalayer-1.5.4 → healthdatalayer-1.5.6}/healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_visit_repository.py

@@ -96,7 +96,7 @@ class MedicalDiagnosisVisitRepository:
         
     def delete_command(self, medical_diagnosis_visit_id: UUID, soft_delete: bool = False)->None:
         with get_session(self.tenant) as session:
-            existing_medical_diagnosis_visit = session.get(MedicalVisit, medical_diagnosis_visit_id)
+            existing_medical_diagnosis_visit = session.get(MedicalDiagnosisVisit, medical_diagnosis_visit_id)
             if not existing_medical_diagnosis_visit:
                 raise ValueError(f"MedicalDiagnosisVisit with id {medical_diagnosis_visit_id} does not exist")
 

{healthdatalayer-1.5.4 → healthdatalayer-1.5.6}/healthdatalayer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: healthdatalayer
-Version: 1.5.4
+Version: 1.5.6
 Summary: Health Datalayer to access data from different sources
 Author: Jesus Martinez
 Author-email: jesusmartinez@noosds.com

{healthdatalayer-1.5.4 → healthdatalayer-1.5.6}/setup.py

@@ -5,7 +5,7 @@ with open('requirements.txt') as f:
 
 setup(
     name="healthdatalayer",
-    version="1.5.4",
+    version="1.5.6",
     include_package_data=True,
     python_requires='>=3.10',
     packages=find_packages(),