diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json index 600576e59..d6e7b3305 100644 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -344,6 +344,9 @@ "Date MDT Held":{ "required":true }, + "MDT Outcome":{ + "required":true + }, "defaults": { "Number of living children": 1, "Accepted Family Planning methods": [ diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index f9d741492..562a297b0 100644 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -323,47 +323,7 @@ Bahmni.ConceptSet.FormConditions.rules = { } }, - "ART Regimen - Substitution within 1st Line" : function (formName , formFieldValues, patient){ - if(patient.age < 15){ - return{ - show: ["Child Regimens (First Line)"], - hide:["Substitution Regimen For Adults(First Line)"] - } - }else { - return{ - hide: ["Child Regimens (First Line)"], - show: ["Substitution Regimen For Adults(First Line)"] - } - } - }, - "ART Regimen(Switch to 2nd Line)" : function (formName , formFieldValues, patient){ - if(patient.age < 15){ - return{ - show: ["Children Second Line Regimens"], - hide:["Substitution Regimen (2nd Line Adults)"] - } - }else { - return{ - hide: ["Children Second Line Regimens"], - show:["Substitution Regimen (2nd Line Adults)"] - } - } - }, - "AntiRetroviral Treatment" : function (formName , formFieldValues, patient){ - if(patient.age < 15){ - return{ - show: ["Initial ART Regimen For Children"], - hide:["Initial ART Regimen (Adult)"] - - } - }else { - return{ - hide: ["Initial ART Regimen For Children"], - show:["Initial ART Regimen (Adult)"] - - } - } - }, + "Is there an immunization not Given?" : function (formName , formFieldValues){ var immunizationgiven = formFieldValues["Is there an immunization not Given?"]; if(immunizationgiven == true){ @@ -642,11 +602,11 @@ Bahmni.ConceptSet.FormConditions.rules = { var mdtheld = formFieldValues["MDT Held?"]; if (mdtheld == true) { return { - show:["Date MDT Held"] + show:["Date MDT Held","MDT Outcome"] } } else { return { - hide:["Date MDT Held"] + hide:["Date MDT Held","MDT Outcome"] } } }, diff --git a/openmrs/i18n/clinical/locale_en.json b/openmrs/i18n/clinical/locale_en.json index 43e4cf1b5..f7a165e02 100644 --- a/openmrs/i18n/clinical/locale_en.json +++ b/openmrs/i18n/clinical/locale_en.json @@ -57,7 +57,7 @@ "OBSERVATIONS_BOARD_LABEL_KEY":"Observations", - "MEDICATIONS_BOARD_LABEL_KEY":"Medications", + "MEDICATIONS_BOARD_LABEL_KEY":"ARV Regimen / Medications", "ORDERS_BOARD_LABEL_KEY":"Orders", "BACTERIOLOGY_BOARD_LABEL_KEY":"Bacteriology", "CONSULTATION_BOARD_LABEL_KEY":"Consultation",