mm-sdk - pypi Package Compare versions

Comparing version 0.1.424 to 0.1.426

PKG-INFO

 Metadata-Version: 2.1
 Name: mm-sdk
-Version: 0.1.424
+Version: 0.1.426
 Summary: 
@@ -5,0 +5,0 @@ Author: dyus

pyproject.toml

 [tool.poetry]
 name = "mm-sdk"
-version = "0.1.424"
+version = "0.1.426"
 description = ""
@@ -5,0 +5,0 @@ authors = ["dyus <[e-mail]>"]

sdk/samd.py

@@ -35,2 +35,29 @@ import datetime
 
+class NsiMap(BaseModel):
+    code: str
+    name: str
+
+
+class Factor(BaseModel):
+    code_29n: str  # nsi_id now
+
+
+class FiasAddress(BaseModel):
+    ao_guid: str
+    house_guid: Optional[str] = None
+
+    class Config:
+        use_enum_values = True
+
+
+class Address(BaseModel):
+    full: str
+    state_code: str
+    postal_code: Optional[str] = None
+    fias: Optional[FiasAddress] = None
+
+    class Config:
+        use_enum_values = True
+
+
 class AddPatientRequest(BaseModel):
@@ -106,4 +133,5 @@ uuid: str
 
-class Factor(BaseModel):
-    code_29n: str
+class Lmk(BaseModel):
+    number: Optional[str] = None
+    is_preliminary: bool
 
@@ -115,17 +143,19 @@
     exams_done: datetime.datetime
+    next_date: datetime.date
     org_name: Optional[str]
     org_inn: Optional[str]
-    post: str
+    post: Optional[str] = None
+    factors: List[Factor]
+    payment: Optional[Payment]
+    code_unit: str = ""
+    conclusion: Optional[str] = None
     exam_type: Optional[ExamType]
-    conclusion: str
     health_group: Optional[HealthGroup]
-    next_date: datetime.date
-    factors: List[Factor]
-    payment: Optional[Payment]
-    code_unit: str
+    lmk: Optional[Lmk]
 
+    class Config:
+        use_enum_values = True
 
+
 class Doctor(BaseModel):
-    speciality: str
-    post: str
     mis_id: str
@@ -136,4 +166,11 @@ lname: str
     snils: Optional[str]
+    address: Optional[Address]
+    speciality: Optional[str]
+    post: Optional[str]
+    position: Optional[NsiMap]
 
+    class Config:
+        use_enum_values = True
 
+
 class Exam(BaseModel):
@@ -144,2 +181,3 @@ conclusion: str
     id: str
+    nsi_id: Optional[str] = None
 
@@ -149,5 +187,6 @@
     date: datetime.date
-    result: str
+    result: Optional[str]
     name: str
     id: str
+    nsi_id: Optional[str] = None
 
@@ -160,2 +199,3 @@
     id: str
+    nsi_id: Optional[str] = None
 
@@ -165,24 +205,33 @@
     name: str
-    step: str
+    step: Optional[str] = None
     date: datetime.date
     is_revac: bool = False
+    nsi_id: Optional[str] = None
 
 
+class Infection(BaseModel):
+    year: int
+    mkb: str
+
+
 class AddMedRecordRequest(BaseModel):
-    mis_id: str  # номер заявки
+    mc_id: int
     order_type: OrderType
+    order: Order
     creation_date: datetime.datetime  # lmk - order_time / prof - exams_start
-    med_center: MedCenter
     patient: AddPatientRequest
-    order: Order
+    author: Doctor
+    exams: List[Exam] = []
+    lab_services: List[LabService] = []
+    functional_diagnostics: List[FuncDiag] = []
+    vaccinations: List[Vaccine] = []
+    infections: List[Infection] = []
     samd_type: Literal["103", "194", "230"] = Field(
         description="Доступные типы документов samd"
     )
-    head_doctor: Optional[Doctor]
-    exams: List[Exam]
-    lab_services: List[LabService]
-    functional_diagnostics: List[FuncDiag]
-    vaccinations: List[Vaccine]
 
+    class Config:
+        use_enum_values = True
 
+
 class SamdResponse(BaseModel):
@@ -189,0 +238,0 @@ task_id: str

setup.py

@@ -15,3 +15,3 @@ # -*- coding: utf-8 -*-
     'name': 'mm-sdk',
-    'version': '0.1.424',
+    'version': '0.1.426',
     'description': '',
@@ -18,0 +18,0 @@ 'long_description': 'None',

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

131209

0.75%

Lines of code

3637

0.94%