From ad85d10d3e57e4c63528dc66dae95906ce52b32d Mon Sep 17 00:00:00 2001 From: Daniela Marioti Date: Wed, 24 Jul 2024 15:23:39 -0300 Subject: [PATCH 1/2] fix: occupational consultation types --- package.json | 3 +-- src/ttalk/schemas/MedicalConsultation.ts | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f29795c..560afd8 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,7 @@ { "name": "quirons-broker", - "version": "0.0.1-alpha.129", + "version": "0.0.1-alpha.130", "description": "A small library to expose the broker types", - "main": "index.ts", "typings": "index.d.ts", "types": "index.d.ts", "typescript": { diff --git a/src/ttalk/schemas/MedicalConsultation.ts b/src/ttalk/schemas/MedicalConsultation.ts index f5662fd..1d71adb 100644 --- a/src/ttalk/schemas/MedicalConsultation.ts +++ b/src/ttalk/schemas/MedicalConsultation.ts @@ -44,7 +44,14 @@ export const MedicalConsultationInfo = t.intersection([ /** Matricula */ employeeId: t.string, /** Natureza do ASO */ - type: t.string, + type: t.union([ + t.literal(0), + t.literal(1), + t.literal(2), + t.literal(3), + t.literal(4), + t.literal(5), + ]), /** Data Prevista da Consulta */ expectedDate: datetime, /** Nome do Médico */ @@ -62,7 +69,11 @@ export const MedicalConsultationInfo = t.intersection([ /** Data de Emissão */ issueDate: datetime, /** Parecer do ASO */ - situation: t.string, + situation: t.union([ + t.literal(0), + t.literal(1), + t.literal(2), + ]), /** Observações */ observation: t.string, /** Lista de Exames */ From 9a08896cd7f37e607ba12e960e513071173160ad Mon Sep 17 00:00:00 2001 From: Daniela Marioti Date: Thu, 25 Jul 2024 11:03:55 -0300 Subject: [PATCH 2/2] fix: sst importer --- src/ttalk/schemas/Accredited.ts | 4 ++-- src/ttalk/schemas/ClinicalQuiz.ts | 2 +- src/ttalk/schemas/MedicalConsultation.ts | 6 ++++-- src/ttalk/schemas/Occupation.ts | 15 ++++++++++++--- src/ttalk/schemas/Quiz.ts | 2 +- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/ttalk/schemas/Accredited.ts b/src/ttalk/schemas/Accredited.ts index 5c7a6a6..6925b5f 100644 --- a/src/ttalk/schemas/Accredited.ts +++ b/src/ttalk/schemas/Accredited.ts @@ -26,14 +26,14 @@ export const AccreditedInfo = t.intersection([ erpId: t.string, /** Nome do Credenciado */ name: t.string, - /** CNPJ do Credenciado */ - documentNumber: t.string, /** Data de Início do Contrato */ contractStart: datetime }), t.partial({ /** Exames */ exams: t.array(ExamInfo), + /** CNPJ do Credenciado */ + documentNumber: t.string, }) ]) export type AccreditedInfo = t.TypeOf diff --git a/src/ttalk/schemas/ClinicalQuiz.ts b/src/ttalk/schemas/ClinicalQuiz.ts index 8689fbb..a3859d8 100644 --- a/src/ttalk/schemas/ClinicalQuiz.ts +++ b/src/ttalk/schemas/ClinicalQuiz.ts @@ -27,7 +27,7 @@ export const ClinicalQuizInfo = t.intersection([ realizationDate: datetime, /** Descrição do Questionário */ quiz: t.string, - /** Tipo de Deficiência */ + /** Respostas */ response: t.array(Response), }), t.partial({ diff --git a/src/ttalk/schemas/MedicalConsultation.ts b/src/ttalk/schemas/MedicalConsultation.ts index 1d71adb..1410189 100644 --- a/src/ttalk/schemas/MedicalConsultation.ts +++ b/src/ttalk/schemas/MedicalConsultation.ts @@ -60,10 +60,10 @@ export const MedicalConsultationInfo = t.intersection([ crm: t.string, /** Estado do CRM */ state: t.string, - /** Motivo da Consulta */ - reason: t.string, }), t.partial({ + /** ID interno */ + id: t.string, /** Data de Cancelamento */ cancelDate: datetime, /** Data de Emissão */ @@ -82,6 +82,8 @@ export const MedicalConsultationInfo = t.intersection([ erpId: t.string, /** Credenciado */ accredited: t.string, + /** Motivo da Consulta */ + reason: t.string }) ]) export type MedicalConsultationInfo = t.TypeOf diff --git a/src/ttalk/schemas/Occupation.ts b/src/ttalk/schemas/Occupation.ts index 9fbda82..7996578 100644 --- a/src/ttalk/schemas/Occupation.ts +++ b/src/ttalk/schemas/Occupation.ts @@ -2,13 +2,22 @@ import * as t from 'io-ts' import { Paging } from '../apis/types/totvsApiTypesBase' -const Periodicity = t.type({ - description: t.string, +const Periodicity = t.intersection([ + t.type({ + gender: t.union([ + t.literal(1), + t.literal(2), + t.literal(3), + ]), fromAge: t.number, toAge: t.number, periodicity: t.number, postAdmission: t.number, -}) + }), + t.partial({ + description: t.string, + }) +]) const Exam = t.intersection([ t.type({ diff --git a/src/ttalk/schemas/Quiz.ts b/src/ttalk/schemas/Quiz.ts index 65bae31..ea066a0 100644 --- a/src/ttalk/schemas/Quiz.ts +++ b/src/ttalk/schemas/Quiz.ts @@ -21,7 +21,7 @@ export const QuizInfo = t.intersection([ erpId: t.string, /** Descrição */ description: t.string, - /** Tipo de Deficiência */ + /** Grupo da questão */ questionsGroup: t.array(Group), }), t.partial({