Fix dcm4che#1921 : IOCM-RS Update Patient Service : Incorrect RSOpera…

…tion being sent to RSForward Service
mingdatacom · Apr 11, 2019 · dc2d979 · dc2d979
1 parent 59c1533
commit dc2d979
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/dcm4chee-arc-iocm-rs/src/main/java/org/dcm4chee/arc/iocm/rs/IocmRS.java b/dcm4chee-arc-iocm-rs/src/main/java/org/dcm4chee/arc/iocm/rs/IocmRS.java
@@ -300,13 +300,19 @@ public void updatePatient(@PathParam("PatientID") IDWithIssuer patientID, InputS
                     errResponse("missing Patient ID in message body", Response.Status.BAD_REQUEST));
         try {
             boolean newPatient = patientID.equals(bodyPatientID);
-            if (newPatient)
+            RSOperation rsOp;
+            if (newPatient) {
                 patientService.updatePatient(ctx);
+                rsOp = ctx.getEventActionCode().equals(AuditMessages.EventActionCode.Create)
+                        ? RSOperation.CreatePatient
+                        : RSOperation.UpdatePatient;
+            }
             else {
+                rsOp = RSOperation.ChangePatientID;
                 ctx.setPreviousAttributes(patientID.exportPatientIDWithIssuer(null));
                 patientService.changePatientID(ctx);
             }
-            rsForward.forward(RSOperation.UpdatePatient, arcAE, attrs, request);
+            rsForward.forward(rsOp, arcAE, attrs, request);
             String msgType = ctx.getEventActionCode().equals(AuditMessages.EventActionCode.Create)
                     ? newPatient
                         ? "ADT^A28^ADT_A05" : "ADT^A47^ADT_A30"