healthdatalayer 1.4.4__py3-none-any.whl → 1.4.6__py3-none-any.whl

healthdatalayer/models/medical_visit/medical_visit.py

@@ -2,9 +2,10 @@ import uuid
 from datetime import datetime
 from typing import Optional, List, TYPE_CHECKING
 from sqlmodel import SQLModel, Field, Relationship
+from sqlalchemy import Column, Enum as SqlEnum
 
 from healthdatalayer.models import Collaborator
-
+from healthdatalayer.models.medical_visit.status_visit_enum import StatusVisitEnum
 from healthdatalayer.models import Speciality
 from healthdatalayer.models import BridgeAreaFloorBranch 
 if TYPE_CHECKING:
@@ -28,7 +29,7 @@ class MedicalVisit(SQLModel, table=True):
     speciality_id:Optional[uuid.UUID]=Field(default=None,foreign_key="speciality.speciality_id")
     speciality: Optional[Speciality] = Relationship()
 
-    status_visit:str
+    status_visit: StatusVisitEnum = Field(sa_column=Column(SqlEnum(StatusVisitEnum, native_enum=False), nullable=False))
 
     next_followup_visit_id:Optional[uuid.UUID]=Field(default=None,foreign_key="medical_visit.medical_visit_id")
 

healthdatalayer/models/medical_visit/status_visit_enum.py

@@ -0,0 +1,8 @@
+from enum import Enum
+
+class StatusVisitEnum(str, Enum):
+    AGENDADO = "AGENDADO"
+    REAGENDADO = "REAGENDADO"
+    CANCELADO = "CANCELADO"
+    ATENDIDO = "ATENDIDO"
+    NO_ATENDIDO = "NO_ATENDIDO"

healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_repository.py

@@ -21,6 +21,36 @@ class MedicalDiagnosisRepository:
     def get_by_id_command(self, medical_diagnosis_id: UUID) -> Optional[MedicalDiagnosis]:
         with get_session(self.tenant) as session:
             return session.get(MedicalDiagnosis, medical_diagnosis_id)
+
+    def get_by_name_command(self, name:str, active_only: bool = True) -> Optional[MedicalDiagnosis]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalDiagnosis).where(MedicalDiagnosis.name == name)
+            
+            if active_only:
+                statement = statement.where(MedicalDiagnosis.is_active == True)
+            
+            medical_diagnosis = session.exec(statement).first()
+            return medical_diagnosis
+    
+    def get_by_name_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}%"))
+            
+            if active_only:
+                statement = statement.where(MedicalDiagnosis.is_active == True)
+            
+            medical_diagnosis = session.exec(statement).all()
+            return medical_diagnosis
+    
+    def get_by_code_command(self, code:str, active_only: bool = True) -> Optional[MedicalDiagnosis]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalDiagnosis).where(MedicalDiagnosis.cie_10_code == code)
+            
+            if active_only:
+                statement = statement.where(MedicalDiagnosis.is_active == True)
+            
+            medical_diagnosis = session.exec(statement).first()
+            return medical_diagnosis
     
     def list_all_command(self, active_only: bool = True) -> List[MedicalDiagnosis]:
         with get_session(self.tenant) as session:

healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_visit_repository.py

@@ -33,10 +33,27 @@ class MedicalDiagnosisVisitRepository:
             else:
                 return session.get(MedicalDiagnosisVisit, medical_diagnosis_visit_id)
     
-    def get_by_medical_visit_id_command(self, medical_visit_id: UUID, load_relations: bool = False) ->Optional[MedicalDiagnosisVisit]:
+    def get_by_medical_visit_id_command(self, medical_visit_id: UUID, load_relations: bool = False) ->List[MedicalDiagnosisVisit]:
         with get_session(self.tenant) as session:
             
             statement = select(MedicalDiagnosisVisit).where(MedicalDiagnosisVisit.medical_visit_id == medical_visit_id)
