diff --git a/configuration/ampathforms/HIV_Green_Card.json b/configuration/ampathforms/HIV_Green_Card.json index faa9ffc3..66770d83 100644 --- a/configuration/ampathforms/HIV_Green_Card.json +++ b/configuration/ampathforms/HIV_Green_Card.json @@ -1178,7 +1178,7 @@ "required": "true", "answers": [ { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes" }, { @@ -1200,7 +1200,7 @@ "rendering": "select", "answers": [ { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes" }, { @@ -1210,7 +1210,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } }, { @@ -1221,7 +1221,7 @@ "rendering": "select", "answers": [ { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes" }, { @@ -1232,7 +1232,7 @@ }, "id": "EverOnTPT", "hide": { - "hideWhenExpression": "isEmpty(OnTpT) || OnTpT === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + "hideWhenExpression": "isEmpty(OnTpT) || OnTpT === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } }, { @@ -1263,7 +1263,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'|| (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" + "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'|| (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" } }, { @@ -1285,7 +1285,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT) ) || isEmpty(OnTpT)" + "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT) ) || isEmpty(OnTpT)" } }, { @@ -1307,7 +1307,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" + "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" } }, { @@ -1329,7 +1329,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age < 16 || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" + "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age < 16 || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" } }, { @@ -1351,7 +1351,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'|| age > 15 || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" + "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'|| age > 15 || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" } }, { @@ -1373,7 +1373,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age > 15 || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" + "hideWhenExpression": "isEmpty(OnantiTBdrugs) || OnantiTBdrugs === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age > 15 || (OnantiTBdrugs === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && OnTpT ==='1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && isEmpty(EverOnTPT)) || isEmpty(OnTpT)" } } ] @@ -1521,7 +1521,7 @@ "rendering": "radio", "answers": [ { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes" }, { @@ -1543,7 +1543,7 @@ "rendering": "radio", "answers": [ { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes" }, { @@ -1565,7 +1565,7 @@ "rendering": "radio", "answers": [ { - "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "label": "Yes" }, { @@ -1700,29 +1700,29 @@ "concept": "1659AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "rendering": "radio", "calculate": { - "calculateExpression": "String(sPutUmResuLts) === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || String(cliNicalDiagnosisAction) === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || String(geneXpertActiOn) === '162204AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || String(geneXpertActiOn) === '164104AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || String(geneXpertActiOn) === '162203AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? '1662AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : String(sPutUmResuLts) === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || String(cliNicalDiagnosisAction) === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? '1660AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : String(orDsputumSmEAr) === '307AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || String(oRdchEstXray) === '12AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || String(ordGenexPert) === '162202AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? '142177AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : String(cOughDuratiOn) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && String(FeverIsh) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && String(WeigHtLossGain) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && String(NighTsWeatS) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && String(ConTacTbCase) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'&& String(LeSSpLayFul) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? '1660AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : ''" + "calculateExpression":"String(cOughDuratiOn) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && String(FeverIsh) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && String(WeigHtLossGain) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && String(NighTsWeatS) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && String(ConTacTbCase) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && String(LeSSpLayFul) === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || ((String(cliNicalDiagnosisAction) === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(sPutUmResuLts) === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(geneXpertActiOn) === '1138AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(geneXpertActiOn) === '163611AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(geneXpertActiOn) === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(chEstXrAyAction) === '152526AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(testOrdered) === '307AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(testOrdered) === '12AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0)+ (String(testOrdered) === '162202AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0)) === 0 ? '1660AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : ((String(cliNicalDiagnosisAction) === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(sPutUmResuLts) === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(geneXpertActiOn) === '162203AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(geneXpertActiOn) === '162204AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(geneXpertActiOn) === '164104AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0)) > 0 ? '1662AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' :((String(cliNicalDiagnosisAction) === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(sPutUmResuLts) === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(geneXpertActiOn) === '1138AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(geneXpertActiOn) === '163611AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(geneXpertActiOn) === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(chEstXrAyAction) === '152526AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(testOrdered) === '307AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(testOrdered) === '12AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0)+ (String(testOrdered) === '162202AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0)) > 0 ?'142177AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : ''" + }, + "answers": [ + { + "concept": "1660AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "No TB Signs" }, - "answers": [ - { - "concept": "1660AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "No TB Signs" - }, - { - "concept": "142177AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "Presumed TB" - }, - { - "concept": "1662AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "TB Confirmed" - }, - { - "concept": "160737AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "label": "TB Screening Not Done" - } - ] + { + "concept": "142177AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "Presumed TB" + }, + { + "concept": "1662AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "TB Confirmed" + }, + { + "concept": "160737AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "label": "TB Screening Not Done" + } + ] }, "hide": { - "hideWhenExpression": "cOughDuratiOn === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(FeverIsh) || FeverIsh === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(WeigHtLossGain) || WeigHtLossGain === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(NighTsWeatS) && NighTsWeatS === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || ConTacTbCase === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || LeSSpLayFul === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + "hideWhenExpression": "((String(cOughDuratiOn) === '159799AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(FeverIsh) === '1494AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(WeigHtLossGain) === '832AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(NighTsWeatS) === '133027AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(LeSSpLayFul) === '116334AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0) + (String(ConTacTbCase) === '124068AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'? 1 : 0)) === 0" } }, { @@ -1752,7 +1752,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(cOughDuratiOn) || cOughDuratiOn === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(FeverIsh) || FeverIsh === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(WeigHtLossGain) || WeigHtLossGain === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(NighTsWeatS) || NighTsWeatS === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || ConTacTbCase === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(LeSSpLayFul) || LeSSpLayFul === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + "hideWhenExpression": "isEmpty(cOughDuratiOn) || cOughDuratiOn === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(FeverIsh) || FeverIsh === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(WeigHtLossGain) || WeigHtLossGain === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(NighTsWeatS) || NighTsWeatS === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || ConTacTbCase === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(LeSSpLayFul) || LeSSpLayFul === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } }, { @@ -1774,7 +1774,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(cOughDuratiOn) || cOughDuratiOn === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(FeverIsh) || FeverIsh === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(WeigHtLossGain) || WeigHtLossGain === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(NighTsWeatS) || NighTsWeatS === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || ConTacTbCase === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(LeSSpLayFul) || LeSSpLayFul === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + "hideWhenExpression": "isEmpty(cOughDuratiOn) || cOughDuratiOn === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(FeverIsh) || FeverIsh === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(WeigHtLossGain) || WeigHtLossGain === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(NighTsWeatS) || NighTsWeatS === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || ConTacTbCase === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(LeSSpLayFul) || LeSSpLayFul === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } }, { @@ -1796,7 +1796,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(cOughDuratiOn) || cOughDuratiOn === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(FeverIsh) || FeverIsh === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(WeigHtLossGain) || WeigHtLossGain === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(NighTsWeatS) || NighTsWeatS === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || ConTacTbCase === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(LeSSpLayFul) || LeSSpLayFul === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + "hideWhenExpression": "isEmpty(cOughDuratiOn) || cOughDuratiOn === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(FeverIsh) || FeverIsh === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(WeigHtLossGain) || WeigHtLossGain === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(NighTsWeatS) || NighTsWeatS === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || ConTacTbCase === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(LeSSpLayFul) || LeSSpLayFul === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } }, { @@ -1818,7 +1818,7 @@ ] }, "hide": { - "hideWhenExpression": "isEmpty(cOughDuratiOn) || cOughDuratiOn === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(FeverIsh) || FeverIsh === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(WeigHtLossGain) || WeigHtLossGain === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(NighTsWeatS) || NighTsWeatS === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || ConTacTbCase === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(LeSSpLayFul) || LeSSpLayFul === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + "hideWhenExpression": "isEmpty(cOughDuratiOn) || cOughDuratiOn === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(FeverIsh) || FeverIsh === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(WeigHtLossGain) || WeigHtLossGain === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(NighTsWeatS) || NighTsWeatS === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(ConTacTbCase) || ConTacTbCase === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || isEmpty(LeSSpLayFul) || LeSSpLayFul === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } } ], @@ -3963,6 +3963,7 @@ { "label": "WHO staging(Adult)", "type": "obs", + "required":"true", "questionOptions": { "rendering": "select", "concept": "5356AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", @@ -4029,7 +4030,20 @@ "isExpanded": "true", "questions": [ { - "label": "Treatment/Management Plan", + "label": "Diagnosis", + "id": "DiagNosIS", + "type": "diagnosis", + "questionOptions": { + "rendering": "repeating", + "dataSource": "diagnoses", + "rank": 1 + }, + "hide": { + "hideWhenExpression": "isEmpty(visitScheduled) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + } + }, + { + "label": "Treatment", "type": "obsGroup", "questionOptions": { "rendering": "repeating", @@ -4040,18 +4054,6 @@ "hideWhenExpression": "isEmpty(visitScheduled) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" }, "questions": [ - { - "label": "Diagnosis", - "type": "obs", - "id": "DiagNosIS", - "questionOptions": { - "concept": "6042AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "rendering": "diagnosis" - }, - "hide": { - "hideWhenExpression": "isEmpty(visitScheduled) || personPresent !== '978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" - } - }, { "label": "Treatment Plan", "type": "obs",