Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r36596 -r36676
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 36596)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 36676)
@@ -5611,6 +5611,8 @@
                                             temp.put("amount",toussesAmount );//每次扫描加载的数量
                                             temp.put("stockAmount", 0);
                                             temp.put("todayAmount",toussesOfToday.size());//今日审核数量
+                                            temp.put("spelling", td.getSpelling());
+                                            temp.put("wbCode", td.getWbCode());
                                             tousseInstanceArr.add(temp);
                                         }
                                         temp.put("tousseBarcode", ((JSONObject)arr.get(i)).optString("barcode"));
@@ -5622,6 +5624,8 @@
                                         temp.put("unTraceable", Constants.STR_YES);
                                         temp.put("department", department);
                                         temp.put("reviewTime", reviewTime);
+                                        temp.put("spelling", td.getSpelling());
+                                        temp.put("wbCode", td.getWbCode());
                                         tousseInstanceArr.add(temp);
                                     }
                                     jsonObj.put("success", 2);
@@ -5653,6 +5657,8 @@
                                                 temp.put("amount",stSize );//每次扫描加载的数量
                                                 temp.put("stockAmount",stockAmount);//库存数量
                                                 temp.put("todayAmount",toussesOfToday.size());//今日审核数量
+                                                temp.put("spelling", td.getSpelling());
+                                                temp.put("wbCode", td.getWbCode());
                                                 tousseInstanceArr.add(temp);
                                             }
                                             temp.put("tousseBarcode", tousseInstance1.getBarcode());
@@ -5664,6 +5670,8 @@
                                             temp.put("unTraceable", Constants.STR_YES);
                                             temp.put("department", StringUtils.defaultString(departCodeAndNameMap.get(tousseInstance1.getDepartCoding()), ""));
                                             temp.put("reviewTime", reviewTime);
+                                            temp.put("spelling", td.getSpelling());
+                                            temp.put("wbCode", td.getWbCode());
                                             tousseInstanceArr.add(temp);
                                         }
                                         jsonObj.put("success", 2);
@@ -5711,6 +5719,8 @@
                                 jsonObj.put("success", 0);
                                 jsonObj.put("tousseBarcode", tousseInstance.getBarcode());
                                 jsonObj.put("tousseName", tousseInstance.getTousseName());
+                                jsonObj.put("spelling", tousseDefinition.getSpelling());
+                                jsonObj.put("wbCode", tousseDefinition.getWbCode());
                                 jsonObj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance.getProxyDisinfection_id() , tousseInstance.getTousseDefinition().getTousseType() , tousseInstance.getTousseDefinition().getIsForeignTousse()));
                                 jsonObj.put("SterilingType", tousseInstance.getSterilingType());
                                 jsonObj.put("sterilingMode", tousseInstance.getSterilingMode());
@@ -5778,7 +5788,7 @@
                             tousseList.addAll(toussesInBasket);
                             Collections.sort(tousseList);//按id降序排序
                             Map<String,JSONObject> cMap=Maps.newHashMap();
-                            int countAmount=0;
+                            //int countAmount=0;
                             Date now = new Date();
                             List<String> messageList = new ArrayList<String>();
                             // 只要有一个包加急，篮筐就显示加急 
@@ -5825,7 +5835,7 @@
                                         }
                                         //覆盖
                                         cMap.put(tousseName, obj);
-                                        countAmount++;
+                                        //countAmount++;
                                     }else{
                                     	//判断该包实例装配时原定的灭菌日期是否是今天以后
                                     	if(isLimitedByDate && donotAllowSterilingDateOfTousseAfterTodayAddToSterilizationRecord){
@@ -5861,8 +5871,10 @@
                                         if(TousseDefinition.STR_YES .equals(isUrgentTousse)){
                                             isBasketUrgent = true;     
                                         }
+                                        TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
+                                        temp.put("spelling", tousseDefinition.getSpelling());
+                                        temp.put("wbCode", tousseDefinition.getWbCode());
                                         if(!includeImplant){
-                                        	TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
                                         	Integer implant = tousseDefinition.getIncludeImplant();
                                         	if(implant != null && implant.intValue() == TousseDefinition.INCLUDE_IMPLANT){
                                         		includeImplant = true;
@@ -5876,7 +5888,7 @@
                                             jsonObj.put("tousseBarcode", tousseBarcode);//固定条码
                                             cMap.put(tousseName, temp);
                                         }
-                                        countAmount++;
+                                        //countAmount++;
                                     }
 
                                 }
@@ -5970,8 +5982,10 @@
                                 temp.put("urgentLevel",urgentLevelInfo);
                                 temp.put("urgentGrade",urgentGrade);
                                 temp.put("isUrgentTousse",tousseInstance.getIsUrgentTousse());
+                                TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
+                                temp.put("spelling", tousseDefinition.getSpelling());
+                                temp.put("wbCode", tousseDefinition.getWbCode());
                                 if(!includeImplant){
-                                	TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
                                 	Integer implant = tousseDefinition.getIncludeImplant();
                                 	if(implant != null && implant.intValue() == TousseDefinition.INCLUDE_IMPLANT){
                                 		includeImplant = true;
@@ -6046,8 +6060,10 @@
                                 if(TousseDefinition.STR_YES .equals(isUrgentTousse)){
                                     isBasketUrgent = true;     
                                 }
+                                TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
+                                temp.put("spelling", tousseDefinition.getSpelling());
+                                temp.put("wbCode", tousseDefinition.getWbCode());
                                 if(!includeImplant){
-                                	TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
                                 	Integer implant = tousseDefinition.getIncludeImplant();
                                 	if(implant != null && implant.intValue() == TousseDefinition.INCLUDE_IMPLANT){
                                 		includeImplant = true;
@@ -9721,6 +9737,8 @@
                     jsonObj.put("reviewTime", ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, ""));
                     jsonObj.put("urgentLevel", urgentLevelInfo);//加急信息
                     jsonObj.put("isUrgentTousse",tousseInstance.getIsUrgentTousse());//是否加急
+                    jsonObj.put("spelling", tousseDefinition.getSpelling());
+                    jsonObj.put("wbCode", tousseDefinition.getWbCode());
                     // 包定义是否包含植入物，不区分外来器械包和普通器械包(ZSYY-261)
                     String tdIncludeImplant = Constants.STR_NO;
                     if(tousseDefinition.getIncludeImplant() != null