Adjust clinical view content for treatment (#312)

Author: Daphne210

packages/esm-ugandaemr-app/src/custom-expressions/custom-apis.ts

@@ -1,7 +1,6 @@
 import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, provide } from '@openmrs/esm-framework';
 import { configSchema } from './config-schema';
 import { moduleName } from './constants';
-import { registerCustomDataSource, registerExpressionHelper } from '@openmrs/openmrs-form-engine-lib';
 
 import formBuilderAppMenu from './menu-app-items/form-builder-app-item/form-builder-app-item.component';
 import systemInfoAppMenu from './menu-app-items/system-info-app-item/system-info-app-item.component';
@@ -25,13 +24,6 @@ import {
   patientChartDivider_dashboardMeta,
 } from '@ohri/openmrs-esm-ohri-commons-lib';
 
-import {
-  CalcMonthsOnART,
-  DSDMCategorizationDatasource,
-  latestObs,
-  patientDSDM,
-} from './custom-expressions/custom-expressions';
-
 import {
   drtbSummaryDashboardMeta,
   dstbSummaryDashboardMeta,
@@ -78,18 +70,6 @@ export const dispensingAppMenuItem = getSyncLifecycle(dispensingAppMenu, options
 
 export function startupApp() {
   defineConfigSchema(moduleName, configSchema);
-  registerExpressionHelper('cusGetLatestObs', latestObs);
-  registerExpressionHelper('getPatientDSMD', patientDSDM);
-  registerExpressionHelper('CustomMonthsOnARTCalc', CalcMonthsOnART);
-
-  registerCustomDataSource({
-    name: 'dsdm_categorization_datasource',
-    load: () => {
-      return Promise.resolve({
-        default: new DSDMCategorizationDatasource(),
-      });
-    },
-  });
 }
 
 export const systemInfoPage = getAsyncLifecycle(() => import('./pages/system-info/system-info.component'), {

packages/esm-ugandaemr-app/src/custom-expressions/custom-expressions.ts

@@ -21,18 +21,13 @@
                 {
                     "id": "memberAgeUnit",
                     "title": "Member Age",
-                    "concept": "4049d989-b99e-440d-8f70-c222aa9fe45c"
+                    "concept": "33b18e88-0eb9-48f0-8023-2e90caad4469"
                 },
                 {
                     "id": "memberRelationship",
                     "title": "Member Relationship",
                     "concept": "164352AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                 },
-                {
-                    "id": "memberEIDCare",
-                    "title": "EID Care",
-                    "concept": "eidCareConceptUuid"
-                },
                 {
                     "id": "memberStatus",
                     "title": "Member Status",
@@ -41,23 +36,18 @@
                 {
                     "id": "memberHIVCare",
                     "title": "HIV Care",
-                    "concept": "dce13f66-30ab-102d-86b0-7a5022ba4115"
+                    "concept": "1f98a7e6-4d0a-4008-a6f7-4ec118f08983"
                 },
                 {
-                    "id": "memberEIDNo",
-                    "title": "EID No",
-                    "concept": "dce11a89-30ab-102d-86b0-7a5022ba4115"
+                    "id": "memberStatusDate",
+                    "title": "HIV Status Date",
+                    "concept": "b7f597e7-39b5-419e-9ec5-de5901fffb52"
                 },
                 {
                     "id": "memberContact",
                     "title": "Contact ",
                     "concept": "159635AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                 },
-                {
-                    "id": "memberStatusDate",
-                    "title": "HIV Status Date",
-                    "concept": "b7f597e7-39b5-419e-9ec5-de5901fffb52"
-                },
                 {
                     "id": "actions",
                     "title": "Actions",

packages/esm-ugandaemr-app/src/index.ts

@@ -9,20 +9,29 @@
       "encounterType": "6d88e370-f2ba-476b-bf1b-d8eaf3b1b67e",
       "columns": [
         {
-          "id": "contactDate",
-          "isDate": true,
-          "title": "contactDateTitle",
-          "concept": "160753AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          "id": "physcohologicalIssues",
+          "title": "Psychological issues",
+          "concept": "1760ea50-8f05-4675-aedd-d55f99541aa8"
+        },
+        {
+          "id": "socialIssues",
+          "title": "Social Issues",
+          "concept": "1760ea50-8f05-4675-aedd-d55f99541aa8"
         },
         {
-          "id": "contactMethod",
-          "title": "contactMethodTitle",
-          "concept": "166456AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          "id": "patientCategorization",
+          "title": "Patient Categorization",
+          "concept": "cc183c11-0f94-4992-807c-84f33095ce37"
         },
         {
-          "id": "contactOutcome",
-          "title": "contactOutcomeTitle",
-          "concept": "167011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          "id": "dsdModel",
+          "title": "DSDM Model",
+          "concept": "1e755463-df07-4f18-bc67-9e5527bc252f"
+        },
+        {
+          "id": "dsdApproach",
+          "title": "DSDM Approach",
+          "concept": "73312fee-c321-11e8-a355-529269fb1459"
         },
         {
           "id": "actions",
@@ -59,20 +68,37 @@
       "encounterType": "38cb2232-30fc-4b1f-8df1-47c795771ee9",
       "columns": [
         {
-          "id": "contactDate",
+          "id": "vlSampleCollectionDate",
           "isDate": true,
-          "title": "contactDateTitle",
-          "concept": "160753AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          "title": "VL Sample Collection Date",
+          "concept": "c4389c60-32f5-4390-b7c6-9095ff880df5"
         },
         {
-          "id": "contactMethod",
-          "title": "contactMethodTitle",
-          "concept": "166456AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          "id": "vlInitiationCpoies",
+          "title": "VL Copes/ml at Initiation of IAC",
+          "concept": "dc8d83e3-30ab-102d-86b0-7a5022ba4115"
         },
         {
-          "id": "contactOutcome",
-          "title": "contactOutcomeTitle",
-          "concept": "167011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          "id": "hivdr4SampleCollectionDate",
+          "isDate": true,
+          "title": "HIVDR Sample Collection Date",
+          "concept": "0b434cfa-b11c-4d14-aaa2-9aed6ca2da88"
+        },
+        {
+          "id": "vlResultsAfterIac",
+          "title": "VL Results after IAC",
+          "concept": "dca12261-30ab-102d-86b0-7a5022ba4115"
+        },
+        {
+          "id": "vlCopiesAfterIac",
+          "title": "VL copies/ml after IAC",
+          "concept": "dc8d83e3-30ab-102d-86b0-7a5022ba4115"
+        },
+        {
+          "id": "dateResultsReceivedAtFacility",
+          "isDate": true,
+          "title": "Date VL Results Received at facility",
+          "concept": "163150AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
         },
         {
           "id": "actions",