healthdatalayer 1.4.5__py3-none-any.whl → 1.5.0__py3-none-any.whl

healthdatalayer/dtos/__init__.py

@@ -0,0 +1 @@
+from .collaborator.schedule_collaborator import ScheduleCollaboratorDTO

healthdatalayer/dtos/collaborator/schedule_collaborator.py

@@ -0,0 +1,13 @@
+from pydantic import BaseModel, Field
+from typing import List
+from datetime import time
+
+class ScheduleCollaboratorDTO(BaseModel):
+    
+    available_schedules: List[str] = Field(default_factory=list)
+    busy_schedules: List[str] = Field(default_factory=list)
+    
+    class Config:
+        json_encoders = {
+            time: lambda v: v.strftime('%H:%M')
+        }

healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py

@@ -1,9 +1,11 @@
+from datetime import date
 from typing import Optional, List
 from uuid import UUID
-from sqlmodel import select, or_, join
+from sqlmodel import select, or_, join, text
 from sqlalchemy.orm import selectinload,joinedload
 from healthdatalayer.models import Collaborator
 from healthdatalayer.models import Speciality, CollaboratorSpeciality
+from healthdatalayer.dtos import ScheduleCollaboratorDTO
 from healthdatalayer.config.db import engines, get_session
 
 class CollaboratorRepository:
@@ -147,4 +149,48 @@ class CollaboratorRepository:
                 session.commit()
                 session.refresh(collab)
             
-            return collab
+            return collab
+    
+    def get_availability_schedules_command(self, visit_date: date, collaborator_id: str) -> ScheduleCollaboratorDTO:
+    
+        with get_session(self.tenant) as session:
+            
+            query = text("""
+                WITH horarios_generados AS (
+                    SELECT horario::TIME as hora
+                    FROM generate_series(
+                        :fecha::DATE + TIME '08:00:00',
+                        :fecha::DATE + TIME '17:00:00',
+                        INTERVAL '30 minutes'
+                    ) AS horario
+                ),
+                horarios_ocupados AS (
+                    SELECT t.visit_date::TIME as hora
+                    FROM medical_visit t
+                    WHERE t.visit_date::DATE = :fecha
+                    AND t.collaborator_id = :colab_id
+                )
+                SELECT 
+                    hg.hora,
+                    CASE WHEN ho.hora IS NOT NULL THEN true ELSE false END as ocupado
+                FROM horarios_generados hg
+                LEFT JOIN horarios_ocupados ho ON hg.hora = ho.hora
+                ORDER BY hg.hora
+            """)
+            
+            result = session.exec(query, {"fecha": visit_date, "colab_id": collaborator_id})
+            
+            availables = []
+            busy = []
+            
+            for row in result:
+                hour, is_busy = row[0], row[1]
+                if is_busy:
+                    busy.append(hour)
+                else:
+                    availables.append(hour)
+            
+            return ScheduleCollaboratorDTO(
+                available_schedules=availables,
+                busy_schedules=busy
+            )

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/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.5.dist-info → healthdatalayer-1.5.0.dist-info}/METADATA

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

{healthdatalayer-1.4.5.dist-info → healthdatalayer-1.5.0.dist-info}/RECORD

@@ -3,6 +3,9 @@ healthdatalayer/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 healthdatalayer/config/config.py,sha256=vyqrlHDgCGpYX7V9fDn4g671lUU1RuWlSYCIazI-SqQ,689
 healthdatalayer/config/db.py,sha256=b_SWTINJSVUhR0uyD4h93jPLKUzRm6Ky0tmALWbjM18,342
 healthdatalayer/config/vault.py,sha256=9yUMXjaTYSnqr0npcQXDsg6Z7G3DityqpmHl1x42zS0,748
+healthdatalayer/dtos/__init__.py,sha256=yNIWA7EF04esaVDpSymVyeuaotsHdOjLzqk3ygbh59o,71
+healthdatalayer/dtos/collaborator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+healthdatalayer/dtos/collaborator/schedule_collaborator.py,sha256=liF-UDijHIVZdyzvGuniqcXbA6avns65ey1hfnLI0J4,367
 healthdatalayer/models/__init__.py,sha256=ZBY7CL172P68TWRWVTpzHO0_cnFzDRGz7aTy85Z8HPI,2056
 healthdatalayer/models/bridge_area_floor_branch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/models/bridge_area_floor_branch/area.py,sha256=g_u6RoorLJ7XUx7qcqXLavrHxpflHGi0p77f-3RPbVU,201
@@ -67,7 +70,7 @@ healthdatalayer/repositories/client_repositories/pet_repository.py,sha256=aUjti4
 healthdatalayer/repositories/client_repositories/profession_repository.py,sha256=ALnx_y_z9Jfx9rBDvOdnK1P1_lkqKmFBeR1GVXj3m3Q,2620
 healthdatalayer/repositories/client_repositories/px_repository.py,sha256=cTXDfKolG5aLdlQzXV98_r4Y1Qm5jYW9cUtntdw7e0k,10116
 healthdatalayer/repositories/collaborator_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py,sha256=aYew_0UMYRvng3DgP5vnKbSVmYe8ozYWUnLly6LxTcI,6467
+healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py,sha256=xDyLO0DqrbojaXzMBgweamKPDtPYFwURVEFoV0pgBIg,8228
 healthdatalayer/repositories/collaborator_repositories/collaborator_type_repository.py,sha256=7-bJqbxgsJtyRU7nV_YCZhKufYLlighWBWjglw70nUw,2858
 healthdatalayer/repositories/collaborator_repositories/speciality_repository.py,sha256=tcAjp2OzFAnHpRKNdmw2Zsqvs7XdsO51h7cIJHt105s,2940
 healthdatalayer/repositories/infraestructure_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -81,20 +84,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=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.5.dist-info/METADATA,sha256=8JRrMnan-t3mU9GK2JZ_dYAW2nUjvg3de0Mm04juGKY,827
-healthdatalayer-1.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-healthdatalayer-1.4.5.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
-healthdatalayer-1.4.5.dist-info/RECORD,,
+healthdatalayer-1.5.0.dist-info/METADATA,sha256=PSPVrGaysLeAPs1TvTjrEB8abDmrrCIoowfLdrJ0eYw,827
+healthdatalayer-1.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+healthdatalayer-1.5.0.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
+healthdatalayer-1.5.0.dist-info/RECORD,,