Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r26408 -r26439
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26408)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26439)
@@ -5748,7 +5748,8 @@
                 ti.setSterilingType(rs.getString("sterilingType"));
                 ti.setIsUrgentTousse(rs.getString("IsUrgentTousse"));
                 //加急信息
-                if(DatabaseUtil.isPoIdValid(rs.getLong("ulId"))){
+                boolean enableUrgentFunction = CssdUtils.getSystemSetConfigByNameBool("enableUrgentFunction", false);
+                if(enableUrgentFunction && DatabaseUtil.isPoIdValid(rs.getLong("ulId"))){
                 	UrgentLevelVo urgentLevelVo = new UrgentLevelVo();      
                 	urgentLevelVo.setId(rs.getLong("ulId"));
                     urgentLevelVo.setColorCode(rs.getString("ulColorCode"));
@@ -5793,11 +5794,16 @@
         } else if(dbConnection.isOracle()){
             firstBarcodeSql = "(select barcode from TousseInstance ti1 join barcodeDevice b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=tdancestor.id and rownum <= 1) ";
         }
-        
-        //关联加急对象的sql语句（不追溯器械包暂不考虑加急）
-        String sqlSelect_UrgentLevel = String.format(" ,ul.colorCode  ulColorCode ,ul.grade  ulGrade, ul.name  ulName , ul.id  ulId ");
-        String sqlJoin_UrgentLevel = String.format(" left join %s ul on ti.urgentLevel_id = ul.id ", UrgentLevel.class.getSimpleName());
-        
+        boolean enableUrgentFunction = CssdUtils.getSystemSetConfigByNameBool("enableUrgentFunction", false);
+        String sqlSelect_UrgentLevel = "";
+        String sqlJoin_UrgentLevel = "";
+        String nullSql = "";
+        if(enableUrgentFunction){
+        	//关联加急对象的sql语句（不追溯器械包暂不考虑加急）
+            sqlSelect_UrgentLevel = String.format(" ,ul.colorCode  ulColorCode ,ul.grade  ulGrade, ul.name  ulName , ul.id  ulId ");
+            sqlJoin_UrgentLevel = String.format(" left join %s ul on ti.urgentLevel_id = ul.id ", UrgentLevel.class.getSimpleName());
+            nullSql = "  ,null ulColorCode ,null ulGrade, null  ulName , null  ulId  ";
+        }
         String sql = "select * from ((select tdancestor.id,ti.depart,ti.tousseName,ti.comboTousseInstanceId,ti.sterilingType,ti.sterilingMode,"
                 + "IsUrgentTousse,b.barcode,ti.reviewTime,1 amount " 
         		+ sqlSelect_UrgentLevel
@@ -5814,12 +5820,13 @@
                 + "(select tdancestor.id ,null depart,tdancestor.name tousseName,null,null,null sterilingMode,null,"
                 + firstBarcodeSql
                 + "barcode,null reviewTime,count(0) amount " 
-                + "  ,null ulColorCode ,null ulGrade, null  ulName , null  ulId  "
+                + nullSql
                 + " from "+ TousseInstance.class.getSimpleName() +" ti "
                 + " join "+ BarcodeDevice.class.getSimpleName() +" b on b.id=ti.id "
                 + "join "+ TousseDefinition.class.getSimpleName() +" td on ti.tousseDefinition_id=td.id join "+ TousseDefinition.class.getSimpleName() +" tdancestor "
                 + "on td.ancestorID=tdancestor.id left join "+ InvoicePlan.class.getSimpleName() +" pd on pd.id=ti.proxyDisinfection_id where 1=1 and tdancestor.isTraceable='"+ Constants.STR_NO +"' and ti.status='"+ TousseInstance.STATUS_REVIEWED +"' and ti.comboTousseInstanceId is null "
-                + "and ti.reviewBasket_id is null and (pd.id is null and ti.orgunitcoding='"+orgUnitCode+"' or pd.id is not null and pd.handleDepartCoding='"+orgUnitCode+"') group by tdancestor.id,tdancestor.name"
+                + dateSql
+                + " and ti.reviewBasket_id is null and (pd.id is null and ti.orgunitcoding='"+orgUnitCode+"' or pd.id is not null and pd.handleDepartCoding='"+orgUnitCode+"') group by tdancestor.id,tdancestor.name"
                 + "))t";
         return sql;
     }