56. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 3/25/2019 8:58:04 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.

56.1 Files compared

# Location File Last Modified
1 C:\AraxisMergeCompare\Pri_un\IMAG_Source\VISA\Java\StudyWebApp\main\src\java\gov\va\med\imaging\study\rest StudyService.java Mon Mar 18 20:39:11 2019 UTC
2 C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\StudyWebApp\main\src\java\gov\va\med\imaging\study\rest StudyService.java Tue Mar 19 12:04:04 2019 UTC

56.2 Comparison summary

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

56.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

56.4 Active regular expressions

No regular expressions were active.

56.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: Mar  16, 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.stu dy.rest;
  27  
  28   import gov .va.med.Pa tientIdent ifier;
  29   import gov .va.med.im aging.core .interface s.exceptio ns.Connect ionExcepti on;
  30   import gov .va.med.im aging.core .interface s.exceptio ns.MethodE xception;
  31   import gov .va.med.im aging.rest .types.Res tStringTyp e;
  32   import gov .va.med.im aging.stud y.commands .GetStored FiltersCom mand;
  33   import gov .va.med.im aging.stud y.commands .StudyGetC prsImagesC ommand;
  34   import gov .va.med.im aging.stud y.commands .StudyGetP atientStud iesCommand ;
  35   import gov .va.med.im aging.stud y.commands .StudyGetS tudiesComm and;
  36   import gov .va.med.im aging.stud y.commands .StudyGetS tudyComman d;
  37   import gov .va.med.im aging.stud y.commands .StudyGetS tudyReport Command;
  38   import gov .va.med.im aging.stud y.rest.typ es.LoadedS tudyType;
  39   import gov .va.med.im aging.stud y.rest.typ es.StoredF iltersType ;
  40   import gov .va.med.im aging.stud y.rest.typ es.Studies ResultType ;
  41   import gov .va.med.im aging.stud y.rest.typ es.Studies Type;
  42   import gov .va.med.im aging.stud y.rest.typ es.StudyFi lterResult Type;
  43   import gov .va.med.im aging.stud y.rest.typ es.StudyFi lterType;
  44  
  45   import jav a.util.Arr ayList;
  46   import jav a.util.Cal endar;
  47   import jav a.util.Lis t;
  48  
  49   import jav ax.ws.rs.C onsumes;
  50   import jav ax.ws.rs.G ET;
  51   import jav ax.ws.rs.P OST;
  52   import jav ax.ws.rs.P ath;
  53   import jav ax.ws.rs.P athParam;
  54   import jav ax.ws.rs.P roduces;
  55   import jav ax.ws.rs.c ore.MediaT ype;
  56  
  57   /**
  58    * @author   DN S      WERFEJ
  59    *
  60    */
  61   @Path("")
  62   public cla ss StudySe rvice
  63   {
  64           
  65           @P OST
  66           @P ath("studi es/va/icn/ {treatingF acilitySit eId}/{pati entIcn}")
  67           @P roduces(Me diaType.AP PLICATION_ XML)
  68           @C onsumes(Me diaType.AP PLICATION_ XML)
  69           pu blic Studi esResultTy pe getVaPa tientStudi esFromIcn(
  70                             @PathP aram("trea tingFacili tySiteId")  String tr eatingFaci litySiteId ,
  71                             @PathP aram("pati entIcn") S tring pati entIcn,
  72                             StudyF ilterType  studyFilte rType)
  73           th rows Metho dException , Connecti onExceptio n
  74           {
  75                    stud yFilterTyp e.setStore dFilterId( null);
  76                    retu rn new Stu dyGetPatie ntStudiesC ommand(tre atingFacil itySiteId,
  77                                      PatientI dentifier. icnPatient Identifier (patientIc n),
  78                                      studyFil terType).e xecute();
  79           }
  80           
  81           @G ET
  82           @P ath("studi es/va/icn/ {treatingF acilitySit eId}/{pati entIcn}")
  83           @P roduces(Me diaType.AP PLICATION_ XML)
  84           pu blic Studi esResultTy pe getVaPa tientStudi esFromIcn(
  85                             @PathP aram("trea tingFacili tySiteId")  String tr eatingFaci litySiteId ,
  86                             @PathP aram("pati entIcn") S tring pati entIcn)
  87           th rows Metho dException , Connecti onExceptio n
  88           {
  89                    retu rn getVaPa tientStudi esFromIcn( treatingFa cilitySite Id, 
  90                                      patientI cn, null);
  91           }
  92           
  93           @P OST
  94           @P ath("studi es/site/ic n/{siteId} /{patientI cn}")
  95           @P roduces(Me diaType.AP PLICATION_ XML)
  96           @C onsumes(Me diaType.AP PLICATION_ XML)
  97           pu blic Studi esResultTy pe getPati entStudies FromIcn(
  98                             @PathP aram("site Id") Strin g siteId,
  99                             @PathP aram("pati entIcn") S tring pati entIcn,
  100                             StudyF ilterType  studyFilte rType)
  101           th rows Metho dException , Connecti onExceptio n
  102           {
  103                    retu rn new Stu dyGetStudi esCommand( siteId,
  104                                      PatientI dentifier. icnPatient Identifier (patientIc n),
  105                                      studyFil terType).e xecute();
  106           }
  107           
  108           @G ET
  109           @P ath("studi es/site/ic n/{siteId} /{patientI cn}")
  110           @P roduces(Me diaType.AP PLICATION_ XML)
  111           pu blic Studi esResultTy pe getPati entStudies FromIcn(
  112                             @PathP aram("site Id") Strin g siteId,
  113                             @PathP aram("pati entIcn") S tring pati entIcn)
  114           th rows Metho dException , Connecti onExceptio n
  115           {
  116                    retu rn new Stu dyGetStudi esCommand( siteId,
  117                                      PatientI dentifier. icnPatient Identifier (patientIc n),
  118                                      null).ex ecute();
  119           }
  120           
  121           @P OST
  122           @P ath("studi es/local/d fn/{patien tDfn}")
  123           @P roduces(Me diaType.AP PLICATION_ XML)
  124           @C onsumes(Me diaType.AP PLICATION_ XML)
  125           pu blic Studi esResultTy pe getLoca lPatientSt udiesFromD fn(
  126                             @PathP aram("pati entDfn") S tring pati entDfn,
  127                             StudyF ilterType  studyFilte rType)
  128           th rows Metho dException , Connecti onExceptio n
  129           {
  130                    retu rn new Stu dyGetStudi esCommand( null,
  131                                      PatientI dentifier. dfnPatient Identifier (patientDf n),
  132                                      studyFil terType).e xecute();
  133           }
  134           
  135           @G ET
  136           @P ath("studi es/local/d fn/{patien tDfn}")
  137           @P roduces(Me diaType.AP PLICATION_ XML)
  138           pu blic Studi esResultTy pe getLoca lPatientSt udiesFromD fn(
  139                             @PathP aram("pati entDfn") S tring pati entDfn)
  140           th rows Metho dException , Connecti onExceptio n
  141           {
  142                    retu rn new Stu dyGetStudi esCommand( null,
  143                                      PatientI dentifier. dfnPatient Identifier (patientDf n),
  144                                      null).ex ecute();
  145           }
  146           
  147           @G ET
  148           @P ath("study /{studyId} ")
  149           @P roduces(Me diaType.AP PLICATION_ XML)
  150           pu blic Loade dStudyType  getStudy(
  151                             @PathP aram("stud yId") Stri ng studyId )
  152           th rows Metho dException , Connecti onExceptio n
  153           {
  154                    retu rn new Stu dyGetStudy Command(st udyId).exe cute();
  155           }
  156           
  157           @G ET
  158           @P ath("study /report/{s tudyId}")
  159           @P roduces(Me diaType.AP PLICATION_ XML)
  160           pu blic RestS tringType  getStudyRe port(
  161                             @PathP aram("stud yId") Stri ng studyId )
  162           th rows Metho dException , Connecti onExceptio n
  163           {
  164                    retu rn new Stu dyGetStudy ReportComm and(studyI d).execute ();
  165           }
  166           
  167           @G ET
  168           @P ath("filte rs/{siteId }")
  169           @P roduces(Me diaType.AP PLICATION_ XML)
  170           pu blic Store dFiltersTy pe getStud yFilters(
  171                             @PathP aram("site Id") Strin g siteId)
  172           th rows Metho dException , Connecti onExceptio n
  173           {
  174                    retu rn new Get StoredFilt ersCommand (siteId).e xecute();
  175           }
  176           
  177           @G ET
  178           @P ath("cprs/ {siteId}/{ patientIcn }/{cprsIde ntifier}")
  179           @P roduces(Me diaType.AP PLICATION_ XML)
  180           pu blic Studi esType get ImagesAsso ciatedWith CprsIdenti fier(
  181                    @Pat hParam("si teId") Str ing siteId ,
  182                    @Pat hParam("pa tientIcn")  String pa tientIcn,
  183                    @Pat hParam("cp rsIdentifi er") Strin g cprsIden tifierStri ng)
  184           th rows Metho dException , Connecti onExceptio n
  185           {
  186                    retu rn new Stu dyGetCprsI magesComma nd(siteId,  patientIc n, cprsIde ntifierStr ing).execu te();
  187           }
  188  
  189  
  190           @G ET
  191           @P ath("filte r")
  192           @P roduces(Me diaType.AP PLICATION_ XML)
  193           pu blic Study FilterType  getFilter ()
  194           {
  195                    
  196                    
  197                    Stud yFilterTyp e filter =  new Study FilterType ();
  198                    Cale ndar fromD ate = Cale ndar.getIn stance();
  199                    from Date.set(C alendar.YE AR, 2010);
  200                    from Date.set(C alendar.MO NTH, 0);
  201                    from Date.set(C alendar.DA Y_OF_MONTH , 1);
  202                    
  203                    filt er.setFrom Date(fromD ate.getTim e());
  204                    filt er.setToDa te(Calenda r.getInsta nce().getT ime());
  205                    filt er.setResu ltType(Stu dyFilterRe sultType.a ll);
  206                    
  207                    List <String> c ptCodes =  new ArrayL ist<String >();
  208                    cptC odes.add(" Code1");
  209                    cptC odes.add(" Code2");
  210                    
  211                    filt er.setCptC odes(cptCo des);
  212                    
  213                    List <String> m odalityCod es = new A rrayList<S tring>();
  214                    moda lityCodes. add("Code1 ");
  215                    moda lityCodes. add("Code2 ");
  216                    
  217                    filt er.setModa lityCodes( modalityCo des);
  218                    
  219                    
  220                    retu rn filter;
  221           }
  222           /*
  223           
  224           @P OST
  225           @P ath("filte r")
  226           @C onsumes(Me diaType.AP PLICATION_ XML)
  227           @P roduces(Me diaType.TE XT_PLAIN)
  228           pu blic Strin g setFilte r(StudyFil terType fi lter)
  229           {
  230                    retu rn filter. getFromDat e().toStri ng();
  231           }* /
  232   }