Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Outpatient (OPD) Module #904

Merged
merged 126 commits into from
Dec 27, 2016
Merged

Outpatient (OPD) Module #904

merged 126 commits into from
Dec 27, 2016

Conversation

jkleinsc
Copy link
Member

Merging in the outpatient branch to bring the outpatient module/functionality into master.

This includes the following features:
New Outpatient Screen which allows for checkin/checkout of outpatients and the creation of new patients during checkin(#463)
Custom form editor (#788)
Allow visits to have custom forms attached to them (#789)
Allow patients to have custom forms attached to them (#470)
Change how diagnosis works so patient can have multiple primary diagnoses and users can mark diagnoses as active/inactive (#816)
Mark appointments as fulfilled if a visit happens (#754) (#835)

Resolves #463
Resolves #895
Resolves #893
Resolves #898
Resolves #899
Resolves #836
Resolves #860
Resolves #835
Resolves #878
Resolves #886
Resolves #470
Resolves #754
Resolves #788
Resolves #816
Resolves #789

cc @HospitalRun/core-maintainers

# Conflicts:
#	app/locales/en/translations.js
combines labs, imaging and medication into one table.
Fixes Expected an identifier but found \'IDB_SUPPORTS_BLOB\' instead
Also renamed reason for visit to chief complaint.
# Conflicts:
#	app/components/sortable-column.js
#	app/components/type-ahead.js
#	app/medication/edit/controller.js
#	app/routes/abstract-edit-route.js
# Conflicts:
#	app/components/patient-summary.js
#	app/locales/en/translations.js
#	app/medication/edit/controller.js
#	app/templates/components/patient-summary.hbs
#	app/visits/edit/template.hbs
#	ember-cli-build.js
#	prod/index.html
#	prod/manifest.appcache
#	prod/service-worker.js
#	tests/unit/mixins/patient-diagnosis-test.js
Resolves #860
Also, fixed outpatient screen to no longer display admission type
visits.
# Conflicts:
#	tests/unit/controllers/abstract-edit-controller-test.js
@jkleinsc jkleinsc merged commit 51a246a into master Dec 27, 2016
@jkleinsc jkleinsc deleted the outpatient branch February 7, 2017 14:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant