'[29390] openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports: committing changes to E3'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openmrs-svn
Subject:    [29390] openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports: committing changes to E3
From:       svn-noreply () openmrs ! org
Date:       2012-09-26 16:52:27
Message-ID: 20120926165227.4F924401A5 () 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>[29390] openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports: \
committing changes to E3</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>29390</dd>
<dt>Author</dt> <dd>rubailly</dd>
<dt>Date</dt> <dd>2012-09-26 16:52:27 +0000 (Wed, 26 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>committing changes to E3</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#openmrsmodulesrwandareportssrcorgopenmrsmodulerwandareportsreportingSetu \
pAsthmaQuarterlyAndMonthReportjava">openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports/reporting/SetupAsthmaQuarterlyAndMonthReport.java</a></li>
 <li><a href="#openmrsmodulesrwandareportssrcorgopenmrsmodulerwandareportsutilCohortsj \
ava">openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports/util/Cohorts.java</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="openmrsmodulesrwandareportssrcorgopenmrsmodulerwandareportsreportingSetupAsthmaQuarterlyAndMonthReportjava"></a>
 <div class="modfile"><h4>Modified: \
openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports/reporting/SetupAsthmaQuarterlyAndMonthReport.java \
(29389 => 29390)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports/reporting/SetupAsthmaQuarterlyAndMonthReport.java	2012-09-26 \
                15:48:31 UTC (rev 29389)
+++ openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports/reporting/SetupAsthmaQuarterlyAndMonthReport.java	2012-09-26 \
16:52:27 UTC (rev 29390) </span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> 		            \
.createParameterMappings(&quot;endDate=${endDate}&quot;)), &quot;&quot;); \
</span><span class="cx"> 		 </span><span class="cx"> \
//======================================================================= \
</span><del>-		//E3: Of total active patients with ‘severe persistent’ or ‘severe \
uncontrolled’ asthma classification at last visit, % with next scheduled RDV visit 28 \
weeks or more past last visit date  </del><ins>+		//E3: Of total active patients with \
‘severe persistent’ or ‘severe uncontrolled’ asthma classification at last visit, % \
with next scheduled RDV visit 14 weeks or more past last visit date  </ins><span \
class="cx"> 		//=======================================================================		
 </span><span class="cx"> 		SqlCohortDefinition \
patientsWithAsthmaClassificationObsAnswer = Cohorts </span><span class="cx">         \
.getPatientsWithObservationInFormBetweenStartAndEndDate(&quot;patientsWithAsthmaClassificationObsAnswer&quot;,
 </span></span></pre></div>
<a id="openmrsmodulesrwandareportssrcorgopenmrsmodulerwandareportsutilCohortsjava"></a>
 <div class="modfile"><h4>Modified: \
openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports/util/Cohorts.java \
(29389 => 29390)</h4> <pre class="diff"><span>
<span class="info">--- \
openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports/util/Cohorts.java	2012-09-26 \
                15:48:31 UTC (rev 29389)
+++ openmrs-modules/rwandareports/src/org/openmrs/module/rwandareports/util/Cohorts.java	2012-09-26 \
16:52:27 UTC (rev 29390) </span><span class="lines">@@ -764,7 +764,7 @@
</span><span class="cx"> 	                                                            \
Concept concept, List&lt;Concept&gt; obsAnswers) { </span><span class="cx"> \
SqlCohortDefinition query = new SqlCohortDefinition(); </span><span class="cx"> \
StringBuilder queryStr = new StringBuilder(); \
</span><del>-		queryStr.append(&quot;select distinct o.person_id from encounter e, \
obs o where e.encounter_id=o.encounter_id and e.form_id in(&quot;); \
</del><ins>+		queryStr.append(&quot;select lst.patient_id from (select \
last_encounter.patient_id, last_encounter.encounter_id from (select e.patient_id, \
e.encounter_datetime, e.encounter_id from encounter e where e.form_id in(&quot;); \
</ins><span class="cx"> 		 </span><span class="cx"> 		int i = 0;
</span><span class="cx"> 		for (Form f : forms) {
</span><span class="lines">@@ -776,7 +776,7 @@
</span><span class="cx"> 			i++;
</span><span class="cx"> 		}
</span><span class="cx"> 		
</span><del>-		queryStr.append(&quot;) and o.concept_id=&quot;);
</del><ins>+		queryStr.append(&quot;) and e.encounter_datetime &gt;= :startDate and \
e.encounter_datetime &lt;= :endDate and e.voided=0 order by e.encounter_datetime \
desc) as last_encounter group by last_encounter.patient_id) as lst, obs o where \
lst.encounter_id=o.encounter_id and o.voided=0 and o.concept_id=&quot;); </ins><span \
class="cx"> 		queryStr.append(concept.getId()); </span><span class="cx"> \
queryStr.append(&quot; and o.value_coded in (&quot;); </span><span class="cx"> 		
</span><span class="lines">@@ -789,8 +789,7 @@
</span><span class="cx"> 			
</span><span class="cx"> 			y++;
</span><span class="cx"> 		}
</span><del>-		
-		queryStr.append(&quot;) and o.voided=0 and e.voided=0 and o.obs_datetime&gt;= \
:startDate and o.obs_datetime&lt;= :endDate and (o.value_numeric is NOT NULL or \
o.value_coded is NOT NULL or o.value_datetime is NOT NULL or o.value_boolean is NOT \
NULL)&quot;); </del><ins>+		queryStr.append(&quot;)&quot;);
</ins><span class="cx"> 		query.setQuery(queryStr.toString());
</span><span class="cx"> 		query.setName(name);
</span><span class="cx"> 		query.addParameter(new Parameter(&quot;startDate&quot;, \
&quot;startDate&quot;, Date.class)); </span></span></pre>
</div>
</div>

</body>
</html>

<p></p>

-- 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


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic