diagnosis & diagnotic procedure

package.json

@@ -25,6 +25,7 @@
         "helmet": "^8.0.0",
         "i": "^0.3.7",
         "joi": "^17.13.3",
+        "moment": "^2.30.1",
         "morgan": "^1.10.0",
         "npm": "^10.9.1",
         "pg": "^8.13.1",

src/controllers/diagnosis.ts

@@ -0,0 +1,349 @@
+import { Diagnosis, Paging } from "entity";
+import { NextFunction, Response } from "express";
+import { Request } from "express-jwt";
+import Joi from "joi";
+import { ILogObj, Logger } from "tslog";
+import CommonHelper from "../helpers/common";
+import { ReturnHelper } from "../helpers/express/return";
+import { Language } from "../langs/lang";
+import { DiagnosisModel } from "../model/diagnosis";
+import { OrmHelper } from "../helpers/orm";
+import moment from "moment";
+
+const log: Logger<ILogObj> = new Logger({
+	name: "[DiagnosisController]",
+	type: "pretty",
+});
+
+export class DiagnosisController {
+	static async list(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+            #swagger.tags = ['Diagnosis (ICD-11)']
+            #swagger.security = [{
+                "bearerAuth": []
+            }]
+            #swagger.parameters['filter'] = {
+                description:'',
+                in: 'query',
+                type: 'string',
+            }
+            #swagger.parameters['limit'] = {
+                in: 'query',
+                required: true,
+                type: 'number'
+            }
+            #swagger.parameters['page'] = {
+                in: 'query',
+                required: true,
+                type: 'number'
+            }
+            #swagger.parameters['with_deleted'] = {
+                in: 'query',
+                required: true,
+                type: 'boolean'
+            }
+            #swagger.parameters['order_field'] = {
+                in: 'query',
+                required: true,
+                type: 'string'
+            }
+            #swagger.parameters['order_direction'] = {
+                in: 'query',
+                required: true,
+                schema: {
+                    '@enum': ['ASC', 'DESC']
+                }
+            }
+        */
+
+		try {
+			const schema = Joi.object().keys({
+				filter: Joi.string().allow("").optional().label("Filter"),
+				page: Joi.number().required().min(1).label("Page"),
+				limit: Joi.number().required().min(1).label("Limit"),
+				with_deleted: Joi.bool().required().label("With Deleted"),
+				order_field: Joi.string().required().label("Order Field"),
+				order_direction: Joi.string().allow("asc", "desc").required().label("Order Direction"),
+			});
+
+			let param: Paging = await schema.validateAsync(req.query);
+
+			let filter = JSON.parse(param.filter);
+
+			var query = await DiagnosisModel.list(filter);
+
+			const offset = (param.page - 1) * param.limit;
+			let limit = param.limit;
+
+			const res_count = query;
+			const res_list = query
+				.orderBy("Diagnosis." + param.order_field, param.order_direction)
+				.offset(offset)
+				.limit(limit);
+
+			if (param.with_deleted) {
+				res_count.withDeleted();
+				res_list.withDeleted();
+			}
+
+			const current_page = param.page;
+			const total_count_data = await res_count.getCount();
+			const list_data = await res_list.getMany();
+			const count_data = CommonHelper.countObject(list_data);
+
+			return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, list_data);
+		} catch (e: unknown) {
+			log.error(e);
+			const err = e as Error;
+
+			return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message);
+		}
+	}
+
+	static async create(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+         #swagger.tags = ['Diagnosis (ICD-11)']
+         #swagger.security = [{
+             "bearerAuth": []
+         }]
+         #swagger.requestBody = {
+             required: true,
+             content: {
+                 "application/json": {
+                     schema: {
+                         $ref: "#/components/schemas/diagnosis"
+                     }
+                 }
+             }
+         }
+         */
+		const queryRunner = OrmHelper.DB.createQueryRunner();
+		await queryRunner.startTransaction();
+		try {
+			const schema = Joi.object().keys({
+				diagnosis: Joi.string().max(256).required().label("Diagnosis"),
+				code: Joi.string().max(128).required().label("Code"),
+				status: Joi.string().required().label("Status"),
+			});
+
+			let param: any = await schema.validateAsync(req.body);
+
+			let filter = {
+				code: param.code,
+			};
+			let exist = await DiagnosisModel.list(filter).then((q) => q.getOne());
+			if (exist) throw { message: "Diagnosis " + Language.lang.failed_duplicate };
+
+			let diagnosis = new Diagnosis();
+			diagnosis.diagnosis = param.diagnosis;
+			diagnosis.code = param.code;
+			diagnosis.status = param.status;
+			diagnosis.created_by = req.auth.data.name;
+			diagnosis.updated_by = req.auth.data.name;
+			await queryRunner.manager.save(diagnosis);
+
+			await queryRunner.commitTransaction();
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, diagnosis);
+		} catch (e: unknown) {
+			await queryRunner.rollbackTransaction();
+			log.error(e);
+			const err = e as Error;
+			return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message);
+		} finally {
+			await queryRunner.release();
+		}
+	}
+
+	static async detail(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+         #swagger.tags = ['Diagnosis (ICD-11)']
+         #swagger.security = [{
+             "bearerAuth": []
+         }]
+        #swagger.parameters['id'] = {
+            description:'',
+            in: 'path',
+            type: 'string'
+        }
+        */
+
+		try {
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("Diagnosis Id"),
+			});
+
+			let param: any = await schema.validateAsync(req.params);
+
+			let diagnosis = await DiagnosisModel.list({ id: param.id }).then((q) => q.getOne());
+
+			if (!diagnosis) throw { message: "Diagnosis Not Found" };
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, diagnosis);
+		} catch (e: unknown) {
+			log.error(e);
+			const err = e as Error;
+
+			return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_not_found, err.message);
+		}
+	}
+
+	static async update(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+         #swagger.tags = ['Diagnosis (ICD-11)']
+         #swagger.security = [{
+             "bearerAuth": []
+         }]
+        #swagger.parameters['id'] = {
+            description:'',
+            in: 'path',
+            type: 'string'
+        }
+         #swagger.requestBody = {
+             required: true,
+             content: {
+                 "application/json": {
+                     schema: {
+                         $ref: "#/components/schemas/diagnosis"
+                     }
+                 }
+             }
+         }
+         */
+
+		const queryRunner = OrmHelper.DB.createQueryRunner();
+		await queryRunner.startTransaction();
+
+		try {
+			req.body.id = req.params["id"];
+
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("Diagnosis ID"),
+				diagnosis: Joi.string().max(256).required().label("Diagnosis"),
+				code: Joi.string().max(128).required().label("Code"),
+				status: Joi.string().required().label("Status"),
+			});
+
+			let param: any = await schema.validateAsync(req.body);
+
+			let filter = {
+				code: param.code,
+			};
+			let exist = await DiagnosisModel.list(filter).then((q) => q.getOne());
+			if (exist && exist.id != param.id) throw { message: "Diagnosis " + Language.lang.failed_duplicate };
+
+			let diagnosis = await DiagnosisModel.list({ id: param.id }).then((q) => q.getOne());
+
+			if (!diagnosis) throw { message: "Diagnosis " + Language.lang.failed_not_found };
+
+			diagnosis.diagnosis = param.diagnosis;
+			diagnosis.code = param.code;
+			diagnosis.status = param.status;
+			diagnosis.updated_by = req.auth.data.name;
+			await queryRunner.manager.save(diagnosis);
+
+			await queryRunner.commitTransaction();
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, diagnosis);
+		} catch (e: unknown) {
+			await queryRunner.rollbackTransaction();
+			log.error(e);
+			const err = e as Error;
+			return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message);
+		} finally {
+			await queryRunner.release();
+		}
+	}
+
+	static async delete(req: Request, res: Response, next: NextFunction): Promise<Response> {
+		/*
+        #swagger.tags = ['Diagnosis (ICD-11)']
+        #swagger.security = [{
+            "bearerAuth": []
+        }]
+        #swagger.parameters['id'] = {
+            in: 'path',
+            description: 'Diagnosis ID.',
+            required: true,
+            type: 'string'
+        }
+        #swagger.parameters['hard'] = {
+            in: 'path',
+            description: 'Is Hard Delete',
+            required: false,
+            type: 'boolean'
+        }
+        */
+		try {
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("ID"),
+				hard: Joi.bool().optional().allow("").label("Is hard delete?"),
+			});
+
+			const param: { id: string; hard: boolean } = await schema.validateAsync(req.params);
+
+			let affected = 0;
+			if (!param.hard) {
+				let diagnosis: Diagnosis = await DiagnosisModel.list({ id: param.id }).then((q) => q.getOne());
+
+				if (!diagnosis) throw { message: "Diagnosis " + Language.lang.failed_not_found };
+
+				diagnosis.deleted_by = req.auth.data.name;
+				diagnosis.deleted_at = moment().toDate();
+				await OrmHelper.DB.manager.save(diagnosis);
+				affected = 1;
+			} else {
+				const repo = OrmHelper.DB.getRepository(Diagnosis);
+				affected = (await repo.delete({ id: param.id })).affected;
+			}
+
+			if (affected > 0) {
+				return ReturnHelper.successResponseAny(res, 200, Language.lang.success_delete, {});
+			} else {
+				return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
+			}
+		} catch (e: unknown) {
+			log.error(e);
+			const err = e as Error;
+
+			return ReturnHelper.errorResponse(res, 500, 402, Language.lang.failed_delete, err.message);
+		}
+	}
+
+	static async restore(req: Request, res: Response, next: NextFunction): Promise<Response> {
+		/*
+        #swagger.tags = ['Diagnosis (ICD-11)']
+        #swagger.security = [{
+            "bearerAuth": []
+        }]
+        #swagger.parameters['id'] = {
+            in: 'path',
+            description: 'Diagnosis ID.',
+            required: true,
+            type: 'string'
+        }
+        */
+		try {
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("ID"),
+			});
+
+			const param: any = await schema.validateAsync(req.params);
+
+			const repo = OrmHelper.DB.getRepository(Diagnosis);
+
+			const affected = (await repo.restore({ id: param.id })).affected;
+
+			if (affected > 0) {
+				return ReturnHelper.successResponseAny(res, 200, Language.lang.success_restore, {});
+			} else {
+				return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
+			}
+		} catch (e: unknown) {
+			log.error(e);
+			const err = e as Error;
+
+			return ReturnHelper.errorResponse(res, 500, 402, Language.lang.failed_restore, err.message);
+		}
+	}
+}