+            if load_relations:
+                statement = statement.options(
+                    joinedload(MedicalDiagnosisVisit.medical_visit),
+                    joinedload(MedicalDiagnosisVisit.medical_diagnosis)
+                )
+            medical_diagnosis_visits = session.exec(statement).all()
+            
+            return medical_diagnosis_visits
+    
+    def get_by_medicalvisitid_and_diagnosisid_command(self, medical_visit_id: UUID, medical_diagnosis_id: UUID, load_relations: bool = False) ->Optional[MedicalDiagnosisVisit]:
+        with get_session(self.tenant) as session:
+            
+            statement = select(MedicalDiagnosisVisit).where(
+                MedicalDiagnosisVisit.medical_visit_id == medical_visit_id,
+                MedicalDiagnosisVisit.medical_diagnosis_id == medical_diagnosis_id
+            )
+
             if load_relations:
                 statement = statement.options(
                     joinedload(MedicalDiagnosisVisit.medical_visit),
@@ -46,7 +63,7 @@ class MedicalDiagnosisVisitRepository:
             
             return medical_diagnosis_visit
     
-    def get_all_command(self, active_only: bool = True,load_related: bool = False) -> List[MedicalDiagnosisVisit]:
+    def list_all_command(self, active_only: bool = True,load_related: bool = False) -> List[MedicalDiagnosisVisit]:
         with get_session(self.tenant) as session:
             
             statement = select(MedicalDiagnosisVisit)

healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py

@@ -1,6 +1,7 @@
 from typing import Optional, List
+from datetime import datetime
 from uuid import UUID
-from sqlmodel import select, or_
+from sqlmodel import select
 from sqlalchemy.orm import selectinload,joinedload
 from healthdatalayer.models import MedicalVisit
 from healthdatalayer.config.db import engines, get_session
@@ -79,6 +80,123 @@ class MedicalVisitRepository:
             
             medical_visits = session.exec(statement).all()
             return medical_visits
+        
+    def get_by_collaborator_id_command(self, collaborator_id: UUID, active_only: bool = True, load_relations: bool = False) -> List[MedicalVisit]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalVisit).where(MedicalVisit.collaborator_id == collaborator_id)
+            
+            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_next_followup_id_command(self, next_followup_id: UUID, active_only: bool = True, load_relations: bool = False) -> List[MedicalVisit]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalVisit).where(MedicalVisit.next_followup_visit_id == next_followup_id)
+            
+            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(
+                    MedicalVisit.collaborator_id == collaborator_id,
+                    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_collaboratorid_and_targetdate_command(self, collaborator_id: UUID, target_date: datetime, active_only: bool = True, load_relations: bool = False) -> List[MedicalVisit]:
+        with get_session(self.tenant) as session:
+
+            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.collaborator_id == collaborator_id,
+                    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_specificdatetime_command(self, collaborator_id: UUID, specific_datetime: datetime, active_only: bool = True, load_relations: bool = False) -> Optional[MedicalVisit]:
+        with get_session(self.tenant) as session:
+
+            statement = select(MedicalVisit).where(
+                    MedicalVisit.collaborator_id == collaborator_id,
+                    MedicalVisit.visit_date == specific_datetime
+                )
+
+            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_visit = session.exec(statement).first()
+            return medical_visit
     
     def update_command(self, medical_visit: MedicalVisit) -> MedicalVisit:
         with get_session(self.tenant) as session:
@@ -107,4 +225,10 @@ class MedicalVisitRepository:
                 session.delete(existing_bridge)
 
             session.commit()
+    
+    def exists_by_collaboratoid_and_targetdate_command(self, collaborator_id: UUID, target_date: datetime) -> bool:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalVisit).where(MedicalVisit.collaborator_id == collaborator_id, MedicalVisit.visit_date == target_date)
+            result = session.exec(statement).first()
+            return result is not None
     

healthdatalayer/repositories/medical_visit_repositories/visit_triage_repository.py

@@ -1,6 +1,6 @@
 from typing import Optional, List
 from uuid import UUID
-from sqlmodel import select, or_
+from sqlmodel import select
 from sqlalchemy.orm import selectinload,joinedload
 from healthdatalayer.models import VisitTriage
 from healthdatalayer.models import MedicalVisit
@@ -86,4 +86,10 @@ class VisitTriageRepository:
             else:
                 session.delete(existing_visit_triage)
 
