[dcm4che-commits] CVS: dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity PatientBean.java,1.12,1.13 StudyBean.java,1.21,1.22

[gunter z. <gun...@us...>]

Update of /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24737/src/java/org/dcm4chex/archive/ejb/entity

Modified Files:
	PatientBean.java StudyBean.java 
Log Message:
Patient Merge in progress

Index: PatientBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/PatientBean.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PatientBean.java	20 Feb 2004 09:19:53 -0000	1.12
--- PatientBean.java	8 Mar 2004 21:25:48 -0000	1.13
***************
*** 61,64 ****
--- 61,69 ----
   *  transaction-type="Supports"
   *
+  * @ejb.finder
+  *  signature="java.util.Collection findByPatientIdWithIssuer(java.lang.String pid, java.lang.String issuer)"
+  *  query="SELECT OBJECT(a) FROM Patient AS a WHERE a.patientId = ?1 AND (a.issuerOfPatientId IS NULL OR a.issuerOfPatientId = ?1)"
+  *  transaction-type="Supports"
+  * 
   * @author <a href="mailto:gu...@ti...">Gunter Zeilinger</a>
   *
***************
*** 103,106 ****
--- 108,114 ----
      public abstract String getIssuerOfPatientId();
  
+     /**
+      * @ejb.interface-method
+      */
      public abstract void setIssuerOfPatientId(String issuer);
  

Index: StudyBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/StudyBean.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** StudyBean.java	29 Feb 2004 21:49:35 -0000	1.21
--- StudyBean.java	8 Mar 2004 21:25:48 -0000	1.22
***************
*** 207,210 ****
--- 207,212 ----
      
      /**
+      * @ejb.interface-method view-type="local"
+      * 
       * @ejb.relation
       *  name="patient-study"