From 682283453fcacd8d8372175186bcfa7802e7950c Mon Sep 17 00:00:00 2001 From: Amos Laboso Date: Tue, 31 Oct 2023 15:39:26 +0300 Subject: [PATCH 1/2] Added PTracker Never received ARV prophylaxis[en] concept --- ...P-Tracker_v202310311536.2023-10-31_073705.zip | Bin 0 -> 6844 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 distro/configuration/ocl/OHRITechGroup_P-Tracker_v202310311536.2023-10-31_073705.zip diff --git a/distro/configuration/ocl/OHRITechGroup_P-Tracker_v202310311536.2023-10-31_073705.zip b/distro/configuration/ocl/OHRITechGroup_P-Tracker_v202310311536.2023-10-31_073705.zip new file mode 100644 index 0000000000000000000000000000000000000000..ef1096ab51e6bcae362c22c0861d0151e7d68c2e GIT binary patch literal 6844 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⁢!zgag+4OR>xh_!z_aj z^yrix_84=JbE?DY7;_}0L#I0IDaIU{7;|88s)OcE_4GhLjwqzpbgG|44|AU4{Mp-N z9MSZ+0z8uT6Kyg_@F<$IRoMePZVw*A-riRO4qKqPW-vf4|{* zyRgnUV(XP`%{r;;g?MRF&r{eGYI&y8+5*+J$mU(|)q(0du}jx`Pl4(X8{(X}-gm}m zL>!jfk^}^o_?in{$vIfx{k~eRw{h5dqVkVLnEceei^Mcua^Pgc)`=}!l|8WM#@RE> zT3*kr#TLJ=Wi#)7uZ~~WiCwzidx~F&$S~x@{k}6sBZiPMh9gb^WY;`W@eGDsYtCXC z%#n0)?#YS$T9rL;r>*m4p+3+ui<+jC%u@1^?$yxH14?($Xg^1}i=I|m>AWzG zmvKR@&a8lGzXcwRee(pQXLoQx#WnBI{bXwY;e8!5eq3%I!}!0~`~AStRR0^zBGZRm z(j#lTkWf~g!1bGYQkzHhRn_9-*p{sdFXE$6XhnTqJ3ww=TbKJ)t~A#HAl_f;?fQWpge;q)O7)ikaxj7>MZ6h>sh?~7R73=?Yav-Ss#Ay z7AT1=Bi=_w2%dWFl_lUxV9bdDFhCtl?Ce$_bQA!F|F(%uj6 z7%#>lFDzTYMDs0RAUP6B59Q9sn^^2=Fm&sGAA(*#jr9mr44h6 z25(jPz?=%^kPewc%9(=zze1!+lIy^n&Y5H1Z!GwMIW^mjArtPH(|)(HW9FD`$AVj! zlRrS9jyZsjAm)Hw)1mTSSHSzE;*IWHUUDm<@sCu{CH+Z?C;h1=$`w2+S=$K~m^;Er z(Uz?WA8=BE6W$?CcqvX0gU(^1^BhppIZA9Xk6Jc!8;NT|9w7(rP|`l)(J@M>L5XEQ zv1q)X7;91EBQ6L-?3&Y;`+s_$;^pe`d9HrfQaQDt>()4^u!oIA|{+H ziJcg@8>BLaUgk8?lTQssE&oEI)*5zIoI#X|hN= zlY6oxW?%?0C*J!Lv$iUHAWH>VU>9EeLt*7}l`A+~23JcTT(O;1uQfCmuu^?gJ%Yla ztEK%(^^UnB4Oc92E244Siq}DOJ)p2 zB&Z5^Y)+SBsqOLuz-gj~Z#XF0H?`_L8JHNRR&;Q=m%TW+m%ak$e9 zw!h}rb@U1_e1R6ed49)KCEc3jhEB0000000000 qq=5hc003opaBp&SE^2dcZcs}F1^@s6009620672v0Bsro0001Xbucyn literal 0 HcmV?d00001 From b0b63a7228953108904a9cab61ec3469fd92b38c Mon Sep 17 00:00:00 2001 From: lucyjemutai <130601439+lucyjemutai@users.noreply.github.com> Date: Tue, 31 Oct 2023 22:31:37 +0300 Subject: [PATCH 2/2] OHRI-1893: Enable the Clinical visit form to save (#111) * Updated the Clinical visit- radio to toggle * OHRI-1850:Enable the Clinical visit form to save * OHRI-1850:Enable the Clinical visit form to save- updating a label --- .../ampathforms/ct_clinical_visit_v2.0.json | 197 +++++++++++------- 1 file changed, 122 insertions(+), 75 deletions(-) diff --git a/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json b/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json index 69eb5cb44..321c05fc5 100644 --- a/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json +++ b/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json @@ -9104,101 +9104,148 @@ "questions": [ { "label": "CD4 Lab Results", - "type": "obs", + "type": "obsGroup", + "id": "cd4ResultObsGroup", "questionOptions": { - "rendering": "radio", - "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0", - "conceptMappings": [ - { - "type": "OCT", - "value": "LabOrdered" - } - ], - "answers": [ - { - "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", - "label": "Yes", + "rendering": "group", + "concept": "c731a01e-7268-11ee-b962-0242ac120002", + "conceptMappings": [] + }, + "questions": [ + { + "label": "CD4 Lab Results", + "type": "obs", + "questionOptions": { + "rendering": "toggle", + "concept": "9674e958-7269-11ee-b962-0242ac120002", + "toggleOptions": { + "labelTrue": "Yes", + "labelFalse": "No" + }, "conceptMappings": [ { - "type": "CIEL", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - }, - { - "type": "PIH", - "value": "1065" - }, - { - "type": "SNOMED CT", - "value": "CT: 373066001" + "type": "OCT", + "value": "LabOrdered" } ] }, - { - "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", - "label": "No", - "conceptMappings": [] - } - ] - }, - "id": "cd4LabResultsToggle", - "behaviours": [ + "id": "cd4LabResultsToggle", + "behaviours": [ + { + "intent": "*", + "required": "false" + } + ] + }, { - "intent": "*", - "required": "false" + "label": "Which form was filled?", + "type": "obs", + "questionOptions": { + "rendering": "fixed-value", + "concept": "5ac76d80-726a-11ee-b962-0242ac120002", + "conceptMappings": [] + }, + "id": "cd4Lab", + "behaviours": [ + { + "intent": "*", + "hide": { + "hideWhenExpression": "false" + }, + "value": "CD4 Lab Result" + } + ] } ] - }, + } + ] + }, + { + "label": "Viral Lab Results", + "isExpanded": "true", + "questions": [ { "label": "Viral Lab Results", - "type": "obs", + "type": "obsGroup", + "id": "viralLabResultObsGroup", "questionOptions": { - "rendering": "radio", - "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0", - "conceptMappings": [ - { - "type": "OCT", - "value": "LabOrdered" - } - ], - "answers": [ - { - "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", - "label": "Yes", + "rendering": "group", + "concept": "c731a01e-7268-11ee-b962-0242ac120002", + "conceptMappings": [] + }, + "questions": [ + { + "label": "Viral Lab Results", + "type": "obs", + "questionOptions": { + "rendering": "toggle", + "concept": "9674e958-7269-11ee-b962-0242ac120002", + "toggleOptions": { + "labelTrue": "Yes", + "labelFalse": "No" + }, "conceptMappings": [ { - "type": "CIEL", - "value": "1065" - }, - { - "type": "AMPATH", - "value": "1065" - }, + "type": "OCT", + "value": "LabOrdered" + } + ], + "answers": [ { - "type": "PIH", - "value": "1065" + "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3", + "label": "Yes", + "conceptMappings": [ + { + "type": "CIEL", + "value": "1065" + }, + { + "type": "AMPATH", + "value": "1065" + }, + { + "type": "PIH", + "value": "1065" + }, + { + "type": "SNOMED CT", + "value": "CT: 373066001" + } + ] }, { - "type": "SNOMED CT", - "value": "CT: 373066001" + "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", + "label": "No", + "conceptMappings": [] } ] }, - { - "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594", - "label": "No", - "conceptMappings": [] - } - ] - }, - "id": "viralLabResultsToggle", - "behaviours": [ + "id": "viralLabResultsToggle", + "behaviours": [ + { + "intent": "*", + "required": "false" + } + ] + }, { - "intent": "*", - "required": "false" + "label": "Which form was filled?", + "type": "obs", + "questionOptions": { + "rendering": "fixed-value", + "concept": "5ac76d80-726a-11ee-b962-0242ac120002", + "conceptMappings": [] + }, + "id": "viralLoad", + "behaviours": [ + { + "intent": "*", + "hide": { + "hideWhenExpression": "false" + }, + "value": "Viral Load Lab Result" + } + ] } ] } @@ -9224,7 +9271,7 @@ "behaviours": [ { "intent": "*", - "hide": { + "hide": { "hideWhenExpression": "cd4LabResultsToggle == '488b58ff-64f5-4f8a-8979-fa79940b1594'" } }