From cddb6a98c80839426fdda35742ad3e508158a414 Mon Sep 17 00:00:00 2001
From: Steve Nyemba <steve@the-phi.com>
Date: Tue, 16 Feb 2021 12:43:27 -0600
Subject: [PATCH] merger issues fix schema ...

---
 healthcareio/x12/__init__.py | 30 ++++++++++++++++++++++++------
 setup.py                     |  2 +-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/healthcareio/x12/__init__.py b/healthcareio/x12/__init__.py
index e9f56c3..1ffd91b 100644
--- a/healthcareio/x12/__init__.py
+++ b/healthcareio/x12/__init__.py
@@ -414,8 +414,10 @@ class Parser (Process):
 
     def get_default_value(self,content,_code):
         
+        
         util = Formatters()
         TOP_ROW = content[1].split('*')        
+        
         SUBMITTED_DATE  = util.parse.date(TOP_ROW[4])
 
         CATEGORY= content[2].split('*')[1].strip()
@@ -451,18 +453,29 @@ class Parser (Process):
             file = file.read().split('CLP')
             _code = '835'
             section = 'CLP'
+            
             if len(file) == 1 :
+                
                 file = file[0].split('CLM')
                 _code = '837'
                 section = 'HL'
+            
             INITIAL_ROWS = file[0].split(section)[0].split('\n')
+            
             if len(INITIAL_ROWS) == 1 :
-                INITIIAL_ROWS = INITIAL_ROWS[0].split('~')
+                
+                INITIAL_ROWS = INITIAL_ROWS[0].split('~')
+                
+                # for item in file[1:] :
+                #     item = item.replace('~','\n')
+            # print (INITIAL_ROWS)
+            
             DEFAULT_VALUE =  self.get.default_value(INITIAL_ROWS,_code)            
             DEFAULT_VALUE['name'] = filename.strip()
-            print (json.dumps(DEFAULT_VALUE))
+            
             file = section.join(file).split('\n')
             if len(file) ==  1:
+                
                 file = file[0].split('~')
             #
             # In the initial rows, there's redundant information (so much for x12 standard)
@@ -504,10 +517,13 @@ class Parser (Process):
                             schema  = {"properties":dict.fromkeys(schema,{"mergeStrategy":"append"})}
                             
                         else:
-                            schema = {}
-                        merger = jsonmerge.Merger(schema)                        
+                            schema = None
+                        merger = jsonmerge.Merger(schema)         
+                        if not schema :
+                            merger = jsonmerge
+
                         _claim = merger.merge(DEFAULT_VALUE.copy(),_claim)
-                        
+                        print (['billing_pr_name' in _claim, 'billing_pr_name' in DEFAULT_VALUE])
                         claims.append( _claim)
                     segment = [row]
                     
@@ -529,7 +545,9 @@ class Parser (Process):
                         schema  = {"properties":dict.fromkeys(schema,{"mergeStrategy":"append"})}
                         
                     else:
-                        schema = {}
+                        schema = None
+                    if not schema :
+                        merger = jsonmerge
                     merger = jsonmerge.Merger(schema)
                     # top_row_claim = self.apply(_toprows,_code)
                     
diff --git a/setup.py b/setup.py
index 32109d2..ead76a4 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ import sys
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read() 
 args = {
-    "name":"healthcareio","version":"1.6.2.16",
+    "name":"healthcareio","version":"1.6.2.18",
     "author":"Vanderbilt University Medical Center",
     "author_email":"steve.l.nyemba@vumc.org",
     "include_package_data":True,