TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "upd: fix reference range unit to number days""

Browse Source 
This reverts commit f110ff4a79.
This commit is contained in:
avicenan
2026-02-23 12:59:42 +07:00
parent f110ff4a79
commit 71c5416719
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/controllers/reference_range.ts
View File

@ -81,10 +81,10 @@ export class ReferenceRangeController {
try {
const schema = Joi.object().keys({
gender: Joi.string().valid("male", "female").required().label("Gender"),
age_range_min: Joi.string().max(256).default("0 day").required().label("Age Range Min"),
age_range_max: Joi.string().max(256).default("999 years").required().label("Age Range Max"),
value_min: Joi.string().max(256).required().label("Value Min"),
value_max: Joi.string().max(256).required().label("Value Max"),
age_range_min: Joi.number().integer().min(0).default(0).required().label("Age Range Min (days)"),
age_range_max: Joi.number().integer().min(0).default(36500).required().label("Age Range Max (days)"),
value_min: Joi.number().required().label("Value Min"),
value_max: Joi.number().required().label("Value Max"),
status: Joi.string().required().label("Status"),
});
@ -92,8 +92,8 @@ export class ReferenceRangeController {
let referenceRange = new ReferenceRange();
referenceRange.gender = param.gender;
referenceRange.age_range_min = param.age_range_min || "0 day";
referenceRange.age_range_max = param.age_range_max || "999 years";
referenceRange.age_range_min = param.age_range_min;
referenceRange.age_range_max = param.age_range_max;
referenceRange.value_min = param.value_min;
referenceRange.value_max = param.value_max;
referenceRange.status = param.status;
@ -155,10 +155,10 @@ export class ReferenceRangeController {
const schema = Joi.object().keys({
id: Joi.string().uuid().required().label("Reference Range ID"),
gender: Joi.string().valid("male", "female").required().label("Gender"),
age_range_min: Joi.string().max(256).default("0 day").required().label("Age Range Min"),
age_range_max: Joi.string().max(256).default("999 years").required().label("Age Range Max"),
value_min: Joi.string().max(256).required().label("Value Min"),
value_max: Joi.string().max(256).required().label("Value Max"),
age_range_min: Joi.number().integer().min(0).default(0).required().label("Age Range Min (days)"),
age_range_max: Joi.number().integer().min(0).default(36500).required().label("Age Range Max (days)"),
value_min: Joi.number().required().label("Value Min"),
value_max: Joi.number().required().label("Value Max"),
status: Joi.string().required().label("Status"),
});
@ -169,8 +169,8 @@ export class ReferenceRangeController {
if (!referenceRange) throw { message: "Reference Range " + Language.lang.failed_not_found };
referenceRange.gender = param.gender;
referenceRange.age_range_min = param.age_range_min || "0 day";
referenceRange.age_range_max = param.age_range_max || "999 years";
referenceRange.age_range_min = param.age_range_min
referenceRange.age_range_max = param.age_range_max;
referenceRange.value_min = param.value_min;
referenceRange.value_max = param.value_max;
referenceRange.status = param.status;