src/controllers/diagnostic_procedure.ts

@@ -0,0 +1,349 @@
+import { DiagnosticProcedure, Paging } from "entity";
+import { NextFunction, Response } from "express";
+import { Request } from "express-jwt";
+import Joi from "joi";
+import { ILogObj, Logger } from "tslog";
+import CommonHelper from "../helpers/common";
+import { ReturnHelper } from "../helpers/express/return";
+import { Language } from "../langs/lang";
+import { DiagnosticProcedureModel } from "../model/diagnostic_procedure";
+import { OrmHelper } from "../helpers/orm";
+import moment from "moment";
+
+const log: Logger<ILogObj> = new Logger({
+	name: "[DiagnosticProcedureController]",
+	type: "pretty",
+});
+
+export class DiagnosticProcedureController {
+	static async list(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+            #swagger.tags = ['Diagnostic Procedure (ICD-9)']
+            #swagger.security = [{
+                "bearerAuth": []
+            }]
+            #swagger.parameters['filter'] = {
+                description:'',
+                in: 'query',
+                type: 'string',
+            }
+            #swagger.parameters['limit'] = {
+                in: 'query',
+                required: true,
+                type: 'number'
+            }
+            #swagger.parameters['page'] = {
+                in: 'query',
+                required: true,
+                type: 'number'
+            }
+            #swagger.parameters['with_deleted'] = {
+                in: 'query',
+                required: true,
+                type: 'boolean'
+            }
+            #swagger.parameters['order_field'] = {
+                in: 'query',
+                required: true,
+                type: 'string'
+            }
+            #swagger.parameters['order_direction'] = {
+                in: 'query',
+                required: true,
+                schema: {
+                    '@enum': ['ASC', 'DESC']
+                }
+            }
+        */
+
+		try {
+			const schema = Joi.object().keys({
+				filter: Joi.string().allow("").optional().label("Filter"),
+				page: Joi.number().required().min(1).label("Page"),
+				limit: Joi.number().required().min(1).label("Limit"),
+				with_deleted: Joi.bool().required().label("With Deleted"),
+				order_field: Joi.string().required().label("Order Field"),
+				order_direction: Joi.string().allow("asc", "desc").required().label("Order Direction"),
+			});
+
+			let param: Paging = await schema.validateAsync(req.query);
+
+			let filter = JSON.parse(param.filter);
+
+			var query = await DiagnosticProcedureModel.list(filter);
+
+			const offset = (param.page - 1) * param.limit;
+			let limit = param.limit;
+
+			const res_count = query;
+			const res_list = query
+				.orderBy("DiagnosticProcedure." + param.order_field, param.order_direction)
+				.offset(offset)
+				.limit(limit);
+
+			if (param.with_deleted) {
+				res_count.withDeleted();
+				res_list.withDeleted();
+			}
+
+			const current_page = param.page;
+			const total_count_data = await res_count.getCount();
+			const list_data = await res_list.getMany();
+			const count_data = CommonHelper.countObject(list_data);
+
+			return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, list_data);
+		} catch (e: unknown) {
+			log.error(e);
+			const err = e as Error;
+
+			return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message);
+		}
+	}
+
+	static async create(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+         #swagger.tags = ['Diagnostic Procedure (ICD-9)']
+         #swagger.security = [{
+             "bearerAuth": []
+         }]
+         #swagger.requestBody = {
+             required: true,
+             content: {
+                 "application/json": {
+                     schema: {
+                         $ref: "#/components/schemas/diagnostic_procedure"
+                     }
+                 }
+             }
+         }
+         */
+		const queryRunner = OrmHelper.DB.createQueryRunner();
+		await queryRunner.startTransaction();
+		try {
+			const schema = Joi.object().keys({
+				diagnosticProcedure: Joi.string().max(256).required().label("Diagnostic Procedure"),
+				code: Joi.string().max(128).required().label("Code"),
+				status: Joi.string().required().label("Status"),
+			});
+
+			let param: any = await schema.validateAsync(req.body);
+
+			let filter = {
+				code: param.code,
+			};
+			let exist = await DiagnosticProcedureModel.list(filter).then((q) => q.getOne());
+			if (exist) throw { message: "Diagnostic Procedure " + Language.lang.failed_duplicate };
+
+			let diagnosticProcedure = new DiagnosticProcedure();
+			diagnosticProcedure.diagnosticProcedure = param.diagnosticProcedure;
+			diagnosticProcedure.code = param.code;
+			diagnosticProcedure.status = param.status;
+			diagnosticProcedure.created_by = req.auth.data.name;
+			diagnosticProcedure.updated_by = req.auth.data.name;
+			await queryRunner.manager.save(diagnosticProcedure);
+
+			await queryRunner.commitTransaction();
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, diagnosticProcedure);
+		} catch (e: unknown) {
+			await queryRunner.rollbackTransaction();
+			log.error(e);
+			const err = e as Error;
+			return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message);
+		} finally {
+			await queryRunner.release();
+		}
+	}
+
+	static async detail(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+         #swagger.tags = ['Diagnostic Procedure (ICD-9)']
+         #swagger.security = [{
+             "bearerAuth": []
+         }]
+        #swagger.parameters['id'] = {
+            description:'',
+            in: 'path',
+            type: 'string'
+        }
+        */
+
+		try {
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("Diagnostic Procedure Id"),
+			});
+
+			let param: any = await schema.validateAsync(req.params);
+
+			let diagnosticProcedure = await DiagnosticProcedureModel.list({ id: param.id }).then((q) => q.getOne());
+
+			if (!diagnosticProcedure) throw { message: "Diagnostic Procedure Not Found" };
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, diagnosticProcedure);
+		} catch (e: unknown) {
+			log.error(e);
+			const err = e as Error;
+
+			return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_not_found, err.message);
+		}
+	}
+
+	static async update(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+         #swagger.tags = ['Diagnostic Procedure (ICD-9)']
+         #swagger.security = [{
+             "bearerAuth": []
+         }]
+        #swagger.parameters['id'] = {
+            description:'',
+            in: 'path',
+            type: 'string'
+        }
+         #swagger.requestBody = {
+             required: true,
+             content: {
+                 "application/json": {
+                     schema: {
+                         $ref: "#/components/schemas/diagnostic_procedure"
+                     }
+                 }
+             }
+         }
+         */
+
+		const queryRunner = OrmHelper.DB.createQueryRunner();
+		await queryRunner.startTransaction();
+
+		try {
+			req.body.id = req.params["id"];
+
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("Diagnostic Procedure ID"),
+				diagnosticProcedure: Joi.string().max(256).required().label("Diagnostic Procedure"),
+				code: Joi.string().max(128).required().label("Code"),
+				status: Joi.string().required().label("Status"),
+			});
+
+			let param: any = await schema.validateAsync(req.body);
+
+			let filter = {
+				code: param.code,
+			};
+			let exist = await DiagnosticProcedureModel.list(filter).then((q) => q.getOne());
+			if (exist && exist.id != param.id) throw { message: "Diagnostic Procedure " + Language.lang.failed_duplicate };
+
+			let diagnosticProcedure = await DiagnosticProcedureModel.list({ id: param.id }).then((q) => q.getOne());
+
+			if (!diagnosticProcedure) throw { message: "Diagnostic Procedure " + Language.lang.failed_not_found };
+
+			diagnosticProcedure.diagnosticProcedure = param.diagnosticProcedure;
+			diagnosticProcedure.code = param.code;
+			diagnosticProcedure.status = param.status;
+			diagnosticProcedure.updated_by = req.auth.data.name;
+			await queryRunner.manager.save(diagnosticProcedure);
+
+			await queryRunner.commitTransaction();
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, diagnosticProcedure);
+		} catch (e: unknown) {
+			await queryRunner.rollbackTransaction();
+			log.error(e);
+			const err = e as Error;
+			return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message);
+		} finally {
+			await queryRunner.release();
+		}
+	}
+
+	static async delete(req: Request, res: Response, next: NextFunction): Promise<Response> {
+		/*
+        #swagger.tags = ['Diagnostic Procedure (ICD-9)']
+        #swagger.security = [{
+            "bearerAuth": []
+        }]
+        #swagger.parameters['id'] = {
+            in: 'path',
+            description: 'Diagnostic Procedure ID.',
+            required: true,
+            type: 'string'
+        }
+        #swagger.parameters['hard'] = {
+            in: 'path',
+            description: 'Is Hard Delete',
+            required: false,
+            type: 'boolean'
+        }
+        */
+		try {
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("ID"),
+				hard: Joi.bool().optional().allow("").label("Is hard delete?"),
+			});
+
+			const param: { id: string; hard: boolean } = await schema.validateAsync(req.params);
+
+			let affected = 0;
+			if (!param.hard) {
+				let diagnosticProcedure: DiagnosticProcedure = await DiagnosticProcedureModel.list({ id: param.id }).then((q) => q.getOne());
+
+				if (!diagnosticProcedure) throw { message: "Diagnostic Procedure " + Language.lang.failed_not_found };
+
+				diagnosticProcedure.deleted_by = req.auth.data.name;
+				diagnosticProcedure.deleted_at = moment().toDate();
+				await OrmHelper.DB.manager.save(diagnosticProcedure);
+				affected = 1;
+			} else {
+				const repo = OrmHelper.DB.getRepository(DiagnosticProcedure);
+				affected = (await repo.delete({ id: param.id })).affected;
+			}
+
+			if (affected > 0) {
+				return ReturnHelper.successResponseAny(res, 200, Language.lang.success_delete, {});
+			} else {
+				return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
+			}
+		} catch (e: unknown) {
+			log.error(e);
+			const err = e as Error;
+
+			return ReturnHelper.errorResponse(res, 500, 402, Language.lang.failed_delete, err.message);
+		}
+	}
+
+	static async restore(req: Request, res: Response, next: NextFunction): Promise<Response> {
+		/*
+        #swagger.tags = ['Diagnostic Procedure (ICD-9)']
+        #swagger.security = [{
+            "bearerAuth": []
+        }]
+        #swagger.parameters['id'] = {
+            in: 'path',
+            description: 'Diagnostic Procedure ID.',
+            required: true,
+            type: 'string'
+        }
+        */
+		try {
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("ID"),
+			});
+
+			const param: any = await schema.validateAsync(req.params);
+
+			const repo = OrmHelper.DB.getRepository(DiagnosticProcedure);
+
+			const affected = (await repo.restore({ id: param.id })).affected;
+
+			if (affected > 0) {
+				return ReturnHelper.successResponseAny(res, 200, Language.lang.success_restore, {});
+			} else {
+				return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
+			}
+		} catch (e: unknown) {
+			log.error(e);
+			const err = e as Error;
+
+			return ReturnHelper.errorResponse(res, 500, 402, Language.lang.failed_restore, err.message);
+		}
+	}
+}

