Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r33768 -r33794
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 33768)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 33794)
@@ -6690,10 +6690,15 @@
             tousseList.addAll(tousses);
             Collections.sort(tousseList);
             Map<String,JSONObject> bMap = Maps.newHashMap();
-            
+            boolean showDepartOfTousseInstanceSterile = CssdUtils.getSystemSetConfigByNameBool("showDepartOfTousseInstanceSterile", false);
             for (TousseInstance tousseInstance : tousseList) {
                 String tousseName = tousseInstance.getShowTousseName();
-                String key = tousseName;
+                String key = null;
+                if(returnType != null && returnType == 1 && showDepartOfTousseInstanceSterile){
+                	key = tousseInstance.getDepart() + "-_-" + tousseName;
+                }else{
+                	key = tousseName;
+                }
                 boolean isCountBarcode = isCountBarcode(tousseInstance.getBarcode());
                 //加急信息
                 UrgentLevel urgentLevel = tousseInstance.getUrgentLevel();
@@ -6763,7 +6768,7 @@
             	jsonArray.sort(Comparator.comparing(obj -> ((JSONObject)obj).getInt("urgentGrade")).reversed());
             }
             if(returnType != null && returnType == 1){
-            	jsonArray = resetTousseInfo(jsonArray);
+            	jsonArray = resetTousseInfo(jsonArray, showDepartOfTousseInstanceSterile);
             }
             return jsonArray;
         }
@@ -9621,10 +9626,9 @@
      * @param array 篮筐器械包信息
      * @return
      */
-    private JSONArray resetTousseInfo(JSONArray array){
+    private JSONArray resetTousseInfo(JSONArray array, boolean showDepartOfTousseInstanceSterile){
         Map<String,Map<String,JSONArray>> tousseMap = new HashMap<String, Map<String,JSONArray>>();
         Map<String, JSONArray> tousseMapOfNoDepart = new HashMap<String, JSONArray>();
-        boolean showDepartOfTousseInstanceSterile = CssdUtils.getSystemSetConfigByNameBool("showDepartOfTousseInstanceSterile", false);
         for (int i = 0; i < array.size(); i++) {
     		JSONObject thisTousse = (JSONObject)array.get(i);
     		//前台需要