Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r28556 -r29207
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 28556)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 29207)
@@ -110,6 +110,7 @@
 import com.forgon.disinfectsystem.toussetransition.service.TousseTransitionRecordManager;
 import com.forgon.disinfectsystem.washTransition.service.WashTransitionItemManager;
 import com.forgon.exception.SystemException;
+import com.forgon.security.model.User;
 import com.forgon.tools.MapTools;
 import com.forgon.tools.SqlBuilder;
 import com.forgon.tools.StrutsParamUtils;
@@ -1020,6 +1021,17 @@
 	                    invoicePlanJSON.put("iinvoice_SerialNum", ip.getSerialNumber()==null?"":ip.getSerialNumber());
 	                    invoicePlanJSON.put("invoice__applicant", ip.getApplicant()==null?"":ip.getApplicant());
 	                    invoicePlanJSON.put("invoice_Type", ip.getType()==null?"":ip.getType());
+	                    if(ip instanceof ForeignProxyDisinfection){
+	                    	if(StringUtils.isBlank(ti.getOperator())){
+	                    		// DGSDBZXYY-83 外部代理灭菌包，器械包信息里面的装配记录的配包人没有显示出来
+	                    		ForeignProxyDisinfection fpd = (ForeignProxyDisinfection) ip;
+	                    		@SuppressWarnings("unchecked")
+								List<User> makerList = objectDao.findByProperty(User.class.getSimpleName(), "name", fpd.getMakerCode());
+	                    		String operator = CollectionUtils.isEmpty(makerList) ? fpd.getMaker() : makerList.get(0).getFullName();
+	                    		ti.setOperatorCode(fpd.getMakerCode());
+	                    		ti.setOperator(operator);
+	                    	}
+	                    }
 	                } 
 				}
 				
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r29205 -r29207
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 29205)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 29207)
@@ -697,6 +697,10 @@
 				tousseInstance.setDepartCoding(foreignProxyDisinfection.getDepartCoding());
 				//设置包实例的任务组
 				tousseInstance.setTaskGroup(tousseDefinition.getTaskGroup());
+				//DGSDBZXYY-83 外部代理灭菌包，器械包信息里面的装配记录的配包人没有显示出来
+				//制作者就是配包人
+				tousseInstance.setOperator(foreignProxyDisinfection.getMaker());
+				tousseInstance.setOperatorCode(foreignProxyDisinfection.getMakerCode());
 				objectDao.save(tousseInstance);
 				
 //				if (i % 50 == 0) {