Merge pull request #1314 from synthetichealth/esrd

Resolve weirdness of ESRD diagnosis and transplant interaction

Author: eedrummer

src/main/resources/modules/kidney_transplant.json

@@ -139,12 +139,7 @@
           "display": "Chronic kidney disease stage 3 (disorder)"
         }
       ],
-      "direct_transition": "End_CKD_4_or_5"
-    },
-    "End_CKD_4_or_5": {
-      "type": "ConditionEnd",
-      "direct_transition": "Begin Post Surgical Stay",
-      "referenced_by_attribute": "dialysis_reason"
+      "direct_transition": "End_CKD_4"
     },
     "Medication Review": {
       "type": "Procedure",
@@ -2129,6 +2124,33 @@
           "display": "Renal dysplasia (disorder)"
         }
       ]
+    },
+    "End_CKD_4": {
+      "type": "ConditionEnd",
+      "codes": [
+        {
+          "system": "SNOMED-CT",
+          "code": 431857002,
+          "display": "Chronic kidney disease stage 4 (disorder)"
+        }
+      ],
+      "direct_transition": "End_End_Stage_Renal_Disease"
+    },
+    "End_End_Stage_Renal_Disease": {
+      "type": "ConditionEnd",
+      "codes": [
+        {
+          "system": "SNOMED-CT",
+          "code": "46177005",
+          "display": "End-stage renal disease (disorder)"
+        }
+      ],
+      "direct_transition": "End any other dialysis reason"
+    },
+    "End any other dialysis reason": {
+      "type": "ConditionEnd",
+      "direct_transition": "Begin Post Surgical Stay",
+      "referenced_by_attribute": "dialysis_reason"
     }
   },
   "gmf_version": 2

src/main/resources/modules/metabolic_syndrome/kidney_conditions.json

@@ -2113,29 +2113,6 @@
           },
           "transition": "Diagnose_End_Stage_Renal_Disease"
         },
-        {
-          "condition": {
-            "condition_type": "And",
-            "conditions": [
-              {
-                "condition_type": "Attribute",
-                "attribute": "kidney_transplant",
-                "operator": "is not nil"
-              },
-              {
-                "condition_type": "Active Condition",
-                "codes": [
-                  {
-                    "system": "SNOMED-CT",
-                    "code": "46177005",
-                    "display": "End-stage renal disease (disorder)"
-                  }
-                ]
-              }
-            ]
-          },
-          "transition": "End_End_Stage_Renal_Disease"
-        },
         {
           "transition": "Terminal"
         }
@@ -2153,17 +2130,6 @@
       "direct_transition": "Record_MetabolicPanel_5",
       "assign_to_attribute": "dialysis_reason"
     },
-    "End_End_Stage_Renal_Disease": {
-      "type": "ConditionEnd",
-      "codes": [
-        {
-          "system": "SNOMED-CT",
-          "code": "46177005",
-          "display": "End-stage renal disease (disorder)"
-        }
-      ],
-      "direct_transition": "Terminal"
-    },
     "Terminal": {
       "type": "Terminal"
     }