Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r30183 -r30272 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 30183) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 30272) @@ -768,6 +768,9 @@ String limit = StrutsParamUtils.getPraramValue("limit", ""); String field = StrutsParamUtils.getPraramValue("field", ""); String direction = StrutsParamUtils.getPraramValue("direction", ""); + if(StringUtils.equals(field, "objBarcode")){ + field = "barcode"; + } JSONArray jsonArray = new JSONArray(); Map sqlCondition = new HashMap(); //以前的分页不适用于固定条码汇总 Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r30254 -r30272 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30254) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 30272) @@ -922,7 +922,7 @@ + " join Sterilisation s on s.sterilisation = tdancestor.sterilingMethod " + " where 1=1 and tdancestor.isTraceable='否' "+keyWordSearchSql+" " + "and ti.status='"+TousseInstance.STATUS_REVIEWED+"' and ti.comboTousseInstanceId is null "+departSearchSql+" and ti.reviewBasket_id is null " - + "and ti.orgunitcoding='"+orgUnitCoding+"' group by tdancestor.id,tdancestor.name,s.sterilizationMode)) tt ) t " + + "and ti.orgunitcoding='"+orgUnitCoding+"' group by tdancestor.id,tdancestor.name,s.sterilizationMode)) tt " + orderSql + ") t " + "where" + " t.barcode not in (select top "+start+" barcode from " + "((select tdancestor.id,depart,ti.tousseName,b.barcode,ti.reviewTime,1 amount from TousseInstance ti "