Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r30680 -r33192
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 30680)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 33192)
@@ -407,13 +407,21 @@
 					obj.put("sterileDateTime2", TousseInstanceUtils.safelyGetSterileStartDateTimeStr2(tousseInstance));
 					obj.put("expirationDateTime2", tousseInstance.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM));
 					obj.put("urgentLevel", tousseInstance.getUrgentLevel());
+					obj.put("sterilizationUserCode", tousseInstance.getSterilizationUserCode());
+					obj.put("sterilizationUser", tousseInstance.getSterilizationUser());
 					if(foreignProxyDisinfection != null){
 						obj.put("makerCode", foreignProxyDisinfection.getMakerCode());
 						obj.put("assistantCode", foreignProxyDisinfection.getAssistantCode());
 						obj.put("maker", foreignProxyDisinfection.getMaker());
 						obj.put("assistant", foreignProxyDisinfection.getAssistant());
 						obj.put("applicant", foreignProxyDisinfection.getApplicant());
 						obj.put("applicantDepart", foreignProxyDisinfection.getDepart());
+						if(StringUtils.isBlank(tousseInstance.getSterilizationUser())
+								&& StringUtils.isBlank(tousseInstance.getSterilizationUserCode())){
+							//器械包还没有灭菌，灭菌员取外部代理灭菌单上的灭菌员
+							obj.put("sterilizationUserCode", foreignProxyDisinfection.getSterilizationUserCode());
+							obj.put("sterilizationUser", foreignProxyDisinfection.getSterilizationUser());
+						}
 					}
 					array.add(obj);
 
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r33104 -r33192
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 33104)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 33192)
@@ -825,6 +825,7 @@
 				if(TousseDefinition.STR_YES.equals(td.getIsPrint()) && TousseDefinition.STR_YES.equals(td.getIsPrintMaterialForPacking())){
 									tdJson = getTousseDefinitionJson(td);
 								}
+				ForeignProxyDisinfection foreignProxyDisinfection = tousseInstance.getForeignProxyDisinfection(objectDao);
 				JSONArray subBarcodeArray = new JSONArray();
 				subBarcodeArray.add(tousseInstance.getBarcode());
 					
@@ -842,6 +843,15 @@
 					String reviewerCode = tousseInstance.getReviewerCode();
 					String sterileUserName = tousseInstance.getSterilizationUser();
 					String sterileUserCode = tousseInstance.getSterilizationUserCode();
+					if(foreignProxyDisinfection != null){
+						//HBTSGRYY-4【器械包信息】界面重新打印外部代理灭菌包的标签时，灭菌员信息未显示
+						if(StringUtils.isBlank(sterileUserName)
+								&& StringUtils.isBlank(sterileUserCode)){
+							//器械包还没有灭菌，灭菌员取外部代理灭菌单上的灭菌员
+							sterileUserName = foreignProxyDisinfection.getSterilizationUser();
+							sterileUserCode = foreignProxyDisinfection.getSterilizationUserCode();
+						}
+					}
 					Date sterileEndTime = TousseInstanceUtils.safelyGetSterileStartDate(tousseInstance);
 					Date validUntil = tousseInstance.getValidUntil();
 					String validUntilDateToPrint = "";
@@ -943,18 +953,15 @@
 						td.getPrintOrgSource(),idCardDefinitionUseAmount,idCardDefinitionIdNumber, idCardDefinitionDescription, objectDao,td.getBarcodePaperType(),tousseInstance.getWashOperator(),tousseInstance.getWashOperatorCode(),
 					tousseInstance.getWeight(),tousseInstance.getRemark(),td.getPrintAmountForPrint(objectDao),BooleanUtils.toBooleanDefaultIfNull(tousseInstance.getHaveUnSupplementMaterials(), false),tousseInstance.getIsUrgentTousse(),tousseInstance.getTousseInstancesAmountBelongToThisComboTousse(objectDao));
 				// 特殊单的包实例处理
-				if(tousseInstance.getForeignProxyItem_id() != null){
-					ForeignProxyDisinfection foreignProxyDisinfection = tousseInstance.getForeignProxyDisinfection(objectDao);
-					if(foreignProxyDisinfection != null){
-						if(isPrintUserName){
-							obj.put("maker", foreignProxyDisinfection.getMaker());
-							obj.put("assistant", foreignProxyDisinfection.getAssistant());
-						}else{
-							obj.put("maker", foreignProxyDisinfection.getMakerCode());
-							obj.put("assistant", foreignProxyDisinfection.getAssistantCode());
-						}
-						obj.put("depart", foreignProxyDisinfection.getDepart());
+				if(foreignProxyDisinfection != null){
+					if(isPrintUserName){
+						obj.put("maker", foreignProxyDisinfection.getMaker());
+						obj.put("assistant", foreignProxyDisinfection.getAssistant());
+					}else{
+						obj.put("maker", foreignProxyDisinfection.getMakerCode());
+						obj.put("assistant", foreignProxyDisinfection.getAssistantCode());
 					}
+					obj.put("depart", foreignProxyDisinfection.getDepart());
 				}
 				obj.put("tousseDefinitionId", td.getId());
 				array.add(obj);