Skip to content

Read the note from the RxFill message and add to the MedicationDispense. #97

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

Open
plarocque4 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Read the note from the RxFill message and add to the MedicationDispense. #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/main/java/org/hl7/codex/rems/script/FillStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,18 @@ public DispensedStatusEnum getStatus() {
return DispensedStatusEnum.UNKNOWN;
}
}


public DispensedStatus getDispensedStatus() {
if (getDispensed() != null) {
return getDispensed();
} else if (getPartiallyDispensed() != null) {
return getPartiallyDispensed();
} else if (getNotDispensed() != null) {
return getNotDispensed();
} else if (getTransferred() != null) {
return getTransferred();
} else {
return null;
}
}
}
7 changes: 6 additions & 1 deletion src/main/java/org/hl7/codex/rems/script/NcpdpScriptController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.hl7.fhir.r4.model.MedicationRequest;
import org.hl7.fhir.r4.model.Annotation;
import org.hl7.fhir.r4.model.MedicationDispense;
import org.hl7.fhir.r4.model.Reference;

Expand Down Expand Up @@ -80,6 +81,9 @@ private void handleRxFillMessage(RxFill rxFill, Header header) {
logger.info(" PrescriberOrderNumber: " + header.getPrescriberOrderNumber());
logger.info(" Dispensed Status: " + dispensedStatus);

String note = rxFill.getFillStatus().getDispensedStatus().Note;
logger.info(" Dispensed Note: " + note);

IFhirResourceDao<MedicationRequest> medicationRequestDao =
jpaRestfulServer.getDao(MedicationRequest.class);
IFhirResourceDao<MedicationDispense> medicationDispenseDao =
Expand Down Expand Up @@ -114,6 +118,7 @@ private void handleRxFillMessage(RxFill rxFill, Header header) {
medicationDispense.setMedication(medicationRequest.getMedication());
medicationDispense.setSubject(medicationRequest.getSubject());
medicationDispense.addAuthorizingPrescription(new Reference(requestId));
medicationDispense.addNote(new Annotation().setText(note));

// store the MedicationDispense
RequestDetails dispenseDetails = new SystemRequestDetails();
Expand All @@ -130,7 +135,7 @@ private MedicationDispense.MedicationDispenseStatus convertRxFillDispensedStatus
case PARTIALLY_DISPENSED:
return MedicationDispense.MedicationDispenseStatus.INPROGRESS;
case NOT_DISPENSED:
return MedicationDispense.MedicationDispenseStatus.PREPARATION;
return MedicationDispense.MedicationDispenseStatus.ONHOLD;
case TRANSFERRED:
case UNKNOWN:
default:
Expand Down
Loading