This repository has been archived by the owner on Jan 9, 2023. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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