Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java =================================================================== diff -u -r23466 -r23480 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java (.../ExpensiveGoodsApplicationAction.java) (revision 23466) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java (.../ExpensiveGoodsApplicationAction.java) (revision 23480) @@ -84,9 +84,9 @@ 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.isNodeDefinitionWorkFlowApprovalTask = 1 and wt.formid=ip.id)"; + + "where wt.formid=ip.id and createtasktime=(select max(createtasktime) from WorkFlowApprovalTask wt where wt.formid=ip.id) and wt.isNodeDefinitionWorkFlowApprovalTask = 1"; - String select = "select ("+ firstBarcodeSql+ ") handler, " + String select = "select ("+ firstBarcodeSql+ ") handler, " + "case when ip.processstatus = '已结束' then '已完成审批' else ip.currentNodeDefinitionName end taskName, " + "ip.id,ip.patient,ip.hospitalNumber, " + "ega.doctor,ega.operationTime, "