(feat) O3-3886: Demo Ward App in the Ref App #851

mogoodrich · 2024-10-11T17:08:30Z

No description provided.

mogoodrich · 2024-10-11T17:09:24Z

distro/configuration/dispositionConfig.json

+    "uuid": "66de7f60-b73a-11e2-9e96-0800200c9a66",
+    "name": "disposition.admit",
+    "type": "ADMIT",
+    "conceptCode": "PIH:ADMIT TO HOSPITAL",


All these concept codes will need to be updated once we identify and add the correct concepts to use

PIH:ADMIT TO HOSPITAL looks to me to be equivalent to CIEL:162478 (Approved Admission). I don't see anything that looks similar to PIH:Transfer within hospital. PIH:DISCHARGED is already marked SAME-AS CIEL:1692.

I think we have figured it out, just waiting on the new CIEL release from Andy: https://talk.openmrs.org/t/concepts-needed-for-ipd-ward-app-in-o3-ref-app-distro/43805/9

Yeah, saw that after I wrote this.

# Conflicts: # distro/configuration/encountertypes/encountertypes_core-demo.csv

ibacher · 2024-10-18T16:58:56Z

distro/configuration/dispositionConfig.json

+    "uuid": "66de7f60-b73a-11e2-9e96-0800200c9a66",
+    "name": "disposition.admit",
+    "type": "ADMIT",
+    "conceptCode": "PIH:ADMIT TO HOSPITAL",


PIH:ADMIT TO HOSPITAL looks to me to be equivalent to CIEL:162478 (Approved Admission). I don't see anything that looks similar to PIH:Transfer within hospital. PIH:DISCHARGED is already marked SAME-AS CIEL:1692.

distro/configuration/locations/locations-core_demo.csv

# Conflicts: # distro/distro.properties # distro/pom.xml # frontend/spa-assemble-config.json

mogoodrich · 2024-10-25T21:23:12Z

distro/configuration/encountertypes/encountertypes_core-demo.csv

@@ -13,3 +13,6 @@ d7151f82-c1f3-4152-a605-2f9ea7414a79,,Visit Note,"Encounter where a full or abbr
 39da3525-afe4-45ff-8977-c53b7b359158,,Order,Encounter for capturing orders,,,
 29c02aff-9a93-46c9-bf6f-48b552fcb1fa,,Immunizations,Encounter for capturing immunizations,,,
 36db5123-0ad5-41c0-9037-625b46e0ceef,,Mental Health Assessment,Mental Health Assessment,,,
+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.),,,
+a1f5c3d2-4b6e-4e8a-9f2d-1b3e8e4a2d7f,,Inpatient Note,A short free-text note written by a clinician about an inpatient during their stay,,,
+b2c4d5e6-7f8a-4e9b-8c1d-2e3f8e4a3b8f,,Transfer Request,A stand-alone encounter type for a transfer request not part of a larger note,,,


Adds some new encounter types associated with ADT events

mogoodrich · 2024-10-25T21:23:57Z

distro/configuration/locations/locations-core_demo.csv

+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
+8d6c993e-c2cc-11de-8d13-0010c6dffd0f,,Unknown Location,Unknown Location,,,,,,,,,,,,,,,,,,,,,


The most noteworthy thing about the changes to locations is that it sets up a location hierarchy at "Ubuntu Hospital""

