Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r30743 -r30862
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 30743)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 30862)
@@ -1247,12 +1247,13 @@
         SterilizationRecord sr = getSterilizationRecordById(id);
         if(sr != null){
             Session session = objectDao.getHibernateSession();
-            String cycleStr = " and s.cycleCounter = "+sr.getCycleCounter()+" ";
+            String cycleStr = null;
             String dateSql = "";
             //中山六院是按照开始时间来匹配数据的
             Date beginProcStartTime = null;
             Date endProcStartTime = null;
-            if(CssdUtils.isProject("zsly")){
+            boolean sterilizaMatchPatternForDate = CssdUtils.getSystemSetConfigByNameBool("sterilizaMatchPatternForDate", false);
+            if((sterilizaMatchPatternForDate && sr.getSterilizer().getDeviceInterface() != null && DeviceInterface.GETINGE.equals(sr.getSterilizer().getDeviceInterface().getDeviceBrand())) || CssdUtils.isProject("zsly")){
             	beginProcStartTime = new Date(sr.getStartDate().getTime() - 10*60*1000);
                 endProcStartTime = new Date(sr.getStartDate().getTime() + 480*60*1000);
             	String beginProcStartTimeStr =  ForgonDateUtils.safelyFormatDate(beginProcStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
@@ -1266,6 +1267,8 @@
                 String endProcStartTimeStr  =ForgonDateUtils.safelyFormatDate(endProcStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
                 dateSql  = " and "+dateQueryAdapter.dateAreaSql("s.procStartTime", beginProcStartTimeStr, endProcStartTimeStr, false);
                 cycleStr = "";
+            }else{
+            	cycleStr = " and s.cycleCounter = "+sr.getCycleCounter()+" ";
             }
             String queryString = "select s from SterilizerRecord s"
                     + " where s.machineNo = :machineNo"