123. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 3/25/2019 8:58:08 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

123.1 Files compared

# Location File Last Modified
1 C:\AraxisMergeCompare\Pri_un\IMAG_Source\VISA\Java\VistaImagingDataSourceProvider\main\src\java\gov\va\med\imaging\vistaimagingdatasource VistaImagingStudyGraphDataSourceServiceV2.java Mon Mar 18 20:39:06 2019 UTC
2 C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\VistaImagingDataSourceProvider\main\src\java\gov\va\med\imaging\vistaimagingdatasource VistaImagingStudyGraphDataSourceServiceV2.java Tue Mar 19 12:04:26 2019 UTC

123.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 3 228
Changed 2 4
Inserted 0 0
Removed 0 0

123.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

123.4 Active regular expressions

No regular expressions were active.

123.5 Comparison detail

  1   /**
  2    * 
  3     Package:  MAG - Vis tA Imaging
  4     WARNING:  Per VHA D irective 2 004-038, t his routin e should n ot be modi fied.
  5     Date Cre ated: Apr  20, 2012
  6     Site Nam e:  Washin gton OI Fi eld Office , Silver S pring, MD
  7       Developer:     DN S      WERFEJ
  8     Descript ion: 
  9  
  10           ;;  +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
  11           ;;  Property  of the US  Government .
  12           ;;  No permis sion to co py or redi stribute t his softwa re is give n.
  13           ;;  Use of un released v ersions of  this soft ware requi res the us er
  14           ;;   to execu te a writt en test ag reement wi th the Vis tA Imaging
  15           ;;   Developm ent Office  of the De partment o f Veterans  Affairs,
  16           ;;   telephon e (301) 73 4-0100.
  17           ;;
  18           ;;  The Food  and Drug A dministrat ion classi fies this  software a s
  19           ;;  a Class I I medical  device.  A s such, it  may not b e changed
  20           ;;  in any wa y.  Modifi cations to  this soft ware may r esult in a n
  21           ;;  adulterat ed medical  device un der 21CFR8 20, the us e of which
  22           ;;  is consid ered to be  a violati on of US F ederal Sta tutes.
  23           ;;  +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
  24  
  25    */
  26   package go v.va.med.i maging.vis taimagingd atasource;
  27  
  28   import jav a.io.IOExc eption;
  29   import jav a.util.Map ;
  30  
  31   import gov .va.med.im aging.arti factsource .ResolvedA rtifactSou rce;
  32   import gov .va.med.im aging.core .interface s.exceptio ns.Connect ionExcepti on;
  33   import gov .va.med.im aging.data source.exc eptions.Un supportedP rotocolExc eption;
  34   import gov .va.med.im aging.exch ange.busin ess.StudyF ilter;
  35   import gov .va.med.im aging.exch ange.enums .StudyDele tedImageSt ate;
  36   import gov .va.med.im aging.exch ange.enums .StudyLoad Level;
  37   import gov .va.med.im aging.url. vista.Vist aQuery;
  38   import gov .va.med.im aging.url. vista.exce ptions.Inv alidVistaC redentials Exception;
  39   import gov .va.med.im aging.url. vista.exce ptions.Vis taMethodEx ception;
  40   import gov .va.med.im aging.vist adatasourc e.session. VistaSessi on;
  41   import gov .va.med.im aging.vist aimagingda tasource.c ommon.Vist aImagingCo mmonUtilit ies;
  42  
  43   /**
  44    * @author   DN S      WERFEJ
  45    *
  46    */
  47   public cla ss VistaIm agingStudy GraphDataS ourceServi ceV2 
  48   extends Vi staImaging StudyGraph DataSource Service
  49   {
  50           //  The requi red versio n of VistA  Imaging n eeded to e xecute the  RPC calls  for this  operation
  51           //  Patch 119  is necess ary becaus e of the c hanges to  MAG DOD GE T STUDIES  IEN that h andles del eted image s
  52           pu blic final  static St ring MAG_R EQUIRED_VE RSION = "3 .0P119";
  53           
  54           pu blic Vista ImagingStu dyGraphDat aSourceSer viceV2(Res olvedArtif actSource  resolvedAr tifactSour ce, String  protocol)
  55           {
  56                    supe r(resolved ArtifactSo urce, prot ocol);
  57           }
  58           
  59           pu blic stati c VistaIma gingStudyG raphDataSo urceServic eV2 create (ResolvedA rtifactSou rce resolv edArtifact Source, St ring proto col)
  60           th rows Conne ctionExcep tion, Unsu pportedPro tocolExcep tion
  61           {
  62                    retu rn new Vis taImagingS tudyGraphD ataSourceS erviceV2(r esolvedArt ifactSourc e, protoco l);
  63           }
  64  
  65           @O verride
  66           pr otected St ring getRe quiredVist aImagingVe rsion()
  67           {
  68                    retu rn VistaIm agingCommo nUtilities .getVistaD ataSourceI magingVers ion(
  69                                      VistaIma gingDataSo urceProvid er.getVist aConfigura tion(), 
  70                                      this.get Class(), 
  71                                      MAG_REQU IRED_VERSI ON);
  72           }
  73  
  74           @O verride
  75           pr otected Vi staQuery g etPatientG roupsVista Query(Vist aSession v istaSessio n, String  patientDfn ,
  76                             StudyF ilter stud yFilter)
  77           th rows IOExc eption, In validVista Credential sException , VistaMet hodExcepti on
  78           {
  79                    // J MW 4/20/20 12 P119
  80                    // i nclude the  option fo r deleted  images
  81                    if(s tudyFilter  != null)
  82                             studyF ilter.clea rStoredStu dyFilterIf Necessary( getSite(). getSiteNum ber());
  83                    retu rn VistaIm agingCommo nUtilities .createMag ImageListQ uery(vista Session, p atientDfn,  studyFilt er, true);
  84           }
  85           
  86           
  87  
  88           /*  (non-Java doc)
  89            *  @see gov. va.med.ima ging.vista imagingdat asource.Vi staImaging StudyGraph DataSource Service#ge tPatientSt udyGraphVi staQuery(j ava.util.M ap, java.l ang.String , gov.va.m ed.imaging .exchange. enums.Stud yLoadLevel , gov.va.m ed.imaging .exchange. enums.Stud yDeletedIm ageState)
  90            * /
  91           @O verride
  92           pr otected Vi staQuery g etPatientS tudyGraphV istaQuery(
  93                             Map<St ring, Stri ng> studyM ap, String  patientDf n,
  94                             StudyL oadLevel s tudyLoadLe vel,
  95                             StudyD eletedImag eState stu dyDeletedI mageState)  
  96           {
  97                    // o verride to  include t he study d eleted ima ge state t o use to d etermine i f deleted  images sho uld be inc luded in t he result
  98                    // t his versio n does use s the stud yDeletedIm ageState
  99           re turn Vista ImagingQue ryFactory. createGetS tudiesByIe nVistaQuer y(studyMap
  100                             patien tDfn, stud yLoadLevel , studyDel etedImageS tate);
  101       
  102           }
  103  
  104           @O verride
  105           pr otected bo olean canR etrieveDel etedImages ()
  106           {
  107                    // J MW 4/20/20 12 Patch 1 19 will su pport dele ted images
  108                    retu rn true;
  109           }
  110  
  111           @O verride
  112           pr otected St ring getDa taSourceVe rsion()
  113           {
  114                    retu rn "3";
  115           }
  116   }