healthdatalayer 1.6.3__tar.gz → 1.7.0__tar.gz

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/PKG-INFO

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

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/healthdatalayer/dtos/__init__.py

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

healthdatalayer-1.7.0/healthdatalayer/dtos/medical_visit/recipe_dto.py

@@ -0,0 +1,16 @@
+from pydantic import BaseModel, Field
+from typing import List, Optional
+from datetime import date, datetime, time
+
+class HeaderRecipe(BaseModel):
+    visit_date : Optional[datetime] = None
+    name_doctor : Optional[str] = None
+    ruc : Optional[str] = None
+    code : Optional[str] = None
+    first_name_px : Optional[str] = None
+    last_name_px : Optional[str] = None
+    
+class RecipeMedicalDrugData(BaseModel):
+    drug_name : Optional[str] = None
+    comment: Optional[str] = None
+    quantity :Optional[int] = None

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/healthdatalayer/models/client/px.py

@@ -1,4 +1,4 @@
-from typing import Optional, TYPE_CHECKING
+from typing import Optional, TYPE_CHECKING, List
 from sqlmodel import Field, Relationship
 import uuid
 
@@ -7,6 +7,7 @@ from healthdatalayer.models import Client
 
 if TYPE_CHECKING:
     from healthdatalayer.models import ClientLab
+    from healthdatalayer.models import PathologicalHistory
     
 
 class Px(Client, table=True):
@@ -21,10 +22,14 @@ class Px(Client, table=True):
     education_id: Optional[uuid.UUID] = Field(default=None, foreign_key="education.education_id")
     user_id: Optional[uuid.UUID] = Field(default=None, foreign_key="user.user_id")
     nationality_id: Optional[uuid.UUID] = Field(default=None, foreign_key="nationality.nationality_id")
+    pathological_histories: List["PathologicalHistory"] = Relationship(
+        back_populates="client",
+        sa_relationship_kwargs={"lazy": "selectin"}
+    )
 
 Px.marriage_status = Relationship()
 Px.profession = Relationship()
 Px.education = Relationship()
 Px.user = Relationship()
 Px.nationality = Relationship()
-Px.medical_labs = Relationship(back_populates="pxs", link_model="ClientLab")
+Px.medical_labs = Relationship(back_populates="pxs", link_model="ClientLab")

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/healthdatalayer/models/medical_visit/medical_drug.py

@@ -5,8 +5,7 @@ from sqlmodel import SQLModel, Field, Relationship
 
 from healthdatalayer.models.medical_visit.medical_drug_recipe import MedicalDrugRecipe
 
-if TYPE_CHECKING:
-    from healthdatalayer.models.medical_visit.medical_recipe_visit import MedicalRecipeVisit
+
 
 class MedicalDrug(SQLModel, table=True):
     __tablename__ = "medical_drug"
@@ -21,7 +20,4 @@ class MedicalDrug(SQLModel, table=True):
 
     is_active: bool = Field(default=True)
 
-    medical_recipe_visits: List["MedicalRecipeVisit"] = Relationship(
-        back_populates="medical_drugs",
-        link_model=MedicalDrugRecipe
-    )
+   

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/healthdatalayer/models/medical_visit/medical_drug_recipe.py

@@ -1,7 +1,11 @@
 import uuid
 from datetime import datetime
-from typing import Optional
-from sqlmodel import SQLModel, Field
+from typing import Optional, TYPE_CHECKING
+from sqlmodel import SQLModel, Field, Relationship
+
+#from healthdatalayer.models import MedicalDrug
+if TYPE_CHECKING:
+    from healthdatalayer.models import MedicalRecipeVisit,MedicalDrug
 
 class MedicalDrugRecipe(SQLModel, table=True):
     __tablename__ = "medical_drug_recipe"
@@ -9,10 +13,13 @@ class MedicalDrugRecipe(SQLModel, table=True):
     medical_drug_recipe_id:uuid.UUID=Field(default_factory=uuid.uuid4,primary_key=True)
 
     medical_drug_id: uuid.UUID = Field(foreign_key="medical_drug.medical_drug_id", primary_key=True)
+    medical_drug: Optional["MedicalDrug"] = Relationship()
     medical_recipe_visit_id: uuid.UUID = Field(foreign_key="medical_recipe_visit.medical_recipe_visit_id", primary_key=True)
+    medical_recipe_visit: Optional["MedicalRecipeVisit"] = Relationship()
     
     quantity:int
     suplied:bool
+    comment:Optional[str] = Field(default=None)
     suplied_date: Optional[datetime] = Field(default=None)
