healthdatalayer 1.4.3__py3-none-any.whl → 1.7.0__py3-none-any.whl

healthdatalayer/repositories/medical_visit_repositories/medical_recipe_visit_repository.py

@@ -1,8 +1,9 @@
 from typing import Optional, List
 from uuid import UUID
-from sqlmodel import select, or_
+from sqlmodel import select, or_, text
 from sqlalchemy.orm import selectinload,joinedload
-from healthdatalayer.models import MedicalRecipeVisit
+from healthdatalayer.models import MedicalRecipeVisit, MedicalDrugRecipe, MedicalDrug
+from healthdatalayer.dtos import HeaderRecipe, RecipeMedicalDrugData
 from healthdatalayer.config.db import engines, get_session
 
 class MedicalRecipeVisitRepository:
@@ -24,7 +25,7 @@ class MedicalRecipeVisitRepository:
             if load_relations:
                 statement = select(MedicalRecipeVisit).where(MedicalRecipeVisit.medical_recipe_visit_id == medical_recipe_visit_id).options(
                     joinedload(MedicalRecipeVisit.medical_visit),
-                    joinedload(MedicalRecipeVisit.medical_drugs)
+                    selectinload(MedicalRecipeVisit.medical_drug_recipes).selectinload(MedicalDrugRecipe.medical_drug)
                 )
                 medical_recipe_visit = session.exec(statement).first()
                
@@ -38,7 +39,7 @@ class MedicalRecipeVisitRepository:
             if load_relations:
                 statement = statement.options(
                     selectinload(MedicalRecipeVisit.medical_visit),
-                    selectinload(MedicalRecipeVisit.medical_drugs)
+                    selectinload(MedicalRecipeVisit.medical_drug_recipes).selectinload(MedicalDrugRecipe.medical_drug)
                 )
             medical_recipe_visit = session.exec(statement).first()
                
@@ -52,7 +53,7 @@ class MedicalRecipeVisitRepository:
                 
                 statement = select(MedicalRecipeVisit).options(
                     selectinload(MedicalRecipeVisit.medical_visit),
-                    selectinload(MedicalRecipeVisit.medical_drugs)
+                    selectinload(MedicalRecipeVisit.medical_drug_recipes).selectinload(MedicalDrugRecipe.medical_drug)
                 )
                 if active_only:
                     statement = statement.where(MedicalRecipeVisit.is_active == True)
@@ -90,4 +91,55 @@ class MedicalRecipeVisitRepository:
                 session.delete(existing_medical_recipe_visit)
 
             session.commit()
-    
+            
+    def get_header_recipe_data(self, med_recipe_visit_id : str) ->Optional[HeaderRecipe]:
+        with get_session(self.tenant) as session:
+            query= text("""
+                select mv.visit_date, c."name"  as name_doctor,
+                c.ruc, c.code,
+                px.first_name as first_name_px , px.last_name as last_name_px
+                from medical_recipe_visit mrv 
+                join medical_visit mv on mv.medical_visit_id  = mrv.medical_visit_id
+                join collaborator c  on c.collaborator_id  = mv.collaborator_id 
+                join px on px.client_id  = mv.client_id 
+                where mrv.medical_recipe_visit_id  = :med_recipe_visit_id
+            """)
+            result = session.exec(query, params={"med_recipe_visit_id": med_recipe_visit_id})
+            
+            row = result.fetchone()
+
+            if not row:
+                raise ValueError(f"No se encontró la visita médica con ID: {med_recipe_visit_id}")
+            
+            return HeaderRecipe(
+                visit_date=row[0],
+                name_doctor=row[1],
+                ruc=row[2],
+                code=row[3],
+                first_name_px=row[4],
+                last_name_px=row[5]
+            )
+    
+    def get_recipe_drugs_data(self, med_recipe_visit_id : str) ->List[RecipeMedicalDrugData]:
+        with get_session(self.tenant) as session:
+            query = text("""
+                select md.drug_name, mdr."comment", mdr.quantity  from medical_recipe_visit mrv 
+                left join medical_drug_recipe mdr on mrv.medical_recipe_visit_id = mdr.medical_recipe_visit_id 
+                left join medical_drug md on md.medical_drug_id  = mdr.medical_drug_id 
+                where mrv.medical_recipe_visit_id  = :med_recipe_visit_id
+            """)
+            
+            result = session.exec(query, params={"med_recipe_visit_id": med_recipe_visit_id})
+            rows = result.fetchall()
+            
+            # Convertir cada fila a DiagnosisDTO
+            recipe_list = []
+            for row in rows:
+                diagnosis = RecipeMedicalDrugData(
+                    drug_name=row[0],
+                    comment=row[1],
+                    quantity=row[2]
+                )
+                recipe_list.append(diagnosis)
+            
+            return recipe_list

healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py

@@ -1,8 +1,10 @@
 from typing import Optional, List
+from datetime import datetime, date, time
 from uuid import UUID
-from sqlmodel import select, or_
+from sqlmodel import select, text
 from sqlalchemy.orm import selectinload,joinedload
-from healthdatalayer.models import MedicalVisit
+from healthdatalayer.models import MedicalVisit,MedicalDiagnosisVisit
+from healthdatalayer.dtos import MedicalCertificateDTO,  DiagnosisDTO, MedicalDiagnosesDTO
 from healthdatalayer.config.db import engines, get_session
 
 class MedicalVisitRepository:
@@ -26,7 +28,7 @@ class MedicalVisitRepository:
                     joinedload(MedicalVisit.client),
                     joinedload(MedicalVisit.collaborator),
                     joinedload(MedicalVisit.speciality),
-                    selectinload(MedicalVisit.medical_diagnosis_visits),
+                    selectinload(MedicalVisit.medical_diagnosis_visits).selectinload(MedicalDiagnosisVisit.medical_diagnosis),
                     selectinload(MedicalVisit.medical_recipe_visits),
                     selectinload(MedicalVisit.organ_system_reviews),
                     selectinload(MedicalVisit.physical_exams)
@@ -64,6 +66,46 @@ class MedicalVisitRepository:
     def get_by_client_id_command(self, client_id: UUID, active_only: bool = True, load_relations: bool = False) -> List[MedicalVisit]:
         with get_session(self.tenant) as session:
             statement = select(MedicalVisit).where(MedicalVisit.client_id == client_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(MedicalDiagnosisVisit.medical_diagnosis),
+                    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_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(MedicalDiagnosisVisit.medical_diagnosis),
+                    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:
@@ -79,6 +121,194 @@ 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(MedicalDiagnosisVisit.medical_diagnosis),
+                    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(MedicalDiagnosisVisit.medical_diagnosis),
+                    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(MedicalDiagnosisVisit.medical_diagnosis),
+                    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:
+
+            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.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(MedicalDiagnosisVisit.medical_diagnosis),
+                    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(MedicalDiagnosisVisit.medical_diagnosis),
+                    selectinload(MedicalVisit.medical_recipe_visits),
+                    selectinload(MedicalVisit.organ_system_reviews),
+                    selectinload(MedicalVisit.physical_exams)
+                )
+            
+            medical_visit = session.exec(statement).first()
+            return medical_visit
+        
+    def get_first_by_clientid_command(self, client_id: UUID, active_only: bool = True, load_relations: bool = False) -> Optional[MedicalVisit]:
+        with get_session(self.tenant) as session:
+
+            statement = select(MedicalVisit).where(MedicalVisit.client_id == client_id).order_by(MedicalVisit.visit_date.asc())
+
+            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(MedicalDiagnosisVisit.medical_diagnosis),
+                    selectinload(MedicalVisit.medical_recipe_visits),
+                    selectinload(MedicalVisit.organ_system_reviews),
+                    selectinload(MedicalVisit.physical_exams)
+                )
+            
+            medical_visit = session.exec(statement).first()
+            return medical_visit
+    
+    def get_last_by_clientid_command(self, client_id: UUID, active_only: bool = True, load_relations: bool = False) -> Optional[MedicalVisit]:
+        with get_session(self.tenant) as session:
+
+            statement = select(MedicalVisit).where(MedicalVisit.client_id == client_id).order_by(MedicalVisit.visit_date.desc())
+
+            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(MedicalDiagnosisVisit.medical_diagnosis),
+                    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 +337,173 @@ 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
+    
+    
+    def get_data_medical_certificate_command(self, medical_visit_id: str) -> MedicalCertificateDTO:
+    
+        with get_session(self.tenant) as session:
+            
+            query = text("""
+                select 
+                s."name"  as "sys",
+                b2."name" as stablishment,
+                px.medical_record_number,
+                px.identification  as number_his,
+                px.last_name ,
+                px.first_name,
+                case 
+                    when g.name ='Male' then 'M'
+                    else 'F'
+                end as sex,
+                EXTRACT(YEAR FROM AGE(px.birth_date)) AS age,
+                sp.name as service,
+                sp.subspeciality as speciality,
+                EXTRACT(YEAR FROM mv.visit_date) AS year_visit,
+                EXTRACT(MONTH FROM mv.visit_date) AS month_visit,
+                EXTRACT(DAY FROM mv.visit_date) AS day_visit,
+                mv.visit_date::time AS hour_start,
+                (mv.visit_date + INTERVAL '30 minutes')::time AS hour_end,
+                TO_CHAR(mv.visit_date, 'DD') || ' de ' ||
+                CASE EXTRACT(MONTH FROM mv.visit_date)
+                    WHEN 1 THEN 'enero'
+                    WHEN 2 THEN 'febrero'
+                    WHEN 3 THEN 'marzo'
+                    WHEN 4 THEN 'abril'
+                    WHEN 5 THEN 'mayo'
+                    WHEN 6 THEN 'junio'
+                    WHEN 7 THEN 'julio'
+                    WHEN 8 THEN 'agosto'
+                    WHEN 9 THEN 'septiembre'
+                    WHEN 10 THEN 'octubre'
+                    WHEN 11 THEN 'noviembre'
+                    WHEN 12 THEN 'diciembre'
+                END || ' del ' || EXTRACT(YEAR FROM mv.visit_date) AS visit_date_spanish,
+                mv.rest,
+                mv.rest_hours, 
+                mv.rest_date_start , 
+                EXTRACT(YEAR FROM mv.rest_date_start) AS year_rest_start,
+                EXTRACT(MONTH FROM mv.rest_date_start) AS month_rest_start,
+                EXTRACT(DAY FROM mv.rest_date_start) AS day_rest_start,
+                TO_CHAR(mv.rest_date_start, 'DD') || ' de ' ||
+                CASE EXTRACT(MONTH FROM mv.rest_date_start)
+                    WHEN 1 THEN 'enero'
+                    WHEN 2 THEN 'febrero'
+                    WHEN 3 THEN 'marzo'
+                    WHEN 4 THEN 'abril'
+                    WHEN 5 THEN 'mayo'
+                    WHEN 6 THEN 'junio'
+                    WHEN 7 THEN 'julio'
+                    WHEN 8 THEN 'agosto'
+                    WHEN 9 THEN 'septiembre'
+                    WHEN 10 THEN 'octubre'
+                    WHEN 11 THEN 'noviembre'
+                    WHEN 12 THEN 'diciembre'
+                END || ' del ' || EXTRACT(YEAR FROM mv.rest_date_start) AS rest_date_start_spanish,
+                mv.rest_date_end,
+                EXTRACT(YEAR FROM mv.rest_date_end) AS year_rest_end,
+                EXTRACT(MONTH FROM mv.rest_date_end) AS month_rest_end,
+                EXTRACT(DAY FROM mv.rest_date_end) AS day_rest_end,
+                TO_CHAR( mv.rest_date_end, 'DD') || ' de ' ||
+                CASE EXTRACT(MONTH FROM  mv.rest_date_end)
+                    WHEN 1 THEN 'enero'
+                    WHEN 2 THEN 'febrero'
+                    WHEN 3 THEN 'marzo'
+                    WHEN 4 THEN 'abril'
+                    WHEN 5 THEN 'mayo'
+                    WHEN 6 THEN 'junio'
+                    WHEN 7 THEN 'julio'
+                    WHEN 8 THEN 'agosto'
+                    WHEN 9 THEN 'septiembre'
+                    WHEN 10 THEN 'octubre'
+                    WHEN 11 THEN 'noviembre'
+                    WHEN 12 THEN 'diciembre'
+                END || ' del ' || EXTRACT(YEAR FROM  mv.rest_date_end) AS rest_date_end_spanish,
+                c.name as doctor_name,
+                c.ruc  as doctor_ruc
+                from medical_visit mv
+                left join px on px.client_id  = mv.client_id 
+                left join gender g on g.gender_id  = px.gender_id 
+                left join collaborator c on c.collaborator_id  = mv.collaborator_id 
+                left join bridge_area_floor_branch b on b.bridge_area_floor_branch_id  = mv.bridge_area_floor_branch_id 
+                left join branch b2 on b.branch_id  = b2.branch_id 
+                left join "system" s on s.system_id  = b2.system_id 
+                left join speciality sp on sp.speciality_id = mv.speciality_id
+                where mv.medical_visit_id = :medical_visit_id
+                and mv.status_visit != 'CANCELADO'
+            """)
+            
+            result = session.exec(query, params={"medical_visit_id": medical_visit_id})
+            
+            row = result.fetchone()
+        
+            
+            if not row:
+                raise ValueError(f"No se encontró la visita médica con ID: {medical_visit_id}")
+            
+            
+            return MedicalCertificateDTO(
+                sys=row[0],
+                stablishment=row[1],
+                medical_record_number=row[2],
+                number_his=row[3],
+                last_name=row[4],
+                first_name=row[5],
+                sex=row[6],
+                age=row[7],
+                service=row[8],
+                speciality=row[9],
+                year_visit=row[10],
+                month_visit=row[11],
+                day_visit=row[12],
+                hour_start=row[13],
+                hour_end=row[14],
+                visit_date_spanish=row[15],
+                rest=row[16],
+                rest_hours=row[17],
+                rest_date_start=row[18],
+                year_rest_start=row[19],
+                month_rest_start=row[20],
+                day_rest_start=row[21],
+                rest_date_start_spanish=row[22],
+                rest_date_end=row[23],
+                year_rest_end=row[24],
+                month_rest_end=row[25],
+                day_rest_end=row[26],
+                rest_date_end_spanish=row[27],
+                doctor_name=row[28],
+                doctor_ruc=row[29]
+            )
+    
+    def get_medical_diagnoses_command(self, medical_visit_id: str) -> MedicalDiagnosesDTO:
+    
+        with get_session(self.tenant) as session:
+            
+            query = text("""
+                select md."name" as name_diagnosis,
+                md.cie_10_code 
+                from medical_diagnosis md 
+                join medical_diagnosis_visit mdv on mdv.medical_diagnosis_id  = md.medical_diagnosis_id 
+                where md.is_active = true
+                and mdv.is_active  = true
+                and mdv.medical_visit_id  = :medical_visit_id
+            """)
+            
+            result = session.exec(query, params={"medical_visit_id": medical_visit_id})
+            rows = result.fetchall()
+            
+            # Convertir cada fila a DiagnosisDTO
+            diagnoses_list = []
+            for row in rows:
+                diagnosis = DiagnosisDTO(
+                    name_diagnosis=row[0],
+                    cie_10_code=row[1]
+                )
+                diagnoses_list.append(diagnosis)
+            
+            return MedicalDiagnosesDTO(diagnoses=diagnoses_list)

healthdatalayer/repositories/medical_visit_repositories/organ_system_review_repository.py

@@ -76,7 +76,7 @@ class OrganSystemReviewRepository:
         
     def delete_command(self, organ_system_review_id: UUID, soft_delete: bool = False)->None:
         with get_session(self.tenant) as session:
-            existing_organ_system_review = session.get(MedicalVisit, organ_system_review_id)
+            existing_organ_system_review = session.get(OrganSystemReview, organ_system_review_id)
             if not existing_organ_system_review:
                 raise ValueError(f"MedicalVisit with id {organ_system_review_id} does not exist")
 

healthdatalayer/repositories/medical_visit_repositories/physical_exam_repository.py

@@ -76,7 +76,7 @@ class PhysicalExamRepository:
         
     def delete_command(self, physical_exam_id: UUID, soft_delete: bool = False)->None:
         with get_session(self.tenant) as session:
-            existing_physical_exam = session.get(MedicalVisit, physical_exam_id)
+            existing_physical_exam = session.get(PhysicalExam, physical_exam_id)
             if not existing_physical_exam:
                 raise ValueError(f"MedicalVisit with id {physical_exam_id} does not exist")
 

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

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