Skip to content

Commit 5c1c51a

Browse files
pgorrindopgorrindo
authored
Merge pull request #61 from Salcedo-HDF/1dev
Dev into Test 2025-02-11a
2 parents 66cfe6c + 44ee910 commit 5c1c51a

File tree

11 files changed

+32
-25
lines changed

11 files changed

+32
-25
lines changed

‎distro/configuration/drugs/drugs-core-sdh.csv‎ renamed to ‎distro/configuration/drugs/drugs-core-demo.csv‎

File renamed without changes.

‎distro/configuration/encounterroles/encounterroles-core-sdh.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Uuid,Void/Retire,Name,Description
22
a0b03050-c99b-11e0-9572-0800200c9a66,,Unknown,Unknown encounter role for legacy providers with no encounter role set
3-
240b26f9-dd88-4172-823d-4a8bfeb7841f,,Clinician_DEMO,"Doctor or Nurse who is the primary provider for an encounter, and will sign the note"
3+
240b26f9-dd88-4172-823d-4a8bfeb7841f,,Clinician,"Doctor or Nurse who is the primary provider for an encounter, and will sign the note"

‎distro/configuration/encountertypes/encountertypes_core-sdh.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ d7151f82-c1f3-4152-a605-2f9ea7414a79,,Visit Note,"Encounter where a full or abbr
1515
36db5123-0ad5-41c0-9037-625b46e0ceef,,Mental Health Assessment,Mental Health Assessment,,,
1616
d3b07384-8d1c-4e6b-9b8e-2f3b8e4a1c9f,,Transfer,Indicates that a patient is being transferred into a different department within the hospital. (Transfers out of the hospital should not use this encounter type.),,,
1717
a1f5c3d2-4b6e-4e8a-9f2d-1b3e8e4a2d7f,,Inpatient Note,A short free-text note written by a clinician about an inpatient during their stay,,,
18-
b2c4d5e6-7f8a-4e9b-8c1d-2e3f8e4a3b8f,,Transfer Request_DEMO,A stand-alone encounter type for a transfer request not part of a larger note,,,
18+
b2c4d5e6-7f8a-4e9b-8c1d-2e3f8e4a3b8f,,Transfer Request,A stand-alone encounter type for a transfer request not part of a larger note,,,
1919
f47ac10b-58cc-4372-a567-0e02b2c3d479,,Bed Assignment,Assigning a new bed to a patient without admitting or transferring them,,,
2020
550e8400-e29b-41d4-a716-446655440000,,Cancel ADT,An encounter that notes that a request to admit/transfer/discharge a patient is being overridden,,,

‎distro/configuration/locations/locations-core-sdh.csv‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Uuid,Void/Retire,Name,Description,Parent,Tag|Login Location,Tag|Visit Location,Tag|Facility Location,Tag|Queue Location,Tag|Admission Location,Tag|Transfer Location,Attribute|9eca4f4e-707f-4bb8-8289-2f9b6e93803c,Attribute|Last Audit Date,Address 1,Address 2,Address 3,Address 4,Address 5,Address 6,City/Village,County/District,State/Province,Postal Code,Country,_order:1000
2-
452ef6c0-e440-11ef-b6f6-b2f86dcd4df4,,SDH,SDH-desc,,,TRUE,,,,,,,,,,,,,,,,,,
3-
452ef710-e440-11ef-b6f6-b2f86dcd4df4,,Emergency Dept,ED-desc,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
4-
452ef724-e440-11ef-b6f6-b2f86dcd4df4,,Outpatient Dept,OPD-desc,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
5-
452ef742-e440-11ef-b6f6-b2f86dcd4df4,,Inpatient Dept,inpt-desc,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
6-
452ef74c-e440-11ef-b6f6-b2f86dcd4df4,,Community Outreach,Community Outreach-desc,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
2+
2f4a7536-e81f-11ef-95d0-b2f86dcd4df4,,SDH,Salcedo Doctors Hospital,,,TRUE,,,,,,,,,,,,,,,,,,
3+
2f4a759a-e81f-11ef-95d0-b2f86dcd4df4,,SDH ER,Emergency Dept,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
4+
2f4a75ae-e81f-11ef-95d0-b2f86dcd4df4,,SDH OPD,Outpatient Dept,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
5+
2f4a75c2-e81f-11ef-95d0-b2f86dcd4df4,,SDH Ward,Inpatient Dept,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
6+
2f4a75cc-e81f-11ef-95d0-b2f86dcd4df4,,SDH Registration,Registration Dept,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
7+
2f4a75cd-e81f-11ef-95d0-b2f86dcd4df4,,SDH Laboratory,Laboratory Dept,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
8+
2f4a75ea-e81f-11ef-95d0-b2f86dcd4df4,,SDH Imaging,Imaging Dept,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
9+
2f4a75f4-e81f-11ef-95d0-b2f86dcd4df4,,SDH OR,Operating Room,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
10+
2f4a75fe-e81f-11ef-95d0-b2f86dcd4df4,,SDH PACU,Post-Anesthesia Care Unit,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
11+
2f4a75ff-e81f-11ef-95d0-b2f86dcd4df4,,SDH Pharmacy,Pharmacy Dept,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
12+
2f4a7608-e81f-11ef-95d0-b2f86dcd4df4,,SDH Business Office,Business Dept,SDH,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,

