healthdatalayer 1.5.3__py3-none-any.whl → 1.5.5__py3-none-any.whl

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/repositories/medical_visit_repositories/medical_visit_repository.py

@@ -120,7 +120,67 @@ class MedicalVisitRepository:
             
             medical_visits = session.exec(statement).all()
             return medical_visits
+
+    def get_by_daterange_command(self, start_date: datetime, end_date: datetime, active_only: bool = True, load_relations: bool = False) -> List[MedicalVisit]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalVisit).where(
+                    MedicalVisit.visit_date >= start_date
+                )
+            
+            if end_date is not None:
+                statement = statement.where(MedicalVisit.visit_date <= end_date)
+            if active_only:
+                statement = statement.where(MedicalVisit.is_active == True)
+            if load_relations:
+                statement = statement.options(
+                    joinedload(MedicalVisit.client),
+                    joinedload(MedicalVisit.collaborator),
+                    joinedload(MedicalVisit.speciality),
+                    selectinload(MedicalVisit.medical_diagnosis_visits),
+                    selectinload(MedicalVisit.medical_recipe_visits),
+                    selectinload(MedicalVisit.organ_system_reviews),
+                    selectinload(MedicalVisit.physical_exams)
+                )
+            
+            medical_visits = session.exec(statement).all()
+            return medical_visits
         
+    def get_by_targetdate_command(self, target_date: datetime, active_only: bool = True, load_relations: bool = False) -> List[MedicalVisit]:
+        with get_session(self.tenant) as session:
+
+            if isinstance(target_date, str):
+                try:
+                    target_date = datetime.strptime(target_date, "%Y-%m-%d")
+                except ValueError:
+                    raise ValueError("Invalid date format")
+
+            elif isinstance(target_date, date) and not isinstance(target_date, datetime):
+                target_date = datetime.combine(target_date, time.min)
+
+            start_of_day = datetime.combine(target_date.date(), datetime.min.time())
+            end_of_day = datetime.combine(target_date.date(), datetime.max.time())
+
+            statement = select(MedicalVisit).where(
+                    MedicalVisit.visit_date >= start_of_day,
+                    MedicalVisit.visit_date <= end_of_day
+                )
+
+            if active_only:
+                statement = statement.where(MedicalVisit.is_active == True)
+            if load_relations:
+                statement = statement.options(
+                    joinedload(MedicalVisit.client),
+                    joinedload(MedicalVisit.collaborator),
+                    joinedload(MedicalVisit.speciality),
+                    selectinload(MedicalVisit.medical_diagnosis_visits),
+                    selectinload(MedicalVisit.medical_recipe_visits),
+                    selectinload(MedicalVisit.organ_system_reviews),
+                    selectinload(MedicalVisit.physical_exams)
+                )
+            
+            medical_visits = session.exec(statement).all()
+            return medical_visits
+
     def get_by_collaboratorid_and_daterange_command(self, collaborator_id: UUID, start_date: datetime, end_date: datetime, active_only: bool = True, load_relations: bool = False) -> List[MedicalVisit]:
         with get_session(self.tenant) as session:
             statement = select(MedicalVisit).where(

{healthdatalayer-1.5.3.dist-info → healthdatalayer-1.5.5.dist-info}/METADATA

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

{healthdatalayer-1.5.3.dist-info → healthdatalayer-1.5.5.dist-info}/RECORD

@@ -84,12 +84,12 @@ healthdatalayer/repositories/lab_repositories/__init__.py,sha256=47DEQpj8HBSa-_T
 healthdatalayer/repositories/lab_repositories/measure_lab_repository.py,sha256=AAwgGjaLWTqyH3YHTD_eisunn6I0E0GmYLEseuLgZ0Q,3174
 healthdatalayer/repositories/lab_repositories/medical_lab_repository.py,sha256=owZQe3cXKkXsRuGXpqPBXjZvA-DEb7yD1OKPMOCqF1o,10909
 healthdatalayer/repositories/medical_visit_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_repository.py,sha256=dnVW3hMUqrVGctBSNKVU2_j0ITH46aXN31XduELO8wg,4012
+healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_repository.py,sha256=hwb5vh64ze72tFMSIUPNitC5t6pUCcO6pnI0gk-7LZU,4157
 healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_visit_repository.py,sha256=BHhglV8CBw4xpcLsFjRJPglg2D0ASnYD2k4RmbP80tU,5499
 healthdatalayer/repositories/medical_visit_repositories/medical_drug_recipe_repository.py,sha256=6rubP_KtheyJSvLmpBJwYuPKNsjhSvKi-_HM2QoP1hM,3141
 healthdatalayer/repositories/medical_visit_repositories/medical_drug_repository.py,sha256=mJNN6_aAK3eY9IpFc16nT3IshObGcFE5fi27SK-Sjio,2401
 healthdatalayer/repositories/medical_visit_repositories/medical_recipe_visit_repository.py,sha256=j4cJ4zURKILN3lkqfpXya29MQYFIMiTmJukOADBj5_c,4551
-healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py,sha256=hhHXQZh5T9G5GJgkTqN0jqQ-qiwXejCYbmF7ycwwa_8,14265
+healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py,sha256=vATKxoBimx_-VYtqnxx-6u4sdU7u8sjtE2y6Kr2uepM,17186
 healthdatalayer/repositories/medical_visit_repositories/organ_system_review_repository.py,sha256=-BTfgzvt8VlE2FsBHX3snzRl2VDrRClqz-dJL3bLheE,4192
 healthdatalayer/repositories/medical_visit_repositories/physical_exam_repository.py,sha256=Q4R2-6fv57jqZrGUMFQw4YZgZGQbn8UmSRS3UhUSZQg,3877
 healthdatalayer/repositories/medical_visit_repositories/visit_triage_repository.py,sha256=9Up5M7wWo5GnaYdl6QvTamYaIG4dG_ALM0Su66rlj44,4140
@@ -97,7 +97,7 @@ healthdatalayer/repositories/user_repositories/__init__.py,sha256=47DEQpj8HBSa-_
 healthdatalayer/repositories/user_repositories/permission_repository.py,sha256=3L4y-zCkI2PIRo-L3FJRSk4g3nZnu6q35lEY4ACJyq4,9630
 healthdatalayer/repositories/user_repositories/role_repository.py,sha256=jIsbeAFFQQ_CZJqBMcOskuMXtT1Il6eiN0Y2BpVO1JE,6821
 healthdatalayer/repositories/user_repositories/user_repository.py,sha256=FUCNdRRGc12dq5XuwDT3btvDETt6HGXh_xQIPTLCAvk,9839
-healthdatalayer-1.5.3.dist-info/METADATA,sha256=kgjLX_1bbO11W6ktpeuXw4zBBPacFg1nYuqpZcMHIUs,827
-healthdatalayer-1.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-healthdatalayer-1.5.3.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
-healthdatalayer-1.5.3.dist-info/RECORD,,
+healthdatalayer-1.5.5.dist-info/METADATA,sha256=FI6jWXF1Buf7HqOFDKYHKVxaQ8iB5T_lgdkmsNR2VvE,827
+healthdatalayer-1.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+healthdatalayer-1.5.5.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
+healthdatalayer-1.5.5.dist-info/RECORD,,