From ed5f6e250841534897a5df6008edf729e6d009ba Mon Sep 17 00:00:00 2001
From: Rute Martins <rute@mitre.org>
Date: Mon, 25 Jan 2021 12:08:25 -0600
Subject: [PATCH] Fix medication tagged as condition and remove redundant logic

---
 .../medications/hypertension_medication.json  | 58 ++++---------------
 1 file changed, 11 insertions(+), 47 deletions(-)

diff --git a/src/main/resources/modules/medications/hypertension_medication.json b/src/main/resources/modules/medications/hypertension_medication.json
index 775e1b96ee..2f020733b4 100644
--- a/src/main/resources/modules/medications/hypertension_medication.json
+++ b/src/main/resources/modules/medications/hypertension_medication.json
@@ -221,34 +221,19 @@
       "complex_transition": [
         {
           "condition": {
-            "condition_type": "And",
+            "condition_type": "Or",
             "conditions": [
               {
-                "condition_type": "Or",
-                "conditions": [
-                  {
-                    "condition_type": "Attribute",
-                    "attribute": "microalbuminuria",
-                    "operator": "==",
-                    "value": true
-                  },
-                  {
-                    "condition_type": "Attribute",
-                    "attribute": "proteinuria",
-                    "operator": "==",
-                    "value": true
-                  }
-                ]
+                "condition_type": "Attribute",
+                "attribute": "microalbuminuria",
+                "operator": "==",
+                "value": true
               },
               {
-                "condition_type": "Active Medication",
-                "codes": [
-                  {
-                    "system": "RxNorm",
-                    "code": 310798,
-                    "display": "Hydrochlorothiazide 25 MG Oral Tablet"
-                  }
-                ]
+                "condition_type": "Attribute",
+                "attribute": "proteinuria",
+                "operator": "==",
+                "value": true
               }
             ]
           },
@@ -277,27 +262,6 @@
             }
           ]
         },
-        {
-          "condition": {
-            "condition_type": "Or",
-            "conditions": [
-              {
-                "condition_type": "Attribute",
-                "attribute": "microalbuminuria",
-                "operator": "==",
-                "value": true
-              },
-              {
-                "condition_type": "Attribute",
-                "attribute": "proteinuria",
-                "operator": "==",
-                "value": true
-              }
-            ]
-          },
-          "distributions": [],
-          "transition": "Lisinopril_2"
-        },
         {
           "distributions": [
             {
@@ -961,10 +925,10 @@
         },
         {
           "condition": {
-            "condition_type": "Active Condition",
+            "condition_type": "Active Medication",
             "codes": [
               {
-                "system": "SNOMED-CT",
+                "system": "RxNorm",
                 "code": 308136,
                 "display": "amLODIPine 2.5 MG Oral Tablet"
               }