-    
+
     is_active: bool = Field(default=True)

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/healthdatalayer/models/medical_visit/medical_recipe_visit.py

@@ -22,7 +22,7 @@ class MedicalRecipeVisit(SQLModel, table=True):
 
     is_active: bool = Field(default=True)
     
-    medical_drugs: List["MedicalDrug"] = Relationship(
-        back_populates="medical_recipe_visits",
-        link_model=MedicalDrugRecipe
+    medical_drug_recipes: List["MedicalDrugRecipe"] = Relationship(
+        back_populates="medical_recipe_visit",
+        sa_relationship_kwargs={"lazy": "selectin"}
     )

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/healthdatalayer/repositories/client_repositories/px_repository.py

@@ -57,6 +57,12 @@ class PxRepository:
                     from healthdatalayer.models.client.nationality import Nationality
                     user_obj = session.get(Nationality, px.nationality_id)
                     object.__setattr__(px, 'nationality', user_obj)
+                    
+                from healthdatalayer.models.client.pathological_history import PathologicalHistory
+                statement = select(PathologicalHistory).where(PathologicalHistory.client_id == px_id)
+                pathological_his = session.exec(statement).all()
+                if pathological_his:
+                    object.__setattr__(px, 'pathological_histories',pathological_his)
             
             return px
             
@@ -100,6 +106,13 @@ class PxRepository:
                     from healthdatalayer.models.client.nationality import Nationality
                     user_obj = session.get(Nationality, px.nationality_id)
                     object.__setattr__(px, 'nationality', user_obj)
+                
+                    
+                from healthdatalayer.models.client.pathological_history import PathologicalHistory
+                statement = select(PathologicalHistory).where(PathologicalHistory.client_id == px.client_id)
+                pathological_his = session.exec(statement).all()
+                if pathological_his:
+                    object.__setattr__(px, 'pathological_histories',pathological_his)
             
             
             return px
@@ -149,6 +162,12 @@ class PxRepository:
                         from healthdatalayer.models.client.nationality import Nationality
                         user_obj = session.get(Nationality, px.nationality_id)
                         object.__setattr__(px, 'nationality', user_obj)
+                    
+                    from healthdatalayer.models.client.pathological_history import PathologicalHistory
+                    statement = select(PathologicalHistory).where(PathologicalHistory.client_id == px.client_id)
+                    pathological_his = session.exec(statement).all()
+                    if pathological_his:
+                        object.__setattr__(px, 'pathological_histories',pathological_his)
                 
                 
             return results
@@ -198,6 +217,12 @@ class PxRepository:
                         from healthdatalayer.models.client.nationality import Nationality
                         user_obj = session.get(Nationality, px.nationality_id)
                         object.__setattr__(px, 'nationality', user_obj)
+                    
+                    from healthdatalayer.models.client.pathological_history import PathologicalHistory
+                    statement = select(PathologicalHistory).where(PathologicalHistory.client_id == px.client_id)
+                    pathological_his = session.exec(statement).all()
+                    if pathological_his:
+                        object.__setattr__(px, 'pathological_histories',pathological_his)
             
             
             return results

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/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-1.6.3 → healthdatalayer-1.7.0}/healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py

@@ -3,7 +3,7 @@ from datetime import datetime, date, time
 from uuid import UUID
 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
 
@@ -28,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)
@@ -73,7 +73,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)
@@ -93,7 +93,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)
@@ -137,7 +137,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)
@@ -173,7 +173,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)
@@ -198,7 +198,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)
@@ -235,7 +235,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)
@@ -259,7 +259,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)
@@ -280,7 +280,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)
@@ -301,7 +301,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)

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/healthdatalayer.egg-info/PKG-INFO

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

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/healthdatalayer.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ healthdatalayer/dtos/collaborator/__init__.py
 healthdatalayer/dtos/collaborator/schedule_collaborator.py
 healthdatalayer/dtos/medical_visit/__init__.py
 healthdatalayer/dtos/medical_visit/medical_certificate.py
+healthdatalayer/dtos/medical_visit/recipe_dto.py
 healthdatalayer/models/__init__.py
 healthdatalayer/models/bridge_area_floor_branch/__init__.py
 healthdatalayer/models/bridge_area_floor_branch/area.py

{healthdatalayer-1.6.3 → healthdatalayer-1.7.0}/setup.py

@@ -5,7 +5,7 @@ with open('requirements.txt') as f:
 
 setup(
     name="healthdatalayer",
-    version="1.6.3",
+    version="1.7.0",
     include_package_data=True,
     python_requires='>=3.10',
     packages=find_packages(),