FM2-312: Map the order number as an identifier for MedicationRequest and ServiceRequest #306
Conversation
Codecov Report
@@ Coverage Diff @@
## master #306 +/- ##
============================================
- Coverage 84.22% 84.19% -0.03%
- Complexity 2084 2095 +11
============================================
Files 188 188
Lines 5305 5325 +20
Branches 602 604 +2
============================================
+ Hits 4468 4483 +15
- Misses 502 504 +2
- Partials 335 338 +3
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
@Ruhanga Thanks for this! It looks mostly good and I'm sorry it's taken me a bit to get back to you. In addition to the below suggestions, I would look into adding a BaseOrderDao class that both FhirServiceRequestDaoImpl and FhirMedicationRequestDaoImpl can inherit from so we only need one definition of the the handleOrderNumber() logic (and can add other common logic for orders as needed).
| @@ -25,6 +25,11 @@ | |||
| @Override | |||
| MedicationRequest get(@Nonnull String uuid); | |||
|
|
|||
| IBundleProvider searchForMedicationRequests(ReferenceAndListParam patientReference, | |||
There was a problem hiding this comment.
Ideally, we only have on search method per service. I would just extend the existing method to also support identifier.
There was a problem hiding this comment.
Could there not be some code already depending on the current method signature elsewhere? I was worried of the backwards compatibility by introducing another search.
There was a problem hiding this comment.
No. This is a very closed set so far and, in essence, no one outside of the FHIR2 module should be depending on this (at least yet).
There was a problem hiding this comment.
Ohh, ok. Thank you for clarifying this.
There was a problem hiding this comment.
However, there are very many tests that are so tightly coupled to the method signature scattered all over the project. I see a huge refactor if I refactored the method(for example), could I go ahead @ibacher? Thanks.
api/src/main/java/org/openmrs/module/fhir2/api/dao/impl/FhirMedicationRequestDaoImpl.java
Show resolved
Hide resolved
api/src/main/java/org/openmrs/module/fhir2/api/dao/impl/FhirServiceRequestDaoImpl.java
Show resolved
Hide resolved
| @@ -60,6 +61,9 @@ | |||
| @Autowired | |||
| private DosageTranslator dosageTranslator; | |||
|
|
|||
| @Autowired | |||
| private OrderIdentifierTranslator orderIdentifierTranslator; | |||
There was a problem hiding this comment.
We should also have a mapping for this in toOpenmrsType()
There was a problem hiding this comment.
I'll let the method throw an exceptions at the moment since an order-number is read only and that it is of a string type.
|
|
||
| orderIdentifier.setValue(order.getOrderNumber()); | ||
|
|
||
| orderIdentifier.setUse(Identifier.IdentifierUse.OFFICIAL); |
There was a problem hiding this comment.
I think this should be left as USUAL.
| @Component | ||
| public class OrderIdentifierTranslatorImpl implements OrderIdentifierTranslator { | ||
|
|
||
| private static String ORDER_ID_TYPE = "Order Number"; |
There was a problem hiding this comment.
I tend to prefer that constants like this go in the FhirConstants class.
|
|
||
| Identifier orderIdentifier = new Identifier(); | ||
|
|
||
| orderIdentifier.setType(new CodeableConcept().setText(ORDER_ID_TYPE)); |
There was a problem hiding this comment.
Technically, I think this should be the PLAC type:
Coding placCoding = new Coding().setSystem("http://terminology.hl7.org/CodeSystem/v2-0203").setCode("PLAC").setDisplay("Placer Identifier");
orderIdentifier.setType(new CodeableConcept().addCoding(placCoding));We can even define the CodeableConcept as a constant.
| import org.hl7.fhir.r4.model.Identifier; | ||
| import org.openmrs.Order; | ||
|
|
||
| public interface OrderIdentifierTranslator { |
There was a problem hiding this comment.
This should really extend ToFhirTranslator<Order> or, better yet:
public interface OrderIdentifierTranslator<T extends Order> extends OpenmrsFhirTranslator<T, Identifier>There was a problem hiding this comment.
I'd go with:
public interface OrderIdentifierTranslator extends OpenmrsFhirTranslator<Order, Identifier>
…and ServiceRequest
…and ServiceRequest
…and ServiceRequest
…and ServiceRequest
… parameter + fixing failing tests
Description of what I changed
Issue I worked on
see https://issues.openmrs.org/browse/FM2-312
Checklist: I completed these to help reviewers :)
My IDE is configured to follow the code style of this project.
I have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
I ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
All new and existing tests passed.
My pull request is based on the latest changes of the master branch.