(feat) O3-3316 Add support for encounter diagnosis #298

CynthiaKamau · 2024-05-28T11:48:58Z

Requirements

This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a conventional commit label. See existing PR titles for inspiration.
My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
My work includes tests or is validated by existing tests.

Summary

This feature attempts to introduce encounter diagnosis in RFE
Current RFE Schema :

{
      "label": "Reason for hospitalization:",
      "id": "hospReason",
      "questionOptions": {
	      "concept": "a8a07a48-1350-11df-a1f1-0026b9348838",
	      "rendering": "problem",
	      "rank": 1
      },
      "type": "diagnosis",
      "validators": []
 }

Proposed schema as in AFE :

{ 
  "label": "Test Diagnosis",
  "id": "DiagNosIS",
  "type": "diagnosis",
  "questionOptions": { 
    "rendering": "repeating",
    "dataSource": "diagnoses",
    "rank": 1 
  }
}

Screenshots

Screen.Recording.2024-10-02.at.15.21.51.mov

Related Issue

Other

github-actions · 2024-05-28T11:52:02Z

Size Change: -252 kB (-18.04%) 👏

Total Size: 1.15 MB

Filename	Size	Change
`dist/572.js`	0 B	-252 kB (removed)	🏆

ℹ️ View Unchanged

Filename	Size	Change
`dist/151.js`	300 kB	0 B
`dist/225.js`	2.57 kB	0 B
`dist/277.js`	1.84 kB	0 B
`dist/300.js`	642 B	0 B
`dist/335.js`	968 B	0 B
`dist/353.js`	3.02 kB	0 B
`dist/41.js`	3.37 kB	0 B
`dist/422.js`	6.8 kB	0 B
`dist/501.js`	108 kB	0 B
`dist/540.js`	2.63 kB	0 B
`dist/55.js`	758 B	0 B
`dist/617.js`	86.9 kB	0 B
`dist/635.js`	14.3 kB	0 B
`dist/70.js`	483 B	0 B
`dist/901.js`	11.8 kB	0 B
`dist/936.js`	253 kB	0 B
`dist/99.js`	691 B	0 B
`dist/993.js`	3.09 kB	0 B
`dist/main.js`	342 kB	+49 B (+0.01%)
`dist/openmrs-esm-form-engine-lib.js`	3.67 kB	+2 B (+0.05%)

_{compressed-size-action}

samuelmale · 2024-05-29T09:13:41Z

src/components/encounter/encounter-form.component.tsx

+        const saveDiagnoses = await EncounterFormManager.saveDiagnosis(fields, savedEncounter);
+        if (saveDiagnoses) {
+          showSnackbar({
+            title: t('encounterDiagnosisSaved', 'Encounter diagnosis saved successfully'),
+            kind: 'success',
+            isLowContrast: true,
+          });
+        }


So the EncounterResource supports diagnoses as a create-able property shouldn't we be creating the diagnoses in a single transaction with the encounter?

Let me add it the same way we handle orders

brandones · 2024-06-19T15:05:18Z

@CynthiaKamau Ping, are you still working on this? Any blockers?

CynthiaKamau · 2024-06-19T15:43:23Z

@CynthiaKamau Ping, are you still working on this? Any blockers?

Yes, there some fixes that need to be done on the backend to complete the work

brandones · 2024-06-19T15:59:04Z

@CynthiaKamau Please provide links to the work or issues you're talking about. If there is no linkable issue/PR/talk/Slack, please tell us what work needs to be completed before this can move forward.

CynthiaKamau · 2024-06-19T16:31:01Z

@CynthiaKamau Please provide links to the work or issues you're talking about. If there is no linkable issue/PR/talk/Slack, please tell us what work needs to be completed before this can move forward.

This is the link to the backend pr

brandones · 2024-09-15T11:54:36Z

Ok @CynthiaKamau , looks like that backend PR is merged. Can we move forward with this?

CynthiaKamau · 2024-09-17T09:59:54Z

Ok @CynthiaKamau , looks like that backend PR is merged. Can we move forward with this?

Im working on it now

samuelmale

Nice work @CynthiaKamau! Are you planning on adding some test coverage?

samuelmale · 2024-09-25T12:06:08Z

src/processors/encounter/encounter-processor-helper.ts

@@ -300,6 +304,27 @@ export async function hydrateRepeatField(
        }),
    );
  }
