[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao IntakeDao.java, 1.1.2.48, 1.1.2.49

[dawsonli <daw...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9705/src/com/quatro/dao

Modified Files:
      Tag: QUATRO_TORONTO_RFQ_20080408B
	IntakeDao.java 
Log Message:


Index: IntakeDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/Attic/IntakeDao.java,v
retrieving revision 1.1.2.48
retrieving revision 1.1.2.49
diff -C2 -d -r1.1.2.48 -r1.1.2.49
*** IntakeDao.java	26 Jun 2008 18:44:39 -0000	1.1.2.48
--- IntakeDao.java	27 Jun 2008 19:23:54 -0000	1.1.2.49
***************
*** 18,21 ****
--- 18,24 ----
  
  import org.oscarehr.PMmodule.dao.MergeClientDao;
+ import org.oscarehr.PMmodule.dao.ProgramQueueDao;
+ import org.oscarehr.PMmodule.dao.ClientReferralDAO;
+ 
  import org.oscarehr.PMmodule.model.ClientReferral;
  import org.oscarehr.PMmodule.model.ProgramQueue;
***************
*** 32,35 ****
--- 35,42 ----
  
  	private MergeClientDao mergeClientDao;
+ 	
+ 	private ProgramQueueDao programQueueDao;
+     private ClientReferralDAO clientReferralDao;
+     
  	public List LoadOptionsList() {
  		String sSQL="from QuatroIntakeOptionValue s order by s.prefix, s.displayOrder";		
***************
*** 634,637 ****
--- 641,666 ----
          if(intakeDb.getId().intValue()>0){
  		  getHibernateTemplate().update(intakeDb);
+ 		  
+ 		  //always update programId in referral and queue record in case program changed on intake_edit jsp page.
+ 		  if(KeyConstants.INTAKE_STATUS_ACTIVE.equals(intakeDb.getIntakeStatus()) &&
+ 	        intakeDb.getProgramType().equals(KeyConstants.BED_PROGRAM_TYPE)){
+ 	        	
+ 	        Integer queueId = intakeDb.getQueueId();
+ 	        if(queueId != null){
+ 	          ProgramQueue programQueue = programQueueDao.getProgramQueue(queueId);
+ 	          if(programQueue!=null){
+ 	             programQueue.setProgramId(intakeDb.getProgramId());
+ 	             programQueueDao.saveProgramQueue(programQueue);
+ 	          }
+         	}
+ 	        Integer referralId = intakeDb.getReferralId();
+ 	        if(referralId != null){
+ 	          ClientReferral clientReferral = clientReferralDao.getClientReferral(referralId);
+ 	          if(clientReferral!=null){
+ 	        	clientReferral.setProgramId(intakeDb.getProgramId());
+ 	        	clientReferralDao.saveClientReferral(clientReferral);
+ 	          }
+ 	        }
+ 		  }
  /*		  
  	      if(!bFamilyMember){
***************
*** 746,749 ****
--- 775,786 ----
  		this.lookupDao = lookupDao;
  	}
+ 
+ 	public void setClientReferralDAO(ClientReferralDAO clientReferralDao) {
+ 		this.clientReferralDao = clientReferralDao;
+ 	}
+ 
+ 	public void setProgramQueueDao(ProgramQueueDao programQueueDao) {
+ 		this.programQueueDao = programQueueDao;
+ 	}
  	
  }