src/helpers/common.ts

@@ -198,4 +198,45 @@ export default class CommonHelper {
 
         return { whereAttr, whereVal };
     }
+
+    static handleQueryFilter(filter: { [x: string]: any }): any {
+        const whereAttr = [];
+        const whereVal: any = {};
+
+        for (let p in filter) {
+            let f = Array.isArray(filter[p]) ? filter[p] : String(filter[p]);
+
+            if (p !== "any") {
+                if (!validate(f)) {
+                    if (p.endsWith("_from") || p.endsWith("_to")) {
+                        const baseField = p.replace(/_(from|to)$/, "");
+                        const fromKey = `${baseField}_from`;
+                        const toKey = `${baseField}_to`;
+
+                        if (p.endsWith("_to") && !filter[p].includes(" ")) {
+                            filter[p] = `${filter[p]} 23:59:59`;
+                            f = filter[p];
+                        }
+
+                        whereAttr.push(`${baseField} BETWEEN :_${fromKey} AND :_${toKey}`);
+                    } else if (f === "null") {
+                        whereAttr.push(`${p} IS NULL`);
+                    } else if (typeof f === "string" && f.includes("%")) {
+                        whereAttr.push(`${p} ILIKE :_${p}`);
+                        whereVal[`_${p}`] = p;
+                    } else if (Array.isArray(f)) {
+                        whereAttr.push(`${p} IN (:..._${p})`);
+                    } else {
+                        whereAttr.push(`${p} = :_${p}`);
+                    }
+                } else {
+                    whereAttr.push(`${p} = :_${p}`);
+                }
+
+                whereVal[`_${p}`] = f;
+            }
+        }
+
+        return { whereAttr, whereVal };
+    }
 }