‎distro/configuration/programs/programs-package-hiv-core-sdh.csv‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
Uuid,Void/Retire,Name,Description,Program concept,Outcomes concept,_order:1000,
2-
64f950e6-1b07-4ac0-8e7e-f3e148f3463f,,HIV Care and Treatment_DEMO,HIV Care and Treatment,Human immunodeficiency virus (HIV) disease,,,
3-
d1b6cd43-8ac7-4cdd-8fb4-fe51635c82b4,,PMTCT,Program for prevention of Maternal to Child HIV transmission,PMTCT,,,
4-
ac1bbc45-8c35-49ff-a574-9553ff789527,,HIV Preventative Services (PEP/PrEP),Program for prevention of HIV through Pre-Exposure Prophylaxis regimens,Pre-exposure prophylaxis (PrEP),,,
5-
7a72a724-8994-4d33-962e-f65d8ca4ae67,,Outpatient Diabetes Education Program, Outpatient service for patient education about diabetes,Diabetes clinic,,,
2+
392329e4-e820-11ef-95d0-b2f86dcd4df4,,Demo - Outpatient Diabetes Education Program, Outpatient service for patient education about diabetes,Diabetes clinic,,,

‎distro/configuration/relationshiptypes/relationshiptypes-core-sdh.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Uuid,Void/Retire,Name,Description,Weight,Preferred,A is to b,B is to a
22
c86d9979-b8ac-4d8c-85cf-cc04e7f16315,,Uncle/Nephew_DEMO,A relationship of an uncle and his nephew,1,true,Uncle,Nephew
3-
3982f469-cedc-4b2d-91ea-fe38f881e1a0,true,Aunt/Niece,A relationship of an aunt and her niece,,,Aunt,Niece
3+
3982f469-cedc-4b2d-91ea-fe38f881e1a0,,Aunt/Niece,A relationship of an aunt and her niece,,,Aunt,Niece
44
4f6b4fc4-66e5-4364-be1d-d5872ff8817e,,Friend/Friend,A relationship of friendship where there is often no biological link,,,Friend,Friend
55
53d8a8f3-0084-4a52-8666-c655f5bd2689,,Supervisor/Supervisee,A description for supervisor to supervisee relationship,,,Supervisor,Supervisee
66
117ac27a-7fec-4834-8fad-d967c702c15a,,Clinician/Patient,A relationship from a care provider to the patient,,,Clinician,Patient

