=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAuditStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAuditStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAuditStore.java	2013-11-04 00:01:39 +0000
@@ -61,5 +61,4 @@
             Restrictions.eq( "visitor", visitor ), Restrictions.eq( "date", date ),
             Restrictions.eq( "accessedModule", accessedModule ) ).uniqueResult();
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientRegistrationFormStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientRegistrationFormStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientRegistrationFormStore.java	2013-11-04 00:01:39 +0000
@@ -36,9 +36,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version HibernatePatientRegistrationFormStore.java 10:07:23 AM Jan 31, 2013
- *          $
  */
 public class HibernatePatientRegistrationFormStore
     extends HibernateGenericStore<PatientRegistrationForm>

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/util/PatientIdentifierGenerator.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/util/PatientIdentifierGenerator.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/util/PatientIdentifierGenerator.java	2013-11-04 00:01:39 +0000
@@ -92,7 +92,10 @@
         int sum = 0, flip = 0;
 
         for ( int i = num.length() - 1; i >= 0; i--, flip++ )
+        {
             sum += sumTable[flip & 0x1][num.charAt( i ) - '0'];
+        }
+        
         return sum % 10 == 0;
     }
 
@@ -100,8 +103,12 @@
     {
         int i = 0;
         String pattern = "";
+        
         if ( length == 0 )
+        {
             pattern = "000000";
+        }
+        
         while ( i < length && length > 0 )
         {
             pattern += "0";

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java	2013-10-14 11:20:58 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java	2013-11-04 00:01:39 +0000
@@ -120,6 +120,7 @@
 
     public void updatePatientAttributeValues( PatientAttributeOption patientAttributeOption )
     {
+        //TODO use hql for caching reasons
         String sql = "UPDATE patientattributevalue SET value='" + patientAttributeOption.getName()
             + "' WHERE patientattributeoptionid='" + patientAttributeOption.getId() + "'";
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/hibernate/HibernatePatientDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/hibernate/HibernatePatientDataValueStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/hibernate/HibernatePatientDataValueStore.java	2013-11-04 00:01:39 +0000
@@ -78,8 +78,9 @@
     public Collection<PatientDataValue> get( ProgramStageInstance programStageInstance,
         Collection<DataElement> dataElements )
     {
-        String hql = "from PatientDataValue pdv where pdv.dataElement in ( :dataElements ) "
-            + "and pdv.programStageInstance = :programStageInstance";
+        String hql = 
+            "from PatientDataValue pdv where pdv.dataElement in ( :dataElements ) " + 
+            "and pdv.programStageInstance = :programStageInstance";
 
         return getQuery( hql ).setParameterList( "dataElements", dataElements ).setEntity( "programStageInstance",
             programStageInstance ).list();
@@ -106,9 +107,10 @@
     public Collection<PatientDataValue> get( Patient patient, Collection<DataElement> dataElements, Date startDate,
         Date endDate )
     {
-        String hql = "from PatientDataValue pdv where pdv.dataElement in ( :dataElements ) "
-            + "and pdv.programStageInstance.programInstance.patient = :patient "
-            + "and pdv.programStageInstance.executionDate >= :startDate and pdv.programStageInstance.executionDate <= :endDate ";
+        String hql = 
+            "from PatientDataValue pdv where pdv.dataElement in ( :dataElements ) " + 
+            "and pdv.programStageInstance.programInstance.patient = :patient " + 
+            "and pdv.programStageInstance.executionDate >= :startDate and pdv.programStageInstance.executionDate <= :endDate ";
 
         return getQuery( hql ).setParameterList( "dataElements", dataElements ).setEntity( "patient", patient )
             .setDate( "startDate", startDate ).setDate( "endDate", endDate ).list();
@@ -119,5 +121,4 @@
         return (PatientDataValue) getCriteria( Restrictions.eq( "programStageInstance", programStageInstance ),
             Restrictions.eq( "dataElement", dataElement ) ).uniqueResult();
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2013-11-03 23:45:52 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2013-11-04 00:01:39 +0000
@@ -46,7 +46,6 @@
 import org.hisp.dhis.message.MessageConversation;
 import org.hisp.dhis.message.MessageService;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.patient.PatientReminder;
 import org.hisp.dhis.patient.PatientReminderService;
@@ -93,13 +92,6 @@
         this.patientDataValueService = patientDataValueService;
     }
 
-    private OrganisationUnitService organisationUnitService;
-
-    public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
-    {
-        this.organisationUnitService = organisationUnitService;
-    }
-
     private SmsSender smsSender;
 
     public void setSmsSender( SmsSender smsSender )

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2013-11-03 23:45:52 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2013-11-04 00:01:39 +0000
@@ -34,8 +34,6 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import org.hibernate.Criteria;
 import org.hibernate.Query;
@@ -46,15 +44,9 @@
 import org.hisp.dhis.common.GridHeader;
 import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
 import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.jdbc.StatementBuilder;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 import org.hisp.dhis.patient.Patient;
-import org.hisp.dhis.patient.PatientAudit;
-import org.hisp.dhis.patient.PatientAuditService;
 import org.hisp.dhis.patient.PatientReminder;
-import org.hisp.dhis.patient.PatientService;
-import org.hisp.dhis.patientreport.TabularReportColumn;
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramInstance;
@@ -66,9 +58,7 @@
 import org.hisp.dhis.sms.outbound.OutboundSms;
 import org.hisp.dhis.system.grid.GridUtils;
 import org.hisp.dhis.system.grid.ListGrid;
-import org.hisp.dhis.system.util.DateUtils;
 import org.hisp.dhis.system.util.TextUtils;
-import org.hisp.dhis.user.CurrentUserService;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 
 /**
@@ -81,35 +71,7 @@
     // -------------------------------------------------------------------------
     // Dependency
     // -------------------------------------------------------------------------
-
-    private StatementBuilder statementBuilder;
-
-    public void setStatementBuilder( StatementBuilder statementBuilder )
-    {
-        this.statementBuilder = statementBuilder;
-    }
     
-    private PatientAuditService patientAuditService;
-
-    public void setPatientAuditService( PatientAuditService patientAuditService )
-    {
-        this.patientAuditService = patientAuditService;
-    }
-
-    private CurrentUserService currentUserService;
-
-    public void setCurrentUserService( CurrentUserService currentUserService )
-    {
-        this.currentUserService = currentUserService;
-    }
-
-    private PatientService patientService;
-
-    public void setPatientService( PatientService patientService )
-    {
-        this.patientService = patientService;
-    }
-
     private ProgramInstanceService programInstanceService;
 
     public void setProgramInstanceService( ProgramInstanceService programInstanceService )
@@ -540,203 +502,6 @@
         return criteria;
     }
 
-    private String getTabularReportSql( Boolean anonynousEntryForm, boolean count, ProgramStage programStage,
-        List<TabularReportColumn> columns, Collection<Integer> orgUnits, int level, int maxLevel, Date startDate,
-        Date endDate, Boolean descOrder, Boolean completed, Boolean accessPrivateInfo, Boolean displayOrgunitCode,
-        Integer min, Integer max )
-    {
-        Set<String> deKeys = new HashSet<String>();
-        String selector = count ? "count(*) " : "* ";
-
-        String sql = "select " + selector + "from ( select DISTINCT psi.programstageinstanceid, psi.executiondate,";
-        String where = "";
-        String operator = "where ";
-
-        if ( anonynousEntryForm == null || !anonynousEntryForm )
-        {
-            for ( int i = level; i <= maxLevel; i++ )
-            {
-                sql += "(select name from organisationunit where organisationunitid=ous.idlevel" + i + ") as level_"
-                    + i + ",";
-            }
-        }
-
-        if ( displayOrgunitCode != null && displayOrgunitCode )
-        {
-            sql += "(select code from organisationunit where organisationunitid=psi.organisationunitid ) as code_,";
-        }
-
-        for ( TabularReportColumn column : columns )
-        {
-            if ( column.isFixedAttribute() )
-            {
-                sql += "p." + column.getIdentifier() + ",";
-
-                if ( column.hasQuery() )
-                {
-                    if ( column.isDateType() )
-                    {
-                        where += operator + column.getIdentifier() + " " + column.getOperator() + " "
-                            + column.getQuery() + " ";
-                    }
-                    else
-                    {
-                        where += operator + "lower(" + column.getIdentifier() + ") " + column.getOperator() + " "
-                            + column.getQuery() + " ";
-                    }
-                    operator = "and ";
-                }
-            }
-            else if ( column.isIdentifierType() )
-            {
-                String deKey = "identifier_" + column.getIdentifier();
-                if ( !deKeys.contains( deKey ) )
-                {
-                    sql += "(select identifier from patientidentifier where patientid=p.patientid and patientidentifiertypeid="
-                        + column.getIdentifier() + ") as identifier_" + column.getIdentifier() + ",";
-                }
-
-                if ( column.hasQuery() )
-                {
-                    if ( column.isDateType() )
-                    {
-                        where += operator + "identifier_" + column.getIdentifier() + " " + column.getOperator() + " "
-                            + column.getQuery() + " ";
-                    }
-                    else
-                    {
-                        where += operator + "lower(identifier_" + column.getIdentifier() + ") " + column.getOperator()
-                            + " " + column.getQuery() + " ";
-                    }
-                    operator = "and ";
-                }
-            }
-            else if ( column.isDynamicAttribute() )
-            {
-                String deKey = "attribute_" + column.getIdentifier();
-                if ( !deKeys.contains( deKey ) )
-                {
-                    sql += "(select value from patientattributevalue where patientid=p.patientid and patientattributeid="
-                        + column.getIdentifier() + ") as attribute_" + column.getIdentifier() + ",";
-                }
-
-                if ( column.hasQuery() )
-                {
-                    if ( column.isDateType() )
-                    {
-                        where += operator + "attribute_" + column.getIdentifier() + " " + column.getOperator() + " "
-                            + column.getQuery() + " ";
-                    }
-                    else
-                    {
-                        where += operator + "lower(attribute_" + column.getIdentifier() + ") " + column.getOperator()
-                            + " " + column.getQuery() + " ";
-                    }
-                    operator = "and ";
-                }
-            }
-            if ( column.isNumberDataElement() )
-            {
-                String deKey = "element_" + column.getIdentifier();
-                if ( !deKeys.contains( deKey ) )
-                {
-                    sql += "(select cast( value as "
-                        + statementBuilder.getDoubleColumnType()
-                        + " ) from patientdatavalue where programstageinstanceid=psi.programstageinstanceid and dataelementid="
-                        + column.getIdentifier() + ") as element_" + column.getIdentifier() + ",";
-                    deKeys.add( deKey );
-                }
-
-                if ( column.hasQuery() )
-                {
-                    where += operator + "element_" + column.getIdentifier() + " " + column.getOperator() + " "
-                        + column.getQuery() + " ";
-                    operator = "and ";
-                }
-            }
-            else if ( column.isDataElement() )
-            {
-                String deKey = "element_" + column.getIdentifier();
-                if ( !deKeys.contains( deKey ) )
-                {
-                    sql += "(select value from patientdatavalue where programstageinstanceid=psi.programstageinstanceid and dataelementid="
-                        + column.getIdentifier() + ") as element_" + column.getIdentifier() + ",";
-                    deKeys.add( deKey );
-                }
-
-                if ( column.hasQuery() )
-                {
-                    if ( column.isDateType() )
-                    {
-                        where += operator + "element_" + column.getIdentifier() + " " + column.getOperator() + " "
-                            + column.getQuery() + " ";
-                    }
-                    else
-                    {
-                        where += operator + "lower(element_" + column.getIdentifier() + ") " + column.getOperator()
-                            + " " + column.getQuery() + " ";
-                    }
-                    operator = "and ";
-                }
-            }
-        }
-
-        sql += " psi.completed ";
-        if ( accessPrivateInfo != null && accessPrivateInfo )
-        {
-            sql += ", p.patientid ";
-        }
-
-        sql += "from programstageinstance psi ";
-        sql += "left join programinstance pi on (psi.programinstanceid=pi.programinstanceid) ";
-        sql += "left join patient p on (pi.patientid=p.patientid) ";
-        sql += "join organisationunit ou on (ou.organisationunitid=psi.organisationunitid) ";
-
-        if ( anonynousEntryForm == null || !anonynousEntryForm )
-        {
-            sql += "join _orgunitstructure ous on (psi.organisationunitid=ous.organisationunitid) ";
-        }
-
-        sql += "where psi.programstageid=" + programStage.getId() + " ";
-
-        if ( startDate != null && endDate != null )
-        {
-            String sDate = DateUtils.getMediumDateString( startDate );
-            String eDate = DateUtils.getMediumDateString( endDate );
-
-            sql += "and psi.executiondate >= '" + sDate + "' ";
-            sql += "and psi.executiondate <= '" + eDate + "' ";
-        }
-
-        if ( orgUnits != null )
-        {
-            sql += "and ou.organisationunitid in (" + TextUtils.getCommaDelimitedString( orgUnits ) + ") ";
-        }
-        if ( completed != null )
-        {
-            sql += "and psi.completed=" + completed + " ";
-        }
-
-        sql += "order by ";
-
-        if ( anonynousEntryForm == null || !anonynousEntryForm )
-        {
-            for ( int i = level; i <= maxLevel; i++ )
-            {
-                sql += "level_" + i + ",";
-            }
-        }
-
-        sql += "psi.executiondate ";
-        sql += (descOrder == null || descOrder) ? "desc " : "";
-        sql += ") as tabular ";
-        sql += where; // filters
-        sql = sql.substring( 0, sql.length() - 1 ) + " "; // Remove last comma
-        sql += (min != null && max != null) ? statementBuilder.limitRecord( min, max ) : "";
-
-        return sql;
-    }
-
     private Criteria getStatisticalProgramStageCriteria( ProgramStage programStage, Collection<Integer> orgunitIds,
         Date startDate, Date endDate, int status )
     {

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java	2013-09-06 08:35:43 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java	2013-11-04 00:01:39 +0000
@@ -56,5 +56,4 @@
 
         return (ProgramStageSection) criteria.uniqueResult();
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageStore.java	2013-11-04 00:01:39 +0000
@@ -51,5 +51,4 @@
         return (ProgramStage) getCriteria( Restrictions.eq( "name", name ), Restrictions.eq( "program", program ) )
             .uniqueResult();
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java	2013-09-05 13:09:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java	2013-11-04 00:01:39 +0000
@@ -45,7 +45,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $Id: HibernateProgramStore.java Dec 14, 2011 9:24:21 AM $
  */
 public class HibernateProgramStore
     extends HibernateIdentifiableObjectStore<Program>
@@ -158,5 +157,4 @@
 
         return criteria.list();
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java	2013-11-04 00:01:39 +0000
@@ -48,9 +48,8 @@
     @SuppressWarnings( "unchecked" )
     public Collection<Relationship> getForPatient( Patient patient )
     {
-        return getCriteria(
-            Restrictions.disjunction().add( Restrictions.eq( "patientA", patient ) ).add(
-                Restrictions.eq( "patientB", patient ) ) ).list();
+        return getCriteria( Restrictions.disjunction().add( Restrictions.eq( "patientA", patient ) ).add(
+            Restrictions.eq( "patientB", patient ) ) ).list();
     }
 
     @SuppressWarnings( "unchecked" )
@@ -76,7 +75,6 @@
     public Relationship get( Patient patientA, Patient patientB )
     {
         return (Relationship) getCriteria( Restrictions.eq( "patientA", patientA ),
-            Restrictions.eq( "patientB", patientB ) )
-            .uniqueResult();
+            Restrictions.eq( "patientB", patientB ) ).uniqueResult();
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipTypeStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipTypeStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipTypeStore.java	2013-11-04 00:01:39 +0000
@@ -35,7 +35,6 @@
 
 /**
  * @author Abyot Asalefew Gizaw
- * @version $Id$
  */
 public class HibernateRelationshipTypeStore
     extends HibernateIdentifiableObjectStore<RelationshipType>

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2013-10-14 17:00:41 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2013-11-04 00:01:39 +0000
@@ -29,10 +29,6 @@
 		<property name="clazz" value="org.hisp.dhis.program.ProgramStageInstance" />
 		<property name="sessionFactory" ref="sessionFactory" />
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
-		<property name="statementBuilder" ref="statementBuilder" />
-		<property name="patientAuditService" ref="org.hisp.dhis.patient.PatientAuditService" />
-		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
-		<property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
 		<property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
 	</bean>
 
@@ -185,8 +181,6 @@
 		<property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
 		<property name="patientDataValueService"
 			ref="org.hisp.dhis.patientdatavalue.PatientDataValueService" />
-		<property name="organisationUnitService"
-			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
 		<property name="smsSender" ref="org.hisp.dhis.sms.SmsSender" />
 		<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
 		<property name="patientReminderService" ref="org.hisp.dhis.patient.PatientReminderService" />