FM2-632: Medication Request should return Null when Drug Order has dose units but no dose #535
Conversation
mherman22
requested review from
mogoodrich,
denniskigen and
ibacher
and removed request for
denniskigen
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #535 +/- ##
============================================
+ Coverage 77.82% 77.83% +0.01%
Complexity 2681 2681
============================================
Files 239 239
Lines 7451 7451
Branches 901 901
============================================
+ Hits 5798 5799 +1
Misses 1115 1115
+ Partials 538 537 -1 ☔ View full report in Codecov by Sentry. |
| @@ -54,6 +54,9 @@ public Dosage toFhirResource(@Nonnull DrugOrder drugOrder) { | |||
| if (drugOrder.getDose() != null || drugOrder.getDoseUnits() != null) { | |||
| Dosage.DosageDoseAndRateComponent doseAndRate = new Dosage.DosageDoseAndRateComponent(); | |||
| Quantity dose = new SimpleQuantity(); | |||
| if (drugOrder.getDose() == null) { | |||
There was a problem hiding this comment.
We don't want to return null entirely for the dosage if the dose is null, I think it should be sufficient to just change line 54 to "if (drugOrder.getDose() != null) {" ....
There was a problem hiding this comment.
from small exp bg, @mherman22 i think the request by @mogoodrich is the ideal. thanks
There was a problem hiding this comment.
Thanks @mherman22 , looks good to me, though I'm interested in @ibacher 's thoughts before merging.
|
@ibacher, @mogoodrich, do we need a new release of the FHIR module to make this fix generally available? |
Description of what I changed
Issue I worked on
see https://issues.openmrs.org/browse/FM2-632
Checklist: I completed these to help reviewers :)
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master