Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r19585 -r19592 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19585) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19592) @@ -1630,7 +1630,7 @@ */ private List findForeignToussePackingTask(String basketBarcode) { String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); - String sql = "select po.serialNumber,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode," + String sql = "select po.recyclingItemRemark,po.serialNumber,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode," + "td.id as tousseDefinitionId,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable," + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask from PackingTask po , TousseDefinition td " + "where po.tousseDefinition_id = td.id " @@ -1662,7 +1662,7 @@ private List findCustomerToussePackingTask(String basketBarcode) { List queryResult = new ArrayList(); String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); - String sql = "select po.serialNumber, po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode," + String sql = "select po.recyclingItemRemark,po.serialNumber, po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode," + "td.id as tousseDefinitionId,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable," + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask from PackingTask po , TousseDefinition td " + "where po.tousseDefinition_id = td.id and td.tousseType='"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"' and po.orgUnitCoding = '" + orgCode + "'";