‎distro/configuration/roles/roles_core-sdh.csv‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ dc978fe8-b574-4e11-be54-626ae2d28ed8,Application: Enters ADT Events,Enters ADT e
99
eba658df-fa88-4dab-b000-57e1e5cb2e43,Application: Enters Vitals,Enters vitals,Privilege Level: High,,
1010
fb393086-d6ec-4bcb-a300-5815a554c4ae,Application: Has Super User Privileges,Extends the underlying System Developer API role,System Developer; Privilege Level: High,,
1111
2d09a0e2-240a-4dd7-9c3e-9e2cd2cb2d1f,Application: Records Allergies,Records and edits allergies,Privilege Level: High,,
12-
58f60da3-03bd-4b57-bb3c-429b50f6939b,Application: Registers Patients_DEMO,Registers patients,Privilege Level: High,,
12+
58f60da3-03bd-4b57-bb3c-429b50f6939b,Application: Registers Patients,Registers patients,Privilege Level: High,,
1313
564b560e-3fe8-4829-8be4-68ddb40cf106,Application: Uses Patient Summary,Uses patient summary,Privilege Level: High,,
1414
93a9c2f8-9296-488f-9451-43667e1c4d7f,Application: Writes Clinical Notes,Writes clinical notes,Privilege Level: High,,
15-
4ef1f0f9-fee6-414b-910d-28e17df345c2,Organizational: Doctor,Doctor,Application: Records Allergies; Application: Writes Clinical Notes; Application: Enters ADT Events; Application: Uses Patient Summary,,
16-
2749cd1b-251a-4d8b-bc35-0165f2b1af3e,Organizational: Nurse,Nurse,Application: Records Allergies; Application: Enters ADT Events; Application: Uses Patient Summary; Application: Enters Vitals,
17-
fab43ac4-79bc-4f3d-805b-bd3a82ce41e9,Organizational: Registration Clerk,Registration Clerk,Application: Registers Patients;,,
18-
2f087f90-9c47-4262-bfce-23c7862e727e,Organizational: System Administrator,System Administrator,Application: Configures Forms; Application: Configures Metadata; Application: Administers System,,
15+
4ef1f0f9-fee6-414b-910d-28e17df345c2,SDH: Doctor,Doctor,Application: Records Allergies; Application: Writes Clinical Notes; Application: Enters ADT Events; Application: Uses Patient Summary,,
16+
4ef1f0f9-fee6-414b-910d-28e17df345c2,SDH: Midwife,Midwife,Application: Records Allergies; Application: Writes Clinical Notes; Application: Enters ADT Events; Application: Uses Patient Summary,,
17+
2749cd1b-251a-4d8b-bc35-0165f2b1af3e,SDH: Nurse,Nurse,Application: Records Allergies; Application: Enters ADT Events; Application: Uses Patient Summary; Application: Enters Vitals,,
18+
fab43ac4-79bc-4f3d-805b-bd3a82ce41e9,SDH: Clerk,Registration Clerk,Application: Registers Patients; Application: Uses Patient Summary,,
19+
2f087f90-9c47-4262-bfce-23c7862e727e,SDH: System Administrator,System Administrator,Application: Configures Forms; Application: Configures Metadata; Application: Administers System,,
20+
487d4f3e-e81e-11ef-95d0-b2f86dcd4df4,SDH: Imaging Technician,Imaging Technician,Application: Uses Patient Summary;,,
21+
487d4f8e-e81e-11ef-95d0-b2f86dcd4df4,SDH: Lab Technician,Lab Technician,Application: Uses Patient Summary;,,

‎distro/configuration/visittypes/visittypes-core_data-sdh.csv‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Uuid,Void/Retire,Name,Description,_version:1
2-
7b0f5697-27e3-40c4-8bae-f4049abfb4ed,,Facility Visit,"Patient visits the clinic/hospital (as opposed to a home visit, or telephone contact)",
3-
d66e9fe0-7d51-4801-a550-5d462ad1c944,,Home Visit,Provider visits the patient at their home,
4-
287463d3-2233-4c69-9851-5841a1f5e109,,OPD Visit,OPD Visit,
5-
a22733fa-3501-4020-a520-da024eeff088,,Offline Visit_DEMO,Visit type for offline features,
6-
78370d15-38ad-48a1-825f-f0e9ff60d5a1,,Group Session,Visit type for group sessions (used in Fast Data Entry),
2+
c3e8aab2-e821-11ef-95d0-b2f86dcd4df4,,Inpatient,"Patient admitted to the hospital",
3+
c3e8aada-e821-11ef-95d0-b2f86dcd4df4,,Outpatient (New),"New patient seen in clinic",
4+
c3e8ab02-e821-11ef-95d0-b2f86dcd4df4,,Outpatient (Return),"Return patient seen in clinic",
5+
c3e8aae4-e821-11ef-95d0-b2f86dcd4df4,,Emergency Room,"Patient seen in ER",
6+
c3e8aaee-e821-11ef-95d0-b2f86dcd4df4,,Telehealth,"Patient interaction via phone/Facebook",
7+
c3e8aaf8-e821-11ef-95d0-b2f86dcd4df4,,Group Session,Visit type for group sessions (used in Fast Data Entry),

‎distro/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.openmrs</groupId>
66
<artifactId>distro-emr</artifactId>
7-
<version>3.3.0-SNAPSHOT</version>
7+
<version>3.2.1</version>
88
</parent>
99

1010
<artifactId>distro-emr-configuration</artifactId>

‎frontend/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.openmrs</groupId>
66
<artifactId>distro-emr</artifactId>
7-
<version>3.3.0-SNAPSHOT</version>
7+
<version>3.2.1</version>
88
</parent>
99

1010
<artifactId>distro-emr-frontend</artifactId>

0 commit comments

Comments
 (0)