[prev in list] [next in list] [prev in thread] [next in thread]
List: openmrs-svn
Subject: [30857] openmrs-modules/chica/trunk: --chica -
From: svn-noreply () openmrs ! org
Date: 2014-08-20 17:00:43
Message-ID: 20140820170043.0A35D4029A () openmrs ! osuosl ! org
[Download RAW message or body]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[30857] openmrs-modules/chica/trunk: --chica - </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>30857</dd>
<dt>Author</dt> <dd>msheley</dd>
<dt>Date</dt> <dd>2014-08-20 17:00:42 +0000 (Wed, 20 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>--chica -
* modifications to constant names
* handle state stop and start times for alias query if no query is performed</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#openmrsmoduleschicatrunklibcommonchirdlutil172jar">openmrs-modules/chica/trunk/lib-common/chirdlutil-1.7.2.jar</a></li>
<li><a href="#openmrsmoduleschicatrunksrcorgopenmrsmodulechicahl7mckessonHL7SocketHan \
dlerjava">openmrs-modules/chica/trunk/src/org/openmrs/module/chica/hl7/mckesson/HL7SocketHandler.java</a></li>
<li><a href="#openmrsmoduleschicatrunksrcorgopenmrsmodulechicahl7mckessonPatientHandl \
erjava">openmrs-modules/chica/trunk/src/org/openmrs/module/chica/hl7/mckesson/PatientHandler.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="openmrsmoduleschicatrunklibcommonchirdlutil172jar"></a>
<div class="binary"><h4>Modified: \
openmrs-modules/chica/trunk/lib-common/chirdlutil-1.7.2.jar</h4> <pre \
class="diff"><span> <span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="openmrsmoduleschicatrunksrcorgopenmrsmodulechicahl7mckessonHL7SocketHandlerjava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/chica/trunk/src/org/openmrs/module/chica/hl7/mckesson/HL7SocketHandler.java \
(30856 => 30857)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/chica/trunk/src/org/openmrs/module/chica/hl7/mckesson/HL7SocketHandler.java 2014-08-19 \
19:51:15 UTC (rev 30856)
+++ openmrs-modules/chica/trunk/src/org/openmrs/module/chica/hl7/mckesson/HL7SocketHandler.java 2014-08-20 \
17:00:42 UTC (rev 30857) </span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Search by SSN
</span><del>- PatientIdentifier ssnIdent = \
hl7Patient.getPatientIdentifier(ChirdlUtilConstants.SSN_IDENTIFIER_TYPE); \
</del><ins>+ PatientIdentifier ssnIdent = \
hl7Patient.getPatientIdentifier(ChirdlUtilConstants.IDENTIFIER_TYPE_SSN); </ins><span \
class="cx"> if (ssnIdent != null) { </span><span class="cx"> String ssn = \
ssnIdent.getIdentifier(); </span><span class="cx"> lookupPatients = \
patientService.getPatients(null, ssn, null, true); </span><span class="lines">@@ \
-646,7 +646,14 @@ </span><span class="cx"> .getSessionId(), \
getLocationTagId(chicaEncounter), </span><span class="cx"> \
getLocationId(chicaEncounter), null); </span><span class="cx"> Date \
queryKiteAliasStart = (Date) parameters.get("queryKiteAliasStart"); \
</span><ins>+ if (queryKiteAliasStart == null){ + queryKiteAliasStart = new \
java.util.Date(); + }
</ins><span class="cx"> Date queryKiteAliasEnd = (Date) \
parameters.get("queryKiteAliasEnd"); </span><ins>+ if (queryKiteAliasEnd \
== null){ + queryKiteAliasEnd = new java.util.Date();
+ }
+
</ins><span class="cx"> patientState.setStartTime(queryKiteAliasStart);
</span><span class="cx"> patientState.setEndTime(queryKiteAliasEnd);
</span><span class="cx"> \
chirdlutilbackportsService.updatePatientState(patientState); </span><span \
class="lines">@@ -860,9 +867,9 @@ </span><span class="cx">
</span><span class="cx"> PatientService patientService = \
Context.getPatientService(); </span><span class="cx">
</span><del>- PatientIdentifier newSSN = \
hl7Patient.getPatientIdentifier(ChirdlUtilConstants.SSN_IDENTIFIER_TYPE); \
</del><ins>+ PatientIdentifier newSSN = \
hl7Patient.getPatientIdentifier(ChirdlUtilConstants.IDENTIFIER_TYPE_SSN); </ins><span \
class="cx"> PatientIdentifier currentSSN = currentPatient \
</span><del>- .getPatientIdentifier(ChirdlUtilConstants.SSN_IDENTIFIER_TYPE); \
</del><ins>+ .getPatientIdentifier(ChirdlUtilConstants.IDENTIFIER_TYPE_SSN); \
</ins><span class="cx"> </span><span class="cx"> //hl7 has no SSN. Or hl7 SSN is \
the same as existing SSN </span><span class="cx"> if (newSSN == null
</span><span class="lines">@@ -894,7 +901,7 @@
</span><span class="cx"> currentPatient.addIdentifier(newSSN);
</span><span class="cx"> } else {
</span><span class="cx"> // if patient has a different SSN
</span><del>- currentPatient.getPatientIdentifier(ChirdlUtilConstants.SSN_IDENTIFIER_TYPE).setVoided(true);
</del><ins>+ currentPatient.getPatientIdentifier(ChirdlUtilConstants.IDENTIFIER_TYPE_SSN).setVoided(true);
</ins><span class="cx"> currentPatient.addIdentifier(newSSN);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1057,8 +1064,8 @@
</span><span class="cx"> */
</span><span class="cx"> private void AddCitizenship(Patient currentPatient, Patient \
hl7Patient,Date encounterDate){ </span><span class="cx">
</span><del>- PersonAttribute currentCitizenshipAttr = \
currentPatient.getAttribute(ChirdlUtilConstants.PERSON_CITIZENSHIP);
- PersonAttribute hl7CitizenshipAttr = \
hl7Patient.getAttribute(ChirdlUtilConstants.PERSON_CITIZENSHIP); \
</del><ins>+ PersonAttribute currentCitizenshipAttr = \
currentPatient.getAttribute(ChirdlUtilConstants.PERSON_ATTRIBUTE_CITIZENSHIP); \
+ PersonAttribute hl7CitizenshipAttr = \
hl7Patient.getAttribute(ChirdlUtilConstants.PERSON_ATTRIBUTE_CITIZENSHIP); \
</ins><span class="cx"> </span><span class="cx"> if (hl7CitizenshipAttr == null || \
hl7CitizenshipAttr.getValue() == null </span><span class="cx"> || \
hl7CitizenshipAttr.getValue().trim().equals("")){ </span><span \
class="lines">@@ -1165,7 +1172,7 @@ </span><span class="cx"> //Create the new \
identifier object and add to existing patient </span><span class="cx"> \
PatientIdentifier newIdentifier = new PatientIdentifier(); </span><span class="cx"> \
newIdentifier.setIdentifier(newMRN); </span><del>- newIdentifier.setIdentifierType( \
patientService.getPatientIdentifierTypeByName(ChirdlUtilConstants.MRN_IDENTIFIER_TYPE));
</del><ins>+ newIdentifier.setIdentifierType( \
patientService.getPatientIdentifierTypeByName(ChirdlUtilConstants.IDENTIFIER_TYPE_MRN));
</ins><span class="cx"> \
newIdentifier.setLocation(newPatientIdentifier.getLocation()); </span><span \
class="cx"> newIdentifier.setPatient(existingPatient); </span><span class="cx"> \
newIdentifier.setPreferred(true); </span></span></pre></div>
<a id="openmrsmoduleschicatrunksrcorgopenmrsmodulechicahl7mckessonPatientHandlerjava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/chica/trunk/src/org/openmrs/module/chica/hl7/mckesson/PatientHandler.java \
(30856 => 30857)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/chica/trunk/src/org/openmrs/module/chica/hl7/mckesson/PatientHandler.java 2014-08-19 \
19:51:15 UTC (rev 30856)
+++ openmrs-modules/chica/trunk/src/org/openmrs/module/chica/hl7/mckesson/PatientHandler.java 2014-08-20 \
17:00:42 UTC (rev 30857) </span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> if (isValidSSN)
</span><span class="cx"> {
</span><del>- PatientIdentifierType type = \
this.patientService.getPatientIdentifierTypeByName(ChirdlUtilConstants.SSN_IDENTIFIER_TYPE);
</del><ins>+ PatientIdentifierType type = \
this.patientService.getPatientIdentifierTypeByName(ChirdlUtilConstants.IDENTIFIER_TYPE_SSN);
</ins><span class="cx"> PatientIdentifier pi = new \
PatientIdentifier(ssn,type,sendingFacility); </span><span class="cx"> \
pi.setDateCreated(encounterDate); </span><span class="cx"> \
pi.setCreator(Context.getAuthenticatedUser()); </span></span></pre>
</div>
</div>
</body>
</html>
<p></p>
-- <br />
-- OpenMRS Subversion Commits: <a \
href="http://go.openmrs.org/svn">http://go.openmrs.org/svn</a><br /> Posting is not \
allowed - please join dev@openmrs.org for discussion.<br />
Unsubscribe: svn+unsubscribe@openmrs.org<br />
<p></p>
To unsubscribe from this group and stop receiving emails from it, send an email to <a \
href="mailto:svn+unsubscribe@openmrs.org">svn+unsubscribe@openmrs.org</a>.<br />
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic