TRUNK-4143 Support for mapping drugs to other terminologies #476
Conversation
…g_reference_map table. - TRUNK-4143
…ew DrugReferenceMap class. - TRUNK-4143
new orders - TRUNK-4163
The API should assign order numbers to new orders - TRUNK-4163
…ies to DrugOrder TRUNK-4130 seperated the previous changeset into two for each column and fixed some other small issues
Merge with upstream.
|
@gitahi86 did you claim the ticket? Also when you are done working on a ticket, please click the Request Code Review button |
|
Yes. I have now claimed it and issued a request for review. |
| @@ -235,4 +239,21 @@ public String getDisplayName() { | |||
| return getConcept().getName().getName(); | |||
| return ""; | |||
| } | |||
|
|
|||
| /** | |||
| * @return Returns the drugReferenceMaps. | |||
…mprovements to Drug.java. - TRUNK-4143
…ReferenceMap.java to conform to convention. - TRUNK-4143
| if (drugReferenceMap.getConceptMapType() == null) { | ||
| drugReferenceMap.setConceptMapType(Context.getConceptService().getDefaultConceptMapType()); | ||
| } | ||
| drugReferenceMaps.add(drugReferenceMap); |
There was a problem hiding this comment.
You can get a NullPointerException here, you can use this instead:
getDrugReferenceMaps().add(drugReferenceMap);
Because getDrugReferenceMaps() always checks if null and instantiates the collection
… of the Drug.java class. - TRUNK-4143
|
Hi @gitahi86 next time when working on a ticket, you need to create a separate branch in your fork for each ticket otherwise you will end with other dev's commits showing up in the list of commits in your pull requests like in the case of this pull request, see what i mean? Normally you name the branch the ticket number e.g if you are working on TRUNK-4143, your branch name becomes TRUNK-4143 |
|
Okay. Noted. |
…base-schema-only.xml to liquibase-update-to-latest.xml. - TRUNK-4143
|
You need to use git pull --rebase upstream 1.10.x when updating your local repo instead of just git pull |
|
So that you avoid commits like gitahinganga@5fa156e in the git history |
| * already a corresponding DrugReferenceMap object for this concept, this one will not be added. | ||
| * | ||
| * @param drugReferenceMap | ||
| * @since 1.10 |
There was a problem hiding this comment.
Can you add some unit tests for this method? See similar tests for ConceptReferenceTerm.addConceptReferenceTermMap(...)
|
The message at the top that says 18 unique commits by 4 authors above shows that you have commits for other devs because, you need to create a separate branch for each ticket you work on and use git pull --rebase ....... otherwise it is becoming painful to merge this code |
|
Code merged at 45b70e2 |
Added support for mapping drugs to other terminologies