healthdatalayer 1.5.8__tar.gz → 1.6.0__tar.gz

{healthdatalayer-1.5.8 → healthdatalayer-1.6.0}/PKG-INFO

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

{healthdatalayer-1.5.8 → healthdatalayer-1.6.0}/healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py

@@ -169,6 +169,7 @@ class CollaboratorRepository:
                     FROM medical_visit t
                     WHERE t.visit_date::DATE = :fecha
                     AND t.collaborator_id = :colab_id
+                    AND t.status_visit in ('AGENDADO','REAGENDADO')
                 )
                 SELECT 
                     hg.hora,

{healthdatalayer-1.5.8 → healthdatalayer-1.6.0}/healthdatalayer/repositories/medical_visit_repositories/medical_drug_recipe_repository.py

@@ -19,8 +19,8 @@ class MedicalDrugRecipeRepository:
 
     def get_by_id_command(self, medical_drug_recipe_id: UUID) -> Optional[MedicalDrugRecipe]:
         with get_session(self.tenant) as session:
-            
-            return session.get(MedicalDrugRecipe, medical_drug_recipe_id)
+            statement = select(MedicalDrugRecipe).where(MedicalDrugRecipe.medical_drug_recipe_id == medical_drug_recipe_id)
+            return session.exec(statement).first()
         
     def list_all_command(self, active_only: bool = True)->List[MedicalDrugRecipe]:
         with get_session(self.tenant) as session:
@@ -56,7 +56,8 @@ class MedicalDrugRecipeRepository:
     
     def delete_command(self, medical_drug_recipe_id: UUID, soft_delete: bool = True) -> bool:
         with get_session(self.tenant) as session:
-            db_medical_drug_recipe = session.get(MedicalDrugRecipe, medical_drug_recipe_id)
+            statement = select(MedicalDrugRecipe).where(MedicalDrugRecipe.medical_drug_recipe_id == medical_drug_recipe_id)
+            db_medical_drug_recipe = session.exec(statement).first()
             if not db_medical_drug_recipe:
                 return False
             

{healthdatalayer-1.5.8 → healthdatalayer-1.6.0}/healthdatalayer/repositories/medical_visit_repositories/medical_drug_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 MedicalDrug
 from healthdatalayer.config.db import engines, get_session
@@ -60,4 +60,19 @@ class MedicalDrugRepository:
                 session.delete(db_medical_drug)
             
             session.commit()
-            return True
+            return True
+    
+    def get_by_name_code_ilike_command(self, name:str, active_only: bool = True) -> List[MedicalDrug]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalDrug).where(
+                or_(
+                MedicalDrug.drug_name.ilike(f"%{name}%"), 
+                MedicalDrug.drug_code.ilike(f"%{name}%")
+                )
+            )
+            
+            if active_only:
+                statement = statement.where(MedicalDrug.is_active == True)
+            
+            medical_diagnosis = session.exec(statement).all()
+            return medical_diagnosis

{healthdatalayer-1.5.8 → healthdatalayer-1.6.0}/healthdatalayer.egg-info/PKG-INFO

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

{healthdatalayer-1.5.8 → healthdatalayer-1.6.0}/setup.py

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