diff --git a/masterdata/configuration/liquibase/liquibase.xml b/masterdata/configuration/liquibase/liquibase.xml index 1ef29931c..f1fcd380a 100644 --- a/masterdata/configuration/liquibase/liquibase.xml +++ b/masterdata/configuration/liquibase/liquibase.xml @@ -29,4 +29,16 @@ "org.openmrs.customdatatype.datatype.LongFreeTextDatatype", "org.openmrs.web.attribute.handler.LongFreeTextTextareaHandler", 0, 1, NOW(), 0, "6cd01df8-4418-4079-95bf-9716413dc8f5"); + + + + select count(*) from person_attribute_type where name = 'confirmedPatient'; + + + Add person_attribute_type 'confirmedPatient' to differentiate potential and actual patients + + INSERT INTO person_attribute_type (name, description, format, searchable, creator, date_created, retired, sort_weight, uuid) + VALUES ('confirmedPatient', 'confirmedPatient', 'java.lang.Boolean', '0', 1, curdate(), 0, 30, uuid()); + + diff --git a/openmrs/apps/adt/app.json b/openmrs/apps/adt/app.json index 7fa36b947..9c510239d 100644 --- a/openmrs/apps/adt/app.json +++ b/openmrs/apps/adt/app.json @@ -80,7 +80,11 @@ "type": "conditionsList", "displayOrder": 6 } - }} + }}, + "filterOutAttributeForAllSearch": [{ + "attrName": "confirmedPatient", + "attrValue": "false" + }] } } \ No newline at end of file diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json index 9f2ecfe1b..59c549b05 100644 --- a/openmrs/apps/clinical/app.json +++ b/openmrs/apps/clinical/app.json @@ -38,6 +38,10 @@ { "locale" : "pt", "css": "offline-language-portuguese-brazil"} ] }, + "filterOutAttributeForAllSearch": [{ + "attrName": "confirmedPatient", + "attrValue": "false" + }], "diagnosisStatus": "Inactive", "program": { "patientInformation": { diff --git a/openmrs/apps/documentUpload/app.json b/openmrs/apps/documentUpload/app.json index d06782ee6..d9b639e97 100644 --- a/openmrs/apps/documentUpload/app.json +++ b/openmrs/apps/documentUpload/app.json @@ -6,5 +6,11 @@ "description": "Bahmni patient search, lookup Page" } ], - "contextModel": [] + "contextModel": [], + "config": { + "filterOutAttributeForAllSearch": [{ + "attrName": "confirmedPatient", + "attrValue": "false" + }] + } } diff --git a/openmrs/apps/ipd/app.json b/openmrs/apps/ipd/app.json index e7f752a7f..a8249cbc6 100644 --- a/openmrs/apps/ipd/app.json +++ b/openmrs/apps/ipd/app.json @@ -28,6 +28,10 @@ "allowFutureDates": true } }, + "filterOutAttributeForAllSearch": [{ + "attrName": "confirmedPatient", + "attrValue": "false" + }], "hideStartNewVisitPopUp": false, "patientForwardUrl": "../bedmanagement/#/patient/{{patientUuid}}/visit/{{visitUuid}}/dashboard", "dashboard": { diff --git a/openmrs/apps/orders/app.json b/openmrs/apps/orders/app.json index fbe3339cd..85da43f83 100644 --- a/openmrs/apps/orders/app.json +++ b/openmrs/apps/orders/app.json @@ -23,6 +23,10 @@ "conceptNames": ["Radiology Notes"], "numberOfVisits": 2, "scope": "latest" - } + }, + "filterOutAttributeForAllSearch": [{ + "attrName": "confirmedPatient", + "attrValue": "false" + }] } } \ No newline at end of file diff --git a/openmrs/apps/ot/app.json b/openmrs/apps/ot/app.json index 412321a28..2eeae5bba 100644 --- a/openmrs/apps/ot/app.json +++ b/openmrs/apps/ot/app.json @@ -15,6 +15,10 @@ "dayViewEnd": "18:00", "dayViewSplit": "60" }, - "startOfWeek": "Monday" + "startOfWeek": "Monday", + "filterOutAttributeForAllSearch": [{ + "attrName": "confirmedPatient", + "attrValue": "false" + }] } } diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json index 40729d427..9ad5cc38b 100644 --- a/openmrs/apps/registration/app.json +++ b/openmrs/apps/registration/app.json @@ -41,7 +41,8 @@ }, "hidden": { "attributes": [ - "primaryContact" + "primaryContact", + "confirmedPatient" ] }, "defaults": { @@ -69,6 +70,11 @@ "showSaveConfirmDialog": false, "showBirthTime": true, "showCasteSameAsLastNameCheckbox": false, + "relatedIdentifierAttribute": { + "name": "confirmedPatient", + "hideOrDisable": "hide", + "hideOnValue": "true" + }, "printOptions": [ { "translationKey": "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY", diff --git a/openmrs/i18n/registration/locale_en.json b/openmrs/i18n/registration/locale_en.json index f3141e655..ead56c02f 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", + "RELATED_PATIENT_IDENTIFIER_LABEL": "Patient" } \ No newline at end of file