Merge pull request #2061 from njorocs/case-report-date-format

Formatting all dates to yyyy-MM-dd HH:mm:ss. changed Key-value separa…

api/src/main/java/org/openmrs/module/kenyaemr/reporting/builder/dmi/CaseReportsListReportBuilder.java

@@ -81,7 +81,7 @@
 @Builds({"kenyaemr.common.report.caseReports"})
 public class CaseReportsListReportBuilder extends AbstractReportBuilder {
 
-    public static final String DATE_FORMAT = "dd/MM/yyyy";
+    public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
     @Override
     protected List<Parameter> getParameters(ReportDescriptor reportDescriptor) {
@@ -348,18 +348,6 @@ protected DataSetDefinition LabsDataSetDefinitionColumns() {
         labOrderTestNameDataDefinition.addParameter(new Parameter("endDate", "End Date", Date.class));
         labOrderTestNameDataDefinition.addParameter(new Parameter("startDate", "Start Date", Date.class));
 
-        VitalsOxygenSaturationModeDataDefinition vitalsOxygenSaturationModeDataDefinition = new VitalsOxygenSaturationModeDataDefinition();
-        vitalsOxygenSaturationModeDataDefinition.addParameter(new Parameter("endDate", "End Date", Date.class));
-        vitalsOxygenSaturationModeDataDefinition.addParameter(new Parameter("startDate", "Start Date", Date.class));
-
-        VitalsSignsIdDataDefinition vitalsSignsIdDataDefinition = new VitalsSignsIdDataDefinition();
-        vitalsSignsIdDataDefinition.addParameter(new Parameter("endDate", "End Date", Date.class));
-        vitalsSignsIdDataDefinition.addParameter(new Parameter("startDate", "Start Date", Date.class));
-
-        VitalSignsDateDataDefinition vitalSignsDateDataDefinition = new VitalSignsDateDataDefinition();
-        vitalSignsDateDataDefinition.addParameter(new Parameter("startDate", "Start Date", Date.class));
-        vitalSignsDateDataDefinition.addParameter(new Parameter("endDate", "End Date", Date.class));
-
         dsd.addColumn("Lab Case Unique Id", labOrdersCaseUniqueIdDataDefinition, paramMapping);
         dsd.addColumn("Lab Order Id", labOrderIdDataDefinition, paramMapping);
         dsd.addColumn("Lab Test Date", labOrderDateDataDefinition, paramMapping);

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/AdmissionDateDataEvaluator.java

@@ -35,7 +35,7 @@ public class AdmissionDateDataEvaluator implements VisitDataEvaluator {
     public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationContext context) throws EvaluationException {
         EvaluatedVisitData c = new EvaluatedVisitData(definition, context);
 
-        String qry = "select e.visit_id,e.date_of_patient_admission from kenyaemr_etl.etl_clinical_encounter e where date(e.visit_date) between date(:startDate) and date(:endDate);";
+        String qry = "select e.visit_id,DATE_FORMAT(e.date_of_patient_admission, '%Y-%m-%d %H:%i:%s') from kenyaemr_etl.etl_clinical_encounter e where date(e.visit_date) between date(:startDate) and date(:endDate);";
 
         SqlQueryBuilder queryBuilder = new SqlQueryBuilder();
         queryBuilder.append(qry);

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/ComplaintDataEvaluator.java

@@ -41,7 +41,7 @@ public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationCon
                 "    GROUP_CONCAT(\n" +
                 "            DISTINCT CASE\n" +
                 "                         WHEN i.complaint IS NOT NULL THEN\n" +
-                "                             CONCAT(i.complaint, ':', COALESCE(\n" +
+                "                             CONCAT(i.complaint, '|', COALESCE(\n" +
                 "                                     case i.complaint\n" +
                 "                                         when 151 then \"Abdominal pain\"\n" +
                 "                                         when 141631 then \"Abnormal Uterine Bleeding\"\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/ComplaintDurationDataEvaluator.java

@@ -119,7 +119,7 @@ public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationCon
                 "                        when 123396 then \"Vaginal Discharge\"\n" +
                 "                        when 122983 then \"Vomiting\"\n" +
                 "                        when 111525 then \"Vertigo\"\n" +
-                "                        when 5622 then \"Other\" end, ':',\n" +
+                "                        when 5622 then \"Other\" end, '|',\n" +
                 "                    COALESCE(i.complaint_duration, '-')\n" +
                 "            )\n" +
                 "        ELSE '-'\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/ComplaintOnsetDateDataEvaluator.java

@@ -119,8 +119,8 @@ public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationCon
                 "            when 123396 then \"Vaginal Discharge\"\n" +
                 "            when 122983 then \"Vomiting\"\n" +
                 "            when 111525 then \"Vertigo\"\n" +
-                "            when 5622 then \"Other\" end, ':',\n" +
-                "        COALESCE(DATE_SUB(i.visit_date, INTERVAL i.complaint_duration DAY), '-')\n" +
+                "            when 5622 then \"Other\" end, '|',\n" +
+                "        COALESCE(DATE_FORMAT(DATE_SUB(i.visit_date, INTERVAL i.complaint_duration DAY), '%Y-%m-%d %H:%i:%s'), '-')\n" +
                 ")\n" +
                 "ELSE '-'\n" +
                 "END\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/DateCreatedDataEvaluator.java

@@ -35,7 +35,7 @@ public class DateCreatedDataEvaluator implements VisitDataEvaluator {
     public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationContext context) throws EvaluationException {
         EvaluatedVisitData c = new EvaluatedVisitData(definition, context);
 
-        String qry = "select v.visit_id,v.date_created from visit v where date(v.date_started) between date(:startDate) and date(:endDate) and v.voided = 0;";
+        String qry = "select v.visit_id,DATE_FORMAT(v.date_created, '%Y-%m-%d %H:%i:%s') from visit v where date(v.date_started) between date(:startDate) and date(:endDate) and v.voided = 0;";
 
         SqlQueryBuilder queryBuilder = new SqlQueryBuilder();
         queryBuilder.append(qry);

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/DateUpdatedDataEvaluator.java

@@ -35,7 +35,7 @@ public class DateUpdatedDataEvaluator implements VisitDataEvaluator {
     public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationContext context) throws EvaluationException {
         EvaluatedVisitData c = new EvaluatedVisitData(definition, context);
 
-        String qry = "select v.visit_id,v.date_changed from visit v where date(v.date_started) between date(:startDate) and date(:endDate) and v.voided = 0;";
+        String qry = "select v.visit_id,DATE_FORMAT(v.date_changed, '%Y-%m-%d %H:%i:%s') from visit v where date(v.date_started) between date(:startDate) and date(:endDate) and v.voided = 0;";
 
         SqlQueryBuilder queryBuilder = new SqlQueryBuilder();
         queryBuilder.append(qry);

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/DiagnosisCaseDataEvaluator.java

@@ -39,7 +39,7 @@ public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationCon
         String qry = "select e.visit_id,\n" +
                 "       GROUP_CONCAT(CASE\n" +
                 "                        WHEN d.diagnosis_coded IS NOT NULL\n" +
-                "                            THEN CONCAT(d.diagnosis_coded, ':', COALESCE(n.name, '-')) END ORDER BY\n" +
+                "                            THEN CONCAT(d.diagnosis_coded, '|', COALESCE(n.name, '-')) END ORDER BY\n" +
                 "                    d.diagnosis_coded SEPARATOR ', ') as diagnosis\n" +
                 "FROM kenyaemr_etl.etl_clinical_encounter e\n" +
                 "         inner join openmrs.encounter_diagnosis d on e.encounter_id = d.encounter_id and d.voided = 0  and d.dx_rank = 2\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/DiagnosisCaseDateDataEvaluator.java

@@ -39,7 +39,7 @@ public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationCon
         String qry = "select e.visit_id,\n" +
                 "       GROUP_CONCAT(CASE\n" +
                 "                        WHEN d.diagnosis_coded IS NOT NULL\n" +
-                "                            THEN CONCAT(COALESCE(n.name, '-'),':', date(d.date_created)) END ORDER BY\n" +
+                "                            THEN CONCAT(COALESCE(n.name, '-'),'|', DATE_FORMAT(d.date_created, '%Y-%m-%d %H:%i:%s')) END ORDER BY\n" +
                 "                    d.diagnosis_coded SEPARATOR ', ') as diagnosis_date\n" +
                 "FROM kenyaemr_etl.etl_clinical_encounter e\n" +
                 "         inner join openmrs.encounter_diagnosis d on e.encounter_id = d.encounter_id and d.voided = 0 and d.dx_rank = 2\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/InterviewDateDataEvaluator.java

@@ -35,7 +35,7 @@ public class InterviewDateDataEvaluator implements VisitDataEvaluator {
     public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationContext context) throws EvaluationException {
         EvaluatedVisitData c = new EvaluatedVisitData(definition, context);
 
-        String qry = "select v.visit_id, coalesce(e.visit_date, t.visit_date) as interview_date\n" +
+        String qry = "select v.visit_id,  DATE_FORMAT(coalesce(e.visit_date, t.visit_date), '%Y-%m-%d %H:%i:%s') as interview_date\n" +
                 "from openmrs.visit v\n" +
                 "         left join kenyaemr_etl.etl_clinical_encounter e on v.visit_id = e.visit_id\n" +
                 "         left join kenyaemr_etl.etl_patient_triage t on v.visit_id = t.visit_id\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/LabOrderDateDataEvaluator.java

@@ -59,7 +59,7 @@ public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationCon
                 "SELECT v.visit_id,\n" +
                 "       GROUP_CONCAT(CASE\n" +
                 "                        WHEN lc.member_concept_id IS NOT NULL\n" +
-                "                            THEN CONCAT(COALESCE(lc.name, '-'), ':', o.date_activated) END ORDER BY\n" +
+                "                            THEN CONCAT(COALESCE(lc.name, '-'), '|', DATE_FORMAT(o.date_activated, '%Y-%m-%d %H:%i:%s')) END ORDER BY\n" +
                 "                    lc.member_concept_id SEPARATOR ', ') as Lab_date\n" +
                 "FROM openmrs.visit v\n" +
                 "         INNER JOIN openmrs.encounter e\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/LabOrderTestNameDataEvaluator.java

@@ -59,7 +59,7 @@ public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationCon
                 "SELECT v.visit_id,\n" +
                 "GROUP_CONCAT(CASE\n" +
                 "WHEN o.concept_id IS NOT NULL\n" +
-                "    THEN CONCAT(COALESCE(o.order_id, '-'), ':', lc.name) END ORDER BY\n" +
+                "    THEN CONCAT(COALESCE(o.order_id, '-'), '|', lc.name) END ORDER BY\n" +
                 "lc.member_concept_id SEPARATOR ', ') as Lab_test\n" +
                 "FROM visit v\n" +
                 "INNER JOIN encounter e ON e.visit_id = v.visit_id\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/LabOrderTestResultDataEvaluator.java

@@ -83,7 +83,7 @@ public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationCon
                 "SELECT v.visit_id,\n" +
                 "       GROUP_CONCAT(CASE\n" +
                 "                        WHEN lc.member_concept_id IS NOT NULL\n" +
-                "                            THEN CONCAT(COALESCE(if(cr.test_name IS NOT NULL,cr.test_name,if(nr.name is not null, nr.name,if(tr.name is not null, tr.name,''))), '-'), ':', COALESCE(cr.name,nr.value_numeric,tr.value_text)) END ORDER BY\n" +
+                "                            THEN CONCAT(COALESCE(if(cr.test_name IS NOT NULL,cr.test_name,if(nr.name is not null, nr.name,if(tr.name is not null, tr.name,''))), '-'), '|', COALESCE(cr.name,nr.value_numeric,tr.value_text)) END ORDER BY\n" +
                 "                    lc.member_concept_id SEPARATOR ', ') as Lab_result\n" +
                 "FROM visit v\n" +
                 "         INNER JOIN encounter e\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/OutpatientDateDataEvaluator.java

@@ -35,7 +35,7 @@ public class OutpatientDateDataEvaluator implements VisitDataEvaluator {
     public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationContext context) throws EvaluationException {
         EvaluatedVisitData c = new EvaluatedVisitData(definition, context);
 
-        String qry = "select v.visit_id, coalesce(e.visit_date, t.visit_date) as outpatient_date\n" +
+        String qry = "select v.visit_id, DATE_FORMAT(coalesce(e.visit_date, t.visit_date), '%Y-%m-%d %H:%i:%s') as outpatient_date\n" +
                 "from openmrs.visit v\n" +
                 "         left join kenyaemr_etl.etl_clinical_encounter e on v.visit_id = e.visit_id\n" +
                 "         left join kenyaemr_etl.etl_patient_triage t on v.visit_id = t.visit_id\n" +

api/src/main/java/org/openmrs/module/kenyaemr/reporting/data/converter/definition/evaluator/dmi/caseReport/VitalSignsDateDataEvaluator.java

@@ -36,7 +36,7 @@ public class VitalSignsDateDataEvaluator implements VisitDataEvaluator {
     public EvaluatedVisitData evaluate(VisitDataDefinition definition, EvaluationContext context) throws EvaluationException {
         EvaluatedVisitData c = new EvaluatedVisitData(definition, context);
 
-        String qry = "select t.visit_id, t.visit_date\n" +
+        String qry = "select t.visit_id, DATE_FORMAT(t.visit_date, '%Y-%m-%d %H:%i:%s')\n" +
                 "from kenyaemr_etl.etl_patient_triage t\n" +
                 "where t.visit_date between date(:startDate) and date(:endDate)\n" +
                 "GROUP BY t.visit_id;";