Skip to content

REC-162: Implementa filtros para listado de recetas #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ma7payne wants to merge 1 commit into
base: master
Choose a base branch
from
Open

REC-162: Implementa filtros para listado de recetas #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions src/controllers/andesPrescription.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import User from '../models/user.model';
import IUser from '../interfaces/user.interface';
import prescriptionController from './prescription.controller';
import AndesService from '../services/andesService';
import moment = require('moment');


class AndesPrescriptionController implements BaseController {
Expand Down Expand Up @@ -88,9 +89,31 @@ class AndesPrescriptionController implements BaseController {
if (!req.query.dni) { return res.status(400).json({ mensaje: 'Missing required params!' }); }
const dni = req.query.dni;
const sexo = req.query.sexo ? req.query.sexo : '';

// Filtros opcionales desde query parameters
const { status, dateFrom, dateTo } = req.query;

let prescriptions: IPrescriptionAndes[] | null = [];

const resp = await needle('get', `${process.env.ANDES_ENDPOINT}/modules/recetas?documento=${dni}&estado=vigente${sexo ? `&sexo=${sexo}` : ''}`, { headers: { Authorization: process.env.JWT_MPI_TOKEN } });
// Construir URL para Andes con filtros opcionales
let andesUrl = `${process.env.ANDES_ENDPOINT}/modules/recetas/filtros?documento=${dni}&sexo=${sexo.toLowerCase()}`;

let estadoFiltro = 'vigente';
const validEstados = ['pendiente', 'vigente', 'finalizada', 'vencida', 'suspendida', 'rechazada', 'dispensada', 'todas'];

// Aplicar filtro de estado si se proporciona, sino usar 'vigente' por defecto
if (status && validEstados.includes(status)) {
estadoFiltro = status;
}

if (dateFrom) { andesUrl += `&fechaInicio=${dateFrom || ''}`; }

if (dateTo) { andesUrl += `&fechaFin=${dateTo || ''}`; }

andesUrl += `&estado=${estadoFiltro}`;

const resp = await needle('get', andesUrl, { headers: { Authorization: process.env.JWT_MPI_TOKEN } });

if (typeof (resp.statusCode) === 'number' && resp.statusCode !== 200) { return res.status(resp.statusCode).json({ mensaje: 'Error', error: resp.body }); }
let andesPrescriptions: IPrescriptionAndes[] | null = resp.body;

Expand All @@ -102,10 +125,7 @@ class AndesPrescriptionController implements BaseController {
prescriptions = [...prescriptions, ...andesPrescriptions];
}

const savedPrescriptions: IPrescriptionAndes[] | null = await PrescriptionAndes.find({ 'paciente.documento': dni });
if (savedPrescriptions) {
prescriptions = [...prescriptions, ...savedPrescriptions];
}

return res.status(200).json(prescriptions);
} catch (e) {
return res.status(500).json({ error: e });
Expand Down
42 changes: 33 additions & 9 deletions src/controllers/prescription.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,24 +331,48 @@ class PrescriptionController implements BaseController {
public getPrescriptionsByDateOrPatientId = async (req: Request, res: Response): Promise<Response> => {
try {
const filterPatient = req.params.patient_id;
const filterDate: string | null = req.params.date;
const { status, dateFrom, dateTo } = req.query;

// define a default date for retrieve all the documents if the date its not provided
const defaultStart = '1900-01-01';
let startDate: Date = moment(defaultStart, 'YYYY-MM-DD').startOf('day').toDate();
let startDate: Date = moment().subtract(1, 'month').toDate();
let endDate: Date = moment(new Date()).endOf('day').toDate();

if (typeof (filterDate) !== 'undefined') {
startDate = moment(filterDate, 'YYYY-MM-DD').startOf('day').toDate();
endDate = moment(filterDate, 'YYYY-MM-DD').endOf('day').toDate();
if (dateFrom) {
startDate = moment(dateFrom, 'DD-MM-YYYY').startOf('day').toDate();
}

if (dateTo) {
endDate = moment(dateTo, 'DD-MM-YYYY').endOf('day').toDate();
}

await this.updateStatuses('', filterPatient);

const prescriptions: IPrescription[] | null = await Prescription.find({
const filters: any = {
'patient.dni': filterPatient,
date: { $gte: startDate, $lt: endDate }
}).sort({ field: 'desc', date: -1 });
};

if (status) {
if (status !== 'todas') {
const validStatuses: Record<string, string> = {
vigente: 'Vigente',
pendiente: 'Pendiente',
rechazada: 'Rechazada',
dispensada: 'Dispensada',
vencida: 'Vencida',
finalizada: 'Finalizada',
suspendida: 'Suspendida'
};

if (Object.keys(validStatuses).includes(status)) {
filters.status = validStatuses[status];
}
}
} else {
filters.status = 'Vigente';
}

const prescriptions: IPrescription[] | null = await Prescription.find(filters)
.sort({ field: 'desc', date: -1 });

if (prescriptions) {
await this.ensurePrescriptionIds(prescriptions);
Expand Down
2 changes: 1 addition & 1 deletion src/routes/private.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class PrivateRoutes {
this.router.get(`/prescriptions/`, hasPermissionIn('readAny', 'prescription'), prescriptionController.index);
this.router.get('/prescriptions/user/:id', prescriptionController.getByUserId);
this.router.get('/prescriptions/user/:id/search', prescriptionController.searchByTerm);
this.router.get('/prescriptions/find/:patient_id&:date?', prescriptionController.getPrescriptionsByDateOrPatientId);
this.router.get('/prescriptions/find/:patient_id', prescriptionController.getPrescriptionsByDateOrPatientId);
this.router.get(`/prescriptions/:id`, hasPermissionIn('readAny', 'prescription'), prescriptionController.show);
this.router.post(`/prescriptions/`, hasPermissionIn('createAny', 'prescription'), prescriptionController.create);
this.router.post(`/prescriptions/get-csv/`, hasPermissionIn('readAny', 'prescription'), prescriptionController.getCsv);
Expand Down