Commit Graph

286 Commits

Author SHA1 Message Date
Rucha Mahabal
8549358708
Merge branch 'develop' into make-ipme-entries-editable 2021-01-11 15:31:08 +05:30
Jannat Patel
dcda8b9e8c
feat: Patient appointment status changes (#24201)
* feat: patient appointment status changes

* fix: sider

* fix: sider

* fix: test status on cancel of docs and test refactor

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-11 12:50:39 +05:30
Rucha Mahabal
aff3f611d3 fix: allow medication entries to be deleted from the table 2021-01-11 12:48:11 +05:30
Rucha Mahabal
7206e12c2f test: Allow Discharge despite Unbilled Services 2021-01-04 12:11:00 +05:30
Rucha Mahabal
03b25be9e9 feat: Allow Discharge despite Unbilled Healthcare Services 2021-01-04 11:16:59 +05:30
Rucha Mahabal
f2a431d866 fix: filter Therapy Types and Therapy Plan in Patient Appointment 2020-12-16 16:09:58 +05:30
Rucha Mahabal
5a8a52b9c6 fix: Therapy Type and Therapy Plan field visibility in Patient Appointment 2020-12-16 15:54:06 +05:30
Marica
d857d70a96
Merge branch 'develop' into stock-entry-for-medication-entries 2020-12-10 20:44:10 +05:30
Afshan
727b2f9b97
fix: throw an error when no pos profile exist (#24025)
* fix: throw an error when no pos profile exist

* fix: throw an error when no pos profile exist

* fix: test cases

* fix: tests

* fix: test

* fix: space as indent

* fix: travis
2020-12-08 09:45:19 +05:30
Rucha Mahabal
cf012ca9c3 fix: show stock entry button only if update stock is enabled 2020-11-27 12:39:33 +05:30
Rucha Mahabal
f5eddce407 test: Inpatient Medication Entry Drug Shortage 2020-11-27 12:27:17 +05:30
Rucha Mahabal
ac8ee249d5 feat: Medication doctypes added to Desk page and Patient dashboard 2020-11-26 22:11:20 +05:30
Rucha Mahabal
54228691e7 feat(IPME): Button to create Stock Entry for Drug Shortage 2020-11-26 16:38:28 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings (#24004)
* fix: translation strings

* fix: linting
2020-11-25 15:37:54 +05:30
Rucha Mahabal
c66bd45ba4
feat: Inpatient Medication Orders Script Report (#23984)
* feat: Inpatient Medication Orders Script Report

* feat: add chart for Inpatient Medication Order Report

* feat: add report to Desk Page

* feat: added filters for dates and healthcare service unit

* test: Inpatient Medication Orders report
2020-11-25 09:09:40 +05:30
Rucha Mahabal
13fb562e9c fix: sider 2020-11-04 20:25:10 +05:30
Rucha Mahabal
2673c19c1a fix: therapy plan and session fixes 2020-11-04 20:06:07 +05:30
Rucha Mahabal
7190e1e4bb fix: Inpatient Medication Order and Entry fixes 2020-11-03 13:45:12 +05:30
Rucha Mahabal
434791ed6e
feat: Therapy Plan Template (#23558)
* feat: Therapy Plan Template

* feat: Handle billing Therapy Plans created via Templates

* feat: add dashboard to Therapy Plan Template

* fix: codacy issues

* fix: sider

* fix: validate Therapy Session overlap

* feat: Create Sales Invoice from Therapy Plan

* fix: sider

* chore: added tests for Therapy Plan Template

* fix: test

* fix: test

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-24 14:20:38 +05:30
Rucha Mahabal
4887b69946
feat: Inpatient Medication Order and Entry (#23473)
* feat: Inpatient Medication Order

* feat: Inpatient Medication Entry

* feat: update medication orders on medication entry submission

* feat: added custom fields for medication references in Stock Entry

* feat: make stock entry if update stock is checked in IPMOE

* fix: handle cancel event for Inpatient Medication Entry

* fix(ux): add link and progress bar to dashboard

* refactor(ux): Adding Medication Orders without linking to Patient Encounter

* fix: make medication entry child table read only

* fix: filter stock items during manual medication order creation

* fix: codacy

* chore: tests for Inpatient Medication Order

* chore: tests for Inpatient Medication Entry

* fix: code clean-up

* fix: filter for inpatients in IPMO

* fix: add datetime validations for IPME filters

* fix: do not hardcode stock entry type

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 20:33:30 +05:30
rohitwaghchaure
7512565184
fix: Patient Appointment not able to save (#23434)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-09-25 12:45:47 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350)
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
2020-09-18 18:27:24 +05:30
Rucha Mahabal
a29436dc91 fix: codacy 2020-09-10 17:45:17 +05:30
Rucha Mahabal
c0f9d1b65a test: Lab Module 2020-09-10 17:33:52 +05:30
Rucha Mahabal
5c6ed4dbcd
Merge branch 'develop' into refactor-lab-module 2020-08-31 09:50:30 +05:30
Rucha Mahabal
9766adbf4e fix: don't overwrite appointment duration if already specified 2020-08-26 14:53:23 +05:30
Rushabh Mehta
ee921052c0 fix(minor): test dependencies 2020-08-25 14:35:49 +05:30
Anoop
d3d3db654e
fix: Inpatient Record - Transfer check-in time validation (#22958)
* fix: inpatient transfer should not allow future checkin time

* Update erpnext/healthcare/doctype/inpatient_record/inpatient_record.js

Error message corrected

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 13:21:12 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913)
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 19:42:25 +05:30
Rucha Mahabal
c5ccf38cdf refactor: Lab Test Report 2020-07-30 18:56:16 +05:30
Rucha Mahabal
ca1b389c99 fix: validate negative quantity for sample collection 2020-07-30 16:58:19 +05:30
Rucha Mahabal
fa2c20ea9e chore: Sample Collection Form clean-up 2020-07-30 16:56:11 +05:30
Rucha Mahabal
afa001a1d1 fix: code clean-up 2020-07-30 15:25:04 +05:30
Rucha Mahabal
73edb12ab3 fix: msgprint for sample collection doc created on Lab Test creation 2020-07-30 14:50:30 +05:30
Rucha Mahabal
c33703d54c fix: move result value validations to server side 2020-07-30 14:25:40 +05:30
Rucha Mahabal
b00f870c77 fix: Lab Test Completed status not visible in list view 2020-07-30 13:49:13 +05:30
Rucha Mahabal
621529adfb
fix: unlink item from healthcare service unit type (#22828)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-30 13:18:41 +05:30
Rucha Mahabal
ff0b9bffcf feat: added dashboard for Lab Test Template 2020-07-30 12:16:56 +05:30
Rucha Mahabal
440c752529 chore: Lab Test Template form clean-up 2020-07-30 12:16:18 +05:30
Rucha Mahabal
a695971596
fix: show the standard validation message
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-28 20:15:29 +05:30
Rucha Mahabal
7cbc7946af fix: validate check out and check in time for inpatient occupancy 2020-07-28 14:11:12 +05:30
bhavesh95863
bcb49e59e7
fix: Add missing translation function (#22813)
* fix: Add missing translation function

Add missing translation function

* fix: Add missing function for translation

* fix: Add missing translation function

* fix: Add missing translation function
2020-07-26 14:02:16 +05:30
Rucha Mahabal
1010feefe0
feat: Patient Progress Page (#22474)
* feat: add patient progress page

* feat: patient progress sidebar

* feat: Patient Progress Charts

* feat: set up sidebar links

* feat: added heatmap chart for patient interactions

* fix: styles

* fix: add markers for max score in assessment charts

* fix(style): mobile view css

* fix: heatmap and percentage chart filters

* feat: add time span filters to line charts

* fix: make date fields mandatory in healthcare doctypes for better analytics

* fix: title and filter styles

* fix: handle null state for charts

* feat: add Patient Progress Page to desk

* feat: add date range filter to all charts

* fix: code clean-up

* fix: assign roles for Patient Progress Page

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-24 10:49:04 +05:30
Anoop
23481cc484
feat: Laboratory Module Enhancements (#22416)
* feat: option to add organism count in descriptive tests
print format to accommodate descriptive test changes
fix: refactoring, clean up wip

* lab test - result based on secondary uom, result format options
lab test print - consider result format options, result legend and worksheet instructions

* feat: option to allow results blank in lab test if configured via lab test template

* fix: rename child doctypes, rename related links

* fix: field display depends on, cleanup - rename fields and variables

* fix: get from encounter popup layout, code cleanup and minor fixes

* fix: sms send dialog bug

* fix: lab test get from encounter html class name typo corrected

* fix: lab test organisms depends on condition

* fix: reorder fields - depends on fields brought together

* fix: PR review feedback, removed : separator, result formatting applied to result UOM

* fix: child table js removed

* fix: internal field require_result_value hidden, secondary uom result field type set to data

* fix: Use ORM methods instead of db.sql, code cleanup, style

* fix: create item price for lab test template if billable, code cleanup

* fix: patch rename doctypes before fields, deleted renamed child doctypes

* fix: secondary uom result calc - warn user if calculation fails

* fix: patch to insert entries into renamed child tables

* fix: codacy issues

* fix: patch duplicate error as items are already migrated in v12 migrate
organisms child table field name updated

* fix: patch a bit lenghty, added comments

* fix: patch

* fix: require_result_value flag marked hidden

* fix: code cleanup-up

* fix: patch - lab_test rename field, lab_test_group_template select option corrected

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-23 15:00:54 +05:30
Rucha Mahabal
6c6c36e780 fix: attribute error while cancelling patient encounter 2020-07-09 11:23:41 +05:30
Rucha Mahabal
45b01d2c02
feat: add medical coding fields to Healthcare DocTypes (#22501)
* feat: add medical coding fields to templates

* feat: fetch medical codes from templates in forms

* fix: codacy issues

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-08 15:39:45 +05:30
Chinmay Pai
96100e9507
chore: add standard queries hooks to whitelist (#21939)
standard queries are used within the search widget, and now require to
be whitelisted before they can be executed through the search widget.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
2020-06-18 11:58:54 +05:30
Deepesh Garg
7e974c9e2c fix: Test Cases 2020-06-12 15:29:40 +05:30
Rucha Mahabal
a18c896a56 fix: titles and order of Healthcare Onboarding steps (#21948)
* fix(Healthcare): title and order of onboarding steps

* refactor: healthcare settings tour
2020-05-27 12:43:44 +05:30
Rucha Mahabal
316d136aca
fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes (#21907)
* fix: unhide company field in Sample Collection

* fix: add and set company field in rehab doctypes
2020-05-25 18:41:47 +05:30