This hierarchy is necessary for the Ward module to work, and modelling general way EMR-API "views the world": when you have multiple locations within a single facility the sites should be arranged as children of a main site location, and the main location (in this case "Ubuntu Hospital" should be tagged as a visit location. In order for the Inpatient functionality to work and to allow admission and transfer between different locations, a patient's active visit needs to be at the parent site.

(Note that I'm not sure what "Facility Location" means within this demo, so I left it as-is.

mogoodrich · 2024-10-25T21:28:46Z

distro/pom.xml

@@ -49,6 +49,9 @@
    <ordertemplates.version>1.0.2</ordertemplates.version>
    <patientflags.version>3.0.8</patientflags.version>
    <o3forms.version>2.3.0</o3forms.version>
+    <emrapi.version>2.1.0-SNAPSHOT</emrapi.version>
+    <event.version>2.10.0</event.version>
+    <bedmanagement.version>6.0.0</bedmanagement.version>


New modules added.... EMR API, Event and Bed management

mogoodrich · 2024-10-25T21:31:09Z

Moving this out of draft, as it is ready for review, see my comments!

Note we will need the following Iniz issue reviewed and merged before this will work:

mekomsolutions/openmrs-module-initializer#284

(temporarily remove IPD OCL package for testing)

This reverts commit 3e9d0af.

update to new IPD package with bogus mappings removed

mogoodrich · 2024-10-25T23:15:43Z

Screencast.from.2024-10-25.19-13-47.webm

mogoodrich · 2024-10-31T14:18:13Z

So @denniskigen @ibacher the appointments test fail went away but there's this one failure that seems pretty consistent: https://github.com/openmrs/openmrs-distro-referenceapplication/actions/runs/11526530278/job/32338808068?pr=851

Is there a way to view a screencast of the failed run without setting up to run the tests locally?

denniskigen · 2024-10-31T14:37:00Z

Yes, @mogoodrich, you can download the artifact named report patient management on that page. You can download the zip file and then upload the trace zip in the data directory to https://trace.playwright.dev/.

Looks like the visit isn't being created in the active-visit spec. Not sure why.

mogoodrich · 2024-10-31T16:50:40Z

Yes, @mogoodrich, you can download the artifact named report patient management on that page. You can download the zip file and then upload the trace zip in the data directory to https://trace.playwright.dev/.

Thanks @denniskigen ! Yeah, I saw the artifact but wasn't sure what to do with it. Thanks! Will take me a little time to decipher this but let me see....

denniskigen · 2024-10-31T18:35:37Z

Dunno why the provider.uuid here is blank here when creating the encounter for running the test.

mogoodrich · 2024-10-31T18:46:36Z

Dunno why the provider.uuid here is blank here when creating the encounter for running the test.

Yeah, I thought that was where the error was... yeah, no reason any of my changes should result in the provider not being avaiable?

denniskigen · 2024-10-31T18:47:46Z

Yeah...

add bed management ESM

mogoodrich · 2024-10-31T20:54:20Z

Yeah...

But's pretty consistently failing... got drawn into other stuff today, hopefully I can take a look tomorrow and have a eureka... :)

mogoodrich · 2024-11-01T14:11:43Z

But's pretty consistently failing... got drawn into other stuff today, hopefully I can take a look tomorrow and have a eureka... :)

Got it @denniskigen ! Need to dig a little deeper to see what exactly is going on and what the fix it... likely just a metadata tweak in the ref app data... but on startup the EMR API module makes sure there is an "Unknown" provider in the system, and in our case it's overwriting the "admin" provider set up by ref app. Will keep you posted, but thanks for the help!

add bed management ESM (update to latest snapshot of reference demo data module)

mogoodrich · 2024-11-01T22:10:53Z

Got it @denniskigen ! Need to dig a little deeper to see what exactly is going on and what the fix it... likely just a metadata tweak in the ref app data... but on startup the EMR API module makes sure there is an "Unknown" provider in the system, and in our case it's overwriting the "admin" provider set up by ref app. Will keep you posted, but thanks for the help!

Fixed! This was the issue: https://openmrs.atlassian.net/browse/RA-2061

Anyway, this is ready for merge, but I'm finishing up for the day shortly and I'm on vacation the first half of next week... so the smart thing is for me not to merge this until I'm back... :)

denniskigen

LGTM. Thanks, @mogoodrich!

mogoodrich · 2024-11-07T02:38:18Z

Thanks @denniskigen @ibacher ! Will test out tomorrow how this is looking on dev3...

vasharma05 · 2024-11-07T04:46:26Z

Hi @mogoodrich!
Can you also configure the beds for a location, or if it's already configured, can you please share the location.
Thanks for the great work!

(feat) O3-3886: Demo Ward App in the Ref App

0cea1f4

mogoodrich marked this pull request as draft October 11, 2024 17:08

mogoodrich commented Oct 11, 2024

View reviewed changes

mogoodrich added 2 commits October 11, 2024 13:11

(feat) O3-3886: Demo Ward App in the Ref App

dc97344

Merge remote-tracking branch 'origin/O3-3886' into O3-3886

cb3d09e

# Conflicts: # distro/configuration/encountertypes/encountertypes_core-demo.csv

denniskigen requested review from ibacher, dkayiwa and mseaton October 17, 2024 13:11

ibacher reviewed Oct 18, 2024

View reviewed changes

mogoodrich added 4 commits October 25, 2024 15:09

(feat) O3-3886: Demo Ward App in the Ref App

683af50

(feat) O3-3886: Demo Ward App in the Ref App

0925719

(feat) O3-3886: Demo Ward App in the Ref App

8b87ae3

Merge branch 'main' into O3-3886

04f2958

# Conflicts: # distro/distro.properties # distro/pom.xml # frontend/spa-assemble-config.json

mogoodrich commented Oct 25, 2024

View reviewed changes

mogoodrich marked this pull request as ready for review October 25, 2024 21:29

mogoodrich added 5 commits October 25, 2024 17:33

(feat) O3-3886: Demo Ward App in the Ref App

09fe05c

(feat) O3-3886: Demo Ward App in the Ref App

3e9d0af

(temporarily remove IPD OCL package for testing)

Revert "(feat) O3-3886: Demo Ward App in the Ref App"

e84cf9e

This reverts commit 3e9d0af.

(feat) O3-3886: Demo Ward App in the Ref App

b7ec683

update to new IPD package with bogus mappings removed

(feat) O3-3886: Demo Ward App in the Ref App

3a9ab16

update to new IPD package with bogus mappings removed

mogoodrich requested review from ibacher and gracepotma October 25, 2024 23:18

denniskigen self-requested a review October 31, 2024 13:17

ibacher approved these changes Oct 31, 2024

View reviewed changes

(feat) O3-3886: Demo Ward App in the Ref App

6d2767d

add bed management ESM

Merge branch 'main' into O3-3886

134b11a

(feat) O3-3886: Demo Ward App in the Ref App

d6083f1

add bed management ESM (update to latest snapshot of reference demo data module)

Merge branch 'main' into O3-3886

e86e112

denniskigen approved these changes Nov 6, 2024

View reviewed changes

ibacher merged commit f36e35b into main Nov 6, 2024
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(feat) O3-3886: Demo Ward App in the Ref App #851

(feat) O3-3886: Demo Ward App in the Ref App #851

mogoodrich commented Oct 11, 2024

mogoodrich Oct 11, 2024

ibacher Oct 18, 2024

mogoodrich Oct 18, 2024

ibacher Oct 18, 2024

ibacher Oct 18, 2024

mogoodrich Oct 25, 2024

mogoodrich Oct 25, 2024

mogoodrich Oct 25, 2024

mogoodrich Oct 25, 2024

mogoodrich commented Oct 25, 2024

mogoodrich commented Oct 25, 2024

mogoodrich commented Oct 31, 2024

denniskigen commented Oct 31, 2024 •

edited

Loading

mogoodrich commented Oct 31, 2024

denniskigen commented Oct 31, 2024 •

edited

Loading

mogoodrich commented Oct 31, 2024

denniskigen commented Oct 31, 2024

mogoodrich commented Oct 31, 2024

mogoodrich commented Nov 1, 2024

mogoodrich commented Nov 1, 2024

denniskigen left a comment

mogoodrich commented Nov 7, 2024

vasharma05 commented Nov 7, 2024

		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
		8d6c993e-c2cc-11de-8d13-0010c6dffd0f,,Unknown Location,Unknown Location,,,,,,,,,,,,,,,,,,,,,

(feat) O3-3886: Demo Ward App in the Ref App #851

(feat) O3-3886: Demo Ward App in the Ref App #851

Conversation

mogoodrich commented Oct 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mogoodrich commented Oct 25, 2024

mogoodrich commented Oct 25, 2024

mogoodrich commented Oct 31, 2024

denniskigen commented Oct 31, 2024 • edited Loading

mogoodrich commented Oct 31, 2024

denniskigen commented Oct 31, 2024 • edited Loading

mogoodrich commented Oct 31, 2024

denniskigen commented Oct 31, 2024

mogoodrich commented Oct 31, 2024

mogoodrich commented Nov 1, 2024

mogoodrich commented Nov 1, 2024

denniskigen left a comment

Choose a reason for hiding this comment

mogoodrich commented Nov 7, 2024

vasharma05 commented Nov 7, 2024

denniskigen commented Oct 31, 2024 •

edited

Loading

denniskigen commented Oct 31, 2024 •

edited

Loading