src/helpers/orm.ts

@@ -1,7 +1,7 @@
 import config from 'config';
 import { DataSource } from "typeorm";
 import { ILogObj, Logger } from 'tslog';
-import { Administrativu, Aldeia, District, Menu, Munisipo, Suco, Application, Nationality } from 'entity'
+import { Administrativu, Aldeia, District, Menu, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure } from 'entity'
 
 export class OrmHelper {
     static DB: DataSource = null
@@ -20,7 +20,7 @@ export class OrmHelper {
             database: String(config.get("database.database")),
             synchronize: true,
             logging: config.get('database.logging'),
-            entities: [Menu, Administrativu, Aldeia, District, Munisipo, Suco, Application, Nationality],
+            entities: [Menu, Administrativu, Aldeia, District, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure],
             subscribers: [],
             migrations: [],
         })

src/model/diagnosis.ts

@@ -0,0 +1,24 @@
+import { Diagnosis } from "entity";
+import { SelectQueryBuilder } from "typeorm";
+import CommonHelper from "../helpers/common";
+import { OrmHelper } from "../helpers/orm";
+
+export class DiagnosisModel {
+	static async list(filter = {}): Promise<SelectQueryBuilder<any>> {
+		const repo = OrmHelper.DB.getRepository(Diagnosis);
+		let whereAttr = [];
+		let whereVal: any = {};
+		if (filter) {
+			whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter).whereAttr];
+			whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter).whereVal };
+		}
+
+		var query = null;
+		query = repo.createQueryBuilder();
+		if (whereAttr.length != 0) {
+			query = query.where(whereAttr.join(" and "), whereVal);
+		}
+
+		return query;
+	}
+}

