Skip to content

Commit

Permalink
Fixing issues on followup, phdp and intakes reported my Mintesinot
Browse files Browse the repository at this point in the history
  • Loading branch information
@melkam-mekonnen
melkam-mekonnen committed Oct 4, 2023
1 parent 4758214 commit 179be4c
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 101 deletions.
16 changes: 11 additions & 5 deletions src/forms/followup/2.1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@
},
"rendering": "number",
"concept": "159368AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"max": 99,
"max": 9999999,
"min": 0,
"showDate": "",
"conceptMappings": [
Expand Down Expand Up @@ -462,6 +462,9 @@
"label": "Treatment end date",
"type": "obs",
"questionOptions": {
"calculate": {
"calculateExpression": "CustomNextVisitDateCalc('followupDate','arvDispensedInDays', 'followupStatus')"
},
"rendering": "eth-date",
"concept": "164384AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
},
Expand Down Expand Up @@ -618,7 +621,7 @@
},
"rendering": "number",
"concept": "1cc8fe7f-fb70-49d8-9065-73654d852187",
"max": 999,
"max": 999999,
"min": 0,
"showDate": ""
},
Expand Down Expand Up @@ -1705,7 +1708,7 @@
"questionOptions": {
"rendering": "number",
"concept": "5314AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"max": 99,
"max": 999,
"min": 0,
"showDate": "",
"conceptMappings": [
Expand Down Expand Up @@ -9893,6 +9896,9 @@
"label": "Next visit date",
"type": "obs",
"questionOptions": {
"calculate": {
"calculateExpression": "CustomNextVisitDateCalc('followupDate','arvDispensedInDays')"
},
"rendering": "eth-date",
"concept": "c596f199-4d76-4eca-b3c4-ffa631c0aee9",
"weeksList": ""
Expand All @@ -9906,11 +9912,11 @@
]
},
{
"label": "TO Reminder",
"label": "Transfer-Out(TO) Reminder",
"isExpanded": "true",
"questions": [
{
"label": "TO date",
"label": "Transfer-Out(TO) date",
"type": "obs",
"required": false,
"id": "toDate",
Expand Down
167 changes: 76 additions & 91 deletions src/forms/phdp/1.0.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "POC PHDP Form",
"version": "1.0",
"published": true,
"retired": false,
"encounter": "PHDP",
"name": "POC PHDP Form",
"pages": [
{
"label": "PHDP",
Expand All @@ -12,95 +12,80 @@
"label": "Issues Addressed",
"isExpanded": "true",
"questions": [
{
"label": "Date",
"type": "obs",
"questionOptions": {
"rendering": "eth-date",
"concept": "160753AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"weeksList": "",
"conceptMappings": [
{
"type": "CIEL",
"value": "160753"
},
{
"type": "CIEL",
"value": "160753"
},
{
"type": "SNOMED-CT",
"value": "439771001"
},
{
"type": "SNOMED-CT",
"value": "439771001"
}
]
},
"id": "datePHDP"
},
{
"label": "Issues Addressed",
"type": "obs",
"required": false,
"id": "issuesAddressed",
"questionOptions": {
"rendering": "checkbox",
"concept": "5e8e03b1-d6ad-4362-a99a-f610af940f57",
"answers": [
{
"concept": "bca15fd1-2449-4eb2-9be5-576a5da654a8",
"label": "What to do if one forgets dose"
},
{
"concept": "7c7c22aa-9ec8-4806-b196-fa654febedfa",
"label": "What side effects and How to manage"
},
{
"concept": "5226a9de-0171-45ea-bd2d-6479cde1647a",
"label": "Why complete adherence needed"
},
{
"concept": "8b428610-e187-49dd-a00a-1d1317c2c129",
"label": "Progression of disease"
},
{
"concept": "92f0adc7-b087-4cc2-97d7-bc9706659cfc",
"label": "Prevention: Abstinence, Safer sex and Condoms"
},
{
"concept": "35c006b3-6ff3-4155-a367-8a50e37109ea",
"label": "Positive living"
},
{
"concept": "b5a43c78-660c-4fb4-9488-01ed5c2ceaaa",
"label": "Explain dose, When to take"
},
{
"concept": "a4674c1b-af47-4c9b-a8e7-d1c6efc6103a",
"label": "Education on essentials of ART"
},
{
"concept": "6c5fd1d8-8b2a-43e8-a5f6-d3aac54f72b5",
"label": "Basic HIV and TB transmission education"
},
{
"concept": "7e2703cc-bb5a-4f16-80c4-a14c51f6fd93",
"label": "Available treatment/Prophylaxis CPT, IPT, FPT"
}
]
}
},
{
"label": "Conclusion",
"type": "obs",
"questionOptions": {
"rendering": "textarea",
"concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
},
"id": "conclusion"
}
{
"label": "Date PHDP issues addressed",
"type": "obs",
"required": false,
"id": "phdpDate",
"questionOptions": {
"rendering": "eth-date",
"concept": "2c4db7e7-1ece-49a6-a075-d466e6d9b27d",
"conceptMappings": [],
"answers": []
},
"validators": []
},
{
"label": "Issues Addressed",
"type": "obs",
"required": false,
"id": "issuesAddressed",
"questionOptions": {
"rendering": "checkbox",
"concept": "5e8e03b1-d6ad-4362-a99a-f610af940f57",
"answers": [
{
"concept": "bca15fd1-2449-4eb2-9be5-576a5da654a8",
"label": "What to do if one forgets dose"
},
{
"concept": "7c7c22aa-9ec8-4806-b196-fa654febedfa",
"label": "What side effects and How to manage"
},
{
"concept": "5226a9de-0171-45ea-bd2d-6479cde1647a",
"label": "Why complete adherence needed"
},
{
"concept": "8b428610-e187-49dd-a00a-1d1317c2c129",
"label": "Progression of disease"
},
{
"concept": "92f0adc7-b087-4cc2-97d7-bc9706659cfc",
"label": "Prevention: Abstinence, Safer sex and Condoms"
},
{
"concept": "35c006b3-6ff3-4155-a367-8a50e37109ea",
"label": "Positive living"
},
{
"concept": "b5a43c78-660c-4fb4-9488-01ed5c2ceaaa",
"label": "Explain dose, When to take"
},
{
"concept": "a4674c1b-af47-4c9b-a8e7-d1c6efc6103a",
"label": "Education on essentials of ART"
},
{
"concept": "6c5fd1d8-8b2a-43e8-a5f6-d3aac54f72b5",
"label": "Basic HIV and TB transmission education"
},
{
"concept": "7e2703cc-bb5a-4f16-80c4-a14c51f6fd93",
"label": "Available treatment/Prophylaxis CPT, IPT, FPT"
}
]
}
},
{
"label": "Conclusion",
"type": "obs",
"questionOptions": {
"rendering": "textarea",
"concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
},
"id": "conclusion"
}
]
}
]
Expand All @@ -110,5 +95,5 @@
"uuid": "1e3aeb30-e55b-47d1-bf17-123550c351d1",
"referencedForms": [],
"encounterType": "f1b397c1-46bd-43e6-a23d-ae2cedaec881",
"allowUnspecifiedAll": true
"allowUnspecifiedAll": true
}
4 changes: 2 additions & 2 deletions src/pages/program-management/tabs/family-information.component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const columns = [
key: "Sex",
header: "Sex",
getValue: (encounter) => {
return getData(encounter, "ec4ceae1-36cf-40eb-8b68-67f8145ef324");
return getData(encounter, "1533AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
},
},
{
Expand All @@ -37,7 +37,7 @@ const columns = [
key: "counselledforhiv",
header: "Counselled for HIV",
getValue: (encounter) => {
return getData(encounter, "de32152d-93b0-412a-908a-20af0c46f215");
return getData(encounter, "ff9eccda-485e-4044-ad92-414e97b279c0");
},
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/pages/program-management/tabs/intake-a.component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const columns = [
key: "date",
header: "Enrollment Date",
getValue: (encounter) => {
return getData(encounter, "160555AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", true);
return getData(encounter, "1ebc345c-6f09-43e1-a616-d7e52fff4c7d", true);
},
},
{
Expand All @@ -30,7 +30,7 @@ const columns = [
key: "reasonForReferral",
header: "Reason for referral",
getValue: (encounter) => {
return getData(encounter, "2cb28f68-0277-48d7-8b38-8e6cf38a30a9");
return getData(encounter, "5f34e705-3574-4b44-b455-d815962026a1");
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/pages/program-management/tabs/phdp.component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const columns = [
key: "phdpdate",
header: "Date",
getValue: (encounter) => {
return getData(encounter, "160753AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", true);
return getData(encounter, "2c4db7e7-1ece-49a6-a075-d466e6d9b27d", true);
},
},
{
Expand Down

0 comments on commit 179be4c

Please sign in to comment.