Index: ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
===================================================================
diff -u -r23782 -r24062
--- ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java	(.../SatisfactionSurveyTableManagerImpl.java)	(revision 23782)
+++ ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java	(.../SatisfactionSurveyTableManagerImpl.java)	(revision 24062)
@@ -1,26 +1,20 @@
 package com.forgon.disinfectsystem.satisfactionsurvey.service;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.forgon.disinfectsystem.customform.forminstance.service.FormInstanceManager;
-import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition;
-import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstance;
-import com.forgon.disinfectsystem.entity.satisfactionsurvey.SatisfactionSurveyTemplate;
-import com.forgon.tools.StrutsParamUtils;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.orm.hibernate4.HibernateTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.forgon.disinfectsystem.customform.forminstance.service.FormInstanceManager;
+import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstance;
 import com.forgon.disinfectsystem.entity.satisfactionsurvey.SatisfactionSurveyTable;
 import com.forgon.disinfectsystem.entity.satisfactionsurvey.SatisfactionSurveyTableItem;
 import com.forgon.tools.db.DatabaseUtil;
-import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.tools.hibernate.ObjectDao;
 
 /**
@@ -29,7 +23,7 @@
  *
  * 2013-9-10 上午10:44:48
  */
-@Service("satisfactionSurveyTableManager")
+@Service("satisfactionSurveyTableManagerTarget")
 public class SatisfactionSurveyTableManagerImpl implements SatisfactionSurveyTableManager{
 
 	protected Logger logger = Logger.getLogger(this.getClass());
Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
===================================================================
diff -u -r23996 -r24062
--- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml	(.../applicationContext-disinfectsystem-service.xml)	(revision 23996)
+++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml	(.../applicationContext-disinfectsystem-service.xml)	(revision 24062)
@@ -236,6 +236,19 @@
 			<value>14 2 0 * * ?</value>
 		</property>
 	</bean>
+
+	<!-- 满意度调查表模板定义及数据的bean定义start -->
+		<bean id="satisfactionSurveyTableManager" parent="txProxyTemplate">
+			<property name="target">
+				<ref bean="satisfactionSurveyTableManagerTarget" />
+			</property>
+		</bean>
+		<bean id="satisfactionSurveyTemplateManager" parent="txProxyTemplate">
+			<property name="target">
+				<ref bean="satisfactionSurveyTemplateManagerTarget" />
+			</property>
+		</bean>
+	<!-- 满意度调查表模板定义及数据的bean定义end -->
 	
 	<!-- 证件信息 -->
 	<bean id="certificateManager" parent="txProxyTemplate">
@@ -2246,6 +2259,9 @@
 		</property>
 	</bean>
 	<bean id="expensiveGoodsApplicationManagerTarget" class="com.forgon.disinfectsystem.expensivegoodsapplication.service.ExpensiveGoodsApplicationManagerImpl"></bean>
+
+	<!-- dwr推送的bean(暂时注释、后期弄好再放开提交) -->
+	<!-- <bean id="dwrPush" class="com.forgon.tools.DwrPush"></bean> -->
 	
 	<!-- 异常处理,不需要配置事务，不访问数据库 -->
 	<bean id="exceptionHandler" class="com.forgon.exception.service.ExceptionHandlerImpl"/>
Index: ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTemplateManagerImpl.java
===================================================================
diff -u -r23858 -r24062
--- ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTemplateManagerImpl.java	(.../SatisfactionSurveyTemplateManagerImpl.java)	(revision 23858)
+++ ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTemplateManagerImpl.java	(.../SatisfactionSurveyTemplateManagerImpl.java)	(revision 24062)
@@ -40,7 +40,7 @@
  * 
  *         2013-9-10 上午10:44:48
  */
-@Service("satisfactionSurveyTemplateManager")
+@Service("satisfactionSurveyTemplateManagerTarget")
 public class SatisfactionSurveyTemplateManagerImpl implements
 		SatisfactionSurveyTemplateManager {
 
@@ -204,8 +204,7 @@
 			List<SatisfactionSurveyTemplate> deleteSut = new ArrayList<SatisfactionSurveyTemplate>();
 	         @SuppressWarnings("unchecked")
 	        //获取满意度表定义信息需要提醒的所有记录
-			List<SatisfactionSurveyTemplate> satisfactionSurveyTemplate = objectDao.getBySql_ForUpdate2
-	        		 (SatisfactionSurveyTemplate.class.getSimpleName(), sql);
+			List<SatisfactionSurveyTemplate> satisfactionSurveyTemplate = objectDao.findBySql(SatisfactionSurveyTemplate.class.getSimpleName(), sql);
 		    for(SatisfactionSurveyTemplate sst : satisfactionSurveyTemplate){
 		    	if(sst.getIsfillOutAlone().equals(Constants.STR_YES)){ //判断是否单独填写
 		    		if(codes.contains(loginUserData.getCurrentOrgUnitCode())){ //对比登录科室是否有填写过调查表