New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BS 216 | BS-Drug Drug - Enhance FHIR CDSS Service based on Standard Format(Only Salt scope) #673

Merged

sivareddyp merged 2 commits into snomed-master from BS-216

Aug 22, 2023

Contributor

manimaarans commented Aug 21, 2023

Requirements

This PR has a proper title that briefly describes the work done
I have squashed / amended the comments to make it more redable
I have included link to all the JIRA ticket('s)
I wrote the code as a pair or atleast performed a self-review of my own code
I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes

Summary

BS-Drug Drug - Enhance FHIR CDSS Service based on Standard Format(Only Salt scope)

Screenshots

JIRA tickets

https://bahmni.atlassian.net/browse/BS-216

Other

manimaarans added 2 commits

August 18, 2023 16:33


          BS-216 | Mani, Siva | updated filtering cdss alert logic

1e3e9fc


          BS-216 | Mani, Siva | fixed ts lint

c49a5e3

manimaarans requested review from sivareddyp and vijayanandtwks

August 21, 2023 12:45

sivareddyp approved these changes

View reviewed changes

vijayanandtwks reviewed

View reviewed changes

ui/app/clinical/consultation/controllers/addTreatmentController.js

@@ @@ -691,12 +691,15 @@ angular.module('bahmni.clinical') @@
                           function filterNewAlerts (cdssAlerts, drugMaps) {
                               return cdssAlerts.filter(function (alert) {
-                                  if (alert.referenceMedication && alert.referenceMedication.coding && alert.referenceMedication.coding.length > 0) {

Contributor

vijayanandtwks Aug 22, 2023

use !== for not null check

Contributor Author

manimaarans Aug 22, 2023

use !== for not null check

we are handling null and undefined check here, so if(var) will handle both null and undefined scenario for var

vijayanandtwks approved these changes

View reviewed changes

sivareddyp merged commit 0f71525 into snomed-master

sivareddyp deleted the BS-216 branch

August 22, 2023 05:48

sivareddyp pushed a commit that referenced this pull request


          BS 216 | BS-Drug Drug - Enhance FHIR CDSS Service based on Standard F…

ca8cd8e

…ormat(Only Salt scope) (#673)

* BS-216 | Mani, Siva | updated filtering cdss alert logic

* BS-216 | Mani, Siva | fixed ts lint

sivareddyp added a commit that referenced this pull request


          BS-258 | SNOMED Changes (#768)

31ddb63

* BS-160 | Patrick | Filter and display only current medication alert (#662)

* BS-160 | Patrick | Close alerts when medication input is cleared (#670)

* BS 216 | BS-Drug Drug - Enhance FHIR CDSS Service based on Standard Format(Only Salt scope) (#673)

* BS-216 | Mani, Siva | updated filtering cdss alert logic

* BS-216 | Mani, Siva | fixed ts lint

* BS-207 | Placement of previous alerts near Drugs (#683)

* BS-207 | Patrick | add CDSS alert icons and tooltips for previous drug alerts

* BS-207 | Patrick | Fix tooltip placement

* BS-207 | Patrick | add cdss alert details and link

* BS-207 | Patrick | make CDSS alert icon a button

* BS-207 | Patrick | fix alert icon button size

* BS-207 | Patrick | Refactor previous alert filtering logic

* BS-207 | Patrick | Refactor new drug order alert filtering logic

* BS-207 | Patrick | remove font size from global icon class

* BS-207 | Patrick | Allow multiple cdss alerts in one tooltip

* BS-207 | Patrick | move tooltip trigger to button

* BS-207 | Patrick | Fix tooltip padding

* BS-207 | Patrick | Add directive for CDSS alerts

* BS-207 | Patrick | Add watchers for the alerts and treatment changes

* BS-207 | Patrick | Add translations for "Dismissed"

* BS-207 | Patrick | Add unit tests

* BS-207 | Patrick | remove translations for other languages

* BS-208 | Placement of Alert near Diagnosis (#687)

* BS-208 | Patrick | Add alerts for past and saved diagnoses

* BS-208 | Patrick | Update system information in FHIR bundle payload

* BS-208 | Patrick | update drug uuid when getting drug concept system

* BS-208 | Patrick | Refactor alert filtering

* BS-208 | Patrick | fix circular dependency bug and styling

* BS-208 | Patrick | Refactor to include unsaved medication

* BS-208 | Patrick | refactor bundle generation for draft drugs

* BS-208 | Patrick | create CDSS service

* BS-208 | Patrick | Remove unused cdss methods for diagnosis and treatment

* BS-208 | Patrick | Add Unit tests

* BS 247 - FHIR Export Admin UI (#757)

* BS-247 | Vijay,Siva | Admin UI

* BS-247 | Vijay,Siva | Admin UI Unit Test

* BS-247 | Vijay,Mani,Siva | restore missing code

* BS-247 | Vijay,Siva | restore missing code

* BS-247 | Vijay | add mising file

* BS-247 | vijay | add username and fix date format

* BS-247 | vijay | i18n

* BS-247 | vijay | cleanup

* BS-58: Trigger and show CDSS Active alert alert at the diagnosis/conditions and Medications tab (#728)

* BS-58 | Patrick | Add active and dismissed CDSS alert row form medications tab

* BS-58 | Patrick | trigger cdss also when updating medication

* BS-58 | Patrick | Fix cdss alert  audit

* BS-58 | Patrick | Fix alerts status update on diagnosis tab

* BS-58 | Patrick | Remove close button from diagnosis alert

* BS-58 | Patrick | align source link and watcher for new medication alerts

* BS-270 Added a  tooltip to procedures buttons (#723)

* BS-270 | Patrick | Add tooltip to procedures buttons

* BS-270 | Patrick | Show tooltip only if text overflows

* BS-270 | Patrick | fix formatting issues

* BS-270 | Vijay, Mani | remove timeout discrepancy

* BS-270 | Vijay, Mani | resolve timeout discrepancy

* BS-270 | Patrick | Add comment for tooltip positioning

---------

Co-authored-by: vijayanandtwks <vijayanand.s@thoughtworks.com>

* BS-282 | Adding Drug Reference Maps to Order set member (#758)

* BS-281 | CDSS Observations for all the interactions (#761)

* BS-281 | Patrick | fix diagnosis alert message layout

* BS=281 | Patrick | Show alerts on conditions change

* BS-281 | Patrick | Fix cdss popover button padding for conditions

* BS-281 | Patrick | Update cdss alerts filter to keep previous alert statuses

* BS-281 | patrick | Get alerts on drug refills

* BS-281 | Patrick | Add high dosage prefix for high dosage alerts

* BS-281 | Patrick | Fix medication duration error

* BS-281 | Patrick | Show alerts on dosage recalculation and activated condition status

* BS-281 | Patrick | Label saved medications and condition alerts as dismissed

* BS-281 | Patrick | Update diagnoses alerts if medication is removed

* BS-281 | Patrick | Change diagnosis alert link color to black

* BS-281 | Patrick | Align dismissed condition alert icon

* BS-281 | Patrick | Fix alert expand toggle in medications tab

* BS-281 | Patrick | Fix to Avoid calling CDSS methods if CDSS is disabled

* BS-281 | Patrick | Remove alerts from inactive diagnosis rows

* BS-283 | BS-285 | Mani | fixed issue when removal of last draft medications/conditions by adding patient resource to get patient id (#763)

* BS-283 | BS-285 | Mani | fixed issue when removal of last draft medications/conditions by adding patient resource to get patient id

* BS-283 | BS-285 | Mani | moved patient resource creation inside the guard condition

* BS-14 | Trigger CDSS on the Drug Order Sets (#765)

* BS-14 | Patrick | Add CDSS alerts for drug order sets

* BS-14 | Patrick | Fix button group styling

* BS281 | CDSS Observations for all the interactions (#766)

* BS-281 | Patrick | Fix closing alert issue

* BS-281 | Patrick | Clear alerts if diagnosis is cleared

* BS-281 | Patrick | Remove alerts for cleared conditions

* Adding missing Keys

---------

Co-authored-by: Patrick Nyatindo <nyatindopatrick@gmail.com>
Co-authored-by: manimaarans <110804183+manimaarans@users.noreply.github.com>
Co-authored-by: vijayanandtwks <vijayanand.s@thoughtworks.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet