diff --git a/src/controllers/examination_detail.ts b/src/controllers/examination_detail.ts
new file mode 100644
index 0000000..592a251
--- /dev/null
+++ b/src/controllers/examination_detail.ts
@@ -0,0 +1,276 @@
+import { ExaminationDetail, 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 { ExaminationDetailModel } from "../model/examination_detail";
+import { MeasurementUnitModel } from "../model/measurement_unit";
+import { ReferenceRangeModel } from "../model/reference_range";
+import { OrmHelper } from "../helpers/orm";
+import moment from "moment";
+
+const log: Logger<ILogObj> = new Logger({
+	name: "[ExaminationDetailController]",
+	type: "pretty",
+});
+
+export class ExaminationDetailController {
+	static async list(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+            #swagger.tags = ['Examination Detail']
+            #swagger.security = [{ "bearerAuth": [] }]
+            #swagger.parameters['filter'] = { description: 'Filter: plain text or JSON object (name, order_no, etc.)', 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 = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
+
+			var query = await ExaminationDetailModel.list(filter);
+
+			const offset = (param.page - 1) * param.limit;
+			let limit = param.limit;
+
+			const res_count = query;
+			const res_list = query
+				.leftJoinAndSelect("ExaminationDetail.measurement_unit", "measurementUnit")
+				.leftJoinAndSelect("ExaminationDetail.reference_range", "referenceRange")
+				.orderBy("ExaminationDetail." + 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 = ['Examination Detail']
+         #swagger.security = [{ "bearerAuth": [] }]
+         #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/examinationDetail" } } } }
+         */
+		const queryRunner = OrmHelper.DB.createQueryRunner();
+		await queryRunner.startTransaction();
+		try {
+			const schema = Joi.object().keys({
+				name: Joi.string().max(256).required().label("Name"),
+				order_no: Joi.string().max(256).required().label("Order No."),
+				measurement_unit_id: Joi.string().uuid().required().label("Measurement Unit ID"),
+				reference_range_id: Joi.string().uuid().required().label("Reference Range ID"),
+				status: Joi.string().required().label("Status"),
+			});
+
+			let param: any = await schema.validateAsync(req.body);
+
+			let measurementUnit = await MeasurementUnitModel.list({ "MeasurementUnit.id": param.measurement_unit_id }).then((q) => q.getOne());
+			if (!measurementUnit) throw { message: "Measurement Unit not found" };
+
+			let referenceRange = await ReferenceRangeModel.list({ "ReferenceRange.id": param.reference_range_id }).then((q) => q.getOne());
+			if (!referenceRange) throw { message: "Reference Range not found" };
+
+			let examinationDetail = new ExaminationDetail();
+			examinationDetail.name = param.name;
+			examinationDetail.order_no = param.order_no;
+			examinationDetail.measurement_unit = measurementUnit;
+			examinationDetail.reference_range = referenceRange;
+			examinationDetail.status = param.status;
+			examinationDetail.created_by = req.auth.data.name;
+			examinationDetail.updated_by = req.auth.data.name;
+			await queryRunner.manager.save(examinationDetail);
+
+			await queryRunner.commitTransaction();
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, examinationDetail);
+		} 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 = ['Examination Detail']
+         #swagger.security = [{ "bearerAuth": [] }]
+         #swagger.parameters['id'] = { in: 'path', type: 'string' }
+        */
+		try {
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("Examination Detail Id"),
+			});
+
+			let param: any = await schema.validateAsync(req.params);
+
+			let examinationDetail = await ExaminationDetailModel.list({ "ExaminationDetail.id": param.id })
+				.then((q) => q.leftJoinAndSelect("ExaminationDetail.measurement_unit", "measurementUnit").leftJoinAndSelect("ExaminationDetail.reference_range", "referenceRange").getOne());
+
+			if (!examinationDetail) throw { message: "Examination Detail Not Found" };
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, examinationDetail);
+		} 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 = ['Examination Detail']
+         #swagger.security = [{ "bearerAuth": [] }]
+         #swagger.parameters['id'] = { in: 'path', type: 'string' }
+         #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/examinationDetail" } } } }
+         */
+		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("Examination Detail ID"),
+				name: Joi.string().max(256).required().label("Name"),
+				order_no: Joi.string().max(256).required().label("Order No."),
+				measurement_unit_id: Joi.string().uuid().required().label("Measurement Unit ID"),
+				reference_range_id: Joi.string().uuid().required().label("Reference Range ID"),
+				status: Joi.string().required().label("Status"),
+			});
+
+			let param: any = await schema.validateAsync(req.body);
+
+			let examinationDetail = await ExaminationDetailModel.list({ "ExaminationDetail.id": param.id }).then((q) => q.getOne());
+
+			if (!examinationDetail) throw { message: "Examination Detail " + Language.lang.failed_not_found };
+
+			let measurementUnit = await MeasurementUnitModel.list({ "MeasurementUnit.id": param.measurement_unit_id }).then((q) => q.getOne());
+			if (!measurementUnit) throw { message: "Measurement Unit not found" };
+
+			let referenceRange = await ReferenceRangeModel.list({ "ReferenceRange.id": param.reference_range_id }).then((q) => q.getOne());
+			if (!referenceRange) throw { message: "Reference Range not found" };
+
+			examinationDetail.name = param.name;
+			examinationDetail.order_no = param.order_no;
+			examinationDetail.measurement_unit = measurementUnit;
+			examinationDetail.reference_range = referenceRange;
+			examinationDetail.status = param.status;
+			examinationDetail.updated_by = req.auth.data.name;
+			await queryRunner.manager.save(examinationDetail);
+
+			await queryRunner.commitTransaction();
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, examinationDetail);
+		} 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 = ['Examination Detail']
+        #swagger.security = [{ "bearerAuth": [] }]
+        #swagger.parameters['id'] = { in: 'path', 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 examinationDetail: ExaminationDetail = await ExaminationDetailModel.list({ "ExaminationDetail.id": param.id }).then((q) => q.getOne());
+
+				if (!examinationDetail) throw { message: "Examination Detail " + Language.lang.failed_not_found };
+
+				examinationDetail.deleted_by = req.auth.data.name;
+				examinationDetail.deleted_at = moment().toDate();
+				await OrmHelper.DB.manager.save(examinationDetail);
+				affected = 1;
+			} else {
+				const repo = OrmHelper.DB.getRepository(ExaminationDetail);
+				affected = (await repo.delete({ id: param.id })).affected ?? 0;
+			}
+
+			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 = ['Examination Detail']
+        #swagger.security = [{ "bearerAuth": [] }]
+        #swagger.parameters['id'] = { in: 'path', 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(ExaminationDetail);
+
+			const affected = (await repo.restore({ id: param.id })).affected ?? 0;
+
+			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);
+		}
+	}
+}
diff --git a/src/controllers/examination_type.ts b/src/controllers/examination_type.ts
new file mode 100644
index 0000000..1b18833
--- /dev/null
+++ b/src/controllers/examination_type.ts
@@ -0,0 +1,255 @@
+import { ExaminationType, 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 { ExaminationTypeModel } from "../model/examination_type";
+import { OrmHelper } from "../helpers/orm";
+import moment from "moment";
+
+const log: Logger<ILogObj> = new Logger({
+	name: "[ExaminationTypeController]",
+	type: "pretty",
+});
+
+export class ExaminationTypeController {
+	static async list(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+		/*
+            #swagger.tags = ['Examination Type']
+            #swagger.security = [{ "bearerAuth": [] }]
+            #swagger.parameters['filter'] = { description: 'Filter: plain text or JSON object (name, status, etc.)', 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 = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
+
+			var query = await ExaminationTypeModel.list(filter);
+
+			const offset = (param.page - 1) * param.limit;
+			let limit = param.limit;
+
+			const res_count = query;
+			const res_list = query
+				.orderBy("ExaminationType." + 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 = ['Examination Type']
+         #swagger.security = [{ "bearerAuth": [] }]
+         #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/examinationType" } } } }
+         */
+		const queryRunner = OrmHelper.DB.createQueryRunner();
+		await queryRunner.startTransaction();
+		try {
+			const schema = Joi.object().keys({
+				name: Joi.string().max(256).required().label("Name"),
+				status: Joi.string().required().label("Status"),
+			});
+
+			let param: any = await schema.validateAsync(req.body);
+
+			let filter = { name: param.name };
+			let exist = await ExaminationTypeModel.list(filter).then((q) => q.getOne());
+			if (exist) throw { message: "Examination Type " + Language.lang.failed_duplicate };
+
+			let examinationType = new ExaminationType();
+			examinationType.name = param.name;
+			examinationType.status = param.status;
+			examinationType.created_by = req.auth.data.name;
+			examinationType.updated_by = req.auth.data.name;
+			await queryRunner.manager.save(examinationType);
+
+			await queryRunner.commitTransaction();
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, examinationType);
+		} 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 = ['Examination Type']
+         #swagger.security = [{ "bearerAuth": [] }]
+         #swagger.parameters['id'] = { in: 'path', type: 'string' }
+        */
+		try {
+			const schema = Joi.object().keys({
+				id: Joi.string().uuid().required().label("Examination Type Id"),
+			});
+
+			let param: any = await schema.validateAsync(req.params);
+
+			let examinationType = await ExaminationTypeModel.list({ "ExaminationType.id": param.id }).then((q) => q.getOne());
+
+			if (!examinationType) throw { message: "Examination Type Not Found" };
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, examinationType);
+		} 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 = ['Examination Type']
+         #swagger.security = [{ "bearerAuth": [] }]
+         #swagger.parameters['id'] = { in: 'path', type: 'string' }
+         #swagger.requestBody = { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/examinationType" } } } }
+         */
+		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("Examination Type ID"),
+				name: Joi.string().max(256).required().label("Name"),
+				status: Joi.string().required().label("Status"),
+			});
+
+			let param: any = await schema.validateAsync(req.body);
+
+			let filter = { name: param.name };
+			let exist = await ExaminationTypeModel.list(filter).then((q) => q.getOne());
+			if (exist && exist.id != param.id) throw { message: "Examination Type " + Language.lang.failed_duplicate };
+
+			let examinationType = await ExaminationTypeModel.list({ "ExaminationType.id": param.id }).then((q) => q.getOne());
+
+			if (!examinationType) throw { message: "Examination Type " + Language.lang.failed_not_found };
+
+			examinationType.name = param.name;
+			examinationType.status = param.status;
+			examinationType.updated_by = req.auth.data.name;
+			await queryRunner.manager.save(examinationType);
+
+			await queryRunner.commitTransaction();
+
+			return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, examinationType);
+		} 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 = ['Examination Type']
+        #swagger.security = [{ "bearerAuth": [] }]
+        #swagger.parameters['id'] = { in: 'path', 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 examinationType: ExaminationType = await ExaminationTypeModel.list({ "ExaminationType.id": param.id }).then((q) => q.getOne());
+
+				if (!examinationType) throw { message: "Examination Type " + Language.lang.failed_not_found };
+
+				examinationType.deleted_by = req.auth.data.name;
+				examinationType.deleted_at = moment().toDate();
+				await OrmHelper.DB.manager.save(examinationType);
+				affected = 1;
+			} else {
+				const repo = OrmHelper.DB.getRepository(ExaminationType);
+				affected = (await repo.delete({ id: param.id })).affected ?? 0;
+			}
+
+			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 = ['Examination Type']
+        #swagger.security = [{ "bearerAuth": [] }]
+        #swagger.parameters['id'] = { in: 'path', 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(ExaminationType);
+
+			const affected = (await repo.restore({ id: param.id })).affected ?? 0;
+
+			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);
+		}
+	}
+}
diff --git a/src/helpers/orm.ts b/src/helpers/orm.ts
index c3f37c7..bffa9ba 100644
--- a/src/helpers/orm.ts
+++ b/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, Diagnosis, DiagnosticProcedure, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule, MeasurementUnit, ReferenceRange, QueueMonitoring, User, UserRole, HrmsEmployee, HrmsDepartment, HrmsPosition, HrmsShift } from 'entity'
+import { Administrativu, Aldeia, District, Menu, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule, MeasurementUnit, ReferenceRange, QueueMonitoring, ExaminationDetail, ExaminationType, User, UserRole, HrmsEmployee, HrmsDepartment, HrmsPosition, HrmsShift } 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, Diagnosis, DiagnosticProcedure, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule, MeasurementUnit, ReferenceRange, QueueMonitoring, User, UserRole, HrmsEmployee, HrmsDepartment, HrmsPosition, HrmsShift],
+            entities: [Menu, Administrativu, Aldeia, District, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule, MeasurementUnit, ReferenceRange, QueueMonitoring, ExaminationDetail, ExaminationType, User, UserRole, HrmsEmployee, HrmsDepartment, HrmsPosition, HrmsShift],
             subscribers: [],
             migrations: [],
         })
