Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion modules/insumos/insumos-schema.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as mongoose from 'mongoose';
import { AuditPlugin } from '@andes/mongoose-plugin-audit';


export const insumoSchema = new mongoose.Schema({
nombre: String,
codigo: [{
Expand Down
12 changes: 9 additions & 3 deletions modules/insumos/insumos.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ class InsumosResource extends ResourceBase {
resourceName = 'insumos';
middlewares = [Auth.authenticate()];
searchFileds = {
nombre: MongoQuery.partialString,
'codigo.valor': MongoQuery.partialString,
tipo: MongoQuery.equalMatch,
nombre: (value: any) => {
if (value && value.charAt(0) === '^') {
const searchPattern = value.substring(1);
const escaped = searchPattern.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\$&');
return { $regex: escaped, $options: 'i' };
}
return value;
},
tipo: MongoQuery.inArray,
estado: MongoQuery.equalMatch,
requiereEspecificacion: MongoQuery.equalMatch,
};
Expand Down
3 changes: 2 additions & 1 deletion modules/recetas/recetasInsumos/receta-insumo.events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { crearRecetaInsumo } from '../../recetas/recetasInsumos/recetaInsumosCon
import { getProfesionActualizada } from '../../recetas/recetasController';
import * as moment from 'moment';
import { RecetaInsumo } from './receta-insumo.schema';
import { createLog, informarLog, updateLog, jobsLog } from './../recetaLogs';
import { createLog } from './../recetaLogs';

EventCore.on('prestacion:recetaInsumo:create', async ({ prestacion, registro }) => {
const idRegistro = registro._id;
Expand Down Expand Up @@ -39,6 +39,7 @@ EventCore.on('prestacion:recetaInsumo:create', async ({ prestacion, registro })
for (const insumo of registro.valor.insumos) {
const receta: any = await RecetaInsumo.findOne({
'insumo.id': insumo.generico.id,
'insumo.nombre': insumo.generico.nombre,
idRegistro
});
if (!receta) {
Expand Down
1 change: 0 additions & 1 deletion modules/recetas/recetasInsumos/receta-insumo.schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const insumoSubSchema = new mongoose.Schema({
valor: String
}
],

tipo: {
type: String,
enum: ['dispositivo', 'nutricion', 'magistral']
Expand Down
Loading