udp
This commit is contained in:
@ -123,7 +123,7 @@ export class DepartmentController {
|
||||
|
||||
let param: any = await schema.validateAsync(req.params);
|
||||
|
||||
let department = await DepartmentModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let department = await DepartmentModel.list({ "Department.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!department) throw { message: "Department Not Found" };
|
||||
|
||||
@ -160,7 +160,7 @@ export class DepartmentController {
|
||||
let exist = await DepartmentModel.list(filter).then((q) => q.getOne());
|
||||
if (exist && exist.id != param.id) throw { message: "Department " + Language.lang.failed_duplicate };
|
||||
|
||||
let department = await DepartmentModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let department = await DepartmentModel.list({ "Department.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!department) throw { message: "Department " + Language.lang.failed_not_found };
|
||||
|
||||
@ -199,7 +199,7 @@ export class DepartmentController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let department: Department = await DepartmentModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let department: Department = await DepartmentModel.list({ "Department.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!department) throw { message: "Department " + Language.lang.failed_not_found };
|
||||
|
||||
|
||||
@ -175,7 +175,7 @@ export class DiagnosisController {
|
||||
|
||||
let param: any = await schema.validateAsync(req.params);
|
||||
|
||||
let diagnosis = await DiagnosisModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let diagnosis = await DiagnosisModel.list({ "Diagnosis.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!diagnosis) throw { message: "Diagnosis Not Found" };
|
||||
|
||||
@ -232,7 +232,7 @@ export class DiagnosisController {
|
||||
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());
|
||||
let diagnosis = await DiagnosisModel.list({ "Diagnosis.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!diagnosis) throw { message: "Diagnosis " + Language.lang.failed_not_found };
|
||||
|
||||
@ -284,7 +284,7 @@ export class DiagnosisController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let diagnosis: Diagnosis = await DiagnosisModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let diagnosis: Diagnosis = await DiagnosisModel.list({ "Diagnosis.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!diagnosis) throw { message: "Diagnosis " + Language.lang.failed_not_found };
|
||||
|
||||
|
||||
@ -175,7 +175,7 @@ export class DiagnosticProcedureController {
|
||||
|
||||
let param: any = await schema.validateAsync(req.params);
|
||||
|
||||
let diagnosticProcedure = await DiagnosticProcedureModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let diagnosticProcedure = await DiagnosticProcedureModel.list({ "DiagnosticProcedure.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!diagnosticProcedure) throw { message: "Diagnostic Procedure Not Found" };
|
||||
|
||||
@ -232,7 +232,7 @@ export class DiagnosticProcedureController {
|
||||
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());
|
||||
let diagnosticProcedure = await DiagnosticProcedureModel.list({ "DiagnosticProcedure.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!diagnosticProcedure) throw { message: "Diagnostic Procedure " + Language.lang.failed_not_found };
|
||||
|
||||
@ -284,7 +284,7 @@ export class DiagnosticProcedureController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let diagnosticProcedure: DiagnosticProcedure = await DiagnosticProcedureModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let diagnosticProcedure: DiagnosticProcedure = await DiagnosticProcedureModel.list({ "DiagnosticProcedure.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!diagnosticProcedure) throw { message: "Diagnostic Procedure " + Language.lang.failed_not_found };
|
||||
|
||||
|
||||
@ -223,7 +223,7 @@ export class DoctorScheduleController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let doctorSchedule: DoctorSchedule = await DoctorScheduleModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let doctorSchedule: DoctorSchedule = await DoctorScheduleModel.list({ "DoctorSchedule.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!doctorSchedule) throw { message: "Doctor Schedule " + Language.lang.failed_not_found };
|
||||
|
||||
|
||||
@ -204,7 +204,7 @@ export class RoomController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let room: Room = await RoomModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let room: Room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.getOne());
|
||||
if (!room) throw { message: "Room " + Language.lang.failed_not_found };
|
||||
room.deleted_by = req.auth.data.name;
|
||||
room.deleted_at = moment().toDate();
|
||||
|
||||
@ -135,7 +135,7 @@ export class ServiceController {
|
||||
|
||||
let param: any = await schema.validateAsync(req.params);
|
||||
|
||||
let service = await ServiceModel.list({ id: param.id })
|
||||
let service = await ServiceModel.list({ "Service.id": param.id })
|
||||
.then((q) => q.leftJoinAndSelect("Service.serviceType", "serviceType").leftJoinAndSelect("Service.rooms", "rooms").getOne());
|
||||
|
||||
if (!service) throw { message: "Service Not Found" };
|
||||
@ -173,7 +173,7 @@ export class ServiceController {
|
||||
let serviceType = await ServiceTypeModel.list({ id: param.service_type_id }).then((q) => q.getOne());
|
||||
if (!serviceType) throw { message: "Service Type not found" };
|
||||
|
||||
let service = await ServiceModel.list({ id: param.id })
|
||||
let service = await ServiceModel.list({ "Service.id": param.id })
|
||||
.then((q) => q.leftJoinAndSelect("Service.serviceType", "st").leftJoinAndSelect("Service.rooms", "r").getOne());
|
||||
|
||||
if (!service) throw { message: "Service " + Language.lang.failed_not_found };
|
||||
@ -222,7 +222,7 @@ export class ServiceController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let service: Service = await ServiceModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let service: Service = await ServiceModel.list({ "Service.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!service) throw { message: "Service " + Language.lang.failed_not_found };
|
||||
|
||||
|
||||
@ -121,7 +121,7 @@ export class ServiceClassController {
|
||||
|
||||
let param: any = await schema.validateAsync(req.params);
|
||||
|
||||
let serviceClass = await ServiceClassModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let serviceClass = await ServiceClassModel.list({ "ServiceClass.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!serviceClass) throw { message: "Service Class Not Found" };
|
||||
|
||||
@ -157,7 +157,7 @@ export class ServiceClassController {
|
||||
let exist = await ServiceClassModel.list(filter).then((q) => q.getOne());
|
||||
if (exist && exist.id != param.id) throw { message: "Service Class " + Language.lang.failed_duplicate };
|
||||
|
||||
let serviceClass = await ServiceClassModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let serviceClass = await ServiceClassModel.list({ "ServiceClass.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!serviceClass) throw { message: "Service Class " + Language.lang.failed_not_found };
|
||||
|
||||
@ -195,7 +195,7 @@ export class ServiceClassController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let serviceClass: ServiceClass = await ServiceClassModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let serviceClass: ServiceClass = await ServiceClassModel.list({ "ServiceClass.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!serviceClass) throw { message: "Service Class " + Language.lang.failed_not_found };
|
||||
|
||||
|
||||
@ -138,7 +138,7 @@ export class ServiceFareController {
|
||||
|
||||
let param: any = await schema.validateAsync(req.params);
|
||||
|
||||
let serviceFare = await ServiceFareModel.list({ id: param.id })
|
||||
let serviceFare = await ServiceFareModel.list({ "ServiceFare.id": param.id })
|
||||
.then((q) =>
|
||||
q.leftJoinAndSelect("ServiceFare.serviceClass", "serviceClass").leftJoinAndSelect("ServiceFare.service", "service").getOne()
|
||||
);
|
||||
@ -181,7 +181,7 @@ export class ServiceFareController {
|
||||
let service = await ServiceModel.list({ id: param.service_id }).then((q) => q.getOne());
|
||||
if (!service) throw { message: "Service not found" };
|
||||
|
||||
let serviceFare = await ServiceFareModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let serviceFare = await ServiceFareModel.list({ "ServiceFare.id": param.id }).then((q) => q.getOne());
|
||||
if (!serviceFare) throw { message: "Service Fare " + Language.lang.failed_not_found };
|
||||
|
||||
let filter = {
|
||||
@ -227,7 +227,7 @@ export class ServiceFareController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let serviceFare: ServiceFare = await ServiceFareModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let serviceFare: ServiceFare = await ServiceFareModel.list({ "ServiceFare.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!serviceFare) throw { message: "Service Fare " + Language.lang.failed_not_found };
|
||||
|
||||
|
||||
@ -138,7 +138,7 @@ export class ServicePackageController {
|
||||
|
||||
let param: any = await schema.validateAsync(req.params);
|
||||
|
||||
let servicePackage = await ServicePackageModel.list({ id: param.id })
|
||||
let servicePackage = await ServicePackageModel.list({ "ServicePackage.id": param.id })
|
||||
.then((q) =>
|
||||
q
|
||||
.leftJoinAndSelect("ServicePackage.serviceClass", "serviceClass")
|
||||
@ -182,7 +182,7 @@ export class ServicePackageController {
|
||||
let serviceClass = await ServiceClassModel.list({ id: param.service_class_id }).then((q) => q.getOne());
|
||||
if (!serviceClass) throw { message: "Service Class not found" };
|
||||
|
||||
let servicePackage = await ServicePackageModel.list({ id: param.id })
|
||||
let servicePackage = await ServicePackageModel.list({ "ServicePackage.id": param.id })
|
||||
.then((q) => q.leftJoinAndSelect("ServicePackage.serviceClass", "sc").leftJoinAndSelect("ServicePackage.services", "s").getOne());
|
||||
if (!servicePackage) throw { message: "Service Package " + Language.lang.failed_not_found };
|
||||
|
||||
@ -231,7 +231,7 @@ export class ServicePackageController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let servicePackage: ServicePackage = await ServicePackageModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let servicePackage: ServicePackage = await ServicePackageModel.list({ "ServicePackage.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!servicePackage) throw { message: "Service Package " + Language.lang.failed_not_found };
|
||||
|
||||
|
||||
@ -123,7 +123,7 @@ export class ServiceTypeController {
|
||||
|
||||
let param: any = await schema.validateAsync(req.params);
|
||||
|
||||
let serviceType = await ServiceTypeModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let serviceType = await ServiceTypeModel.list({ "ServiceType.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!serviceType) throw { message: "Service Type Not Found" };
|
||||
|
||||
@ -160,7 +160,7 @@ export class ServiceTypeController {
|
||||
let exist = await ServiceTypeModel.list(filter).then((q) => q.getOne());
|
||||
if (exist && exist.id != param.id) throw { message: "Service Type " + Language.lang.failed_duplicate };
|
||||
|
||||
let serviceType = await ServiceTypeModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let serviceType = await ServiceTypeModel.list({ "ServiceType.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!serviceType) throw { message: "Service Type " + Language.lang.failed_not_found };
|
||||
|
||||
@ -199,7 +199,7 @@ export class ServiceTypeController {
|
||||
|
||||
let affected = 0;
|
||||
if (!param.hard) {
|
||||
let serviceType: ServiceType = await ServiceTypeModel.list({ id: param.id }).then((q) => q.getOne());
|
||||
let serviceType: ServiceType = await ServiceTypeModel.list({ "ServiceType.id": param.id }).then((q) => q.getOne());
|
||||
|
||||
if (!serviceType) throw { message: "Service Type " + Language.lang.failed_not_found };
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ export class DiagnosisModel {
|
||||
}
|
||||
|
||||
var query = null;
|
||||
query = repo.createQueryBuilder();
|
||||
query = repo.createQueryBuilder("Diagnosis");
|
||||
if (whereAttr.length != 0) {
|
||||
query = query.where(whereAttr.join(" and "), whereVal);
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ export class DiagnosticProcedureModel {
|
||||
}
|
||||
|
||||
var query = null;
|
||||
query = repo.createQueryBuilder();
|
||||
query = repo.createQueryBuilder("DiagnosticProcedure");
|
||||
if (whereAttr.length != 0) {
|
||||
query = query.where(whereAttr.join(" and "), whereVal);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user