diff --git a/src/model/examination_detail.ts b/src/model/examination_detail.ts
new file mode 100644
index 0000000..b66d9e6
--- /dev/null
+++ b/src/model/examination_detail.ts
@@ -0,0 +1,23 @@
+import { ExaminationDetail } from "entity";
+import { SelectQueryBuilder } from "typeorm";
+import CommonHelper from "../helpers/common";
+import { OrmHelper } from "../helpers/orm";
+
+export class ExaminationDetailModel {
+	static async list(filter = {}): Promise<SelectQueryBuilder<any>> {
+		const repo = OrmHelper.DB.getRepository(ExaminationDetail);
+		let whereAttr: string[] = [];
+		let whereVal: any = {};
+		if (filter && Object.keys(filter).length > 0) {
+			whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter).whereAttr];
+			whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter).whereVal };
+		}
+
+		var query = repo.createQueryBuilder("ExaminationDetail");
+		if (whereAttr.length != 0) {
+			query = query.where(whereAttr.join(" and "), whereVal);
+		}
+
+		return query;
+	}
+}
diff --git a/src/model/examination_type.ts b/src/model/examination_type.ts
new file mode 100644
index 0000000..83f1638
--- /dev/null
+++ b/src/model/examination_type.ts
@@ -0,0 +1,23 @@
+import { ExaminationType } from "entity";
+import { SelectQueryBuilder } from "typeorm";
+import CommonHelper from "../helpers/common";
+import { OrmHelper } from "../helpers/orm";
+
+export class ExaminationTypeModel {
+	static async list(filter = {}): Promise<SelectQueryBuilder<any>> {
+		const repo = OrmHelper.DB.getRepository(ExaminationType);
+		let whereAttr: string[] = [];
+		let whereVal: any = {};
+		if (filter && Object.keys(filter).length > 0) {
+			whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter).whereAttr];
+			whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter).whereVal };
+		}
+
+		var query = repo.createQueryBuilder("ExaminationType");
+		if (whereAttr.length != 0) {
+			query = query.where(whereAttr.join(" and "), whereVal);
+		}
+
+		return query;
+	}
+}
diff --git a/src/routes/private.ts b/src/routes/private.ts
index ec65723..8535ff9 100644
--- a/src/routes/private.ts
+++ b/src/routes/private.ts
@@ -23,6 +23,8 @@ import { ServiceToDepartController } from '../controllers/servicetodepart'
 import { MeasurementUnitController } from '../controllers/measurement_unit';
 import { ReferenceRangeController } from '../controllers/reference_range';
 import { QueueMonitoringController } from '../controllers/queue_monitoring';
