Патч
Some checks failed
Build And Push / publish (push) Has been cancelled

This commit is contained in:
2025-11-27 13:28:58 +03:00
parent 45a4123708
commit f3c9cb42d6
12 changed files with 172 additions and 88 deletions

View File

@ -58,27 +58,28 @@ class VITACORE_API(AsyncClient):
raise e.UnknownException
async def findBySnils(self, snils: str):
data = await self.get_cache(f'vitacore_findBySnils:{snils}')
data = await self.get_cache(f'vitacore_findBySnils2:{snils}')
if data:
return s.PatientsModel.model_validate(data)
return s.PatientModel.model_validate(data)
token = await self.get_token()
req = await self.get(
'/findBySnils',
'/findBySnils2',
params={'snils': snils},
headers={'Authorization': f'Bearer {token}'},
)
match req.status_code:
case st.HTTP_200_OK:
model = s.PatientsModel.model_validate(req.json())
model = s.PatientModel.model_validate(req.json())
await self.set_cache(
f'vitacore_findBySnils:{snils}',
f'vitacore_findBySnils2:{snils}',
model.model_dump_json(),
14400,
)
return model
case _:
self.logger.error(req.json())
raise e.UnknownException
@ -177,10 +178,7 @@ class VITACORE_API(AsyncClient):
async def getEntries(self, patId: str):
token = await self.get_token()
if (
patId == 'a72d18cf-c152-4b9e-b8be-313234b87400'
or patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd'
):
if patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd':
patId = 'b66a85f1-4aaa-4db8-942a-2de44341824e'
req = await self.get(
@ -204,11 +202,9 @@ class VITACORE_API(AsyncClient):
async def getVaccsReport(self, patId: str):
token = await self.get_token()
if (
patId == 'a72d18cf-c152-4b9e-b8be-313234b87400'
or patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd'
):
if patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd':
patId = 'b66a85f1-4aaa-4db8-942a-2de44341824e'
req = await self.get(
'/getVaccsReport',
params={'patId': patId},
@ -221,7 +217,11 @@ class VITACORE_API(AsyncClient):
case st.HTTP_206_PARTIAL_CONTENT:
error = s.ErrorModel.model_validate(req.json())
if error.error == 'Не найдены записи по указанному patId':
if (
error.error == 'Не найдены записи по указанному patId'
or error.error
== 'Не найдены вакцинации по данному пациенту'
):
return s.VaccsReportModel(content='')
case _:
self.logger.error(req.json())
@ -242,11 +242,9 @@ class VITACORE_API(AsyncClient):
async def getRoutesList(self, patId: str):
token = await self.get_token()
if (
patId == 'a72d18cf-c152-4b9e-b8be-313234b87400'
or patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd'
):
if patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd':
patId = 'b66a85f1-4aaa-4db8-942a-2de44341824e'
req = await self.get(
'/getRoutesList',
params={'patId': patId},
@ -273,11 +271,9 @@ class VITACORE_API(AsyncClient):
raise e.UnknownException
async def getHospExaminations(self, patId: str, examId: str | None = None):
if (
patId == 'a72d18cf-c152-4b9e-b8be-313234b87400'
or patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd'
):
if patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd':
patId = 'b66a85f1-4aaa-4db8-942a-2de44341824e'
token = await self.get_token()
req = await self.get(
'/getHospExaminations',
@ -306,11 +302,9 @@ class VITACORE_API(AsyncClient):
async def getCurrHosp(self, patId: str):
token = await self.get_token()
if (
patId == 'a72d18cf-c152-4b9e-b8be-313234b87400'
or patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd'
):
if patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd':
patId = 'b66a85f1-4aaa-4db8-942a-2de44341824e'
req = await self.get(
'/getCurrHosp',
params={'patId': patId},
@ -335,11 +329,9 @@ class VITACORE_API(AsyncClient):
async def getHosps(self, patId: str):
token = await self.get_token()
if (
patId == 'a72d18cf-c152-4b9e-b8be-313234b87400'
or patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd'
):
if patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd':
patId = 'b66a85f1-4aaa-4db8-942a-2de44341824e'
req = await self.get(
'/getHosps',
params={'patId': patId},
@ -367,11 +359,9 @@ class VITACORE_API(AsyncClient):
async def getHospRecommendations(self, patId: str):
token = await self.get_token()
if (
patId == 'a72d18cf-c152-4b9e-b8be-313234b87400'
or patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd'
):
if patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd':
patId = 'b66a85f1-4aaa-4db8-942a-2de44341824e'
req = await self.get(
'/getHospRecommendations',
params={'patId': patId},
@ -401,11 +391,9 @@ class VITACORE_API(AsyncClient):
async def getHospRoutes(self, patId: str):
token = await self.get_token()
if (
patId == 'a72d18cf-c152-4b9e-b8be-313234b87400'
or patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd'
):
if patId == '9a4d4b06-5928-4101-b95e-e5ba03a1abfd':
patId = 'b66a85f1-4aaa-4db8-942a-2de44341824e'
req = await self.get(
'/getHospRoutes',
params={'patId': patId},