src/model/diagnostic_procedure.ts

@@ -0,0 +1,24 @@
+import { DiagnosticProcedure } from "entity";
+import { SelectQueryBuilder } from "typeorm";
+import CommonHelper from "../helpers/common";
+import { OrmHelper } from "../helpers/orm";
+
+export class DiagnosticProcedureModel {
+	static async list(filter = {}): Promise<SelectQueryBuilder<any>> {
+		const repo = OrmHelper.DB.getRepository(DiagnosticProcedure);
+		let whereAttr = [];
+		let whereVal: any = {};
+		if (filter) {
+			whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter).whereAttr];
+			whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter).whereVal };
+		}
+
+		var query = null;
+		query = repo.createQueryBuilder();
+		if (whereAttr.length != 0) {
+			query = query.where(whereAttr.join(" and "), whereVal);
+		}
+
+		return query;
+	}
+}

src/routes/private.ts

@@ -9,6 +9,8 @@ import { MunisipoController } from '../controllers/munisipo';
 import { SucoController } from '../controllers/suco';
 import { ApplicationController } from '../controllers/application';
 import { NationalityController } from '../controllers/nationality';
+import { DiagnosisController } from '../controllers/diagnosis';
+import { DiagnosticProcedureController } from '../controllers/diagnostic_procedure';
 
 export class RoutePrivate {
     static setup(app: express.Application) {
@@ -72,5 +74,19 @@ export class RoutePrivate {
         app.put('/api/nationality/update/:id', NationalityController.update)
         app.delete('/api/nationality/delete/:id/:hard', NationalityController.delete)
         app.put('/api/nationality/restore/:id', NationalityController.restore)
+
+        app.get('/api/diagnosis/list', DiagnosisController.list)
+        app.post('/api/diagnosis/create', DiagnosisController.create)
+        app.get('/api/diagnosis/detail/:id', DiagnosisController.detail)
+        app.put('/api/diagnosis/update/:id', DiagnosisController.update)
+        app.delete('/api/diagnosis/delete/:id/:hard', DiagnosisController.delete)
+        app.put('/api/diagnosis/restore/:id', DiagnosisController.restore)
+
+        app.get('/api/diagnostic-procedure/list', DiagnosticProcedureController.list)
+        app.post('/api/diagnostic-procedure/create', DiagnosticProcedureController.create)
+        app.get('/api/diagnostic-procedure/detail/:id', DiagnosticProcedureController.detail)
+        app.put('/api/diagnostic-procedure/update/:id', DiagnosticProcedureController.update)
+        app.delete('/api/diagnostic-procedure/delete/:id/:hard', DiagnosticProcedureController.delete)
+        app.put('/api/diagnostic-procedure/restore/:id', DiagnosticProcedureController.restore)
     }
 }