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

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

@@ -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.dist-info → healthdatalayer-1.5.9.dist-info}/RECORD

@@ -6,7 +6,7 @@ healthdatalayer/config/vault.py,sha256=9yUMXjaTYSnqr0npcQXDsg6Z7G3DityqpmHl1x42z
 healthdatalayer/dtos/__init__.py,sha256=yNIWA7EF04esaVDpSymVyeuaotsHdOjLzqk3ygbh59o,71
 healthdatalayer/dtos/collaborator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/dtos/collaborator/schedule_collaborator.py,sha256=SUD7BIMownZuW9h9GUaFy2U9jaDjZ1tB_9-KCv4H0mk,369
-healthdatalayer/models/__init__.py,sha256=ZBY7CL172P68TWRWVTpzHO0_cnFzDRGz7aTy85Z8HPI,2056
+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
 healthdatalayer/models/bridge_area_floor_branch/branch.py,sha256=lW2pbZVKkQeEWuShOLKFiNJAKt01mBswczk1hRELInw,515
@@ -27,7 +27,7 @@ healthdatalayer/models/client/nationality.py,sha256=k1CKQTQIJAJP_qmeYB-AkRQ1Q5x9
 healthdatalayer/models/client/pathological_history.py,sha256=8jsOAaSGqk1M-60sLhoJuuz9MeUKbk693dARXgBriTY,1029
 healthdatalayer/models/client/pet.py,sha256=y7jiNF_9Jri0_55geo2hweEj4zdsHKu9ZCelBwfVWeA,516
 healthdatalayer/models/client/profession.py,sha256=eKX6Gf93qwQg2NyJsXKKbmEwQTxHvJCnOwQ5pxCpM0I,259
-healthdatalayer/models/client/px.py,sha256=4HgPzbm_OdaQvOHC5-QLQA35VTK83QkaqX-rUF2kVYk,1095
+healthdatalayer/models/client/px.py,sha256=Bs7wuIMfhOCfe3GnwB1q75Dc6yH9TpHKxRJ_6-A8kqs,1138
 healthdatalayer/models/client/state.py,sha256=G_AJOKKfkufZw_axfwSrcL3ZVtKY1FOm0AmCcHfn9Ao,244
 healthdatalayer/models/collaborator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/models/collaborator/collaborator.py,sha256=Hju_VTUEgA22KJ5-lr-8dl8UsgeSEj2c5OxuGjU71oM,1064
@@ -44,7 +44,7 @@ healthdatalayer/models/medical_visit/medical_diagnosis_visit.py,sha256=3ZoWxhqln
 healthdatalayer/models/medical_visit/medical_drug.py,sha256=zG3oqzq0fGZQNkY7AmFZQaHTG7BVQ3kGJ-tgLgfwNdc,829
 healthdatalayer/models/medical_visit/medical_drug_recipe.py,sha256=DiygpjyX72sc5jD-h9hue5kU0T4YgZyLxD_qVacnxV0,657
 healthdatalayer/models/medical_visit/medical_recipe_visit.py,sha256=W8E8RAOtow_-NbEr8SBHnoq_huJlx-6zDrJL98vzNQ4,1042
-healthdatalayer/models/medical_visit/medical_visit.py,sha256=3CtXkXiFasuYEXGGHVfAKYu4VSsv8Xj8tTcR-dzqqmI,2567
+healthdatalayer/models/medical_visit/medical_visit.py,sha256=l0DmP1NAdyt3uzpvmuI3BQlynptYZGQ-f12MDYi9Nic,2652
 healthdatalayer/models/medical_visit/organ_system_review.py,sha256=fXWbuDfdy6QBBl-c5X14XBHpyCqLqqZdPNbzdq5H58U,1168
 healthdatalayer/models/medical_visit/physical_exam.py,sha256=VaezGMp4eptJH-mco-SCumATkcpp2xSA6zBtw9LrMFM,1772
 healthdatalayer/models/medical_visit/status_visit_enum.py,sha256=p4krEZXsXpeAtedCwlj1vcPMPM9y-LHWHfkOVEgZtBY,199
@@ -70,7 +70,7 @@ healthdatalayer/repositories/client_repositories/pet_repository.py,sha256=aUjti4
 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/collaborator_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py,sha256=NBCYH3ziSZ6-SZJDsDVvMrM9oCWYqXpDAUIkh7bzEOo,8261
+healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py,sha256=jSKoM46Rp4MDjI1cotr2setidP9su8GKZBC5EsIr6Po,8329
 healthdatalayer/repositories/collaborator_repositories/collaborator_type_repository.py,sha256=7-bJqbxgsJtyRU7nV_YCZhKufYLlighWBWjglw70nUw,2858
 healthdatalayer/repositories/collaborator_repositories/speciality_repository.py,sha256=tcAjp2OzFAnHpRKNdmw2Zsqvs7XdsO51h7cIJHt105s,2940
 healthdatalayer/repositories/infraestructure_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -87,7 +87,7 @@ healthdatalayer/repositories/medical_visit_repositories/__init__.py,sha256=47DEQ
 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_repository.py,sha256=mJNN6_aAK3eY9IpFc16nT3IshObGcFE5fi27SK-Sjio,2401
+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/organ_system_review_repository.py,sha256=7QNxpQIFcD6B8CX5fua8Qck75j24Y4uEkR_Lans1_0A,4197
@@ -97,7 +97,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.7.dist-info/METADATA,sha256=VliwFmkcJi_GjNR_5JEtRBAu7hl_WeFI9r3zKuUmbRE,827
-healthdatalayer-1.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-healthdatalayer-1.5.7.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
-healthdatalayer-1.5.7.dist-info/RECORD,,
+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,,