Sorry if this is a double post. Getting error with some files posting using RBTools. Java files seem to work fine. I use something called Mirth Connect which generates XML files as code. Basically when RBT tries to upload the diff it fails with the 105 error. Attached is the diff.
-- Supercharge your Review Board with Power Pack: https://www.reviewboard.org/powerpack/ Want us to host Review Board for you? Check out RBCommons: https://rbcommons.com/ Happy user? Let us know! https://www.reviewboard.org/users/ --- You received this message because you are subscribed to the Google Groups "reviewboard" group. To unsubscribe from this group and stop receiving emails from it, send an email to reviewboard+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
>>> RBTools 0.7.4 >>> Python 2.7.5 (default, Mar 9 2014, 22:15:05) [GCC 4.2.1 Compatible Apple LLVM 5.0 (clang-500.0.68)] >>> Running on Darwin-13.4.0-x86_64-i386-64bit >>> Home = /Users/rdejournett >>> Current directory = /Users/rdejournett/mfss-rcm-mirth >>> Running: git version >>> Checking for a Git repository... >>> Running: git rev-parse --git-dir >>> Running: git config core.bare >>> Running: git rev-parse --show-toplevel >>> Running: git symbolic-ref -q HEAD >>> Running: git config --get branch.RCMSTATE-763.merge >>> Running: git config --get branch.RCMSTATE-763.remote >>> Running: git config --get remote.origin.url >>> repository info: Path: g...@bitbucket.org:mfgit/mfss-rcm-mirth.git, Base path: , Supports changesets: False >>> Making HTTP GET request to https://rb.dev.medfusion.net/api/ >>> Running: git rev-parse b269f02 >>> Running: git rev-parse b269f02b7feddcba1b53c9e9f6093e7b50374208^ >>> Running: git merge-base 84d258f5e9aa911bf55a048ab6b968bca91098cb origin/development >>> Running: git rev-parse --git-dir >>> Running: git -c core.quotepath=false -c diff.noprefix=false diff --no-color --full-index --ignore-submodules -M --no-ext-diff 84d258f5e9aa911bf55a048ab6b968bca91098cb..b269f02b7feddcba1b53c9e9f6093e7b50374208 >>> Making HTTP GET request to https://rb.dev.medfusion.net/api/review-requests/5098/?only-links=diffs%2Cdraft&only-fields=absolute_url%2Cbugs_closed%2Cid%2Cstatus >>> Making HTTP GET request to https://rb.dev.medfusion.net/api/review-requests/5098/diffs/?only-fields= >>> Making HTTP POST request to https://rb.dev.medfusion.net/api/review-requests/5098/diffs/ >>> Got API Error 105 (HTTP code 400): One or more fields had errors >>> Error data: {u'fields': {u'path': [u'Not Found']}, u'stat': u'fail', u'err': {u'msg': u'One or more fields had errors', u'code': 105}} Traceback (most recent call last): File "/usr/local/bin/rbt", line 8, in <module> load_entry_point('RBTools==0.7.4', 'console_scripts', 'rbt')() File "/Library/Python/2.7/site-packages/RBTools-0.7.4-py2.7.egg/rbtools/commands/main.py", line 133, in main command.run_from_argv([RB_MAIN, command_name] + args) File "/Library/Python/2.7/site-packages/RBTools-0.7.4-py2.7.egg/rbtools/commands/__init__.py", line 612, in run_from_argv exit_code = self.main(*args) or 0 File "/Library/Python/2.7/site-packages/RBTools-0.7.4-py2.7.egg/rbtools/commands/post.py", line 799, in main base_dir=base_dir) File "/Library/Python/2.7/site-packages/RBTools-0.7.4-py2.7.egg/rbtools/commands/post.py", line 481, in post_request raise CommandError(u'\n'.join(error_msg)) rbtools.commands.CommandError: Error uploading diff diff --git a/mfss-rcm-mirth-core/pom.xml b/mfss-rcm-mirth-core/pom.xml index a90ed7ac3b983670edb3c0068b071df6a57cd48f..88f626bb3bba3c95d1882dd75d5799579251e16b 100644 --- a/mfss-rcm-mirth-core/pom.xml +++ b/mfss-rcm-mirth-core/pom.xml @@ -53,7 +53,41 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.6</version> <configuration> - <outputDirectory>${parent.dir}</outputDirectory> + <outputDirectory>../deploy/custom-lib/Estatements</outputDirectory> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>3.0.0</version> +<!-- <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> --> + <configuration> + <filesets> + <fileset> + <directory>../deploy/custom-lib/Estatements</directory> + <includes> + <include>*.jar</include> + </includes> + <followSymlinks>true</followSymlinks> + </fileset> + <fileset> + <directory>deploy</directory> + <includes> + <include>*</include> + </includes> + <followSymlinks>true</followSymlinks> + </fileset> + + </filesets> </configuration> </plugin> </plugins> diff --git a/mfss-rcm-mirth-core/src/main/java/com/medfusion/estatement/ge/ProcessGE.java b/mfss-rcm-mirth-core/src/main/java/com/medfusion/estatement/ge/ProcessGE.java index 3c6091fa9105c3b6f879008f0314e969fd8ab2fd..f19b9292f857f2187b5f4776d16f8e2ac2e76a86 100644 --- a/mfss-rcm-mirth-core/src/main/java/com/medfusion/estatement/ge/ProcessGE.java +++ b/mfss-rcm-mirth-core/src/main/java/com/medfusion/estatement/ge/ProcessGE.java @@ -3,6 +3,7 @@ package com.medfusion.estatement.ge; import java.io.StringReader; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Calendar; import java.util.List; import java.util.UUID; @@ -40,7 +41,7 @@ public class ProcessGE { //TODO Pradeep to research } - public String ESTtoXML(String est, String filename, boolean useInsAging) { + public String ESTtoXML(String est, String filename, boolean useInsAging, float dateDiff) { // given the eStatement, return DOM qualified XML // probably should send as a XML document?? or convert the string back to XML (but performance cost) // once we have XML version of the GE data, loop through it by row then process it @@ -53,7 +54,7 @@ public class ProcessGE { // here process the file and get the needed objects Delimited delimited = GenerateGEObject(est); // get object from inbound xml - statement = GetStatementInfo(delimited, filename, statement); + statement = GetStatementInfo(delimited, filename, statement, dateDiff); statement = GetGuarantorInfo(delimited, statement); statement = GetAgings(delimited, statement); statement = GetEncounters(delimited, statement); @@ -77,7 +78,7 @@ public class ProcessGE { } - public Statement ESTtoObject(String est, String filename, boolean useInsAging) throws JAXBException { + public Statement ESTtoObject(String est, String filename, boolean useInsAging, float dateDiff) throws JAXBException { // given the eStatement, return statements object @@ -86,7 +87,7 @@ public class ProcessGE { // here process the file and get the needed objects Delimited delimited = GenerateGEObject(est); // get object from inbound xml - statement = GetStatementInfo(delimited, filename, statement); + statement = GetStatementInfo(delimited, filename, statement, dateDiff); statement = GetGuarantorInfo(delimited, statement); statement = GetAgings(delimited, statement); statement = GetEncounters(delimited, statement); @@ -102,7 +103,7 @@ public class ProcessGE { } - private Statement GetStatementInfo(Delimited delimited, String filename, Statement statement) { + private Statement GetStatementInfo(Delimited delimited, String filename, Statement statement, float dateDiff) { for (Row row : delimited.row) { @@ -112,7 +113,10 @@ public class ProcessGE { statement.setStatementBillingAccountNumber(row.getColumn40()); // now patient id - was guar id (1) statement.setPracticePatientId(row.getColumn40()); // mrn / patient id statement.setStatementDate( Helper.StringtoCalendar(row.getColumn39(), "MM/dd/yy hh:mm")); - statement.setPaymentDueDate(statement.getStatementDate()); // we would need to figure this out + int dateDiffint = Math.round(dateDiff); + Calendar c = statement.getStatementDate(); + c.add(Calendar.DATE, dateDiffint); + statement.setPaymentDueDate(c); statement.setStatementFormat(StatementFormatEnum.FORMAT_1); statement.setFileId(filename); } diff --git a/mfss-rcm-mirth-core/src/test/java/com/medfusion/estatementm/ge/ProcessGETest.java b/mfss-rcm-mirth-core/src/test/java/com/medfusion/estatementm/ge/ProcessGETest.java index 39f1e61f56b5b70edb13caee5075537affbdbc4c..a626589c18d2c29cec57ee3ef24081c52e033b98 100644 --- a/mfss-rcm-mirth-core/src/test/java/com/medfusion/estatementm/ge/ProcessGETest.java +++ b/mfss-rcm-mirth-core/src/test/java/com/medfusion/estatementm/ge/ProcessGETest.java @@ -14,7 +14,7 @@ public class ProcessGETest { try { String est = ReadJson.ReadFile("/app/mirth/UnitTests/GEinput.xml"); ProcessGE p = new ProcessGE(); - String xml = p.ESTtoXML(est, "filename", true); + String xml = p.ESTtoXML(est, "filename", true, 60); } catch (Exception e) { e.printStackTrace(); fail(); diff --git a/mirth/CG1-1 Traffic Cop.xml b/mirth/CG1-1 Traffic Cop.xml index a0604fd8e2776ae07f39eaaae3afd5a237b881b9..6a518d260e23e183f6e12daf0d4d99b0c05ff130 100644 --- a/mirth/CG1-1 Traffic Cop.xml +++ b/mirth/CG1-1 Traffic Cop.xml @@ -1,14 +1,14 @@ <channel version="3.2.1"> - <id>07e5d485-2c8f-438a-9ef0-740fee420dff</id> + <id>5b5be794-5cd6-4c97-be53-e08dcbe01175</id> <nextMetaDataId>9</nextMetaDataId> <name>CG1-1 Traffic Cop</name> - <description>Channel Group 1 Channel 1 version 2.11</description> + <description>Channel Group 1 Channel 1 version 2.2.0</description> <enabled>true</enabled> <lastModified> - <time>1449176492049</time> + <time>1449510528386</time> <timezone>America/New_York</timezone> </lastModified> - <revision>38</revision> + <revision>14</revision> <sourceConnector version="3.2.1"> <metaDataId>0</metaDataId> <name>sourceConnector</name> @@ -62,8 +62,8 @@ <errorResponseAction>AFTER_PROCESSING</errorResponseAction> <errorMoveToDirectory>/mirth/error</errorMoveToDirectory> <errorMoveToFileName></errorMoveToFileName> - <checkFileAge>true</checkFileAge> - <fileAge>10000</fileAge> + <checkFileAge>false</checkFileAge> + <fileAge>1000</fileAge> <fileSizeMinimum>0</fileSizeMinimum> <fileSizeMaximum></fileSizeMaximum> <ignoreFileSizeMaximum>true</ignoreFileSizeMaximum> @@ -84,37 +84,23 @@ 
 //get_client_config(practice_id); // this loads the .config file - passed is the clientID globalChannelMap.put('estatement', false); -globalChannelMap.put('precheck', false);
 -var dataType = GetDataTypeFromFilename(); -channelMap.put('dataType', dataType); -var StatementDTTM = GetStatementDTTMFromFilename(); -var mpractice_id = GetMPracticeIDFromFilename(); -var ipractice_id = GetIPracticeIDFromFilename(); // this will be in the filename_format MMDDYYYY_clientID.csv
 - -
 +globalChannelMap.put('precheck', false); +var greenway = false; +var channel = ""; +var StatementDTTM = ""; +var mpractice_id = ""; +var ipractice_id = ""; +var SFTP = false; -var channel = "";
 -var SFTP = false;
 -var map = new java.util.HashMap();
 -
 -map.put('StatementDTTM', StatementDTTM);
 -map.put('ipractice_id', ipractice_id); -map.put('mpractice_id', mpractice_id);
 -map.put('originalFilename', sourceMap.get('originalFilename'));
 -
 -
 -if (dataType.equals("est")) { // est will be of format ipracticeid_batchid_datetime.est - var batch_id = mpractice_id; - map.put('batch_id', batch_id);
 -}
 -
 -//router.routeMessage(channelMap.get("Channel"), msg);
 -// need to add clientid
 +var map = new java.util.HashMap(); 
 +var dataType = GetDataTypeFromFilename(); +channelMap.put('dataType', dataType); 
 -
 if (dataType.equals("est")) { + var batch_id = mpractice_id; + map.put('batch_id', batch_id); channelMap.put('estatement', true); globalChannelMap.put('estatement', true);
 logger.info ('filename is ' + sourceMap.get('originalFilename')); 
 @@ -134,11 +120,20 @@ else if (dataType.equals("apt")) { }
 }
 +
 +
 +map.put('StatementDTTM', StatementDTTM);
 +map.put('ipractice_id', ipractice_id); +map.put('mpractice_id', mpractice_id);
 +map.put('originalFilename', sourceMap.get('originalFilename'));
 + + channelMap.put('StatementDTTM', StatementDTTM);
 channelMap.put('ipractice_id', ipractice_id); channelMap.put('mpractice_id', mpractice_id);
 channelMap.put('channel', channel);
 channelMap.put('map', map); +channelMap.put('greenway', greenway); if (ipractice_id.length > 0)
 globalChannelMap.put('practice_id',ipractice_id) @@ -173,7 +168,11 @@ function FindPracticeTypeForEST() {
 if ( greenwaystr == 'start v2') {
 channel = "CG1-2 Greenway Java";
 //channelMap.put("EstatementChannel", "CG1-2 GE CPS input new model");
 - logger.info("Found Greenway Estatement file");
 + logger.info("Found Greenway Estatement file"); + var filename = $('originalFilename').toString(); + mpractice_id = filename.substring(0,filename.indexOf("-")); + ipractice_id = ""; + greenway = true;
 return true;
 } // Allscripts check @@ -232,13 +231,23 @@ function GetStatementDTTMFromFilename() {
 
 function GetDataTypeFromFilename() {
 
 +
 var dataType = "";
 
 var filename = $('originalFilename').toString();
 if (filename.indexOf(".") > 1) {
 dataType = filename.substring(filename.indexOf(".") + 1, filename.indexOf(".") + 4);
 }
 -
 + if (dataType != "apt" && dataType != "est") { + // see if it's a greenway file + if ( msg.substring(0,8) == 'start v2') { + dataType = "est"; + channel = "CG1-2 Greenway Java QA"; + greenway = true; + mpractice_id = filename.substring(0,filename.indexOf("-")); + }
 + } + return dataType;
 } @@ -265,37 +274,23 @@ function GetMPracticeIDFromFilename() { 
 //get_client_config(practice_id); // this loads the .config file - passed is the clientID globalChannelMap.put('estatement', false); -globalChannelMap.put('precheck', false);
 -var dataType = GetDataTypeFromFilename(); -channelMap.put('dataType', dataType); -var StatementDTTM = GetStatementDTTMFromFilename(); -var mpractice_id = GetMPracticeIDFromFilename(); -var ipractice_id = GetIPracticeIDFromFilename(); // this will be in the filename_format MMDDYYYY_clientID.csv
 +globalChannelMap.put('precheck', false); +var greenway = false; +var channel = ""; +var StatementDTTM = ""; +var mpractice_id = ""; +var ipractice_id = ""; +var SFTP = false; +var map = new java.util.HashMap(); 
 +var dataType = GetDataTypeFromFilename(); +channelMap.put('dataType', dataType); -var channel = "";
 -var SFTP = false;
 -var map = new java.util.HashMap();
 -
 -map.put('StatementDTTM', StatementDTTM);
 -map.put('ipractice_id', ipractice_id); -map.put('mpractice_id', mpractice_id);
 -map.put('originalFilename', sourceMap.get('originalFilename'));
 -
 -
 -if (dataType.equals("est")) { // est will be of format ipracticeid_batchid_datetime.est - var batch_id = mpractice_id; - map.put('batch_id', batch_id);
 -}
 -
 -//router.routeMessage(channelMap.get("Channel"), msg);
 -// need to add clientid
 -
 - -
 
 if (dataType.equals("est")) { + var batch_id = mpractice_id; + map.put('batch_id', batch_id); channelMap.put('estatement', true); globalChannelMap.put('estatement', true);
 logger.info ('filename is ' + sourceMap.get('originalFilename')); 
 @@ -315,11 +310,20 @@ else if (dataType.equals("apt")) { }
 }
 +
 +
 +map.put('StatementDTTM', StatementDTTM);
 +map.put('ipractice_id', ipractice_id); +map.put('mpractice_id', mpractice_id);
 +map.put('originalFilename', sourceMap.get('originalFilename'));
 + + channelMap.put('StatementDTTM', StatementDTTM);
 channelMap.put('ipractice_id', ipractice_id); channelMap.put('mpractice_id', mpractice_id);
 channelMap.put('channel', channel);
 channelMap.put('map', map); +channelMap.put('greenway', greenway); if (ipractice_id.length > 0)
 globalChannelMap.put('practice_id',ipractice_id) @@ -354,7 +358,11 @@ function FindPracticeTypeForEST() {
 if ( greenwaystr == 'start v2') {
 channel = "CG1-2 Greenway Java";
 //channelMap.put("EstatementChannel", "CG1-2 GE CPS input new model");
 - logger.info("Found Greenway Estatement file");
 + logger.info("Found Greenway Estatement file"); + var filename = $('originalFilename').toString(); + mpractice_id = filename.substring(0,filename.indexOf("-")); + ipractice_id = ""; + greenway = true;
 return true;
 } // Allscripts check @@ -413,13 +421,23 @@ function GetStatementDTTMFromFilename() {
 
 function GetDataTypeFromFilename() {
 
 +
 var dataType = "";
 
 var filename = $('originalFilename').toString();
 if (filename.indexOf(".") > 1) {
 dataType = filename.substring(filename.indexOf(".") + 1, filename.indexOf(".") + 4);
 }
 -
 + if (dataType != "apt" && dataType != "est") { + // see if it's a greenway file + if ( msg.substring(0,8) == 'start v2') { + dataType = "est"; + channel = "CG1-2 Greenway Java QA"; + greenway = true; + mpractice_id = filename.substring(0,filename.indexOf("-")); + }
 + } + return dataType;
 } @@ -639,6 +657,40 @@ channelMap.put('mpractice_id', mpractice_id);</string> return false;</script> <operator>NONE</operator> </rule> + <rule> + <sequenceNumber>1</sequenceNumber> + <name>Accept message if "$('greenway')" equals false</name> + <data> + <entry> + <string>Field</string> + <string>$('greenway')</string> + </entry> + <entry> + <string>Name</string> + <string></string> + </entry> + <entry> + <string>OriginalField</string> + <string></string> + </entry> + <entry> + <string>Equals</string> + <string>1</string> + </entry> + <entry> + <string>Values</string> + <list> + <string>false</string> + </list> + </entry> + </data> + <type>Rule Builder</type> + <script>if($('greenway') == false) { + return true; +} +return false;</script> + <operator>AND</operator> + </rule> </rules> </filter> <transportName>HTTP Sender</transportName> @@ -971,11 +1023,19 @@ var respobj = JSON.parse(resp); channelMap.put('mmid', respobj.id.toString() ); var useInsAging = respobj.statementOptions.DISPLAYINSAGEBRACKETS.toString(); - logger.info('useInsAging ' + useInsAging); - if (useInsAging == "false") channelMap.put('useInsAging', false); -else channelMap.put('useInsAging', true);</script> +else channelMap.put('useInsAging', true); + +var stmtdaysdiff = 0; + +try { + logger.info('date from object is ' + respobj.statementOptions.STMTDUEDATELEADDAYS); + stmtdaysdiff = parseInt(respobj.statementOptions.STMTDUEDATELEADDAYS); +} catch (e) { logger.error('Exception in getting Statement DueDate Lead Days' + e) } + +logger.info ('stmtdaysdiff is ' + stmtdaysdiff); +channelMap.put('stmtdaysdiff', stmtdaysdiff);</script> <type>JavaScript</type> <data> <entry> @@ -987,11 +1047,19 @@ var respobj = JSON.parse(resp); channelMap.put('mmid', respobj.id.toString() ); var useInsAging = respobj.statementOptions.DISPLAYINSAGEBRACKETS.toString(); - logger.info('useInsAging ' + useInsAging); - if (useInsAging == "false") channelMap.put('useInsAging', false); -else channelMap.put('useInsAging', true);</string> +else channelMap.put('useInsAging', true); + +var stmtdaysdiff = 0; + +try { + logger.info('date from object is ' + respobj.statementOptions.STMTDUEDATELEADDAYS); + stmtdaysdiff = parseInt(respobj.statementOptions.STMTDUEDATELEADDAYS); +} catch (e) { logger.error('Exception in getting Statement DueDate Lead Days' + e) } + +logger.info ('stmtdaysdiff is ' + stmtdaysdiff); +channelMap.put('stmtdaysdiff', stmtdaysdiff);</string> </entry> </data> </step> @@ -1084,6 +1152,7 @@ if ($('estatement')) { map.put('SendElectronic', $('SendElectronic')); map.put('mmid', $('mmid')); map.put('useInsAging', $('useInsAging')); + map.put('stmtdaysdiff', $('stmtdaysdiff')); router.routeMessage($('channel'), new RawMessage(connectorMessage.getRawData(), null, map)) ; @@ -1377,6 +1446,8 @@ return message; // copies file and changes name importPackage(org.apache.commons.io); +logger.info('estatement is ' + globalChannelMap.get('estatement')); +logger.info('precheck is ' + globalChannelMap.get('precheck')); if (globalChannelMap.get('estatement') == false) return; diff --git a/mirth/CG1-2 GE CPS Java.xml b/mirth/CG1-2 GE CPS Java.xml index 749900f645c005dc2b06dfe8b52461bf7502c1e5..10797cccaa4b3041f834e2677de9a5a5e1f71ff8 100644 --- a/mirth/CG1-2 GE CPS Java.xml +++ b/mirth/CG1-2 GE CPS Java.xml @@ -1,14 +1,14 @@ <channel version="3.2.1"> - <id>9c07f5df-f4ef-4b0c-a81b-3b74917a068f</id> + <id>b0320f00-4e21-4744-bce6-0ba575c19806</id> <nextMetaDataId>25</nextMetaDataId> <name>CG1-2 GE CPS Java</name> - <description>Channel Group 1 Channel 2 version 2.11</description> + <description>Channel Group 1 Channel 2 version 2.2.0</description> <enabled>true</enabled> <lastModified> - <time>1449159653047</time> + <time>1449511144070</time> <timezone>America/New_York</timezone> </lastModified> - <revision>32</revision> + <revision>7</revision> <sourceConnector version="3.2.1"> <metaDataId>0</metaDataId> <name>sourceConnector</name> @@ -54,13 +54,13 @@ if (sourceMap.get('useInsAging') == false) useInsAging = false; else useInsAging = true; - + var b = new Packages.java.lang.Boolean(sourceMap.get('useInsAging')); + +var stmtdaysdiff = sourceMap.get('useInsAging'); + var process = new Packages.com.medfusion.estatement.ge.ProcessGE(); -logger.info('process.ESTtoObject is ' + process.ESTtoObject); -//var statement = process.ESTtoObject(msg, filename); -logger.info ('useInsAgingis ' + sourceMap.get('useInsAging')); -var statement = process.ESTtoObject(msg, filename, useInsAging); +var statement = process.ESTtoObject(msg, filename, useInsAging, stmtdaysdiff); channelMap.put('statementobj', statement); channelMap.put('statementid', statement.getId()); // the UUID @@ -81,7 +81,6 @@ else { channelMap.put('Prod', true); if (CheckStatementAudit (statement.getPracticeManagementStatementId())) gooddata = false; - logger.info("statement rejected - " + statement.getPracticeManagementStatementId() + "already submitted"); } else { @@ -125,13 +124,13 @@ if (sourceMap.get('useInsAging') == false) useInsAging = false; else useInsAging = true; - + var b = new Packages.java.lang.Boolean(sourceMap.get('useInsAging')); + +var stmtdaysdiff = sourceMap.get('useInsAging'); + var process = new Packages.com.medfusion.estatement.ge.ProcessGE(); -logger.info('process.ESTtoObject is ' + process.ESTtoObject); -//var statement = process.ESTtoObject(msg, filename); -logger.info ('useInsAgingis ' + sourceMap.get('useInsAging')); -var statement = process.ESTtoObject(msg, filename, useInsAging); +var statement = process.ESTtoObject(msg, filename, useInsAging, stmtdaysdiff); channelMap.put('statementobj', statement); channelMap.put('statementid', statement.getId()); // the UUID @@ -152,7 +151,6 @@ else { channelMap.put('Prod', true); if (CheckStatementAudit (statement.getPracticeManagementStatementId())) gooddata = false; - logger.info("statement rejected - " + statement.getPracticeManagementStatementId() + "already submitted"); } else { @@ -442,8 +440,8 @@ return false;</script> </com.mirth.connect.plugins.ssl.model.SSLConnectorPluginProperties> </pluginProperties> <destinationConnectorProperties version="3.2.1"> - <queueEnabled>true</queueEnabled> - <sendFirst>true</sendFirst> + <queueEnabled>false</queueEnabled> + <sendFirst>false</sendFirst> <retryIntervalMillis>10000</retryIntervalMillis> <regenerateTemplate>false</regenerateTemplate> <retryCount>0</retryCount> @@ -777,8 +775,8 @@ return false;</script> </com.mirth.connect.plugins.ssl.model.SSLConnectorPluginProperties> </pluginProperties> <destinationConnectorProperties version="3.2.1"> - <queueEnabled>true</queueEnabled> - <sendFirst>true</sendFirst> + <queueEnabled>false</queueEnabled> + <sendFirst>false</sendFirst> <retryIntervalMillis>10000</retryIntervalMillis> <regenerateTemplate>false</regenerateTemplate> <retryCount>0</retryCount> diff --git a/pom.xml b/pom.xml index 58c36c30a15c1d655d0484c8a8643a4b091c7330..c09cb3de58feb9ca5e6b109ec19f1158562428b6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <version>${version.mfss-rcm-mirth}</version> <packaging>pom</packaging> <properties> - <version.mfss-rcm-mirth>2.2.0</version.mfss-rcm-mirth> + <version.mfss-rcm-mirth>2.2.0-SNAPSHOT</version.mfss-rcm-mirth> <version.mirth-common>1.0.0-SNAPSHOT</version.mirth-common> <parent.dir>../deploy/custom-lib/Estatements</parent.dir> <version.rcm>2.0.1</version.rcm> @@ -22,11 +22,8 @@ </modules> <dependencyManagement> <dependencies> -<!-- <dependency> - <artifactId>mirth-common</artifactId> - <groupId>com.medfusion.mirth</groupId> - <version>${version.mirth-common}</version> - </dependency> --> + <!-- <dependency> <artifactId>mirth-common</artifactId> <groupId>com.medfusion.mirth</groupId> + <version>${version.mirth-common}</version> </dependency> --> <dependency> <groupId>com.medfusion.sharedservices</groupId> <artifactId>mfss-rcm-dto</artifactId> @@ -82,14 +79,9 @@ </goals> <configuration> <artifactItems> -<!-- <artifactItem> - <artifactId>mirth-common</artifactId> - <groupId>com.medfusion.mirth</groupId> - <version>${version.mirth-common}</version> - <type>pom</type> - <overWrite>true</overWrite> - <outputDirectory>${basedir}/deploy</outputDirectory> - </artifactItem> --> + <!-- <artifactItem> <artifactId>mirth-common</artifactId> <groupId>com.medfusion.mirth</groupId> + <version>${version.mirth-common}</version> <type>pom</type> <overWrite>true</overWrite> + <outputDirectory>${basedir}/deploy</outputDirectory> </artifactItem> --> <artifactItem> <groupId>com.medfusion.sharedservices</groupId> <artifactId>mfss-rcm-dto</artifactId> @@ -122,6 +114,14 @@ <overWrite>true</overWrite> <outputDirectory>${basedir}/deploy/custom-lib/Estatements</outputDirectory> </artifactItem> +<!-- <artifactItem> + <groupId>com.medfusion.statements</groupId> + <artifactId>mfss-rcm-mirth</artifactId> + <version>${version.mfss-rcm-mirth}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${basedir}/deploy/custom-lib/Estatements</outputDirectory> + </artifactItem> --> </artifactItems> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> @@ -181,6 +181,9 @@ </configuration> </plugin> + + + </plugins> </build> </project> Your review request still exists, but the diff is not attached. https://rb.dev.medfusion.net/r/5098/
