From 8e334f734c43c881d39c5fe0c759b15863de3449 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Thu, 30 Apr 2026 10:30:35 +0700 Subject: [PATCH] upd --- src/controllers/patient_guarantor.ts | 32 +++++++++++++++++++++------- src/model/patient_guarantor.ts | 8 ++++++- src/swagger/builder.js | 8 +++++-- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/controllers/patient_guarantor.ts b/src/controllers/patient_guarantor.ts index 654364c..505e55b 100644 --- a/src/controllers/patient_guarantor.ts +++ b/src/controllers/patient_guarantor.ts @@ -179,8 +179,12 @@ export class PatientGuarantorController { const schema = Joi.object().keys({ guarantor_name: Joi.string().max(256).required().label('Guarantor Name'), phone: Joi.string().max(15).required().label('Phone'), - province: Joi.string().max(128).required().label('Province'), - city: Joi.string().max(128).required().label('City'), + // province: Joi.string().max(128).required().label('Province'), + // city: Joi.string().max(128).required().label('City'), + munisipo: Joi.string().allow(null, "").label("Munisipo ID"), + administrativu: Joi.string().allow(null, "").label("Administrativu ID"), + aldeia: Joi.string().allow(null, "").label("Aldeia ID"), + suco: Joi.string().allow(null, "").label("Suco ID"), zip_code: Joi.string().max(10).required().label('Zip Code'), agreement_no: Joi.string().max(50).required().label('Agreement No.'), agreement_desc: Joi.string().max(512).optional().label('Agreement Description'), @@ -201,8 +205,12 @@ export class PatientGuarantorController { const data = new PatientGuarantor() data.guarantor_name = param.guarantor_name; data.phone = param.phone; - data.province = param.province; - data.city = param.city; + // data.province = param.province; + // data.city = param.city; + data.administrativu = param.administrativu; + data.suco = param.suco; + data.aldeia = param.aldeia; + data.munisipo = param.munisipo; data.zip_code = param.zip_code; data.agreement_no = param.agreement_no; data.agreement_desc = param.agreement_desc; @@ -255,8 +263,12 @@ export class PatientGuarantorController { id: Joi.string().uuid().required().label('ID'), guarantor_name: Joi.string().max(256).required().label('Guarantor Name'), phone: Joi.string().max(15).required().label('Phone'), - province: Joi.string().max(128).required().label('Province'), - city: Joi.string().max(128).required().label('City'), + // province: Joi.string().max(128).required().label('Province'), + // city: Joi.string().max(128).required().label('City'), + munisipo: Joi.string().allow(null, "").label("Munisipo ID"), + administrativu: Joi.string().allow(null, "").label("Administrativu ID"), + aldeia: Joi.string().allow(null, "").label("Aldeia ID"), + suco: Joi.string().allow(null, "").label("Suco ID"), zip_code: Joi.string().max(10).required().label('Zip Code'), agreement_no: Joi.string().max(50).required().label('Agreement No.'), agreement_desc: Joi.string().max(512).optional().label('Agreement Description'), @@ -284,8 +296,12 @@ export class PatientGuarantorController { data.guarantor_name = param.guarantor_name; data.phone = param.phone; - data.province = param.province; - data.city = param.city; + // data.province = param.province; + // data.city = param.city; + data.administrativu = param.administrativu; + data.suco = param.suco; + data.aldeia = param.aldeia; + data.munisipo = param.munisipo; data.zip_code = param.zip_code; data.agreement_no = param.agreement_no; data.agreement_desc = param.agreement_desc; diff --git a/src/model/patient_guarantor.ts b/src/model/patient_guarantor.ts index 59e512b..55862d3 100644 --- a/src/model/patient_guarantor.ts +++ b/src/model/patient_guarantor.ts @@ -27,7 +27,13 @@ export class PatientGuarantorModel { } } - var query = repo.createQueryBuilder("patient_guarantor").leftJoinAndSelect("patient_guarantor.patient_group", "patient_group").leftJoinAndSelect("patient_guarantor.faretype", "faretype"); + var query = repo.createQueryBuilder("patient_guarantor") + .leftJoinAndSelect("patient_guarantor.patient_group", "patient_group") + .leftJoinAndSelect("patient_guarantor.faretype", "faretype") + .leftJoinAndSelect("patient_guarantor.administrativu", "administrativu") + .leftJoinAndSelect("patient_guarantor.suco", "suco") + .leftJoinAndSelect("patient_guarantor.aldeia", "aldeia") + .leftJoinAndSelect("patient_guarantor.munisipo", "munisipo"); if (whereAttr.length != 0) { query = query.where(whereAttr.join(" and "), whereVal); } diff --git a/src/swagger/builder.js b/src/swagger/builder.js index b8d7c3d..096df66 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -372,8 +372,12 @@ const doc = { patient_guarantor: { $guarantor_name: "PatientGuarantor name", $phone: "08123456789", // Nomor telepon - $province: "West Java", // Provinsi - $city: "Bandung", // Kota + // $province: "West Java", // Provinsi + // $city: "Bandung", // Kota + $munisipo: "2e1a1b33-bbb2-4f33-b2c4-cff5976f3f95", // Munisipo (UUID) + $administrativu: "2e1a1b33-bbb2-4f33-b2c4-cff5976f3f95", // Administrativu (UUID) + $aldeia: "2e1a1b33-bbb2-4f33-b2c4-cff5976f3f95", // Aldeia (UUID) + $suco: "2e1a1b33-bbb2-4f33-b2c4-cff5976f3f95", // Suco (UUID) $zip_code: "40123", // Kode Pos $agreement_no: "AG123456789", // Nomor Perjanjian $agreement_desc: "Health Insurance Agreement", // Deskripsi Perjanjian (opsional)