feat: Service Request, Medication Request #286
Merged
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
Co-authored-by: Info Aakvatech <info@aakvatech.com> Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com> Co-authored-by: muhammad <muhammad@earthianslive.com>
…nks in diagnosis, medical department
fix: remove redundant practitioner mandatory validation
- reorder fields - set title - disable set only once for fields since dt is submittable - control field visibility
- make Intent a Link field
- Custom Buttons to change appropriate status - Capture reason for cancellation on cancelling HSO - list view settings - Modify status options according to FHIR standards
- set HSO as completed on service completion - add dashboard for HSO
- consider only submitted docs in invoicing
- show period only for medication - map occurence date and time to service transactions
… information - fetch staff role and patient care type from service templates
- mark invoiced for both service transaction and HSO - show HSO and invoiced in More Information section of service transaction
set medical code when creating hso hso and insurance patch folder name
Healthcare Service Order > Service Request Healthcare Service Order Category > Service Request Category Healthcare Service Order Priority > Service Request Priority Healthcare Service Order Intent > Service Request Intent Healthcare Service Order Reason > Service Request Reason
fix: Service Request - make js and py common
…est for submitted encounters
…_quantity calculation issue
utils.py remove incorrectly merged method
linters issue
m5ingh
pushed a commit
to m5ingh/health
that referenced
this pull request
Feb 20, 2024
# [0.2.0](v0.1.4...v0.2.0) (2024-02-20) ### Bug Fixes * ABHA creation - modified print consent button ([e88515f](e88515f)) * ABHA creation using mobile ([f917d6c](f917d6c)) * add codification table in healthcare service docs ([94ac6c5](94ac6c5)) * add default intent and default priority in Healthcare Settings ([38e730c](38e730c)) * Add Discount Amount field to show payment dialog ([6d28ca5](6d28ca5)) * add missing commitlint.config.js ([91b1820](91b1820)) * Add missing fields in clinical procedure template ([6b69575](6b69575)) * add missing fields to Code System and Code Value ([a0ca802](a0ca802)) * add nosemgrep in create_appointment_type method ([7d80e37](7d80e37)) * add Service Unit, Practitioner and Department custom field in Sales Invoice Item ([230c513](230c513)) * add strings to translate function ([earthians#137](https://github.com/m5ingh/health/issues/137)) ([762a22d](762a22d)) * add System Manager to module onboarding roles ([7e61896](7e61896)) * add translate function to chart labels ([82b7527](82b7527)) * add workspace card for Terminology Mapping ([1826caf](1826caf)) * Added connection to nursing task in inpatient record ([earthians#140](https://github.com/m5ingh/health/issues/140)) ([78ab490](78ab490)) * added defaults for healthcare activity ([4eebdbc](4eebdbc)) * Added permissions for system manager in lab test doctype ([1f08d0a](1f08d0a)) * Added responses package ([9f8f5c6](9f8f5c6)) * allow delete root service unit if deleting company ([5112ff0](5112ff0)) * Allow service unit capacity in quick entry ([9c263df](9c263df)) * Appointment Cancel - move Cancelled from event_type to status ([1cb03d5](1cb03d5)) * book Patient Appointment based on check in ([291095d](291095d)) * Bring back compatibility version check and fee validity status set patches ([8296154](8296154)) * bring back patient quick entry, app_include_js hook lost in merge ([040e664](040e664)) * broken healthcare service unit tree view ([aa88d9a](aa88d9a)) * Bump actions in CI workflow ([earthians#112](https://github.com/m5ingh/health/issues/112)) ([cd9a37e](cd9a37e)) * change FHIR Value Set reference to Code Value ([1f922db](1f922db)) * Change field name automate_appointment_invoicing to show_payment_popup in Healthcare Settings ([9968652](9968652)) * Change in design ([670c4d1](670c4d1)) * Changed docs link to new site ([bfa920f](bfa920f)) * Changed module name to healthcare ([795decf](795decf)) * changed nursing task creation - ([f592f8e](f592f8e)) * check employee leaves only if hrms is installed ([834bdbe](834bdbe)) * Check for employee doctype in hr & setup ([237c33f](237c33f)) * check item price exists on update of Therapy Type ([77d0a5c](77d0a5c)) * **ci:** failing server tests ([dc05b16](dc05b16)) * **CI:** get-app payments, requirement for erpnext ([82c9055](82c9055)) * **ci:** include payments in test site_config install_apps instead of explicit install-app ([092e0e0](092e0e0)) * **ci:** remove linters from github actions ([89cb4de](89cb4de)) * **ci:** use frappe and erpnext develop branches for ci test setup ([df1dd08](df1dd08)) * Code cleanup and sandbox_config update ([11d33aa](11d33aa)) * Code cleanup with verification response shown in dialog ([7889029](7889029)) * code value Display field can be lengthy, changed to small text ([3b63076](3b63076)) * create clinical note from encounter, view and update orders from encounter ([908570d](908570d)) * Create custom fields for abdm on after install of healthcare app ([6d2ab06](6d2ab06)) * Create nursing tasks after creating inpatient record ([earthians#141](https://github.com/m5ingh/health/issues/141)) ([a260b9e](a260b9e)) * Customer not being autoset when Patient is selected in Sales Invoice ([earthians#136](https://github.com/m5ingh/health/issues/136)) ([80440fe](80440fe)) * Define variables before access in patient appointment ([bc9de0a](bc9de0a)) * Enable Fee Validity for existing patients ([871d663](871d663)) * enable import for Observation Template ([5661bd5](5661bd5)) * erpnext as required app ([8651028](8651028)) * failing test Nursing Task ([5063a5f](5063a5f)) * failing tests ([bc33e76](bc33e76)) * failling server test, update node version ([97d5a36](97d5a36)) * FHIRVersion changed from data to link ([4f6f264](4f6f264)) * Fix broken tests ([077e5c4](077e5c4)) * Fix casing for abha card ([7987ae0](7987ae0)) * Fix frappe test case import ([7136513](7136513)) * Fix string translation in nursing task ([ace6ff2](ace6ff2)) * Fixed typos ([1862bf8](1862bf8)) * frappe.db.exists check ([9fa3518](9fa3518)) * Get Applicable Treatment Plan for new Patient Encounter ([421f136](421f136)) * handle practitioner not set in appointment ([94a876c](94a876c)) * Health ID verification with Authentication ([184bc6e](184bc6e)) * healthcare orders widget design change ([a5d83de](a5d83de)) * Icon to search username, Save data to frm on abha creation by aadhaar ([6e9a39d](6e9a39d)) * Include dosage form in grid view ([8fd9876](8fd9876)) * Inpatient Medicaiton ENtry - datetime error while getting pending orders ([930852e](930852e)) * Inpatient Medication Order - get from encounter ([f6f2927](f6f2927)) * insert root item group with is_group 1 ([earthians#171](https://github.com/m5ingh/health/issues/171)) ([36f3955](36f3955)) * Internal / External type in Healthcare Practitioner ([d4d445e](d4d445e)) * Invoice submission error if SR has Observation Template in Order Template Type field ([d7dc2e1](d7dc2e1)) * Item code from Procedure ([aa50921](aa50921)) * Link existing Item in Lab Test Template, Clinical Procedure Template, Therapy Plan Template ([earthians#107](https://github.com/m5ingh/health/issues/107)) ([fdb171e](fdb171e)) * linking existing customer to new Paitient overwrites customer name and other details ([earthians#306](https://github.com/m5ingh/health/issues/306)) ([c5d9de2](c5d9de2)) * linter auto fixes ([3cce6a5](3cce6a5)) * linter issues ([9f5cb53](9f5cb53)) * Linters Issue ([a103390](a103390)) * list view indicators for Nursing Task ([0be4e2a](0be4e2a)) * make field oid non mandatory for all code systems ([61fe137](61fe137)) * make method def available right below the whitelist decorator ([99ec547](99ec547)) * Make service unit type mandatory for all non-group types ([19a4e30](19a4e30)) * make version non mandatory in code_system and code_value ([095a805](095a805)) * **Medication Request:** make medication non mandatory ([44892c5](44892c5)) * **Medication:** make item unique for Medication in child table ([d04c086](d04c086)) * move service request master creation patch to v15 ([59f9200](59f9200)) * **navigation:** Add nursing module doctypes to workspace ([3808c15](3808c15)) * nursing tasks tests ([c11fd68](c11fd68)) * Observation - pass service request reference ([ca2c1e1](ca2c1e1)) * Orders - change status field to code value ([2709a4d](2709a4d)) * Orders - html in encounter design change ([1c2ed2a](1c2ed2a)) * Orders html desgn change ([20d9a7c](20d9a7c)) * Orders Widget - allow creating Observation - Service Request ([1dea09b](1dea09b)) * **patch:** check_version_compatibility_with_frappe ([5391533](5391533)) * **patch:** Set Allow Booking For in Appointment Type ([025117b](025117b)) * **patch:** setup a few non fhir code systems ([b0da7da](b0da7da)) * Patient Appointment - Add discount percentage and amount in payment popup ([0d7f6e2](0d7f6e2)) * Patient Appointment - Default fallback value in invoice_appointment and remove mode_of_payment argument ([a18e3a4](a18e3a4)) * Patient Appointment - fee validity message formating ([b60dc5b](b60dc5b)) * Patient Appointment - position in queue repetition issue ([c6d0ead](c6d0ead)) * Patient Appointment - reload doc after appointment invoiced ([e4c7cd6](e4c7cd6)) * Patient Appointment - Scheduler event update ([a928536](a928536)) * **Patient Appointment:** event permission issue ([976897c](976897c)) * patient details getting disappeared on order and notes html setting ([cfea3d0](cfea3d0)) * Patient Encounter - Insufficient Permission while fetching Treatment Plan Template ([bbeab9d](bbeab9d)) * Patient Encounter - merge observation and lab_test prescription table ([76b528a](76b528a)) * Patient Encounter - Submit all orders on validate ([6a4cc17](6a4cc17)) * **Patient Encounter:** set medication in drug prescription if Medication is already created ([b2dfea8](b2dfea8)) * practitioner gets cleared in book appointment dialog ([08f4076](08f4076)) * Primary Address and Contact in Healthcare Practitioner ([61808ae](61808ae)) * Primary btn disables on error message, Route to patient form if already exist, Rename Sandbox_config to abdm_config, clean up utils ([11bdba0](11bdba0)) * Print consent form and ABHA card png ([6748c71](6748c71)) * prioritize charges configured in practitioner doc above appointment type and settings ([92c141c](92c141c)) * Priority and Intent - remove masters and map to FHIR value set ([9ea09c4](9ea09c4)) * QR code scanning in ABHA address verification ([6cb8b27](6cb8b27)) * remove 'No records found' msgprint ([4baa0a9](4baa0a9)) * Remove duplicate event in Patient Appointment ([f0587f8](f0587f8)) * remove hardwired fiscal year in before_tests method ([fe2c337](fe2c337)) * remove incorrect set_vlaue after rename ([dbab04f](dbab04f)) * Remove insurance hooks healthcare ([earthians#159](https://github.com/m5ingh/health/issues/159)) ([9624c14](9624c14)) * remove mandatory for employee / supplier links in practitioner ([5a6604c](5a6604c)) * Remove mobile mode in ABHA creation ([c3d0105](c3d0105)) * remove Modify Nursing Tasks flow ([cf3406e](cf3406e)) * remove nursing tasks custom button ([6ebc52d](6ebc52d)) * remove old method of showing order history in patient encounter ([cee1aad](cee1aad)) * Remove regional from modules ([33c615c](33c615c)) * remove reload statements for deleted doctypes ([6469002](6469002)) * remove translations from hooks.py portal dict ([earthians#368](https://github.com/m5ingh/health/issues/368)) ([27e1b3c](27e1b3c)) * remove unused _ import from hooks ([01b3112](01b3112)) * Remove unused file ([ad21236](ad21236)) * Removing 'No Lab Tests created' message ([5e88e4e](5e88e4e)) * rename - Value Set to Code Value Set ([9f59f60](9f59f60)) * rename dotypes, path for the same ([fe102d5](fe102d5)) * Renamed ABDM Integration to ABDM Settings ([4a51198](4a51198)) * reorganise healthcare workspace ([64de72a](64de72a)) * reset portal settings after uninstall ([earthians#202](https://github.com/m5ingh/health/issues/202)) ([628fff1](628fff1)) * restrict past slots based on the current time. ([earthians#188](https://github.com/m5ingh/health/issues/188)) ([dd32a9d](dd32a9d)) * Sales Invoice - bring back buttons to invoice healthcare services under "Get Items From" ([80fe070](80fe070)) * Sample Collection - move create observation function to queue ([c2b1c73](c2b1c73)) * Search with ABHA adress and verify ([66b1de1](66b1de1)) * Service Request - add child reference for grouped observations if sample collection is already created ([723ea1b](723ea1b)) * Service Request - add super() to validate method ([a9d6f03](a9d6f03)) * Service Request - filter patient as patient link can be changed from non-submitted encounters ([5c55b9d](5c55b9d)) * set default for time fields ([5e788c8](5e788c8)) * set exercises in Therapy Session from Therapy Type on validate ([c509042](c509042)) * Setup QR code scanner ([26a3349](26a3349)) * Show ABHA card of existing patient on creation and linking ([832bfe1](832bfe1)) * show orders in encounter as html ([b85361d](b85361d)) * **test:** test exercise set from Therapy Type ([0844dbb](0844dbb)) * Text changes ([3af9d45](3af9d45)) * translation, field fixes ([6476165](6476165)) * Treatment Plan Template - Filter for practitioner based on medical department ([c2c1d27](c2c1d27)) * Triggered change to show relevant patient history for different patients [earthians#316](https://github.com/m5ingh/health/issues/316) ([2be37bb](2be37bb)) * uninstall app deosn't clear custom fields, roles, protal menu items etc ([9c8c40b](9c8c40b)) * uodate pyproject.toml ([9b2c294](9b2c294)) * Updated doc links in onboarding steps ([74e8954](74e8954)) * Utils - Return if no patient is selected on invoice submit/cancel ([1aac702](1aac702)) * **ux:** add tab breaks to master doctype forms and healthcare settings ([fd3dbb9](fd3dbb9)) * Value Set ([c6cd88b](c6cd88b)) * Wrapped words with translate function ([earthians#139](https://github.com/m5ingh/health/issues/139)) ([2ffbe1b](2ffbe1b)) ### Features * ABDM - Milestone 1 ([5a941dd](5a941dd)) * ABDM Milestone 1 ([666721f](666721f)) * Add imaging reports to lab tests ([earthians#103](https://github.com/m5ingh/health/issues/103)) ([5abbe80](5abbe80)) * Add nursing tasks for therapy sessions ([e126d38](e126d38)) * Add tests for modifying nursing tasks ([5a4fc61](5a4fc61)) * Added black to CI & reformatted code ([c460e65](c460e65)) * Added checklist for admission & discharge ([6a21422](6a21422)) * Added child table for nursing tasks ([bee7bf9](bee7bf9)) * Added missing fields for task ([21baccd](21baccd)) * Added models for nursing tasks ([2e28783](2e28783)) * Added template for therapy plan ([f89c87e](f89c87e)) * Added validation for nursing tasks ([c6fac56](c6fac56)) * Added validation for nursing tasks ([0062146](0062146)) * allow booking appointments against department / service_unit based on appointment type ([fd2e271](fd2e271)) * Auto create nursing tasks for labs ([b9655b1](b9655b1)) * Clean up nursing tasks tests ([0b73c79](0b73c79)) * Clean up therapy plan ([711b647](711b647)) * Clinical Note ([63aaf48](63aaf48)) * Create nursing tasks for clinical procedure ([ef933a0](ef933a0)) * Create root service units for all companies by default ([6451a16](6451a16)) * Observation, Diagnostic Report ([earthians#302](https://github.com/m5ingh/health/issues/302)) ([59f8be4](59f8be4)) * option to create nursing tasks from encounter ([d5ffcf9](d5ffcf9)) * option to set charges for service unit / department in appointment_type ([963ba8a](963ba8a)) * patient quick entry ([4d42949](4d42949)) * **patient-appointment:** today as a min date in check availability ([earthians#109](https://github.com/m5ingh/health/issues/109)) ([a4e9366](a4e9366)) * Provide modal to select nursing tasks ([3d2b0e2](3d2b0e2)) * Service Request, Medication Request ([earthians#286](https://github.com/m5ingh/health/issues/286)) ([94fc0b0](94fc0b0)) * Tele Consultation via google meet ([earthians#169](https://github.com/m5ingh/health/issues/169)) ([8d773b2](8d773b2))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Medication
Medication
Service Request
Medication Request
Service and Medication Request