+
+  //handle diagnoses
+  const unMappedDiagnosis = encounter.diagnoses.filter((diagnosis) => {


Suggested change

const unMappedDiagnosis = encounter.diagnoses.filter((diagnosis) => {

const unMappedDiagnoses = encounter.diagnoses.filter((diagnosis) => {

samuelmale · 2024-09-25T12:07:36Z

src/processors/encounter/encounter-processor-helper.ts

@@ -28,6 +29,7 @@ export function prepareEncounter(
  const obsForSubmission = [];
  prepareObs(obsForSubmission, formFields);
  const ordersForSubmission = prepareOrders(formFields);
+  const diagnosisForSubmission = prepareDiagnosis(formFields);


Suggested change

const diagnosisForSubmission = prepareDiagnosis(formFields);

const diagnosesForSubmission = prepareDiagnosis(formFields);

samuelmale · 2024-09-25T12:08:01Z

src/adapters/encounter-diagnosis-adapter.ts

+    context: FormProcessorContextProps,
+  ): Promise<any> {
+    const availableDiagnoses = sourceObject ?? (context.domainObjectValue as OpenmrsEncounter);
+    const matchedDiagnosis = availableDiagnoses.diagnoses?.find(


Suggested change

const matchedDiagnosis = availableDiagnoses.diagnoses?.find(

const matchedDiagnoses = availableDiagnoses.diagnoses?.find(

samuelmale · 2024-09-25T13:18:05Z

src/processors/encounter/encounter-form-processor.ts

@@ -166,6 +166,7 @@ export class EncounterFormProcessor extends FormProcessor {
    try {
      const { data: savedEncounter } = await saveEncounter(abortController, encounter, encounter.uuid);
      const saveOrders = savedEncounter.orders.map((order) => order.orderNumber);
+      const saveDiagnosis = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);


Suggested change

const saveDiagnosis = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);

const savedDiagnoses = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);

samuelmale · 2024-09-25T13:36:47Z

src/transformers/default-schema-transformer.ts

@@ -237,3 +240,19 @@ function handleQuestionsWithObsComments(sectionQuestions: Array<FormField>): Arr

  return augmentedQuestions;
 }
+
+function handleDiagnosesDataSource(question: FormField) {


I would simply name this: handleDiagnosis(...)

samuelmale · 2024-09-30T20:48:35Z

src/adapters/encounter-diagnoses-adapter.ts

+    sourceObject: OpenmrsResource,
+    context: FormProcessorContextProps,
+  ): Promise<any> {
+    const availableDiagnoses = sourceObject ?? (context.domainObjectValue as OpenmrsEncounter);


Suggested change

const availableDiagnoses = sourceObject ?? (context.domainObjectValue as OpenmrsEncounter);

const encounter = sourceObject ?? (context.domainObjectValue as OpenmrsEncounter);

samuelmale · 2024-09-30T20:55:11Z

src/adapters/encounter-diagnoses-adapter.ts

+    context: FormProcessorContextProps,
+  ): Promise<any> {
+    const availableDiagnoses = sourceObject ?? (context.domainObjectValue as OpenmrsEncounter);
+    const matchedDiagnoses = availableDiagnoses.diagnoses.find(


Suggested change

const matchedDiagnoses = availableDiagnoses.diagnoses.find(

const matchedDiagnosis = availableDiagnoses.diagnoses.find(

samuelmale · 2024-09-30T21:08:59Z

src/adapters/encounter-diagnoses.test.ts

+  },
+];
+
+describe('EncounterDiagnosesAdapter', () => {


Can you add test case(s) around:

editing a value and the fact that the edited value gets voided

samuelmale · 2024-09-30T21:10:29Z

src/processors/encounter/encounter-form-processor.ts

@@ -166,6 +166,7 @@ export class EncounterFormProcessor extends FormProcessor {
    try {
      const { data: savedEncounter } = await saveEncounter(abortController, encounter, encounter.uuid);
      const saveOrders = savedEncounter.orders.map((order) => order.orderNumber);
+      const saveDiagnoses = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);


Suggested change

const saveDiagnoses = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);

const savedDiagnoses = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);

(I would also rename saveOrders -> savedOrders)

samuelmale · 2024-09-30T21:17:50Z

src/processors/encounter/encounter-form-processor.ts

+      // handle diagnoses
+      if (saveDiagnoses.length) {
+        showSnackbar({
+          title: translateFn('diagnosisSaved', 'Diagnosis(s) saved successfully'),


Suggested change

title: translateFn('diagnosisSaved', 'Diagnosis(s) saved successfully'),

title: translateFn('diagnosisSaved', 'Diagnosis(es) saved successfully'),

samuelmale · 2024-09-30T21:24:14Z

src/processors/encounter/encounter-processor-helper.ts

@@ -300,6 +304,40 @@ export async function hydrateRepeatField(
        }),
    );
  }
+
+  const unMappedDiagnoses = encounter.diagnoses.filter((diagnosis) => {
+    return !assignedDiagnosesIds.includes(diagnosis?.diagnosis?.coded.uuid);


I think the Diagnosis should include the field's ID in it's formFieldPath otherwise we may end up including past diagnoses.

samuelmale · 2024-09-30T21:28:43Z

src/processors/encounter/encounter-processor-helper.ts

+      sortedDiagnoses
+        .filter((diagnosis) => !diagnosis.voided)
+        .map(async (diagnosis) => {
+          const clone = cloneRepeatField(field, diagnosis, counter++);


Can you add a demo where we capture diagnoses with "repeat controls"?

CynthiaKamau marked this pull request as draft May 28, 2024 11:49

CynthiaKamau force-pushed the O3-3316 branch from b959145 to 2d22e64 Compare May 28, 2024 11:51

samuelmale reviewed May 29, 2024

View reviewed changes

CynthiaKamau force-pushed the O3-3316 branch from c9635c2 to 7274df9 Compare June 4, 2024 10:28

CynthiaKamau force-pushed the O3-3316 branch 2 times, most recently from a40ba8d to 2415c6d Compare September 16, 2024 19:12

CynthiaKamau force-pushed the O3-3316 branch 2 times, most recently from e5de3c9 to 63ad98e Compare September 25, 2024 10:58

CynthiaKamau marked this pull request as ready for review September 25, 2024 10:58

samuelmale reviewed Sep 25, 2024

View reviewed changes

(test) O3-3925 Add test coverage for the ProgramStateAdapter

2f9b75f

CynthiaKamau force-pushed the O3-3316 branch from 63ad98e to bc33d5d Compare September 26, 2024 07:48

code review

089214e

CynthiaKamau force-pushed the O3-3316 branch from bc33d5d to 089214e Compare September 30, 2024 10:54

CynthiaKamau requested a review from samuelmale September 30, 2024 10:55

samuelmale reviewed Sep 30, 2024

View reviewed changes

code review

d601ac0

CynthiaKamau requested a review from samuelmale October 2, 2024 12:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(feat) O3-3316 Add support for encounter diagnosis #298

(feat) O3-3316 Add support for encounter diagnosis #298

CynthiaKamau commented May 28, 2024 •

edited

Loading

github-actions bot commented May 28, 2024 •

edited

Loading

samuelmale May 29, 2024

CynthiaKamau May 29, 2024

brandones commented Jun 19, 2024

CynthiaKamau commented Jun 19, 2024

brandones commented Jun 19, 2024

CynthiaKamau commented Jun 19, 2024 •

edited

Loading

brandones commented Sep 15, 2024

CynthiaKamau commented Sep 17, 2024

samuelmale left a comment

samuelmale Sep 25, 2024

samuelmale Sep 25, 2024

samuelmale Sep 25, 2024

samuelmale Sep 25, 2024

samuelmale Sep 25, 2024

samuelmale Sep 30, 2024

samuelmale Sep 30, 2024

samuelmale Sep 30, 2024

samuelmale Sep 30, 2024

samuelmale Sep 30, 2024

samuelmale Sep 30, 2024

samuelmale Sep 30, 2024

CynthiaKamau Oct 2, 2024

	const unMappedDiagnosis = encounter.diagnoses.filter((diagnosis) => {
	const unMappedDiagnoses = encounter.diagnoses.filter((diagnosis) => {

	const diagnosisForSubmission = prepareDiagnosis(formFields);
	const diagnosesForSubmission = prepareDiagnosis(formFields);

	const matchedDiagnosis = availableDiagnoses.diagnoses?.find(
	const matchedDiagnoses = availableDiagnoses.diagnoses?.find(

	const saveDiagnosis = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);
	const savedDiagnoses = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);

	const availableDiagnoses = sourceObject ?? (context.domainObjectValue as OpenmrsEncounter);
	const encounter = sourceObject ?? (context.domainObjectValue as OpenmrsEncounter);

	const saveDiagnoses = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);
	const savedDiagnoses = savedEncounter.diagnoses.map((diagnosis) => diagnosis.display);

	title: translateFn('diagnosisSaved', 'Diagnosis(s) saved successfully'),
	title: translateFn('diagnosisSaved', 'Diagnosis(es) saved successfully'),

(feat) O3-3316 Add support for encounter diagnosis #298

Are you sure you want to change the base?

(feat) O3-3316 Add support for encounter diagnosis #298

Conversation

CynthiaKamau commented May 28, 2024 • edited Loading

Requirements

Summary

Screenshots

Related Issue

Other

github-actions bot commented May 28, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brandones commented Jun 19, 2024

CynthiaKamau commented Jun 19, 2024

brandones commented Jun 19, 2024

CynthiaKamau commented Jun 19, 2024 • edited Loading

brandones commented Sep 15, 2024

CynthiaKamau commented Sep 17, 2024

samuelmale left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CynthiaKamau commented May 28, 2024 •

edited

Loading

github-actions bot commented May 28, 2024 •

edited

Loading

CynthiaKamau commented Jun 19, 2024 •

edited

Loading