Work on why eligible in followup

CDC-HIS · Aug 1, 2024 · cd0fea3 · cd0fea3
1 parent 481856e
commit cd0fea3
Showing 2 changed files with 32 additions and 35 deletions.
diff --git a/src/forms/followup.json b/src/forms/followup.json
@@ -166,48 +166,55 @@
 							"id": "eligibleDate"
 						},
 						{
-							"label": "Why eligible (TI)",
+							"label": "Transferred-In (check this for all TI cases)",
 							"type": "obs",
-							"id": "whyEligible",
 							"questionOptions": {
 								"calculate": {
-									"calculateExpression": "resolve(api.getLatestObs(patient.id, '613718f1-ecf2-4228-b9c2-6157d574bd0b', '136b2ded-22a3-4831-a39a-088d35a50ef5'))?.valueCodeableConcept?.coding?"
+									"calculateExpression": "resolve(api.getLatestObs(patient.id, 'cc2dfcbd-e099-47d5-b01c-74caa296ba3c', '136b2ded-22a3-4831-a39a-088d35a50ef5'))?.valueCodeableConcept?.coding[0]?.code"
 								},
-								"rendering": "select",
-								"concept": "613718f1-ecf2-4228-b9c2-6157d574bd0b",
+								"rendering": "radio",
+								"concept": "cc2dfcbd-e099-47d5-b01c-74caa296ba3c",
 								"answers": [
 									{
-										"concept": "163329AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Test and Treatment",
-										"conceptMappings": [
-											{
-												"type": "CIEL",
-												"value": "163329"
-											},
-											{
-												"type": "CIEL",
-												"value": "163329"
-											}
-										]
+										"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Yes"
 									},
 									{
-										"concept": "dfec38ad-238a-4f4a-a52f-c96b6becdd26",
-										"label": "Clinical Staging",
+										"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "No"
+									}
+								]
+							},
+							"id": "transferredInCase"
+						},
+						{
+							"label": "Why Eligible?",
+							"type": "obs",
+							"questionOptions": {
+							  "calculate": {
+									"calculateExpression": "resolve(api.getLatestObs(patient.id, 'b7b1da64-22f4-4357-9eb8-493b43c02581', '136b2ded-22a3-4831-a39a-088d35a50ef5'))?.valueCodeableConcept?.coding?"
+								},
+								"rendering": "checkbox",
+								"concept": "b7b1da64-22f4-4357-9eb8-493b43c02581",
+								"answers": [
+									{
+										"concept": "b52413a8-cc05-4ce3-8af9-b4a8deda0d1b",
+										"label": "Test and Treat",
 										"conceptMappings": []
 									},
 									{
-										"concept": "160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Transfer in (Check this for all TI cases)",
+										"concept": "dfec38ad-238a-4f4a-a52f-c96b6becdd26",
+										"label": "Clinical Staging",
 										"conceptMappings": []
 									},
 									{
 										"concept": "0b4ec9d0-d86a-4978-b3ad-0add037232d7",
-										"label": "Other (like TB, HBV, Pregnant)",
+										"label": "Other(like TB, HBV, Pregnant)",
 										"conceptMappings": []
 									}
 								]
 							},
-							"validators": []
+							"id": "whyEligible"
 						},
 						{
 							"label": "UAN",

diff --git a/src/forms/intake-b.json b/src/forms/intake-b.json
@@ -3863,18 +3863,8 @@
 				  "readonly": "true",
 				  "answers": [
 					{
-					  "concept": "163329AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-					  "label": "Test and Treatment",
-					  "conceptMappings": [
-						{
-						  "type": "CIEL",
-						  "value": "163329"
-						},
-						{
-						  "type": "CIEL",
-						  "value": "163329"
-						}
-					  ]
+					  "concept": "b52413a8-cc05-4ce3-8af9-b4a8deda0d1b",
+					  "label": "Test and Treatment"
 					},
 					{
 					  "concept": "cd52d9c3-23b5-4394-872e-9e70c4e66728",