Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r22670 -r22744 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22670) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22744) @@ -4302,14 +4302,15 @@ } } barcodes=StringUtils.isNotBlank(barcodes)?barcodes:"0"; - if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType())|| TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType())){//器械包 + if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType())|| TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType())){//器械包和敷料 findSql =" select "+top+" ti.id,ti.tousseName,bd.barcode from TousseInstance ti left join " + " ProxyDisinfection pd on ti.proxyDisinfection_id=pd.id left join invoicePlan ip on " + " ip.id=pd.id join barcodeDevice bd on bd.id = ti.id where tousseDefinition_id="+td.getId()+" " + " and((ti.proxyDisinfection_id is not null and ip.handleDepartCoding='"+userCode+"') or " + " (ti.proxyDisinfection_id is null and ti.orgUnitCoding='"+userCode+"')) " + " and reviewBasket_id is null and bd.barcode not in ("+barcodes+") "; - }else if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(td.getTousseType())){//消毒物品 + }else if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(td.getTousseType()) + || TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType())){//消毒物品和外部代理灭菌包 findSql =" select "+top+" ti.id,ti.tousseName,bd.barcode from TousseInstance ti left join ProxyDisinfection pd on " + " ti.proxyDisinfection_id=pd.id left join invoicePlan ip on ip.id=pd.id " + " join barcodeDevice bd on bd.id = ti.id where tousseDefinition_id in "