Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r27520 -r29025
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 27520)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 29025)
@@ -53,6 +53,8 @@
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
 import com.forgon.disinfectsystem.vo.PrintApplicationItemVO;
+import com.forgon.security.model.User;
+import com.forgon.security.service.UserManager;
 import com.forgon.serialnumber.model.SerialNum;
 import com.forgon.serialnumber.service.SerialNumManager;
 import com.forgon.tools.GB2Alpha;
@@ -103,6 +105,8 @@
 	
 	private OrgUnitManager orgUnitManager;
 	
+	private UserManager userManager;
+	
 	public void setExpirationDateInfoManager(
 			ExpirationDateInfoManager expirationDateInfoManager) {
 		this.expirationDateInfoManager = expirationDateInfoManager;
@@ -156,6 +160,10 @@
 		this.orgUnitManager = orgUnitManager;
 	}
 
+	public void setUserManager(UserManager userManager) {
+		this.userManager = userManager;
+	}
+	
 	@Override
 	public void endForeignProxyDisinfection(String id) {
 		if(StringUtils.isBlank(id)){
@@ -1025,6 +1033,9 @@
 
 	private JSONArray buildTousseInstancesPrintInfo(List<TousseInstance> tousseInstances,ForeignProxyDisinfection foreignProxyDisinfection){
 		JSONArray printParamList = new JSONArray();
+		//科室供应室配置的参数配置
+		SupplyRoomConfig supplyRoomConfigParams = supplyRoomConfigManager.getSystemParamsObj();
+		Boolean isPrintUserFullName = supplyRoomConfigParams.isPrintUserFullName();
 		// 没有限制存放物品的库位
 		List<StorageLocation> unLimitedStorageLocation = storageLocationManager.getUnLimitedStorageLocation();
 		for (TousseInstance tousseInstance : tousseInstances) {
@@ -1040,13 +1051,25 @@
 			obj.put("sterilingType", tousseInstance.getSterilingType());
 			obj.put("validDate", tousseInstance.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDD));
 			obj.put("sterilizationDate", TousseInstanceUtils.safelyGetSterileStartDateStr(tousseInstance));
-			obj.put("maker", foreignProxyDisinfection.getMaker());
-			obj.put("assistant", foreignProxyDisinfection.getAssistant());
+			// (BJ307YY-14外部代理灭菌包标签能正常按照科室供应室配置打印 工号或者姓名)
+			if(isPrintUserFullName){
+				User maker = userManager.getUserByUserCode(foreignProxyDisinfection.getMakerCode());
+				obj.put("maker", maker == null ? foreignProxyDisinfection.getMaker() : maker.getFullName());
+				User assistant = userManager.getUserByUserCode(foreignProxyDisinfection.getAssistantCode());
+				obj.put("assistant", assistant == null ? foreignProxyDisinfection.getAssistant() : assistant.getFullName());
+				User sterilizationUser = userManager.getUserByUserCode(foreignProxyDisinfection.getSterilizationUserCode());
+				obj.put("sterilizationUser", sterilizationUser == null ? foreignProxyDisinfection.getSterilizationUser() : sterilizationUser.getFullName());
+				User applicant = userManager.getUserByUserCode(foreignProxyDisinfection.getApplicantCode());
+				obj.put("applicant", applicant == null ? foreignProxyDisinfection.getApplicant() : applicant.getFullName());
+			}else{
+				obj.put("maker", foreignProxyDisinfection.getMakerCode());
+				obj.put("assistant", foreignProxyDisinfection.getAssistantCode());
+				obj.put("sterilizationUser", foreignProxyDisinfection.getSterilizationUserCode());
+				obj.put("applicant", foreignProxyDisinfection.getApplicantCode());
+			}
 			// 单上的属性
 			obj.put("sterilizer", foreignProxyDisinfection.getSterilizer());
 			obj.put("frequency", foreignProxyDisinfection.getFrequency());
-			obj.put("applicant", foreignProxyDisinfection.getApplicant());
-			obj.put("sterilizationUser", foreignProxyDisinfection.getSterilizationUser());
 			obj.put("depart", foreignProxyDisinfection.getDepart());
 			
 			String validUntilStr = tousseInstance.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDD);;
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java
===================================================================
diff -u -r23492 -r29025
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java	(.../ForeignProxyDisinfection.java)	(revision 23492)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java	(.../ForeignProxyDisinfection.java)	(revision 29025)
@@ -42,15 +42,33 @@
 	 * 制作者
 	 */
 	private String maker;
+	
 	/**
+	 * 制作者登录名(BJ307YY-14外部代理灭菌包标签能正常按照科室供应室配置打印 工号或者姓名)
+	 */
+	private String makerCode;
+	
+	/**
 	 * 核对者
 	 */
 	private String assistant;
+	
 	/**
+	 * 核对者登录名(BJ307YY-14外部代理灭菌包标签能正常按照科室供应室配置打印 工号或者姓名)
+	 */
+	private String assistantCode;
+	
+	/**
 	 * 灭菌员
 	 */
 	private String sterilizationUser = "";
+	
 	/**
+	 * 灭菌员登录名(BJ307YY-14外部代理灭菌包标签能正常按照科室供应室配置打印 工号或者姓名)
+	 */
+	private String sterilizationUserCode;
+	
+	/**
 	 * 送来时间
 	 */
 	private Date arrivedTime;
@@ -217,5 +235,34 @@
 		this.tousseAmount = tousseAmount;
 	}
 	
+
+	public String getMakerCode() {
+		return makerCode;
+	}
 	
+
+	public void setMakerCode(String makerCode) {
+		this.makerCode = makerCode;
+	}
+	
+
+	public String getAssistantCode() {
+		return assistantCode;
+	}
+	
+
+	public void setAssistantCode(String assistantCode) {
+		this.assistantCode = assistantCode;
+	}
+	
+
+	public String getSterilizationUserCode() {
+		return sterilizationUserCode;
+	}
+	
+
+	public void setSterilizationUserCode(String sterilizationUserCode) {
+		this.sterilizationUserCode = sterilizationUserCode;
+	}
+	
 }
\ No newline at end of file