[prev in list] [next in list] [prev in thread] [next in thread]
List: openmrs-svn
Subject: [30921] openmrs-modules/chica/trunk: Remove checks for existing percentile observations.
From: svn-noreply () openmrs ! org
Date: 2014-09-25 15:23:55
Message-ID: 20140925152355.A4807402D3 () 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>[30921] openmrs-modules/chica/trunk: Remove checks for existing percentile \
observations.</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>30921</dd>
<dt>Author</dt> <dd>sjmckee</dd>
<dt>Date</dt> <dd>2014-09-25 15:23:55 +0000 (Thu, 25 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove checks for existing percentile observations.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#openmrsmoduleschicatrunkmetadataconfigxml">openmrs-modules/chica/trunk/metadata/config.xml</a></li>
<li><a href="#openmrsmoduleschicatrunksrcorgopenmrsmodulechicautilUtiljava">openmrs-modules/chica/trunk/src/org/openmrs/module/chica/util/Util.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="openmrsmoduleschicatrunkmetadataconfigxml"></a>
<div class="modfile"><h4>Modified: openmrs-modules/chica/trunk/metadata/config.xml \
(30920 => 30921)</h4> <pre class="diff"><span>
<span class="info">--- openmrs-modules/chica/trunk/metadata/config.xml 2014-09-24 \
20:14:12 UTC (rev 30920)
+++ openmrs-modules/chica/trunk/metadata/config.xml 2014-09-25 15:23:55 UTC (rev \
30921) </span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> <!-- Chica Module Properties -->
</span><span class="cx"> <id>chica</id>
</span><span class="cx"> <name>Chica</name>
</span><del>- <version>1.61.0</version>
</del><ins>+ <version>1.61.1</version>
</ins><span class="cx"> \
<package>org.openmrs.module.@MODULE_ID@</package> </span><span \
class="cx"> <author>Vibha Anand and Tammy Dugan</author> </span><span \
class="cx"> <description> </span></span></pre></div>
<a id="openmrsmoduleschicatrunksrcorgopenmrsmodulechicautilUtiljava"></a>
<div class="modfile"><h4>Modified: \
openmrs-modules/chica/trunk/src/org/openmrs/module/chica/util/Util.java (30920 => \
30921)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/chica/trunk/src/org/openmrs/module/chica/util/Util.java 2014-09-24 \
20:14:12 UTC (rev 30920)
+++ openmrs-modules/chica/trunk/src/org/openmrs/module/chica/util/Util.java 2014-09-25 \
15:23:55 UTC (rev 30921) </span><span class="lines">@@ -511,78 +511,69 @@
</span><span class="cx"> ConceptService conceptService = \
Context.getConceptService(); </span><span class="cx"> Concept concept = \
conceptService.getConcept("BMICentile"); </span><span class="cx"> \
questions.add(concept); </span><del>- List<Obs> obs = \
obsService.getObservations(null, encounters, questions, null, null, null, null, null, \
null, null,
- null, false);
</del><span class="cx">
</span><del>- if (obs == null || obs.size() == 0) {
- Result result = atdService.evaluateRule("bmi", patient, parameters);
-
- if (!(result instanceof EmptyResult)) {
- Double percentile = calculator.calculatePercentile(result.toNumber(), \
patient.getGender(), patient
- .getBirthdate(), "bmi", null);
- if (percentile != null) {
- percentile = org.openmrs.module.chirdlutil.util.Util.round(percentile, 2); // \
round percentile to two places
-
- org.openmrs.module.chica.util.Util.voidObsForConcept(concept,encounterId);
- org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
percentile.toString(),new Date());
- }
</del><ins>+ Result result = atdService.evaluateRule("bmi", patient, \
parameters); +
+ if (!(result instanceof EmptyResult)) {
+ Double percentile = calculator.calculatePercentile(result.toNumber(), \
patient.getGender(), + patient.getBirthdate(), "bmi", null);
+ if (percentile != null) {
+ percentile = org.openmrs.module.chirdlutil.util.Util.round(percentile, 2); // \
round percentile to two places +
+ org.openmrs.module.chica.util.Util.voidObsForConcept(concept, encounterId);
+ org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
percentile.toString(), + new Date());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> questions = new ArrayList<Concept>();
</span><span class="cx"> concept = \
conceptService.getConcept("HCCentile"); </span><span class="cx"> \
questions.add(concept); </span><del>- obs = obsService.getObservations(null, \
encounters, questions, null, null, null, null, null, null, null, null, false); \
</del><span class="cx"> </span><del>- if (obs == null || obs.size() == 0) {
- parameters.put("concept", "HC");
- Result result = atdService.evaluateRule("conceptRule", patient, \
parameters);
- if (!(result instanceof EmptyResult)) {
- Double percentile = calculator.calculatePercentile(result.toNumber(), \
patient.getGender(), patient
- .getBirthdate(), "hc", null);
- if (percentile != null) {
- percentile = org.openmrs.module.chirdlutil.util.Util.round(percentile, 2); // \
round percentile to two places
- org.openmrs.module.chica.util.Util.voidObsForConcept(concept,encounterId);
- org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
percentile.toString(),new Date());
- }
</del><ins>+ parameters.put("concept", "HC");
+ result = atdService.evaluateRule("conceptRule", patient, parameters);
+ if (!(result instanceof EmptyResult)) {
+ Double percentile = calculator.calculatePercentile(result.toNumber(), \
patient.getGender(), + patient.getBirthdate(), "hc", null);
+ if (percentile != null) {
+ percentile = org.openmrs.module.chirdlutil.util.Util.round(percentile, 2); // \
round percentile to two places \
+ org.openmrs.module.chica.util.Util.voidObsForConcept(concept, encounterId); \
+ org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
percentile.toString(), + new Date());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> questions = new ArrayList<Concept>();
</span><span class="cx"> concept = \
conceptService.getConcept("HtCentile"); </span><span class="cx"> \
questions.add(concept); </span><del>- obs = obsService.getObservations(null, \
encounters, questions, null, null, null, null, null, null, null, null, false); \
</del><span class="cx"> </span><del>- if (obs == null || obs.size() == 0) {
- parameters.put("concept", "HEIGHT");
- Result result = atdService.evaluateRule("conceptRule", patient, \
parameters);
- if (!(result instanceof EmptyResult)) {
- Double percentile = calculator.calculatePercentile(result.toNumber(), \
patient.getGender(), patient
- .getBirthdate(), "length", \
org.openmrs.module.chirdlutil.util.Util.MEASUREMENT_IN);
- if (percentile != null) {
- percentile = org.openmrs.module.chirdlutil.util.Util.round(percentile, 2); // \
round percentile to two places
- org.openmrs.module.chica.util.Util.voidObsForConcept(concept,encounterId);
- org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
percentile.toString(),new Date());
- }
</del><ins>+ parameters.put("concept", "HEIGHT");
+ result = atdService.evaluateRule("conceptRule", patient, parameters);
+ if (!(result instanceof EmptyResult)) {
+ Double percentile = calculator.calculatePercentile(result.toNumber(), \
patient.getGender(), + patient.getBirthdate(), "length", \
org.openmrs.module.chirdlutil.util.Util.MEASUREMENT_IN); + if (percentile != null) \
{ + percentile = org.openmrs.module.chirdlutil.util.Util.round(percentile, 2); // \
round percentile to two places \
+ org.openmrs.module.chica.util.Util.voidObsForConcept(concept, encounterId); \
+ org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
percentile.toString(), + new Date());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> questions = new ArrayList<Concept>();
</span><span class="cx"> concept = \
conceptService.getConcept("WtCentile"); </span><span class="cx"> \
questions.add(concept); </span><del>- obs = obsService.getObservations(null, \
encounters, questions, null, null, null, null, null, null, null, null, false); \
</del><span class="cx"> </span><del>- if (obs == null || obs.size() == 0) {
- parameters.put("concept", "WEIGHT");
- Result result = atdService.evaluateRule("conceptRule", patient, \
parameters);
- if (!(result instanceof EmptyResult)) {
- Double percentile = calculator.calculatePercentile(result.toNumber(), \
patient.getGender(), patient
- .getBirthdate(), "weight", \
org.openmrs.module.chirdlutil.util.Util.MEASUREMENT_LB);
- if (percentile != null) {
- percentile = org.openmrs.module.chirdlutil.util.Util.round(percentile, 2); // \
round percentile to two places
- org.openmrs.module.chica.util.Util.voidObsForConcept(concept,encounterId);
- org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
percentile.toString(),new Date());
- }
</del><ins>+ parameters.put("concept", "WEIGHT");
+ result = atdService.evaluateRule("conceptRule", patient, parameters);
+ if (!(result instanceof EmptyResult)) {
+ Double percentile = calculator.calculatePercentile(result.toNumber(), \
patient.getGender(), + patient.getBirthdate(), "weight", \
org.openmrs.module.chirdlutil.util.Util.MEASUREMENT_LB); + if (percentile != null) \
{ + percentile = org.openmrs.module.chirdlutil.util.Util.round(percentile, 2); // \
round percentile to two places \
+ org.openmrs.module.chica.util.Util.voidObsForConcept(concept, encounterId); \
+ org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
percentile.toString(), + new Date());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -590,28 +581,23 @@
</span><span class="cx"> questions = new ArrayList<Concept>();
</span><span class="cx"> concept = conceptService.getConcept("BP");
</span><span class="cx"> questions.add(concept);
</span><del>- obs = obsService.getObservations(null, encounters, questions, null, \
null, null, null, null, null, null, null, false); </del><span class="cx">
</span><del>- if (obs == null || obs.size() == 0) {
- Result result = atdService.evaluateRule("bp", patient, parameters);
- if (!(result instanceof EmptyResult)) {
- org.openmrs.module.chica.util.Util.voidObsForConcept(concept,encounterId);
- org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
result.toString(),new Date());
- }
</del><ins>+ result = atdService.evaluateRule("bp", patient, parameters);
+ if (!(result instanceof EmptyResult)) {
+ org.openmrs.module.chica.util.Util.voidObsForConcept(concept, encounterId);
+ org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
result.toString(), new Date()); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //save BMI
</span><span class="cx"> questions = new ArrayList<Concept>();
</span><span class="cx"> concept = conceptService.getConcept("BMI \
CHICA"); </span><span class="cx"> questions.add(concept);
</span><del>- obs = obsService.getObservations(null, encounters, questions, null, \
null, null, null, null, null, null, null, false); </del><span class="cx">
</span><del>- if (obs == null || obs.size() == 0) {
- Result result = atdService.evaluateRule("bmi", patient, parameters);
- if (!(result instanceof EmptyResult)) {
- org.openmrs.module.chica.util.Util.voidObsForConcept(concept,encounterId);
- org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
result.toString(),new Date());
- }
</del><ins>+ result = atdService.evaluateRule("bmi", patient, parameters);
+ if (!(result instanceof EmptyResult)) {
+ org.openmrs.module.chica.util.Util.voidObsForConcept(concept, encounterId);
+ org.openmrs.module.chirdlutil.util.Util.saveObs(patient, concept, encounterId, \
result.toString(), new Date()); </ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx"> }
</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