Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoodsapplication/ExpensiveGoodsApplication.java
===================================================================
diff -u -r23011 -r23466
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoodsapplication/ExpensiveGoodsApplication.java	(.../ExpensiveGoodsApplication.java)	(revision 23011)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoodsapplication/ExpensiveGoodsApplication.java	(.../ExpensiveGoodsApplication.java)	(revision 23466)
@@ -19,19 +19,9 @@
 public class ExpensiveGoodsApplication extends InvoicePlan {
 	
 	/**
-	 * 住院号
-	 */
-	private String hospitalNumber;
-	
-	/**
 	 * 诊疗号
 	 */
 	private String clinicNumber;
-
-	/**
-	 * 病人姓名
-	 */
-	private String patient;
 	
 	/**
 	 * 病区
@@ -82,16 +72,17 @@
 	 * 外来器械包名称
 	 */
 	private String foreignTousseName;
-	
-	
-	public String getHospitalNumber() {
-		return hospitalNumber;
-	}
 
-	public void setHospitalNumber(String hospitalNumber) {
-		this.hospitalNumber = hospitalNumber;
-	}
+	/**
+	 * 
+	 */
+	private String taskName;
 
+	/**
+	 * 
+	 */
+	private String handler;
+
 	public String getClinicNumber() {
 		return clinicNumber;
 	}
@@ -100,14 +91,6 @@
 		this.clinicNumber = clinicNumber;
 	}
 
-	public String getPatient() {
-		return patient;
-	}
-
-	public void setPatient(String patient) {
-		this.patient = patient;
-	}
-
 	public String getPatientArea() {
 		return patientArea;
 	}
@@ -187,5 +170,21 @@
 	public void setPatientAge(String patientAge) {
 		this.patientAge = patientAge;
 	}
-	
+
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+
+	public String getHandler() {
+		return handler;
+	}
+
+	public void setHandler(String handler) {
+		this.handler = handler;
+	}
+
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java
===================================================================
diff -u -r23447 -r23466
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java	(.../ExpensiveGoodsApplicationAction.java)	(revision 23447)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java	(.../ExpensiveGoodsApplicationAction.java)	(revision 23466)
@@ -84,7 +84,7 @@
 		
 		 String firstBarcodeSql = "select case when wt.status = '1' then wt.handler else (select fullname from ss_users where id=wt.userid) end " 
 	            				+"from WorkFlowApprovalTask wt "
-	            				+ "where  wt.formid=ip.id and createtasktime=(select max(createtasktime) from WorkFlowApprovalTask wt where  wt.formid=ip.id)";
+	            				+ "where  wt.formid=ip.id and createtasktime=(select max(createtasktime) from WorkFlowApprovalTask wt where wt.isNodeDefinitionWorkFlowApprovalTask = 1 and  wt.formid=ip.id)";
 		 
 		String select = "select ("+ firstBarcodeSql+ ") handler, "
 					+ "case when ip.processstatus = '已结束' then '已完成审批' else ip.currentNodeDefinitionName end taskName, "