healthdatalayer 1.5.7__tar.gz → 1.5.9__tar.gz

{healthdatalayer-1.5.7 → healthdatalayer-1.5.9}/PKG-INFO

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

{healthdatalayer-1.5.7 → healthdatalayer-1.5.9}/healthdatalayer/models/__init__.py

@@ -46,6 +46,7 @@ from .medical_visit.organ_system_review import OrganSystemReview
 from .medical_visit.physical_exam import PhysicalExam
 from .medical_visit.visit_triage import VisitTriage
 from .medical_visit.medical_visit import MedicalVisit
+from .medical_visit.status_visit_enum import StatusVisitEnum
 
 
 

{healthdatalayer-1.5.7 → healthdatalayer-1.5.9}/healthdatalayer/models/client/px.py

@@ -15,7 +15,7 @@ class Px(Client, table=True):
     last_name: str
     phone: Optional[str] = None
     email: Optional[str] = None
-    
+    medical_record_number: Optional[str] = None
     marriage_status_id: Optional[uuid.UUID] = Field(default=None, foreign_key="marriage_status.marriage_status_id")
     profession_id: Optional[uuid.UUID] = Field(default=None, foreign_key="profession.profession_id")
     education_id: Optional[uuid.UUID] = Field(default=None, foreign_key="education.education_id")

{healthdatalayer-1.5.7 → healthdatalayer-1.5.9}/healthdatalayer/models/medical_visit/medical_visit.py

@@ -33,12 +33,13 @@ class MedicalVisit(SQLModel, table=True):
 
     next_followup_visit_id:Optional[uuid.UUID]=Field(default=None,foreign_key="medical_visit.medical_visit_id")
 
-    overall_diagnosis:str
+    overall_diagnosis:Optional[str]=Field(default=None)
 
     bridge_area_floor_branch_id:Optional[uuid.UUID]=Field(default=None,foreign_key="bridge_area_floor_branch.bridge_area_floor_branch_id")
     bridge_area_floor_branch: Optional[BridgeAreaFloorBranch] = Relationship()
 
     reason_visit:Optional[str]=Field(default=None)
+    current_illness: Optional[str]=Field(default=None)
     rest: Optional[bool] = Field(default=None)
     rest_hours: Optional[int] = Field(default=None)
     rest_date_start: Optional[datetime] = Field(default=None)

{healthdatalayer-1.5.7 → healthdatalayer-1.5.9}/healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py

@@ -169,6 +169,7 @@ class CollaboratorRepository:
                     FROM medical_visit t
                     WHERE t.visit_date::DATE = :fecha
                     AND t.collaborator_id = :colab_id
+                    AND t.status_visit in ('AGENDADO','REAGENDADO')
                 )
                 SELECT 
                     hg.hora,

{healthdatalayer-1.5.7 → healthdatalayer-1.5.9}/healthdatalayer/repositories/medical_visit_repositories/medical_drug_repository.py

@@ -1,6 +1,6 @@
 from typing import Optional, List
 from uuid import UUID
-from sqlmodel import select
+from sqlmodel import select,or_
 
 from healthdatalayer.models import MedicalDrug
 from healthdatalayer.config.db import engines, get_session
@@ -60,4 +60,19 @@ class MedicalDrugRepository:
                 session.delete(db_medical_drug)
             
             session.commit()
-            return True
+            return True
+    
+    def get_by_name_code_ilike_command(self, name:str, active_only: bool = True) -> List[MedicalDrug]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalDrug).where(
+                or_(
+                MedicalDrug.drug_name.ilike(f"%{name}%"), 
+                MedicalDrug.drug_code.ilike(f"%{name}%")
+                )
+            )
+            
+            if active_only:
+                statement = statement.where(MedicalDrug.is_active == True)
+            
+            medical_diagnosis = session.exec(statement).all()
+            return medical_diagnosis

{healthdatalayer-1.5.7 → healthdatalayer-1.5.9}/healthdatalayer.egg-info/PKG-INFO

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

{healthdatalayer-1.5.7 → healthdatalayer-1.5.9}/setup.py

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