+import { ExaminationDetailController } from '../controllers/examination_detail';
+import { ExaminationTypeController } from '../controllers/examination_type';
 
 export class RoutePrivate {
     static setup(app: express.Application) {
@@ -180,5 +182,19 @@ export class RoutePrivate {
         app.put('/api/queue-monitoring/update/:id', QueueMonitoringController.update)
         app.delete('/api/queue-monitoring/delete/:id/:hard', QueueMonitoringController.delete)
         app.put('/api/queue-monitoring/restore/:id', QueueMonitoringController.restore)
+
+        app.get('/api/examination-detail/list', ExaminationDetailController.list)
+        app.post('/api/examination-detail/create', ExaminationDetailController.create)
+        app.get('/api/examination-detail/detail/:id', ExaminationDetailController.detail)
+        app.put('/api/examination-detail/update/:id', ExaminationDetailController.update)
+        app.delete('/api/examination-detail/delete/:id/:hard', ExaminationDetailController.delete)
+        app.put('/api/examination-detail/restore/:id', ExaminationDetailController.restore)
+
+        app.get('/api/examination-type/list', ExaminationTypeController.list)
+        app.post('/api/examination-type/create', ExaminationTypeController.create)
+        app.get('/api/examination-type/detail/:id', ExaminationTypeController.detail)
+        app.put('/api/examination-type/update/:id', ExaminationTypeController.update)
+        app.delete('/api/examination-type/delete/:id/:hard', ExaminationTypeController.delete)
+        app.put('/api/examination-type/restore/:id', ExaminationTypeController.restore)
     }
 }
\ No newline at end of file
diff --git a/src/swagger/builder.js b/src/swagger/builder.js
index be10ac0..03de2f7 100644
--- a/src/swagger/builder.js
+++ b/src/swagger/builder.js
@@ -169,6 +169,17 @@ const doc = {
                 $room_ids: ["uuid-string"],
                 $status: { "@enum": ["Y", "N"] }
             },
+            examinationType: {
+                $name: "Examination Type name",
+                $status: { "@enum": ["Y", "N"] }
+            },
+            examinationDetail: {
+                $name: "Examination Detail name",
+                $order_no: "Order number",
+                $measurement_unit_id: "uuid-string",
+                $reference_range_id: "uuid-string",
+                $status: { "@enum": ["Y", "N"] }
+            },
         },
         parameters: {