@openmrs/ngx-formentry 5.0.1-pre.339 → 5.0.1-pre.345

package/fesm2020/openmrs-ngx-formentry.mjs

@@ -13743,6 +13743,7 @@ class DiagnosisValueAdapter {
     _createDiagnosesPayload(diagnosisNodes, existingDiagnoses) {
         const payload = [];
         let deletedDiagnoses = [];
+        // Add new diagnosis to payload
         diagnosisNodes?.forEach((node) => {
             if (node instanceof ArrayNode) {
                 node.control.value
@@ -13750,8 +13751,12 @@ class DiagnosisValueAdapter {
                     .forEach((value) => {
                     // Create Payload
                     const payloadDiagnosis = this._createPayloadDiagnosis(value[node.question.key], node.question.extras);
-                    // Validate if is new value
-                    payload.push(payloadDiagnosis);
+                    const isNewDiagnosis = existingDiagnoses.every((d) => d.diagnosis.coded.uuid !== value[node.question.key] ||
+                        d.certainty !== 'CONFIRMED' ||
+                        d.rank !== node.question.extras.questionOptions.rank);
+                    if (isNewDiagnosis) {
+                        payload.push(payloadDiagnosis);
+                    }
                 });
             }
             if (node instanceof ArrayNode) {
@@ -13805,19 +13810,26 @@ class DiagnosisValueAdapter {
         };
         return diagnosis;
     }
-    _getDeletedDiagnoses(payloadDiagnoses, existingDiagnoses) {
+    _getDeletedDiagnoses(diagnosisNodes, existingDiagnoses) {
         return existingDiagnoses
-            ?.filter((e) => {
-            return !payloadDiagnoses.find((p) => {
-                let isSame = !e.voided && p.diagnosis.coded === e.diagnosis.coded.uuid;
-                return isSame;
+            .filter((existingDiagnosis) => {
+            return !diagnosisNodes?.some((node) => {
+                if (node instanceof ArrayNode) {
+                    return node.control.value.some((value) => {
+                        return (value[node.question.key] ===
+                            existingDiagnosis.diagnosis.coded.uuid &&
+                            existingDiagnosis.rank ===
+                                node.question.extras.questionOptions.rank &&
+                            existingDiagnosis.certainty === 'CONFIRMED');
+                    });
+                }
+                return false;
             });
         })
-            .map((d) => {
-            let diagnosisPayload = this._convert(d);
-            diagnosisPayload.voided = true;
-            return diagnosisPayload;
-        });
+            .map((existingDiagnosis) => ({
+            uuid: existingDiagnosis.uuid,
+            voided: true
+        }));
     }
     _updatedOldDiagnoses(payloadDiagnoses, existingDiagnoses) {
         payloadDiagnoses.forEach((p) => {
@@ -13933,7 +13945,7 @@ class DiagnosisValueAdapter {
     hasDiagnosisNodeChanged(nodeAsGroup) {
         const childrenNodes = Object.values(nodeAsGroup.children);
         for (let childNode of childrenNodes) {
-            if (childNode.control.value !== childNode.initialValue) {
+            if (childNode.control.value !== nodeAsGroup.initialValue?.primaryDiagnosisId) {
                 return true;
             }
         }