#205: Improve records in issuer table if more issuer information is a…

…vailable
dcm4che · Jul 11, 2016 · 58b2266 · 58b2266
1 parent f2264e9
commit 58b2266
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/...src/main/java/org/dcm4chee/arc/store/org/dcm4chee/archive/store/impl/StoreServiceEJB.java b/...src/main/java/org/dcm4chee/arc/store/org/dcm4chee/archive/store/impl/StoreServiceEJB.java
@@ -454,6 +454,16 @@ private Patient updatePatient(StoreContext ctx, Patient pat) {
 
  updateInfo.log(session, pat, attrs);
  pat = em.find(Patient.class, pat.getPk());
+ IDWithIssuer idWithIssuer = IDWithIssuer.pidOf(attrs);
+ Issuer issuer = idWithIssuer.getIssuer();
+ if (issuer != null) {
+ PatientID patientID = pat.getPatientID();
+ IssuerEntity issuerEntity = patientID.getIssuer();
+ if (issuerEntity == null)
+ patientID.setIssuer(issuerService.mergeOrCreate(issuer));
+ else
+ issuerEntity.getIssuer().merge(issuer);
+ }
  pat.setAttributes(attrs, filter, arcDev.getFuzzyStr());
  return pat;
  }