-            session.commit()
+            session.commit()
+
+    def exists_by_medical_visit_id_command(self, medical_visit_id: UUID) -> bool:
+        with get_session(self.tenant) as session:
+            statement = select(VisitTriage).where(VisitTriage.medical_visit_id == medical_visit_id)
+            result = session.exec(statement).first()
+            return result is not None

{healthdatalayer-1.4.4.dist-info → healthdatalayer-1.4.6.dist-info}/METADATA

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

{healthdatalayer-1.4.4.dist-info → healthdatalayer-1.4.6.dist-info}/RECORD

@@ -41,9 +41,10 @@ healthdatalayer/models/medical_visit/medical_diagnosis_visit.py,sha256=3ZoWxhqln
 healthdatalayer/models/medical_visit/medical_drug.py,sha256=zG3oqzq0fGZQNkY7AmFZQaHTG7BVQ3kGJ-tgLgfwNdc,829
 healthdatalayer/models/medical_visit/medical_drug_recipe.py,sha256=DiygpjyX72sc5jD-h9hue5kU0T4YgZyLxD_qVacnxV0,657
 healthdatalayer/models/medical_visit/medical_recipe_visit.py,sha256=W8E8RAOtow_-NbEr8SBHnoq_huJlx-6zDrJL98vzNQ4,1042
-healthdatalayer/models/medical_visit/medical_visit.py,sha256=ow5KTmRCaTj5RBKeQ-gfTms-L3kBgqZl90elSbImsVc,2338
+healthdatalayer/models/medical_visit/medical_visit.py,sha256=3CtXkXiFasuYEXGGHVfAKYu4VSsv8Xj8tTcR-dzqqmI,2567
 healthdatalayer/models/medical_visit/organ_system_review.py,sha256=fXWbuDfdy6QBBl-c5X14XBHpyCqLqqZdPNbzdq5H58U,1168
 healthdatalayer/models/medical_visit/physical_exam.py,sha256=VaezGMp4eptJH-mco-SCumATkcpp2xSA6zBtw9LrMFM,1772
+healthdatalayer/models/medical_visit/status_visit_enum.py,sha256=p4krEZXsXpeAtedCwlj1vcPMPM9y-LHWHfkOVEgZtBY,199
 healthdatalayer/models/medical_visit/visit_triage.py,sha256=RrTQ_ckAkOTdNfHXetqKt3a1VmvHSkMZ_5VkGvJQheE,1093
 healthdatalayer/models/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/models/user/permission.py,sha256=U4sU_l68X7lMIooaxJN3aZ7eVJT-DDCTI_ApKyvPo-E,801
@@ -80,20 +81,20 @@ 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=mRrNGt6Z4vsZBhvhlOSXlED289WelBJbTn5EetMmQJ8,2567
-healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_visit_repository.py,sha256=GKgjRvddcaw82WMXDO9R7S8HuaJPYTvRT0ev2trKaa8,4659
+healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_repository.py,sha256=dnVW3hMUqrVGctBSNKVU2_j0ITH46aXN31XduELO8wg,4012
+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=r6l4L2AuStV_9NO208_GG8REJRnFtHBU2zx0BjnYuCI,5151
+healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py,sha256=BmPLxuB22QOPukAAduIKwWq5lQkhKdILF4AuCF7Bj-s,11693
 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=0xVnhXV2CSNi2FcW2tG_BGsqlm_oA9jvXP5qz5Aqj_c,3821
+healthdatalayer/repositories/medical_visit_repositories/visit_triage_repository.py,sha256=9Up5M7wWo5GnaYdl6QvTamYaIG4dG_ALM0Su66rlj44,4140
 healthdatalayer/repositories/user_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.4.4.dist-info/METADATA,sha256=Bve8ZfDL4fPSh3MDTlCtYY0HSC-t2mCTT2y2x1Iskx4,827
-healthdatalayer-1.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-healthdatalayer-1.4.4.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
-healthdatalayer-1.4.4.dist-info/RECORD,,
+healthdatalayer-1.4.6.dist-info/METADATA,sha256=T7QzPWNWK4gtfco36C-ZFyfMT95eNS_vbU3EYjybbWM,827
+healthdatalayer-1.4.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+healthdatalayer-1.4.6.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
+healthdatalayer-1.4.6.dist-info/RECORD,,