Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r20041 -r20049 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 20041) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 20049) @@ -3367,6 +3367,8 @@ //外来器械二次回收,不打印 return list; } + Set sets = fa.getApplicationItems().stream().filter(p->p!= null).map(p->p.getTousseDefinitionId()).collect(Collectors.toSet()); + List tds = tousseDefinitionManager.getCollection(sets); Map> tdPrintDataMap = new HashMap>(); List sequences = classifyBasketRecyclingSequenceManager.getByProperty("recyclingRecordId", recyclingRecord.getId()); for(ClassifyBasket cb : recyclingRecord.getClassifyBaskets()){ @@ -3375,6 +3377,7 @@ } for(ClassifiedItem classifiedItem : cb.getClassfiedItems()){ Long tdId = classifiedItem.getTousseDefinitionID(); + TousseDefinition td = IDOperators.find(tds, tdId); RecyclingBasketSequence sequence = classifyBasketRecyclingSequenceManager.find(sequences, recyclingRecord.getId(), cb.getId(), tdId); List printDatas = tdPrintDataMap.get(tdId); if(printDatas == null){ @@ -3396,7 +3399,14 @@ printDatas.add(printData); } if(classifiedItem.itemTypeMaterial()){ - printData.addItem(classifiedItem.getName(), classifiedItem.getAmount(),classifiedItem.getMaterialDefinition().getIsImplant()); + String isImplant = classifiedItem.getMaterialDefinition().getIsImplant(); + if(td != null){ + MaterialInstance mi = materialInstanceManager.find(td.getMaterialInstances(), classifiedItem.getMaterialDefinition().getId()); + if(mi != null){ + isImplant = mi.materialIsImplant(); + } + } + printData.addItem(classifiedItem.getName(), classifiedItem.getAmount(),isImplant); }else{ if(classifiedItem.getTousseDefinition() != null){ for(MaterialInstance mi : classifiedItem.getTousseDefinition().getMaterialInstances()){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/btn-box.jpg =================================================================== diff -u -r12331 -r20049 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r20041 -r20049 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 20041) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 20049) @@ -236,7 +236,7 @@ - + Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css =================================================================== diff -u -r19120 -r20049 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 19120) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 20049) @@ -68,6 +68,8 @@ .data-table .btn-box .btn-e:hover{ background:url(btn_save1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} .data-table .btn-box .btn-b{ background-position:-142px 0; width:203px; height:64px;} .data-table .btn-box .btn-b:hover{ background-position:-142px -64px; } +.data-table .btn-box .btn-p{ background-position:-632px 0; width:208px; height:64px;} +.data-table .btn-box .btn-p:hover{ background-position:-632px -64px; } .data-table .btn-box .btn-c{ background:url(btn_confirm.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} .data-table .btn-box .btn-c:hover{ background:url(btn_confirm1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;} .data-table .btn-box .btn-d{ background:url(btn_cancel.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}