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

healthdatalayer/dtos/__init__.py

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

healthdatalayer/dtos/medical_visit/medical_certificate.py

@@ -48,4 +48,15 @@ class MedicalCertificateDTO(BaseModel):
     
     
     doctor_name: Optional[str] = None
-    doctor_ruc: Optional[str] = None
+    doctor_ruc: Optional[str] = None
+
+
+class DiagnosisDTO(BaseModel):
+    name_diagnosis: str
+    cie_10_code: Optional[str] = None
+
+class MedicalDiagnosesDTO(BaseModel):
+    diagnoses: List[DiagnosisDTO]
+
+    class Config:
+        from_attributes = True

healthdatalayer/repositories/client_repositories/px_repository.py

@@ -52,6 +52,11 @@ class PxRepository:
                     from healthdatalayer.models.user.user import User
                     user_obj = session.get(User, px.user_id)
                     object.__setattr__(px, 'user', user_obj)
+                    
+                if px.nationality_id:
+                    from healthdatalayer.models.client.nationality import Nationality
+                    user_obj = session.get(Nationality, px.nationality_id)
+                    object.__setattr__(px, 'nationality', user_obj)
             
             return px
             
@@ -90,6 +95,12 @@ class PxRepository:
                     from healthdatalayer.models.user.user import User
                     user_obj = session.get(User, px.user_id)
                     object.__setattr__(px, 'user', user_obj)
+                    
+                if px.nationality_id:
+                    from healthdatalayer.models.client.nationality import Nationality
+                    user_obj = session.get(Nationality, px.nationality_id)
+                    object.__setattr__(px, 'nationality', user_obj)
+            
             
             return px
             
@@ -134,7 +145,12 @@ class PxRepository:
                         from healthdatalayer.models.user.user import User
                         user_obj = session.get(User, px.user_id)
                         object.__setattr__(px, 'user', user_obj)
-            
+                    if px.nationality_id:
+                        from healthdatalayer.models.client.nationality import Nationality
+                        user_obj = session.get(Nationality, px.nationality_id)
+                        object.__setattr__(px, 'nationality', user_obj)
+                
+                
             return results
     
     def list_all_command(self, active_only: bool = True, load_relations: bool = False) -> List[Px]:
@@ -177,6 +193,12 @@ class PxRepository:
                         from healthdatalayer.models.user.user import User
                         user_obj = session.get(User, px.user_id)
                         object.__setattr__(px, 'user', user_obj)
+                        
+                    if px.nationality_id:
+                        from healthdatalayer.models.client.nationality import Nationality
+                        user_obj = session.get(Nationality, px.nationality_id)
+                        object.__setattr__(px, 'nationality', user_obj)
+            
             
             return results
             

healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py

@@ -4,7 +4,7 @@ from uuid import UUID
 from sqlmodel import select, text
 from sqlalchemy.orm import selectinload,joinedload
 from healthdatalayer.models import MedicalVisit
-from healthdatalayer.dtos import MedicalCertificateDTO
+from healthdatalayer.dtos import MedicalCertificateDTO,  DiagnosisDTO, MedicalDiagnosesDTO
 from healthdatalayer.config.db import engines, get_session
 
 class MedicalVisitRepository:
@@ -478,4 +478,32 @@ class MedicalVisitRepository:
                 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-1.6.1.dist-info → healthdatalayer-1.6.3.dist-info}/METADATA

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

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

@@ -3,11 +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=6KxXXnebS8tgfI6l2Fd7nuQL88wfCKU3tmtigbLjgKM,140
+healthdatalayer/dtos/__init__.py,sha256=AVQURjKBjhSm5d4av-_K__gJWPbSKaKxLbZFu6H-dIM,175
 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/dtos/medical_visit/medical_certificate.py,sha256=xMROlxFe7o8RMPzVbTTDeJCmy4jyd6b79A5VP2IXrhM,1622
 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
@@ -70,7 +70,7 @@ healthdatalayer/repositories/client_repositories/nationality_repository.py,sha25
 healthdatalayer/repositories/client_repositories/pathological_history_repository.py,sha256=RabXI8VCWHUHlHwtrYm2vQE_eyep2wrzOsemgYa5NPY,3082
 healthdatalayer/repositories/client_repositories/pet_repository.py,sha256=aUjti4bUniQbbUz5-bjgvUgDrSpPyggy9k5e-RAoYgc,4802
 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/client_repositories/px_repository.py,sha256=vUcpc88LBTcQ4HlH_OGBXggwMGxCkND6U5b0J9oCSto,11330
 healthdatalayer/repositories/collaborator_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py,sha256=jSKoM46Rp4MDjI1cotr2setidP9su8GKZBC5EsIr6Po,8329
 healthdatalayer/repositories/collaborator_repositories/collaborator_type_repository.py,sha256=7-bJqbxgsJtyRU7nV_YCZhKufYLlighWBWjglw70nUw,2858
@@ -91,7 +91,7 @@ healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_visit_
 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=beTd34sFQx_r4FwUQ1dePdWbJlllVdCCotl3ffP5ZBY,23288
+healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py,sha256=cU0qa4YgYkdFtJy-uWcThb9o0YwD0eAMaXbLrXNv-0Y,24442
 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
@@ -99,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.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,,
+healthdatalayer-1.6.3.dist-info/METADATA,sha256=oHWdfM-z8Sk-_PcLxWOoviRbPqhRtGD_ZqYda0Mkpz0,827
+healthdatalayer-1.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+healthdatalayer-1.6.3.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
+healthdatalayer-1.6.3.dist-info/RECORD,,