healthdatalayer 1.5.9__py3-none-any.whl → 1.6.1__py3-none-any.whl

healthdatalayer/dtos/__init__.py

@@ -1 +1,2 @@
-from .collaborator.schedule_collaborator import ScheduleCollaboratorDTO
+from .collaborator.schedule_collaborator import ScheduleCollaboratorDTO
+from .medical_visit.medical_certificate import MedicalCertificateDTO

healthdatalayer/dtos/medical_visit/medical_certificate.py

@@ -0,0 +1,51 @@
+from pydantic import BaseModel, Field
+from typing import List, Optional
+from datetime import date, datetime, time
+
+class MedicalCertificateDTO(BaseModel):
+    sys: Optional[str] = None
+    stablishment: Optional[str] = None
+    
+    
+    medical_record_number: Optional[str] = None
+    number_his: Optional[str] = None
+    last_name: Optional[str] = None
+    first_name: Optional[str] = None
+    sex: Optional[str] = None
+    age: Optional[int] = None
+    
+    
+    service: Optional[str] = None
+    speciality: Optional[str] = None
+    
+    
+    year_visit: Optional[int] = None
+    month_visit: Optional[int] = None
+    day_visit: Optional[int] = None
+    hour_start: Optional[time] = None
+    hour_end: Optional[time] = None
+    visit_date_spanish: Optional[str] = None
+    
+    
+    rest: Optional[bool] = None
+    rest_hours: Optional[float] = None
+    rest_date_start: Optional[datetime] = None
+    
+    
+    year_rest_start: Optional[int] = None
+    month_rest_start: Optional[int] = None
+    day_rest_start: Optional[int] = None
+    rest_date_start_spanish: Optional[str] = None
+    
+    
+    rest_date_end: Optional[datetime] = None
+    
+    
+    year_rest_end: Optional[int] = None
+    month_rest_end: Optional[int] = None
+    day_rest_end: Optional[int] = None
+    rest_date_end_spanish: Optional[str] = None
+    
+    
+    doctor_name: Optional[str] = None
+    doctor_ruc: Optional[str] = None

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

@@ -1,9 +1,10 @@
 from typing import Optional, List
 from datetime import datetime, date, time
 from uuid import UUID
-from sqlmodel import select
+from sqlmodel import select, text
 from sqlalchemy.orm import selectinload,joinedload
 from healthdatalayer.models import MedicalVisit
+from healthdatalayer.dtos import MedicalCertificateDTO
 from healthdatalayer.config.db import engines, get_session
 
 class MedicalVisitRepository:
@@ -342,4 +343,139 @@ class MedicalVisitRepository:
             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]
+            )

{healthdatalayer-1.5.9.dist-info → healthdatalayer-1.6.1.dist-info}/METADATA

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

{healthdatalayer-1.5.9.dist-info → healthdatalayer-1.6.1.dist-info}/RECORD

@@ -3,9 +3,11 @@ 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/__init__.py,sha256=6KxXXnebS8tgfI6l2Fd7nuQL88wfCKU3tmtigbLjgKM,140
 healthdatalayer/dtos/collaborator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/dtos/collaborator/schedule_collaborator.py,sha256=SUD7BIMownZuW9h9GUaFy2U9jaDjZ1tB_9-KCv4H0mk,369
+healthdatalayer/dtos/medical_visit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+healthdatalayer/dtos/medical_visit/medical_certificate.py,sha256=7Kgn95WXXQ_rLXtr-N20hXFs_0DsKAVai0rIwbOk2JQ,1404
 healthdatalayer/models/__init__.py,sha256=Hz31SDpnjtFZZcf_uLt0MuGqE-_P2ZIsZlPQ_YYaetk,2117
 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
@@ -86,10 +88,10 @@ healthdatalayer/repositories/lab_repositories/medical_lab_repository.py,sha256=o
 healthdatalayer/repositories/medical_visit_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_repository.py,sha256=hwb5vh64ze72tFMSIUPNitC5t6pUCcO6pnI0gk-7LZU,4157
 healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_visit_repository.py,sha256=5-QSverT7FN5nay2j_EevCqNAnuD--FTDVQnj0_WRhs,5508
-healthdatalayer/repositories/medical_visit_repositories/medical_drug_recipe_repository.py,sha256=6rubP_KtheyJSvLmpBJwYuPKNsjhSvKi-_HM2QoP1hM,3141
+healthdatalayer/repositories/medical_visit_repositories/medical_drug_recipe_repository.py,sha256=fZViKSu21mYihn3C4p7f7wqZkePoHi-Mm5ZI38XpSvw,3330
 healthdatalayer/repositories/medical_visit_repositories/medical_drug_repository.py,sha256=woyrx4vuV7hpxS9WOZNmCTsfWrZiXoMV2__x9lTqPJY,3011
 healthdatalayer/repositories/medical_visit_repositories/medical_recipe_visit_repository.py,sha256=j4cJ4zURKILN3lkqfpXya29MQYFIMiTmJukOADBj5_c,4551
-healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py,sha256=vATKxoBimx_-VYtqnxx-6u4sdU7u8sjtE2y6Kr2uepM,17186
+healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py,sha256=beTd34sFQx_r4FwUQ1dePdWbJlllVdCCotl3ffP5ZBY,23288
 healthdatalayer/repositories/medical_visit_repositories/organ_system_review_repository.py,sha256=7QNxpQIFcD6B8CX5fua8Qck75j24Y4uEkR_Lans1_0A,4197
 healthdatalayer/repositories/medical_visit_repositories/physical_exam_repository.py,sha256=eCdokx60LB5hLfloqFhvsDj8UxFYXEDi6nqXO0TB18w,3877
 healthdatalayer/repositories/medical_visit_repositories/visit_triage_repository.py,sha256=9Up5M7wWo5GnaYdl6QvTamYaIG4dG_ALM0Su66rlj44,4140
@@ -97,7 +99,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.9.dist-info/METADATA,sha256=55bxMtiwWzQVEqdSgHZIDukDPbdjDq9wItzGvVN9QH0,827
-healthdatalayer-1.5.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-healthdatalayer-1.5.9.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
-healthdatalayer-1.5.9.dist-info/RECORD,,
+healthdatalayer-1.6.1.dist-info/METADATA,sha256=tfw_0ka72WjF5eOVTS3rDYoo15DBiZ_vmbpMU3KBayk,827
+healthdatalayer-1.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+healthdatalayer-1.6.1.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
+healthdatalayer-1.6.1.dist-info/RECORD,,