diff --git a/LICENSE b/LICENSE index 722fa1769..d7d3aaaf3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,6 @@ -Bahmni OpenMRS Apps -Copyright 2014 ThoughtWorks, Inc +Bahmni application configuration for default demo setup + +Copyright (C) 2018 OpenMRS, Inc This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as diff --git a/offline/openmrs/apps/registration/app.json b/offline/openmrs/apps/registration/app.json index d3bf8688f..f7f8fb498 100755 --- a/offline/openmrs/apps/registration/app.json +++ b/offline/openmrs/apps/registration/app.json @@ -82,10 +82,6 @@ } ], "conceptSetUI": { - "REGISTRATION FEES": { - "required": true, - "label": "Fee" - }, "FHS": { "buttonSelect": true }, diff --git a/offline/openmrs/apps/registration/extension.json b/offline/openmrs/apps/registration/extension.json index 8b1f3fc23..222990c76 100755 --- a/offline/openmrs/apps/registration/extension.json +++ b/offline/openmrs/apps/registration/extension.json @@ -44,17 +44,5 @@ }, "order": 1, "requiredPrivilege": "Edit Visits" - }, - "feeInformation":{ - "id": "bahmni.registration.conceptSetGroup.feeInformation", - "extensionPointId": "org.bahmni.registration.conceptSetGroup.observations", - "type": "config", - "extensionParams": { - "conceptName": "Fee Information", - "translationKey": "FEE_INFORMATION_LOCALE_KEY", - "required":true - }, - "order": 2, - "requiredPrivilege": "Edit Visits" } } diff --git a/openmrs/apps/appointments/app.json b/openmrs/apps/appointments/app.json index ad88678de..ac6f6257a 100644 --- a/openmrs/apps/appointments/app.json +++ b/openmrs/apps/appointments/app.json @@ -9,7 +9,7 @@ ], "config": { "minCharLengthToTriggerPatientSearch": 3, - "enableSpecialities": true, + "enableSpecialities": false, "startOfWeek": 2, "weekStart": "isoWeek", "calendarSlotDuration": "00:30", diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json index 2f0150229..989b3ebca 100644 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -40,31 +40,25 @@ "program": { "patientInformation": { "ageLimit": 100 - }, - "ID_Number": { - "required" : true - }, - "Co-morbidites": { - "excludeFrom": ["HIV Program"] - }, + }, "Doctor": { - "excludeFrom": ["TB Program"] + "excludeFrom": ["HIV Program","HEI Program","ART Program","PMTCT Program"] + }, + "Stage":{ + "excludeFrom": ["HEI Program","PMTCT Program"] } }, "patientContext": { "programAttributes": [ - "Id_Number", + "Doctor", - "Stage" + "Stage" + ], "personAttributes": [ "class", "caste" - ], - "additionalPatientIdentifiers": [ - "National ID" - ], - "preferredIdentifier": "Id_Number" + ] }, "obsIgnoreList": [ "REGISTRATION FEES", @@ -115,7 +109,7 @@ }, "Set2": { "allowAddMore": true - }, + }, "Coded3": { "multiSelect": true }, @@ -123,11 +117,140 @@ "allowAddMore": true }, "Gynaecology, Gravida": { - "stepper": true + "stepper": true }, + "Consultation Images": { + "allowAddMore": true + }, + "General Family Information": { + "allowAddMore": true + }, + "ART Regimen - Substitution within 1st Line": { + "allowAddMore": true + }, "Accepted Family Planning methods": { "multiSelect": true }, + "Other Entry Point":{ + "required":true + }, + "Other - Occupation":{ + "required":true + }, + "HIV - Entry Point":{ + "required":true + }, + "Name of Clinic":{ + "required":true + }, + "Date Transferred in":{ + "required":true + }, + "Literate":{ + "required":true + }, + "Education Level":{ + "required":true + }, + "HIV Care - Alcohol Intake":{ + "required":true + }, + "Drug Allergies":{ + "required":true + }, + "HIV Care -Drug Allergies Notes":{ + "required":true + }, + "ARVs Received in":{ + "required":true + }, + "Place Received ART":{ + "required":true + }, + "Other (Place specify)":{ + "required":true + }, + "Were ARVS Received , In Clinical Milestones":{ + "required":true + }, + "ART Follow up - Scheduled Date":{ + "required":true + }, + "FP Method":{ + "required":true + }, + "Number of Days Hospitalized":{ + "required":true + }, + "Child Regimen Information":{ + "allowAddMore": true + }, + "ART Regimen(Switch to 2nd Line)":{ + "allowAddMore": true + }, + "Reason":{ + "required":true + }, + "Specify Reason For Art Stop":{ + "required":true + }, + "Other Reason":{ + "required":true + }, + "Other Reason(Second Regimen Change)":{ + "required":true + }, + "Regimen Switched To":{ + "required":true + }, + "ART Treatment Reasons For Stop":{ + "required":true + }, + "Other Reason(First Line Regimen Change)":{ + "required":true + }, + "Immunization Not Given":{ + "required":true + }, + "Specify other Assessement":{ + "required":true + }, + "Development Milestones Missed":{ + "required":true + }, + "Specify other Mother's ART Regimen":{ + "required":true + }, + "HEI Treatment - Enrolled AT ART Date":{ + "required":true + }, + "HEI Treatment - Referred To ART Clinic Date":{ + "required":true + }, + "ANC, ART Start Date":{ + "required":true + }, + "ART ,Stop Date":{ + "required":true + }, + "CTX or Dapose Start Date":{ + "required":true + }, + "Classification Of Adherence":{ + "required":true + }, + "EDD":{ + "required":true + }, + "PMTCT - HIV & ART Follow up":{ + "required":true + }, + "WHO Stage":{ + "dropdown":true + }, + "Medical History":{ + "multiSelect" : true + }, "defaults": { "Number of living children": 1, "Accepted Family Planning methods": [ diff --git a/openmrs/apps/clinical/dashboard.json b/openmrs/apps/clinical/dashboard.json index 7febca3b0..0553265a4 100644 --- a/openmrs/apps/clinical/dashboard.json +++ b/openmrs/apps/clinical/dashboard.json @@ -82,12 +82,6 @@ "showDetailsButton":true } }, - "radiology":{ - "translationKey":"DASHBOARD_TITLE_RADIOLOGY_KEY", - "type":"radiology", - "showDetailsButton":true, - "displayOrder":5 - }, "programs":{ "translationKey":"DASHBOARD_TITLE_PROGRAMS_KEY", "type":"programs", @@ -105,16 +99,6 @@ "numberOfVisits":4 } }, - "pacs":{ - "orderType":"Radiology Order", - "type":"pacsOrders", - "translationKey":"DASHBOARD_TITLE_PACS_KEY", - "displayOrder":8, - "dashboardConfig":{ - "pacsImageUrl":"/oviyam2/viewer.html?patientID={{patientID}}&accessionNumber={{orderNumber}}", - "numberOfVisits":4 - } - }, "labOrdersDisplayControl":{ "translationKey":"DASHBOARD_TITLE_LAB_ORDERS_DISPLAY_CONTROL_KEY", "type":"ordersControl", @@ -139,17 +123,6 @@ "showDetailsButton":true } }, - "bacteriologyResults":{ - "translationKey":"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY", - "type":"bacteriologyResultsControl", - "scope":"All", - "orderType":"", - "dashboardConfig":{ - "conceptNames":[ - "BACTERIOLOGY CONCEPT SET" - ] - } - }, "labResults":{ "translationKey":"DASHBOARD_TITLE_LAB_RESULTS_KEY", "type":"labOrders", @@ -278,52 +251,6 @@ } } }, - "gynaecology":{ - "translationKey":"DASHBOARD_TITLE_GYNAECOLOGY_KEY", - "type":"gynaecology", - "isObservation":true, - "displayOrder":15, - "dashboardConfig":{ - "conceptNames":[ - "Gynaecology" - ], - "showDetailsButton":true, - "numberOfVisits":2 - }, - "expandedViewConfig":{ - "conceptNames":[ - "Gynaecology" - ], - "numberOfVisits":2, - "showDetailsButton":true, - "pivotTable":{ - - } - } - }, - "obstetrics":{ - "translationKey":"DASHBOARD_TITLE_OBSTETRICS_KEY", - "type":"obstetrics", - "isObservation":true, - "displayOrder":16, - "dashboardConfig":{ - "showDetailsButton":true, - "conceptNames":[ - "Obstetrics" - ], - "numberOfVisits":2 - }, - "expandedViewConfig":{ - "conceptNames":[ - "Obstetrics" - ], - "numberOfVisits":2, - "showDetailsButton":true, - "pivotTable":{ - - } - } - }, "visits":{ "translationKey":"DASHBOARD_TITLE_VISITS_KEY", "type":"visits", @@ -334,51 +261,6 @@ "groupByVisits":true } }, - "diabetes":{ - "title":"Diabetes", - "templateName":"Diabetes Templates", - "type":"diseaseTemplate", - "displayOrder":18, - "dashboardConfig":{ - "showOnly":[ - - ] - }, - "expandedViewConfig":{ - "showDetailsButton":true, - "pivotTable":{ - "numberOfVisits":"15", - "groupBy":"encounters", - "obsConcepts":[ - "Weight", - "Height", - "Systolic", - "Diastolic", - "Diabetes, Foot Exam", - "Diabetes, Eye Exam" - ], - "drugConcepts":[ - "Ipratropium Pressurised", - "Garbhpal Rasa" - ], - "labConcepts":[ - "RBS", - "FBS", - "PP2BS", - "Hb1AC", - "Creatinine", - "Albumin", - "Polymorph" - ] - } - } - }, - "admissionDetails":{ - "translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY", - "type":"admissionDetails", - "displayOrder":19, - "showDetailsButton":true - }, "conditions": { "translationKey":"CONDITION_LIST_DISPLAY_CONTROL_TITLE", "type": "conditionsList", @@ -534,23 +416,6 @@ "translationKey":"DASHBOARD_TAB_PATIENT_SUMMARY_KEY", "maxRecentlyViewedPatients":10, "sections":{ - "Bacteriology Concept Set":{ - "displayType":"Full-Page", - "translationKey":"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY", - "type":"obsToObsFlowSheet", - "dashboardConfig":{ - "numberOfVisits":1, - "templateName":"BACTERIOLOGY CONCEPT SET", - "groupByConcept":"Specimen Collection Date", - "conceptNames":[ - "Specimen Id" - ] - }, - "expandedViewConfig":{ - "templateName":"BACTERIOLOGY CONCEPT SET", - "groupByConcept":"Specimen Collection Date" - } - }, "HistoryAndExamination":{ "type":"historyAndExamination", "isObservation":true, diff --git a/openmrs/apps/clinical/extension.json b/openmrs/apps/clinical/extension.json index 8dd401c45..53239de05 100644 --- a/openmrs/apps/clinical/extension.json +++ b/openmrs/apps/clinical/extension.json @@ -131,28 +131,160 @@ "order": 5, "requiredPrivilege": "app:clinical" }, - "bahmniClinicalConceptSetGroupObservationsHistory": { + "bahmniClinicalConceptSetGroupObservationsHIV": { "id": "bahmni.clinical.conceptSetGroup.observations.history", "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", "type": "config", "extensionParams": { - "conceptName": "History and Examination", + "conceptName": "HIV AND PERSONAL HISTORY FORM", "default": true }, "order": 1, "requiredPrivilege": "app:clinical:history" }, - "bahmniClinicalConceptSetGroupObservationsVitals": { + "bahmniClinicalConceptSetGroupObservationsARTHistory": { "id": "bahmni.clinical.conceptSetGroup.observations.vitals", "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", "type": "config", "extensionParams": { "default": true, - "conceptName": "Vitals" + "conceptName": "ART History And Clinical Milestone" + }, + "order": 3, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObservationsFamilyHistory": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "HIV CARE - Family History Data" }, "order": 2, "requiredPrivilege": "app:clinical" }, + "bahmniClinicalConceptSetGroupObsertionsInterruption": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "ART Treatment And Interruption Form" + }, + "order": 4, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsHIVART": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "HIV AND ART FOLLOW UP FORM" + }, + "order": 5, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsTB": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "TB FORM" + }, + "order": 6, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsEndTB": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "End Of Follow Up Form" + }, + "order": 7, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsANCCARD": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "ANC CARD FORM" + }, + "order": 9, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsViralLoad": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "Viral Load Lab Request Form" + }, + "order": 8, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsHEIEnrollment": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "HEI Enrollment Form" + }, + "order": 10, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsInfantFollowup": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "Infant Clinical Follow Up Form" + }, + "order": 12, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsHEITesting": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "HEI TESTING INFORMATION" + }, + "order": 11, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsHEIEndOfFollowup": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "HEI END OF FOLLOW UP FORM" + }, + "order": 13, + "requiredPrivilege": "app:clinical" + }, + "bahmniClinicalConceptSetGroupObsertionsARTTreatment": { + "id": "bahmni.clinical.conceptSetGroup.observations.vitals", + "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", + "type": "config", + "extensionParams": { + "default": true, + "conceptName": "ART Treatment And Interruptions Form" + }, + "order": 4, + "requiredPrivilege": "app:clinical" + }, "bahmniClinicalConceptSetGroupObservationsSecondVitals": { "id": "bahmni.clinical.conceptSetGroup.observations.secondVitals", "extensionPointId": "org.bahmni.clinical.conceptSetGroup.observations", @@ -235,4 +367,8 @@ "order": 7, "requiredPrivilege": "app:clinical:bacteriologyTab" } -} \ No newline at end of file + + + +} + diff --git a/openmrs/apps/clinical/formConditions.js b/openmrs/apps/clinical/formConditions.js index 9179a948a..4ce0b92d4 100644 --- a/openmrs/apps/clinical/formConditions.js +++ b/openmrs/apps/clinical/formConditions.js @@ -24,5 +24,480 @@ Bahmni.ConceptSet.FormConditions.rules = { disable: ["Posture"] } } - } -}; \ No newline at end of file + }, + "End Of Follow Up Reason" : function(formName, formFieldValues) { + var death = formFieldValues["End Of Follow Up Reason"]; + if(death === "Death during treatment") { + return { + hide: ["Lost To Follow Up Information" , "Transferred Out Information"], + show:["Death Information"] + } + } else if( death === "Lost Follow Up(< 28days)"){ + return { + hide: ["Death Information", "Transferred Out Information"], + show: ["Lost To Follow Up Information"] + } + }else if (death === "Transferred Out"){ + return { + hide: ["Lost To Follow Up Information" , "Death Information"], + show: ["Transferred Out Information"] + } + } + else { + return { + hide: ["Death Information", "Transferred Out Information" , "Lost To Follow Up Information"] + } + } + + }, + "Occupation" : function (formName , formFieldValues){ + var occupationanswer = formFieldValues["Occupation"]; + + if(occupationanswer === "Occupation - Other (Specify)"){ + return{ + show: ["Other - Occupation"] + } + }else { + return{ + hide: ["Other - Occupation"] + } + } + + }, + "HIV - Entry Point" : function (formName , formFieldValues){ + var entrypoint = formFieldValues["HIV - Entry Point"]; + + if(entrypoint === "Other Entry Point (Specify)"){ + return{ + show: ["Other Entry Point"] + } + }else { + return{ + hide: ["Other Entry Point"] + } + } + }, + "Transferred in on ART?" : function (formName , formFieldValues){ + var transferred = formFieldValues["Transferred in on ART?"]; + + if(transferred == true){ + return{ + show: ["Name of Clinic" , "Date Transferred in"] + } + }else { + return{ + hide: ["Name of Clinic" , "Date Transferred in"] + } + } + }, + "Literate" : function (formName , formFieldValues){ + var literate = formFieldValues["Literate"]; + if(literate == true){ + return{ + show: ["Education Level"] + } + }else { + return{ + hide: ["Education Level"] + } + } + }, + "Drug Allergies" : function (formName , formFieldValues){ + var allergy = formFieldValues["Drug Allergies"]; + if(allergy == true){ + return{ + show: ["HIV Care -Drug Allergies Notes"] + } + }else { + return{ + hide: ["HIV Care -Drug Allergies Notes"] + } + } + }, + "Were ARVS Received?" : function (formName , formFieldValues){ + var arvsreceived = formFieldValues["Were ARVS Received?"]; + if(arvsreceived == true){ + return{ + show: ["ARVs Received in" , "Place Received ART", "Other (Place specify)","ANC, ART Start Date","ART ,Stop Date"] + } + }else { + return{ + hide: ["ARVs Received in", "Place Received ART" , "Other (Place specify)","ANC, ART Start Date","ART ,Stop Date"] + + } + } + }, + "Planned Delivery Place" : function (formName , formFieldValues){ + var otheranswer = formFieldValues["Planned Delivery Place"]; + if(otheranswer === "Other Answer"){ + return{ + show: ["Other (Place specify)"] + } + }else { + return{ + hide: ["Other (Place specify)"] + } + } + }, + "TB Screening, Person Age" : function (formName , formFieldValues){ + var personage = formFieldValues["TB Screening, Person Age"]; + if(personage < 15){ + return{ + show: ["Close Contact History with TB patients"] + } + }else { + return{ + hide: ["Close Contact History with TB patients"] + } + } + }, + "Follow up - Scheduled" : function (formName , formFieldValues){ + var scheduled = formFieldValues["Follow up - Scheduled"]; + if(scheduled == true){ + return{ + show: ["ART Follow up - Scheduled Date"] + } + }else { + return{ + hide: ["ART Follow up - Scheduled Date"] + } + } + }, + "Current on FP" : function (formName , formFieldValues){ + var currentfp = formFieldValues["Current on FP"]; + if(currentfp == true){ + return{ + show: ["FP Method"] + } + }else { + return{ + hide: ["FP Method"] + } + } + }, + "Hospitalised" : function (formName , formFieldValues){ + var hospitalised = formFieldValues["Hospitalised"]; + if(hospitalised == true){ + return{ + show: ["Number of Days Hospitalized"] + } + }else { + return{ + hide: ["Number of Days Hospitalized"] + } + } + }, + "Interruption Type" : function (formName , formFieldValues){ + var interruptiontype = formFieldValues["Interruption Type"]; + if(interruptiontype === "Stop"){ + return{ + show: ["ART Treatment Reasons For Stop"] + } + }else { + return{ + hide: ["ART Treatment Reasons For Stop"] + } + } + }, + "Switched Regimen" : function (formName , formFieldValues){ + var switchedregimen = formFieldValues["Switched Regimen"]; + if(switchedregimen == true){ + return{ + show: ["Regimen Switched To"] + } + }else { + return{ + hide: ["Regimen Switched To"] + } + } + }, + "Regimen Switched To" : function (formName , formFieldValues){ + var switchedregimento = formFieldValues["Regimen Switched To"]; + if(switchedregimento === "Regimen Switched To (Adult First Line)"){ + return{ + show: ["ART Regimen - Substitution within 1st Line"], + hide: ["ART Regimen(Switch to 2nd Line)","Other Reason(First Line Regimen Change)"] + + } + }else if(switchedregimento === "Regimen Switched To (Adult Second Line)"){ + return{ + show: ["ART Regimen(Switch to 2nd Line)"], + hide: ["ART Regimen - Substitution within 1st Line","Other Reason(Second Regimen Change)"] + } + } else { + return{ + hide: ["ART Regimen - Substitution within 1st Line", "ART Regimen(Switch to 2nd Line)"] + + } + + } + }, + "ART Treatment Reasons For Stop" : function (formName , formFieldValues){ + var arttreatmentreason = formFieldValues["ART Treatment Reasons For Stop"]; + if(arttreatmentreason === "Other Reason For ART Stop"){ + return{ + show: ["Specify Reason For Art Stop"] + } + }else { + return{ + hide: ["Specify Reason For Art Stop"] + } + } + }, + "Reason For Regimen Change(First Line)" : function (formName , formFieldValues){ + var changereasonfirstreg = formFieldValues["Reason For Regimen Change(First Line)"]; + if(changereasonfirstreg === "Other Reason For Regimen Change(First Line)"){ + return{ + show: ["Other Reason(First Line Regimen Change)"] + } + }else { + return{ + hide: ["Other Reason(First Line Regimen Change)"] + } + } + }, + "Reason For Regimen Change(Second Line)" : function (formName , formFieldValues){ + var changereasonsecond = formFieldValues["Reason For Regimen Change(Second Line)"]; + if(changereasonsecond === "Other Reason For Regimen Change(First Line)"){ + return{ + show: ["Other Reason(Second Regimen Change)"] + } + }else { + return{ + hide: ["Other Reason(Second Regimen Change)"] + } + } + }, + "Family Member - HIV Status" : function (formName , formFieldValues){ + var hivstatus = formFieldValues["Family Member - HIV Status"]; + if(hivstatus === "Known"){ + return{ + show: ["Result","Date Tested HIV","Result of HTS","Unique ART No/HEI No"] + } + }else { + return{ + hide: ["Result","Date Tested HIV","Result of HTS","Unique ART No/HEI No"] + } + } + }, + "ART Follow up - Information" : function (formName , formFieldValues, patient){ + if(patient.gender === "F"){ + return{ + show: ["Current on FP","FP Pregnant","FP Method","EDD","PMTCT - HIV & ART Follow up"] + } + }else { + return{ + hide: ["Current on FP","FP Pregnant","FP Method","EDD","PMTCT - HIV & ART Follow up"] + } + } + }, + "VL Results" : function (formName , formFieldValues){ + var vlresults = formFieldValues["VL Results"]; + if(vlresults >= 1000){ + alert("Patient Required Enhanced Adherence Counselling"); + return{ + show:["Classification Of Adherence"] + } + }else { + return{ + hide:["Classification Of Adherence"] + } + } + }, + "FP Pregnant" : function (formName , formFieldValues){ + var fppregnant = formFieldValues["FP Pregnant"]; + if(fppregnant == true){ + alert("Enroll This Patient To PMTCT Clinic"); + } + }, + + "Date of HIV Retesting Before ART": function (formName, formFieldValues) { + var dateretestedhiv = formFieldValues["Date of HIV Retesting Before ART"]; + var datefirsttestedhiv = formFieldValues["Date First Tested HIV +"]; + var date1 = new Date(datefirsttestedhiv); + var date2 = new Date(dateretestedhiv); + if (date1 > date2) { + alert("HIV RETESTING DATE SHOULD BE GREATER THAN HIV FIRST TESTING DATE"); + + } + }, + "ART Regimen - Substitution within 1st Line" : function (formName , formFieldValues, patient){ + if(patient.age < 15){ + return{ + show: ["Child Regimens (First Line)"], + hide:["Substitution Regimen For Adults(First Line)"] + } + }else { + return{ + hide: ["Child Regimens (First Line)"], + show: ["Substitution Regimen For Adults(First Line)"] + } + } + }, + "ART Regimen(Switch to 2nd Line)" : function (formName , formFieldValues, patient){ + if(patient.age < 15){ + return{ + show: ["Children Second Line Regimens"], + hide:["Substitution Regimen (2nd Line Adults)"] + } + }else { + return{ + hide: ["Children Second Line Regimens"], + show:["Substitution Regimen (2nd Line Adults)"] + } + } + }, + "AntiRetroviral Treatment" : function (formName , formFieldValues, patient){ + if(patient.age < 15){ + return{ + show: ["Initial ART Regimen For Children"], + hide:["Initial ART Regimen (Adult)"] + + } + }else { + return{ + hide: ["Initial ART Regimen For Children"], + show:["Initial ART Regimen (Adult)"] + + } + } + }, + "Is there an immunization not Given?" : function (formName , formFieldValues){ + var immunizationgiven = formFieldValues["Is there an immunization not Given?"]; + if(immunizationgiven == true){ + return{ + show:["Immunization Not Given"] + } + }else { + return{ + hide:["Immunization Not Given"] + } + } + }, + "Clinical Assessment for Signs and Symptoms of HIV": function (formName, formFieldValues) { + var clinicalassessment = formFieldValues["Clinical Assessment for Signs and Symptoms of HIV"]; + if (clinicalassessment === "Other Assessment Specify") { + return { + show: ["Specify other Assessement"] + } + } else { + return { + hide: ["Specify other Assessement"] + } + } + }, + + "Was any Development Milestone Missed?": function (formName, formFieldValues) { + var milestonemissed = formFieldValues["Was any Development Milestone Missed?"]; + if (milestonemissed == true) { + return { + show: ["Development Milestones Missed"] + } + } else { + return { + hide: ["Development Milestones Missed"] + } + } + }, + "Mother's ART Regimen": function (formName, formFieldValues) { + var motherartregimen = formFieldValues["Mother's ART Regimen"]; + if (motherartregimen === "Other ART Regimen") { + return { + show: ["Specify other Mother's ART Regimen"] + } + } else { + return { + hide: ["Specify other Mother's ART Regimen"] + } + } + }, + "HEI Treatment - Referred To ART Clinic": function (formName, formFieldValues) { + var referredtoclinic = formFieldValues["HEI Treatment - Referred To ART Clinic"]; + if (referredtoclinic == true) { + return { + show: ["HEI Treatment - Referred To ART Clinic Date"] + } + } else { + return { + hide: ["HEI Treatment - Referred To ART Clinic Date"] + } + } + }, + "HEI Treatment - Referred To ART Clinic": function (formName, formFieldValues) { + var referredtoclinic = formFieldValues["HEI Treatment - Referred To ART Clinic"]; + if (referredtoclinic == true) { + return { + show: ["HEI Treatment - Referred To ART Clinic Date"] + } + } else { + return { + hide: ["HEI Treatment - Referred To ART Clinic Date"] + } + } + }, + "HEI Treatment - Enrolled AT ART Clinic": function (formName, formFieldValues) { + var enrolleddate = formFieldValues["HEI Treatment - Enrolled AT ART Clinic"]; + if (enrolleddate == true) { + return { + show: ["HEI Treatment - Enrolled AT ART Date"] + } + } else { + return { + hide: ["HEI Treatment - Enrolled AT ART Date"] + } + } + }, + "Place Received ART": function (formName, formFieldValues) { + var placeartreceived = formFieldValues["Place Received ART"]; + if (placeartreceived === "Other Answer") { + return { + show: ["Other (Place specify)"] + } + } else { + return { + hide: ["Other (Place specify)"] + } + } + }, + "Is Patient on CTX or Dapose?": function (formName, formFieldValues) { + var patientondapose = formFieldValues["Is Patient on CTX or Dapose?"]; + if (patientondapose == true) { + return { + show: ["CTX or Dapose Start Date"] + } + } else { + return { + hide: ["CTX or Dapose Start Date"] + } + } + }, + "FP Pregnant": function (formName, formFieldValues) { + var patientpreg = formFieldValues["FP Pregnant"]; + if (patientpreg == true) { + return { + show: ["EDD","PMTCT - HIV & ART Follow up"], + hide:["Current on FP"] + } + } else { + return { + hide: ["EDD","PMTCT - HIV & ART Follow up"], + show:["Current on FP"] + } + } + }, + "ART Follow up - Information": function (formName , formFieldValues, patient){ + if(patient.age < 15){ + return{ + show: ["TB Regimen For Children"], + hide: ["TB Regimen On"] + + } + }else { + return{ + hide: ["TB Regimen For Children"], + show: ["TB Regimen On"] + } + } + }, + }; + diff --git a/openmrs/apps/home/extension.json b/openmrs/apps/home/extension.json index 4f282dc65..ac41530e3 100644 --- a/openmrs/apps/home/extension.json +++ b/openmrs/apps/home/extension.json @@ -149,6 +149,16 @@ "icon": "fa fa-calendar", "order": 14, "requiredPrivilege": "app:appointments" - } + }, + "possible_dhis_2_integration": { + "id": "possible.dhis2Integration", + "extensionPointId": "org.bahmni.home.dashboard", + "type": "link", + "label": "DHIS2 integration", + "url": "/dhis-integration/index.html", + "icon": "fa-book", + "order": 15, + "requiredPrivilege": "app:reports" +} } diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json index 10305921f..735e45a18 100644 --- a/openmrs/apps/home/whiteLabel.json +++ b/openmrs/apps/home/whiteLabel.json @@ -1,6 +1,6 @@ { "homePage": { - "header_text": "WELCOME TO
BAHMNI EMR & HOSPITAL SERVICE", + "header_text": "WELCOME TO
eHospital", "logo": "/bahmni/images/bahmniLogoFull.png", "title_text": " " }, diff --git a/openmrs/apps/ipd/app.json b/openmrs/apps/ipd/app.json index 5fd572af8..056a4e689 100644 --- a/openmrs/apps/ipd/app.json +++ b/openmrs/apps/ipd/app.json @@ -24,7 +24,7 @@ "visitUuid" ], "config": { - "wardListSqlSearchHandler": "emrapi.sqlGet.allWardsListDetails", + "wardListSqlSearchHandler": "bedManagement.sqlGet.patientListForAdmissionLocation", "diagnosisStatus": "Inactive", "onAdmissionForwardTo": "#/bedManagement/patient/{{patientUuid}}/visit/{{visitUuid}}", "onTransferForwardTo": "#/bedManagement/patient/{{patientUuid}}/visit/{{visitUuid}}", @@ -77,8 +77,8 @@ "customLinks": [ { "name": "bedManagement", - "translationKey": "PATIENT_BED_MANAGEMENT_PAGE_KE", - "url": "../bedmanagement/#/bedManagement/patient/{{patientUuid}}/visit/{{visitUuid}}" + "translationKey": "PATIENT_BED_MANAGEMENT_PAGE_KEY", + "url": "../bedmanagement/#/bedManagement/patient/{{patientUuid}}" } ] }, diff --git a/openmrs/apps/ipd/extension.json b/openmrs/apps/ipd/extension.json index b27a9cca7..4c1b0181f 100644 --- a/openmrs/apps/ipd/extension.json +++ b/openmrs/apps/ipd/extension.json @@ -1,93 +1,4 @@ { - "bahmniAdtAdmitContinueVisit":{ - "id": "bahmni.adt.admit.continue.visit", - "extensionPointId": "org.bahmni.adt.admit.action", - "type": "config", - "extensionParams" : { - "displayFunction": "getDisplayForContinuingVisit", - "action":"admit", - "showCondition":"visitExists" - }, - "order": 2, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtAdmitCancel":{ - "id": "bahmni.adt.admit.cancel", - "extensionPointId": "org.bahmni.adt.admit.action", - "type": "config", - "extensionParams" : { - "display": "Cancel", - "action":"cancel" - }, - "order": 3, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtTransferSave":{ - "id": "bahmni.adt.transfer.save", - "extensionPointId": "org.bahmni.adt.transfer.action", - "type": "config", - "extensionParams" : { - "display": "Save", - "action":"transfer" - }, - "order": 1, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtTransferCancel":{ - "id": "bahmni.adt.transfer.cancel", - "extensionPointId": "org.bahmni.adt.transfer.action", - "type": "config", - "extensionParams" : { - "display": "Cancel", - "action":"cancel" - }, - "order": 2, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtDischargeSave":{ - "id": "bahmni.adt.discharge.save", - "extensionPointId": "org.bahmni.adt.discharge.action", - "type": "config", - "extensionParams" : { - "display": "Discharge", - "action":"discharge" - }, - "order": 2, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtDischargeCancel":{ - "id": "bahmni.adt.discharge.cancel", - "extensionPointId": "org.bahmni.adt.discharge.action", - "type": "config", - "extensionParams" : { - "display": "Cancel", - "action":"cancel" - }, - "order": 3, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtUndoDischarge":{ - "id": "bahmni.adt.undo.discharge", - "extensionPointId": "org.bahmni.adt.undo.discharge.action", - "type": "config", - "extensionParams" : { - "display": "Undo Discharge", - "action":"undoDischarge" - }, - "order": 1, - "requiredPrivilege": "app:adt" - }, - "bahmniAdtUndoDischargeCancel":{ - "id": "bahmni.adt.undo.discharge.cancel", - "extensionPointId": "org.bahmni.adt.undo.discharge.action", - "type": "config", - "extensionParams" : { - "display": "Cancel", - "action":"cancel" - }, - "order": 2, - "requiredPrivilege": "app:adt" - }, "bahmniAdtPatientsSearchPatientsToAdmit":{ "id": "bahmni.adt.patients.search.patientsToAdmit", "extensionPointId": "org.bahmni.patient.search", diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 915502784..ea3ee54f0 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -18,26 +18,65 @@ ], "config" : { "patientInformation": { - "additionalPatientInformation": { - "title": "Additional Patient Information", + "registrantInformation": { + "title": "Registrant Information", "attributes": [ - "distanceFromCenter", - "isUrban", - "cluster", - "RationCard", - "familyIncome", - "debt", - "cluster" - ] + "HealthFacilityName", + "TodaysDate", + "RegistrantName" + ], + "expand": true, + "order": 1 }, - "hidden": { + "registerNewPatient1": { + "title": "Register A New Patient", "attributes": [ - "primaryContact" - ] + "TypeofPatient" + ], + "expand": true, + "order": 2 }, - "defaults": { - "class": "General", - "landHolding": 2 + "registerNewPatient2": { + "title": "Not shown", + "attributes": [ + "UniqueArtNo", + "HIVExposedInfant(HEI)No" + ], + "expand": true, + "order": 3 + }, + "registerNewPatient3": { + "title": "Not shown", + "attributes": [ + "MaritalStatus" + ], + "expand": true, + "order": 4 + }, + "contactInformation": { + "title": "Contact Information", + "attributes": [ + "MobileCountryCode", + "MobileNumber", + "AlternativeNumber" + ], + "expand": true, + "order": 5 + }, + "treatmentSupporter": { + "title": "Treatment Supporter", + "attributes": [ + "TreatmentSupporterFirstName", + "TreatmentSupporterLastName", + "TreatmentSupporterTelephoneNumber", + "TreatmentSupporterAddress", + "HomeCareProvidedBy" + ], + "expand": true, + "order": 6 + }, + "defaults": { + "MobileCountryCode": "South Sudan" } }, "addressHierarchy": { @@ -49,43 +88,27 @@ "Parent":"patient" }, - "autoCompleteFields":["familyName", "caste"], - "defaultIdentifierPrefix": "GAN", + "disablePhotoCapture": true, + "showEnterID": false, + "dobMandatory": true, + "autoCompleteFields":["familyName", "givenName"], "defaultVisitType": "OPD", "searchByIdForwardUrl": "/patient/{{patientUuid}}", "showMiddleName": true, "showLastName": true, "isLastNameMandatory": true, "showSaveConfirmDialog": false, - "showBirthTime": true, + "showBirthTime": false, "showCasteSameAsLastNameCheckbox": false, "printOptions": [ { "translationKey": "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY", "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/print_local.html", "shortcutKey": "l" - }, - { - "translationKey": "REGISTRATION_PRINT_REG_CARD_KEY", - "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/print.html", - "shortcutKey": "p" - }, - { - "translationKey": "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER", - "templateUrl": "/bahmni_config/openmrs/apps/registration/supplementalPaperLayout/print.html", - "shortcutKey": "r" - }, - { - "translationKey": "REGISTRATION_PRINT_WITH_BARCODE", - "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html", - "shortcutKey": "c" } + ], "conceptSetUI": { - "REGISTRATION FEES": { - "required": true, - "label": "Fee" - }, "FHS": { "buttonSelect": true }, @@ -102,15 +125,10 @@ "address1" : {"pattern" : "[a-zA-Z0-9\\s]{2,}", "errorMessage" : "Should contain at least 2 characters"} }, "patientSearch": { - "address": { - "label": "Rural Ward", - "placeholder": "Enter ward", - "field": "address2" - }, "customAttributes": { - "label": "रुग्णाचे नाव", - "placeholder": "रुग्णाचे नाव", - "fields": ["givenNameLocal", "middleNameLocal", "familyNameLocal"] + "label": "Unique Art No.", + "placeholder": "Enter Unique Art No", + "fields": ["UniqueArtNo","MaritalStatus","Cohort"] } } } diff --git a/openmrs/apps/registration/extension.json b/openmrs/apps/registration/extension.json index f42906ff8..3b46086b5 100644 --- a/openmrs/apps/registration/extension.json +++ b/openmrs/apps/registration/extension.json @@ -45,18 +45,18 @@ "order": 1, "requiredPrivilege": "Edit Visits" }, - "feeInformation":{ - "id": "bahmni.registration.conceptSetGroup.feeInformation", - "extensionPointId": "org.bahmni.registration.conceptSetGroup.observations", + "enterConsultation": { + "id": "bahmni.patient.registration.next", + "extensionPointId": "org.bahmni.registration.patient.next", "type": "config", - "extensionParams": { - "conceptName": "Fee Information", - "translationKey": "FEE_INFORMATION_LOCALE_KEY", - "required":true + "extensionParams" : { + "display": "Start Consultation", + "shortcutKey": "c", + "forwardUrl": "../clinical/#/default/patient/{{patientUuid}}/dashboard" }, - "order": 2, - "requiredPrivilege": "Edit Visits" - }, + "order": 1, + "requiredPrivilege": "Edit Patients" + }, "nutritionalValue":{ "id": "bahmni.registration.conceptSetGroup.nutritionalValue", "extensionPointId": "org.bahmni.registration.conceptSetGroup.observations", @@ -67,7 +67,7 @@ "required":true, "showLatest": true }, - "order": 3, + "order": 4, "requiredPrivilege": "Edit Visits" } } diff --git a/openmrs/apps/registration/registrationCardLayout/images/bahmniLogoFull.png b/openmrs/apps/registration/registrationCardLayout/images/bahmniLogoFull.png new file mode 100644 index 000000000..12ba755d5 Binary files /dev/null and b/openmrs/apps/registration/registrationCardLayout/images/bahmniLogoFull.png differ diff --git a/openmrs/apps/registration/registrationCardLayout/print_local.html b/openmrs/apps/registration/registrationCardLayout/print_local.html index bade168eb..34bdb483d 100644 --- a/openmrs/apps/registration/registrationCardLayout/print_local.html +++ b/openmrs/apps/registration/registrationCardLayout/print_local.html @@ -1,131 +1,156 @@ - +
+ + - - + +
- - + + - -
+ - -

सूचना

-
    -
  • - स्वास्थ्य केन्द्र में पुनः आने के समय यह कार्ड लाना अति आवश्यक है । -
    • -
  • - दवा डाक्टर के निर्देशानुसार ही लें । -
    • -
  • - केन्द्र में पंजीयन का समय - प्रातः 8:30 से दोपहर 12:00 बजे तक । -
    • -
  • - ओ.पी.डी. के दिन - सोम, बुध, शुक्र । -
    • -
  • - साप्ताहिक अवकाश - रविवार । -
    • -
-
-

सावधान

-

- बीडी, तम्बाकू, गुटका से केंसर, ह्रदय रोग और दमा हो सकते हैं । -

-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Visit DateCD4 Count/CD4%
(<=15yrs)		 Viral LoadCurrent ART
/Other Medication		Next appointment Date
 
 
 
 
+
-

- जन स्वास्थ्य सहयोग -

-

(पंजीकृत)

+

+ MINISTRY OF HEALTH +

+

Republic Of South Sudan

 + onerror="this.onerror=null;this.src='../images/blank.jpeg';" />
- गनियारी, जिला - बिलासपुर + ART CLIENT HAND HELD CARD
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- दिनाँक - : {{patient.registrationDate | bahmniDate}}
- रजिस्ट्रेशन - : {{patient.primaryIdentifier.identifier}}
- नाम - : - {{patient.fullNameLocal()}} -
- उम्र - : {{patient.age | age}}
- लिंग - : {{patient.gender}}
- पिता/पति - : {{patient.primaryRelative}}
- गाँव - : {{patient.address.cityVillage}}
- तहसील - : {{patient.address.address3}}
+ Facility Name : + .....................
+ Full Names: + + {{patient.fullNameLocal()}} +
+ Age:   {{patient.age | age}} + + Sex:   {{patient.gender}} +
+ ART No:   {{patient.primaryIdentifier.identifier}} + + HEI No:   ............. +
+ ART Start Date: + + .... / .... / .... +
Initial ART Regimen: + + ....................... +
+ + +
    +
  1. Carry this card and present it to the health worker at every visit.
    2. +
  2. Keep the appointment date as indicated in this card.
    3. +
  3. In case of new symptoms, visit the facility or call health worker.
    4. +
  4. If you can't come, call health worker on number below.
    5. +
+ + +
Health Facility Telephone No. ......................
+ - - - + + + +
diff --git a/openmrs/apps/reports/facilityReports.json b/openmrs/apps/reports/facilityReports.json new file mode 100644 index 000000000..c7c2d9f15 --- /dev/null +++ b/openmrs/apps/reports/facilityReports.json @@ -0,0 +1,30 @@ +{ + "missedAppointmentReport": { + "name": "Missed Appointment Report", + "type": "MRSGeneric", + "config": { + "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/missedAppointments.sql" + } + }, + "summaryAppointmentReport": { + "name": "Appointment Summary Report", + "type": "MRSGeneric", + "config": { + "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/summaryAppointmentReport.sql" + } + }, + "visitAppointmentReport": { + "name": "Visit Appointment Report", + "type": "MRSGeneric", + "config": { + "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/visitAppointmentReport.sql" + } + }, + "walkinAppointmentReport": { + "name": "WalkIn Visit Report", + "type": "MRSGeneric", + "config": { + "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/walkinAppointmentReport.sql" + } + } +} diff --git a/openmrs/apps/reports/monthlyReports.json b/openmrs/apps/reports/monthlyReports.json new file mode 100644 index 000000000..5a2614097 --- /dev/null +++ b/openmrs/apps/reports/monthlyReports.json @@ -0,0 +1,9 @@ +{ + "artRegisterReport": { + "name": "ART Register Report", + "type": "MRSGeneric", + "config": { + "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/artRegister.sql" + } + } +} diff --git a/openmrs/apps/reports/reports.json b/openmrs/apps/reports/reports.json index 056c565d6..ec16d89ed 100644 --- a/openmrs/apps/reports/reports.json +++ b/openmrs/apps/reports/reports.json @@ -26,635 +26,8 @@ ] } }, - "testReport": { - "name": "Test Observation Report", - "type": "observations", - "config": { - "patientAttributes": [ - "caste", - "class", - "education", - "occupation", - "primaryContact" - ], - "patientAddresses": [ - "address3", - "city_village" - ], - "visitAttributes": [ - "Visit Status", - "Admission Status" - ], - "showVisitInfo": true, - "showProvider": true, - "conceptNamesToFilter": [ - ], - "conceptNameDisplayFormat": "shortNamePreferred", - "conceptValuesToFilter": ["0..20","100..","True"], - "conceptClassesToFilter": [], - "locationTagsToFilter": [], - "programsToFilter": [], - "applyDateRangeFor": "obsDate", - "encounterPerRow": true, - "forDataAnalysis": true, - "visitTypesToFilter": [ - "PHARMACY VISIT", - "OPD" - ] - } - }, - "testFormReport":{ - "name": "Test Forms Report", - "type": "forms", - "config": { - "patientAttributes": [ - "caste", - "class", - "education", - "occupation", - "primaryContact" - ], - "patientAddresses": [ - "address3", - "city_village" - ], - "visitAttributes": [ - "Visit Status", - "Admission Status" - ], - "showVisitInfo": true, - "showProvider": true, - "formNamesToFilter": ["Vitals"], - "conceptNameDisplayFormat": "shortNamePreferred", - "locationTagsToFilter": [], - "programsToFilter": [], - "applyDateRangeFor": "obsDate", - "visitTypesToFilter": [] - } - }, - "formBuilderReport":{ - "name": "Form builder form Report", - "type": "formBuilder", - "config": { - "patientAttributes": [ - "caste", - "class", - "education", - "occupation" - ], - "patientAddresses": [ - "address3", - "city_village" - ], - "visitAttributes": [ - "Visit Status" - ], - "showVisitInfo": true, - "showProvider": true, - "formNamesToFilter": [ "Test Form"], - "conceptNameDisplayFormat": "shortNamePreferred", - "locationTagsToFilter": [], - "programsToFilter": [], - "applyDateRangeFor": "obsDate", - "visitTypesToFilter": [] - } - }, - "chiefComplaintReport": { - "name": "Chief Complaint Report", - "type": "obsCount", - "config": { - "ageGroupName": "All Ages", - "conceptNames": [ - "Chief Complaint" - ], - "countOnlyClosedVisits": "false", - "visitTypes": [ - "IPD", - "OPD" - ] - } - }, - "inpatientMorbidity": { - "name": "Inpatient Morbidity", - "type": "diagnosisCount", - "config": { - "visitTypes": [ - "IPD" - ] - } - }, - "outpatientMorbidity": { - "name": "Outpatient Morbidity", - "type": "diagnosisCount", - "config": { - "visitTypes": [ - "OPD" - ] - } - }, - "laboratoryServices": { - "name": "Laboratory Services", - "type": "TestCount" - }, - "genericLaboratoryServices": { - "name": "Generic Laboratory Services", - "type": "ElisGeneric", - "config": { - "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/testCount.sql" - } - }, - "bloodPressure": { - "name": "Blood Pressure", - "type": "obsCount", - "config": { - "ageGroupName": "All Ages", - "conceptNames": [ - "Systolic", - "Diastolic" - ], - "countOnlyClosedVisits": "false", - "countOncePerPatient": "false", - "visitTypes": [ - "OPD", - "IPD" - ] - } - }, - "smokingHistoryReport": { - "name": "Smoking History Report", - "type": "obsCount", - "config": { - "ageGroupName": "All Ages", - "conceptNames": [ - "Smoking History" - ], - "countOnlyClosedVisits": "false", - "countOncePerPatient": "true" - } - }, - "vitalsTemplateReport": { - "name": "Vitals Template Report", - "type": "obsTemplate", - "config": { - "templateName": "Vitals", - "patientAttributes": [ - "caste", - "education" - ], - "applyDateRangeFor": "encounterCreateDate" - } - }, - "tuberculosisIntakeTemplateReport": { - "name": "Tuberculosis Intake Template Report", - "type": "obsTemplate", - "config": { - "templateName": "Tuberculosis Intake Template" - } - }, - "diabetes": { - "name": "Diabetes", - "type": "obsCount", - "config": { - "ageGroupName": "All Ages", - "conceptNames": [ - "Diabetes Intake" - ], - "visitTypes": [ - "OPD", - "IPD" - ] - } - }, - "codedValueRangeBasedReport": { - "name": "Coded Value Range Based Report", - "type": "obsCount", - "config": { - "ageGroupName": "All Ages", - "conceptNames": [ - "Diabetes, Cormorbidities" - ], - "countOncePerPatient": "true" - } - }, - "OPD/IPDVisitCount": { - "name": "OPD/IPD Visit Count", - "type": "IpdOpdVisitCount" - }, - "haemoglobinRangeBasedReport": { - "name": "Haemoglobin Range Based Report", - "type": "NumericConceptValuesCount", - "config": { - "rangeGroupName": "Haemoglobin", - "ageGroupName": "Haemoglobin", - "conceptNames": [ - "Haemoglobin" - ], - "countOncePerPatient": "false" - } - }, - "radiology(X-Ray)Count": { - "name": "Radiology(X-Ray) Count", - "type": "ObsCountByConceptClass", - "config": { - "conceptClassNames": [ - "Radiology" - ] - } - }, - "obsValuesCountsForAlbuminMCHOperationDateAndPosture(bloodPressure)": { - "name": "Obs Values Counts for Albumin, MCH, Operation Date and Posture(blood pressure)", - "type": "ObsValueCount", - "config": { - "conceptNames": [ - "Albumin", - "MCH", - "Date of Operation", - "Posture" - ] - } - }, - "tuberculosisTreatmentCompletionDates": { - "name": "Tuberculosis Treatment Completion dates", - "type": "DateConceptValuesPatientsList", - "config": { - "conceptNames": [ - "Tuberculosis, Treatment Completion Date" - ], - "templateName": "Tuberculosis Outcome Template" - } - }, - "patientsListWithAlbuminMCHAndHIVELISA(Blood)TestsResults": { - "name": "Patients list with Albumin, MCH and HIV ELISA (Blood) tests results", - "type": "PatientsWithLabtestResults", - "config": { - "conceptNames": [ - "HIV ELISA (Blood)", - "Albumin", - "MCH" - ], - "testOutcome": [ - "abnormal", - "normal" - ] - } - }, - "IPDPatientsReport": { - "name": "IPD Patients Report", - "type": "ipdPatients", - "config": { - "addressAttributes": [ - "address1", - "city_village" - ], - "patientAttributes": [ - "caste", - "education" - ], - "conceptNames": [ - "Height", - "Weight" - ], - "filterBy": "Date of Discharge" - } - }, - "nutritionProgramNutritionalStatusOfRegisteredChildren": { - "name": "Nutrition Program - Nutritional status of registered children", - "type": "obsCount", - "config": { - "ageGroupName": "All Ages", - "conceptNames": [ - "Nutrition, Nutritional Status" - ], - "countOncePerPatient": "true", - "countOnlyClosedVisits": "false" - } - }, - "patientsProgramStateCountReport": { - "name": "Patients Program State Count Report", - "type": "programStateCount", - "config": { - "programName": "Malaria Program" - } - }, - "programPatientStateReport": { - "name": "Program Patient State Report", - "type": "PatientProgramReport", - "config": { - "programName": "Malaria Program" - } - }, - "programStateTransitionReport": { - "name": "Program State Transition Report", - "type": "programStateTransitionReport", - "config": { - "programName": "Malaria Program" - } - }, - "OrderFulfillmentReport": { - "name": "Order Fulfillment Report", - "type": "OrderFulfillmentReport", - "config": { - "type": "OrderFulfillmentReport", - "orderTypes": [ - "Order", - "Drug Order" - ] - } - }, - "visitReport": { - "name": "Visit Report", - "type": "visitReport", - "config": { - "personAttributes": [ - "caste", - "class", - "education", - "occupation", - "primaryContact" - ], - "visitAttributes": [ - "Visit Status" - ] - } - }, "patientReport": { "name": "Patient Information", "type": "PatientReport" - }, - "obsCannedReport": { - "name": "Obs Canned Report", - "type": "obsCannedReport", - "config": { - "patientAttributes": [ - "caste", - "education" - ], - "applyDateRangeFor": "ObsRecording", - "addressAttributes": [ - "postal_code", - "city_village" - ], - "conceptNames": [ - "Pulse", - "WEIGHT", - "Vitals, Systolic", - "Temperature" - ], - "visitIndependentConcept": [ - "HEIGHT", - "Temperature" - ], - "enrolledProgram": "HIV Program", - "showObsOnlyForProgramDuration": false - } - }, - "drugOrderReport": { - "name": "Drug Order report", - "type": "DrugOrder" - }, - "SampleGenericProgramReport": { - "name": "Generic program sample report", - "type": "programs", - "config": { - "patientAttributes": [ - "education", - "primaryContact", - "secondaryContact", - "class", - "cluster" - ], - "patientAddresses": [ - "city_village", - "address3" - ], - "programAttributes": [], - "forDataAnalysis": true, - "showAllStates": true, - "programNamesToFilter": [ - "HIV Program" - ] - } - }, - "pivotReport": { - "name": "Blood Pressure", - "type": "aggregation", - "config": { - "report":{ - "type": "observations", - "config": { - "conceptNamesToFilter":["Diastolic Data", "Systolic Data"], - "showVisitInfo" : true, - "forDataAnalysis": true, - "visitAttributes": ["Visit Status", "Admission Status"], - "visitTypesToFilter": ["IPD"] - - } - }, - "rowGroups": [ - "Gender" - ], - "columnGroups": [ - "Concept Name", "value" - ], - "distinctGroups": [ - "Patient Identifier" - ] - } - }, - "pivotReportOfVisits": { - "name": "Aggregation report for visits", - "type": "aggregation", - "config": { - "report":{ - "type": "visits", - "config": { - "forDataAnalysis": true, - "patientAttributes": [ - "caste", - "class", - "education", - "occupation", - "primaryContact" - ], - "visitAttributes": [ - "Visit Status", - "Admission Status" - ], - "patientAddresses": [ - "address3", - "city_village" - ], - "applyDateRangeFor": "visitStopDate", - "visitTypesToFilter": [ - "PHARMACY VISIT", - "OPD" - ] - } - }, - "rowGroups": [ - "Gender" - ], - "columnGroups": [ - "Visit Status" - ], - "distinctGroups": [ - "Patient Identifier" - ] - } - }, - "pivotReportForPrograms": { - "name": "HIV Program Pivot Report", - "type": "aggregation", - "config": { - "report": { - "type": "programs", - "config": { - "patientAttributes": [ - ], - "patientAddresses": [ - "city_village", - "address3" - ], - "programAttributes": [], - "forDataAnalysis": true, - "showAllStates": true, - "programNamesToFilter": [ - "TB Program", - "HIV Program" - ] - } - }, - "columnGroups": [ - "Program name" - ], - "rowGroups": [ - "Gender" - ], - "distinctGroups": [ - "Patient Identifier" - ], - "showTotalRow":true, - "showTotalColumn":true - - } - }, - "concatenatedReport": { - "name": "ConcatenatedReport", - "type": "concatenated", - "config": { - "reports": [ - { - "name": "Visit Report", - "type": "visits", - "config": { - "forDataAnalysis": true, - "patientAttributes": [ - "caste", - "class", - "education", - "occupation", - "primaryContact" - ], - "visitAttributes": [ - "Visit Status", - "Admission Status" - ], - "patientAddresses": [ - "address3", - "city_village" - ], - "applyDateRangeFor": "visitStopDate", - "visitTypesToFilter": [ - "PHARMACY VISIT", - "OPD" - ] - } - }, - { - "name": "Obs Canned Report", - "type": "obsCannedReport", - "config": { - "patientAttributes": [ - "caste", - "education" - ], - "applyDateRangeFor": "ObsRecording", - "addressAttributes": [ - "postal_code", - "city_village" - ], - "conceptNames": [ - "Pulse", - "WEIGHT", - "Vitals, Systolic", - "Temperature" - ], - "visitIndependentConcept": [ - "HEIGHT", - "Temperature" - ], - "enrolledProgram": "HIV Program", - "showObsOnlyForProgramDuration": false - } - } - ] - } - }, - "GenericLabOrderReport": { - "name": "Lab Order Results", - "type": "labOrders", - "config": { - "patientAttributes": [ - "caste", - "class", - "education", - "occupation", - "primaryContact" - ], - "patientAddresses": [ - "address3", - "city_village" - ], - "visitAttributes": [ - "Visit Status" - ], - "showVisitInfo": true, - "showProvider": true, - "programsToFilter": [], - "showReferredOutTests": true, - "conceptNamesToFilter": [ - "Haemoglobin (Blood)" - ], - "conceptValuesToFilter": [ - "10..100" - ], - "forDataAnalysis": true, - "excludeColumns": [ - "address3" - ], - "showOrderDateTime": true - } - }, - "GenericLabOrderReportAggregation": { - "name": "Test Name vs Gender", - "type": "aggregation", - "config": { - "report": { - "type": "labOrders", - "config": { - "forDataAnalysis": true, - "showVisitInfo": true - } - }, - "rowGroups": [ - "Test Name" - ], - "columnGroups": [ - "Gender" - ], - "distinctGroups": [ - "Patient Identifier" - ] } - } } diff --git a/openmrs/apps/reports/sql/artRegister.sql b/openmrs/apps/reports/sql/artRegister.sql new file mode 100644 index 000000000..98297ed79 --- /dev/null +++ b/openmrs/apps/reports/sql/artRegister.sql @@ -0,0 +1,50 @@ +SELECT DISTINCT IFNULL(DATE_FORMAT(artStartDate, "%d/%m/%Y"), '') AS "ART Start Date", +IFNULL(IF(retestBeforeArt IS NULL OR retestBeforeArt = '', '0', '1'), '') AS "HIV Retesting for ART initiation", +IFNULL(pUART.UniqueArtNo, '') AS "Unique ART Number", concat(pn.given_name, ' ', IF(pn.middle_name IS NULL OR pn.middle_name = '', '', concat(pn.middle_name, ' ')), +IF(pn.family_name IS NULL OR pn.family_name = '', '', pn.family_name)) AS "Name in full", IFNULL(pai.identifier, '') AS "patient ID", IFNULL(pMobile.telephoneNo, '') AS "Telephone No.", IFNULL(p.gender, '') AS "Gender", +TIMESTAMPDIFF(YEAR, p.birthdate, CURDATE()) AS "Age", IFNULL(DATE_FORMAT(v.date_started, "%d/%m/%Y"), '') AS "Appointment Date", IFNULL(HEIGHT, '') HEIGHT, IFNULL(WEIGHT, '') WEIGHT, IFNULL(BMI, '') BMI, IFNULL(CD4, '') CD4, +IFNULL((select name from concept_name where concept_name_type="FULLY_SPECIFIED" and concept_id = WHOS), '') WHOS, IFNULL(CTX, '') CTX, IFNULL(date_startedTBRX, '') "Date Started TB RX", +IFNULL(Breastfeeding, '') "Breast feeding", IFNULL((select name from concept_name where concept_name_type="FULLY_SPECIFIED" and concept_id = SR1stLA ), '') "Substitution Regimen (1st Line Adults)", +IFNULL((select name from concept_name where concept_name_type="FULLY_SPECIFIED" and concept_id = RFRC), '') "Reason For Regimen Change", +IFNULL((select name from concept_name where concept_name_type="FULLY_SPECIFIED" and concept_id = ARSW1L), '') "ART Regimen - Substitution within 1st Line", +IFNULL((select name from concept_name where concept_name_type="FULLY_SPECIFIED" and concept_id = SR2LA), '') "Substitution Regimen (2nd Line Adults)", +IFNULL((select name from concept_name where concept_name_type="FULLY_SPECIFIED" and concept_id = C1LR), '') "Child 1st Line Regimens", +IFNULL((select name from concept_name where concept_name_type="FULLY_SPECIFIED" and concept_id = C2LR), '') "Child 2nd Line Regimens" +FROM visit v +LEFT JOIN person p ON p.person_id = v.patient_id AND v.voided IS FALSE +LEFT JOIN person_name pn ON p.person_id = pn.person_id AND pn.voided IS FALSE +LEFT JOIN patient_identifier pai ON (pai.patient_id = v.patient_id AND pai.preferred = 1) +LEFT JOIN encounter e ON e.visit_id = v.visit_id +LEFT JOIN (select paMobile.person_id as 'pMobilePersonId', paMobile.value AS 'telephoneNo' from person_attribute paMobile +JOIN person_attribute_type patMobile ON patMobile.name = "MobileNumber" AND patMobile.retired IS FALSE AND patMobile.person_attribute_type_id = paMobile.person_attribute_type_id) AS pMobile ON v.patient_id = pMobile.pMobilePersonId +LEFT JOIN (select paUART.person_id as 'pUARTPersonId', paUART.value AS 'UniqueArtNo' from person_attribute paUART +JOIN person_attribute_type patUART ON patUART.name = "UniqueArtNo" AND patUART.retired IS FALSE AND patUART.person_attribute_type_id = paUART.person_attribute_type_id) AS pUART ON v.patient_id = pUART.pUARTPersonId +LEFT JOIN (SELECT distinct v.patient_id AS 'visitPatientId', o.value_datetime AS 'artStartDate' FROM obs o +JOIN concept_name cn ON (cn.concept_name_type = "FULLY_SPECIFIED" AND cn.voided is false AND cn.name="ANC, ART Start Date" and o.concept_id = cn.concept_id) +JOIN encounter enc ON enc.encounter_id = o.encounter_id +JOIN visit v ON v.visit_id = enc.visit_id +GROUP BY v.patient_id +ORDER BY v.visit_id DESC) AS obsConcept ON obsConcept.visitPatientId = v.patient_id +LEFT JOIN ( + SELECT obs.person_id, obs.encounter_id, + REPLACE(Group_concat(IF (obs.concept_id = 3731, obs.value_coded, "")), ",", "") AS retestBeforeArt, + REPLACE(Group_concat(IF (obs.concept_id = 3767, obs.value_coded, "")), ",", "") AS WHOS, + REPLACE(Group_concat(IF (obs.concept_id = 118, obs.value_numeric, "")), ",", "") AS HEIGHT, + REPLACE(Group_concat(IF (obs.concept_id = 119, obs.value_numeric, "")), ",", "") AS WEIGHT, + REPLACE(Group_concat(IF (obs.concept_id = 120, obs.value_numeric, "")), ",", "") AS BMI, + REPLACE(Group_concat(IF (obs.concept_id = 1187, obs.value_numeric, "")), ",", "") AS CD4, + REPLACE(Group_concat(IF (obs.concept_id = 3764, obs.value_datetime, "")), ",", "") AS CTX, + REPLACE(Group_concat(IF (obs.concept_id = 3782, obs.value_datetime, "")), ",", "") AS date_startedTBRX, + REPLACE(Group_concat(IF (obs.concept_id = 2041, obs.value_numeric, "")), ",", "") AS Breastfeeding, + REPLACE(Group_concat(IF (obs.concept_id = 3652, obs.value_coded, "")), ",", "") AS SR1stLA, + REPLACE(Group_concat(IF (obs.concept_id = 3654, obs.value_coded, "")), ",", "") AS RFRC, + REPLACE(Group_concat(IF (obs.concept_id = 3679, obs.value_coded, "")), ",", "") AS ARSW1L, + REPLACE(Group_concat(IF (obs.concept_id = 3663, obs.value_coded, "")), ",", "") AS SR2LA, + REPLACE(Group_concat(IF (obs.concept_id = 3664, obs.value_coded, "")), ",", "") AS ARS2L, + REPLACE(Group_concat(IF (obs.concept_id = 3958, obs.value_coded, "")), ",", "") AS C1LR, + REPLACE(Group_concat(IF (obs.concept_id = 3968, obs.value_coded, "")), ",", "") AS C2LR + FROM obs + WHERE obs.concept_id IN ( 3731, 3767, 118, 119, 120,1187, 3767, 3764, 3782, 2041, 3652, 3654, 3679, 3663, 3664, 3958, 3968) and obs.voided=0 + GROUP BY person_id, encounter_id +) AS nutvalues ON e.encounter_id = nutvalues.encounter_id; +-- WHERE pa.start_date_time BETWEEN '#startDate#' AND '#endDate#' ORDER BY pa.start_date_time DESC; diff --git a/openmrs/apps/reports/sql/missedAppointments.sql b/openmrs/apps/reports/sql/missedAppointments.sql new file mode 100644 index 000000000..8010febdd --- /dev/null +++ b/openmrs/apps/reports/sql/missedAppointments.sql @@ -0,0 +1,22 @@ +SELECT DISTINCT + pai.identifier AS 'patient ID', + pn.given_name AS 'First Name', + ifnull(pn.family_name,'') AS 'Last Name', + pMobile.telephoneNo AS 'Telephone No.', + p.gender AS 'Gender', + DATE_FORMAT(obsConcept.artStartDate, "%d/%m/%Y") AS 'ART Start Date', + DATE_FORMAT(start_date_time, "%d/%m/%Y") AS 'Appointment Date' +FROM patient_appointment pa + LEFT JOIN person p ON p.person_id = pa.patient_id AND pa.voided IS FALSE + LEFT JOIN person_name pn ON p.person_id = pn.person_id AND pn.voided IS FALSE + LEFT JOIN patient_identifier pai ON (pai.patient_id = pa.patient_id AND pai.preferred = 1) + LEFT JOIN (select paMobile.person_id as 'pMobilePersonId', paMobile.value AS 'telephoneNo' from person_attribute paMobile + JOIN person_attribute_type patMobile ON patMobile.name = "MobileNumber" AND patMobile.retired IS FALSE + AND patMobile.person_attribute_type_id = paMobile.person_attribute_type_id) AS pMobile ON pa.patient_id = pMobile.pMobilePersonId + LEFT JOIN (SELECT o.value_datetime AS 'artStartDate', v.patient_id AS 'visitPatientId', v.visit_id AS visitId FROM visit v + JOIN concept_name cn ON (cn.concept_name_type = "FULLY_SPECIFIED" AND cn.voided is false AND cn.name="ANC, ART Start Date") + JOIN encounter enc ON enc.visit_id = v.visit_id + JOIN obs o ON (o.encounter_id = enc.encounter_id and o.concept_id = cn.concept_id AND o.person_id = v.patient_id) + HAVING v.visit_id = (SELECT MAX(maxV.visit_id) as maxVisitId + FROM visit maxV WHERE maxV.patient_id = v.patient_id)) AS obsConcept ON obsConcept.visitPatientId = pa.patient_id +WHERE pa.status = 'Missed' and pa.start_date_time BETWEEN '#startDate#' AND '#endDate#' ORDER BY pa.start_date_time DESC; diff --git a/openmrs/apps/reports/sql/summaryAppointmentReport.sql b/openmrs/apps/reports/sql/summaryAppointmentReport.sql new file mode 100644 index 000000000..110152c51 --- /dev/null +++ b/openmrs/apps/reports/sql/summaryAppointmentReport.sql @@ -0,0 +1,17 @@ +SELECT DISTINCT + pai.identifier AS 'patient ID', + pn.given_name AS 'First Name', + ifnull(pn.family_name,'') AS 'Last Name', + DATE_FORMAT(pa.start_date_time, "%d/%m/%Y") AS 'Appointment Date', + pa.status AS 'Status', + pMobile.telephoneNo AS 'Contact No.', + p.gender AS 'Gender' +FROM patient_appointment pa + LEFT JOIN person p ON p.person_id = pa.patient_id AND pa.voided IS FALSE + LEFT JOIN person_name pn ON p.person_id = pn.person_id AND pn.voided IS FALSE + LEFT JOIN patient_identifier pai ON (pai.patient_id = pa.patient_id AND pai.preferred = 1) + LEFT JOIN (select paMobile.person_id as 'pMobilePersonId', paMobile.value AS 'telephoneNo' from person_attribute paMobile + JOIN person_attribute_type patMobile ON patMobile.name = "MobileNumber" AND patMobile.retired IS FALSE + AND patMobile.person_attribute_type_id = paMobile.person_attribute_type_id) AS pMobile ON pa.patient_id = pMobile.pMobilePersonId +WHERE pa.appointment_kind = 'Scheduled' AND pa.start_date_time BETWEEN '#startDate#' AND '#endDate#' +ORDER BY pa.start_date_time DESC; diff --git a/openmrs/apps/reports/sql/visitAppointmentReport.sql b/openmrs/apps/reports/sql/visitAppointmentReport.sql new file mode 100644 index 000000000..9d975d967 --- /dev/null +++ b/openmrs/apps/reports/sql/visitAppointmentReport.sql @@ -0,0 +1,22 @@ +SELECT DISTINCT + pai.identifier AS 'patient ID', + pn.given_name AS 'First Name', + ifnull(pn.family_name,'') AS 'Last Name', + DATE_FORMAT(pa.start_date_time, "%d/%m/%Y") AS 'Visit Date', + pa.appointment_kind AS 'Visit Type', + pMobile.telephoneNo AS 'Contact No.', + p.gender AS 'Gender' +FROM patient_appointment pa + LEFT JOIN person p ON p.person_id = pa.patient_id AND pa.voided IS FALSE + LEFT JOIN person_name pn ON p.person_id = pn.person_id AND pn.voided IS FALSE + LEFT JOIN patient_identifier pai ON (pai.patient_id = pa.patient_id AND pai.preferred = 1) + LEFT JOIN (select paMobile.person_id as 'pMobilePersonId', paMobile.value AS 'telephoneNo' from person_attribute paMobile + JOIN person_attribute_type patMobile ON patMobile.name = "MobileNumber" AND patMobile.retired IS FALSE + AND patMobile.person_attribute_type_id = paMobile.person_attribute_type_id) AS pMobile ON pa.patient_id = pMobile.pMobilePersonId + LEFT JOIN (SELECT v.patient_id AS 'visitPatientId', + v.visit_id AS visitId, v.date_started AS visitStartDate, vt.name AS visitType FROM visit v + JOIN visit_type vt ON (v.visit_type_id = vt.visit_type_id and vt.retired IS FALSE) + HAVING v.visit_id = (SELECT MAX(maxV.visit_id) AS maxVisitId + FROM visit maxV WHERE maxV.patient_id = v.patient_id)) AS patientVisit ON patientVisit.visitPatientId = pa.patient_id +WHERE pa.start_date_time BETWEEN '#startDate#' AND '#endDate#' +ORDER BY pa.start_date_time DESC; diff --git a/openmrs/apps/reports/sql/walkinAppointmentReport.sql b/openmrs/apps/reports/sql/walkinAppointmentReport.sql new file mode 100644 index 000000000..42b30d80b --- /dev/null +++ b/openmrs/apps/reports/sql/walkinAppointmentReport.sql @@ -0,0 +1,17 @@ +SELECT DISTINCT + pai.identifier AS 'patient ID', + pn.given_name AS 'First Name', + ifnull(pn.family_name,'') AS 'Last Name', + DATE_FORMAT(pa.start_date_time, "%d/%m/%Y") AS 'Visit Date', + pa.appointment_kind AS 'Visit Type', + pMobile.telephoneNo AS 'Contact No.', + p.gender AS 'Gender' +FROM patient_appointment pa + LEFT JOIN person p ON p.person_id = pa.patient_id AND pa.voided IS FALSE + LEFT JOIN person_name pn ON p.person_id = pn.person_id AND pn.voided IS FALSE + LEFT JOIN patient_identifier pai ON (pai.patient_id = pa.patient_id AND pai.preferred = 1) + LEFT JOIN (select paMobile.person_id as 'pMobilePersonId', paMobile.value AS 'telephoneNo' from person_attribute paMobile + JOIN person_attribute_type patMobile ON patMobile.name = "MobileNumber" AND patMobile.retired IS FALSE + AND patMobile.person_attribute_type_id = paMobile.person_attribute_type_id) AS pMobile ON pa.patient_id = pMobile.pMobilePersonId +WHERE pa.appointment_kind = 'WalkIn' AND pa.start_date_time BETWEEN '#startDate#' AND '#endDate#' +ORDER BY pa.start_date_time DESC; diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index f3141e655..6cd53393d 100644 --- a/openmrs/i18n/registration/locale_en.json +++ b/openmrs/i18n/registration/locale_en.json @@ -21,5 +21,6 @@ "REGISTRATION_INSTITUTE_ADDRESS": "Ganiyari, District - Bilaspur", "FEE_INFORMATION_LOCALE_KEY": "Fee Information", "NUTRITIONAL_VALUES_LOCALE_KEY": "Nutritional Values", - "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print" + "REGISTRATION_PRINT_WITH_BARCODE": "Barcode Print", + "TREATMENT_SUPPORTER_LOCALE_KEY": "Treatment Supporter" } \ No newline at end of file diff --git a/openmrs/migrations/bedManagement/PatientWardDetails.sql b/openmrs/migrations/bedManagement/PatientWardDetails.sql deleted file mode 100644 index 9c0b463b1..000000000 --- a/openmrs/migrations/bedManagement/PatientWardDetails.sql +++ /dev/null @@ -1,29 +0,0 @@ -DELETE FROM global_property WHERE property = 'emrapi.sqlGet.allWardsListDetails'; -SELECT uuid() INTO @uuid; -INSERT INTO global_property (`property`, `property_value`, `description`, `uuid`) -VALUES ('emrapi.sqlGet.allWardsListDetails', -"SELECT - bed_tags.bed_tags AS 'Bed Tags', - bed.bed_number AS 'Bed Number', - patient_identifier.identifier AS 'Patient ID', - CONCAT(pn.given_name, ' ', pn.family_name) AS 'Patient Name', - TIMESTAMPDIFF(YEAR, p.birthdate, CURDATE()) AS 'Age' -FROM - bed - INNER JOIN bed_location_map blm ON blm.bed_id = bed.bed_id - INNER JOIN location l ON l.location_id = blm.location_id AND l.name = ${location_name} AND l.name LIKE '%Ward%' AND l.retired IS FALSE - LEFT OUTER JOIN bed_patient_assignment_map bpam ON bpam.bed_id = bed.bed_id AND bpam.date_stopped IS NULL - LEFT OUTER JOIN person p ON p.person_id = bpam.patient_id AND p.voided IS FALSE - LEFT OUTER JOIN person_name pn ON pn.person_id = p.person_id AND pn.voided IS FALSE - LEFT OUTER JOIN patient_identifier ON patient_identifier.patient_id = p.person_id AND patient_identifier.voided IS FALSE - LEFT OUTER JOIN person_address address ON address.person_id = p.person_id AND address.voided IS FALSE - LEFT OUTER JOIN ( - SELECT - bed_tag_map.bed_id AS 'bed_id', - GROUP_CONCAT(DISTINCT bed_tag.name ORDER BY bed_tag.name) AS 'bed_tags' - FROM - bed_tag_map - INNER JOIN bed_tag ON bed_tag.bed_tag_id = bed_tag_map.bed_tag_id AND bed_tag_map.voided IS FALSE - GROUP BY bed_tag_map.bed_id - ) bed_tags ON bed_tags.bed_id = bed.bed_id -GROUP BY bed.bed_number;",'SQL query to get list of bed details in ward',@uuid); diff --git a/openmrs/migrations/liquibase.xml b/openmrs/migrations/liquibase.xml index a70d1c277..064dc3d4f 100644 --- a/openmrs/migrations/liquibase.xml +++ b/openmrs/migrations/liquibase.xml @@ -49,10 +49,6 @@ ); - - Updating SQL query for Bed Management List View - -