Skip to content
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

Directly Assign Pharmacy #24

Merged
merged 8 commits into from
Jun 19, 2021
Merged

Directly Assign Pharmacy #24

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a81bcae
Merge branch 'main' into Medios-Demo-1706
OmarMalass Jun 15, 2021
b45347f
Muster16 template config as an environment variable.
OmarMalass Jun 15, 2021
f202bd2
Fixed template loading in SVGExtractor.
OmarMalass Jun 15, 2021
ed4989a
Updating configuration loading in tests.
OmarMalass Jun 15, 2021
f5fa0b3
Merge branch 'main' into Medios-Demo-17-06
OmarMalass Jun 16, 2021
363e998
Resolving conflicts of the merge with main.
OmarMalass Jun 16, 2021
5a31377
Updated frontend submodule to the latest commit of ERE-381---Demo-Erixa.
OmarMalass Jun 16, 2021
7f1f1c2
Added logging to see what field is problematic
xbarrelet Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Added logging to see what field is problematic
  • Loading branch information
@xbarrelet
xbarrelet committed Jun 17, 2021
commit 7f1f1c2b0367dcd019f80c4ecd8e9604a8f74e23
6 changes: 4 additions & 2 deletions src/main/java/health/ere/ps/service/gematik/ERezeptWorkflowService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,6 @@ public BundleWithAccessCodeOrThrowable createERezeptOnPrescriptionServer(String
* @param task
*/
public void updateERezeptTask(String bearerToken, Task task, String accessCode, byte[] signedBytes) {


Parameters parameters = new Parameters();
ParametersParameterComponent ePrescriptionParameter = new ParametersParameterComponent();
ePrescriptionParameter.setName("ePrescription");
Expand All @@ -318,13 +316,17 @@ public void updateERezeptTask(String bearerToken, Task task, String accessCode,
binary.setContent(signedBytes);
ePrescriptionParameter.setResource(binary);
parameters.addParameter(ePrescriptionParameter);

Response response = client.target(prescriptionserverUrl).path("/Task")
.path("/" + task.getIdElement().getIdPart()).path("/$activate").request()
.header("User-Agent", userAgent)
.header("Authorization", "Bearer " + bearerToken).header("X-AccessCode", accessCode)
.post(Entity.entity(fhirContext.newXmlParser().encodeResourceToString(parameters),
"application/fhir+xml; charset=UTF-8"));

String taskString = response.readEntity(String.class);
log.info("Response when trying to activate the task:" + taskString);

if (Response.Status.Family.familyOf(response.getStatus()) != Response.Status.Family.SUCCESSFUL) {
// OperationOutcome operationOutcome =
// fhirContext.newXmlParser().parseResource(OperationOutcome.class, new
Expand Down