Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r26699 -r26761 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26699) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26761) @@ -10428,8 +10428,9 @@ vo.setTousseDarcode(tousseDarcode); vo.setSupplier(supplierName); vo.setImplantName(materialName); - vo.setIsImplant("√"); - + if(Constants.STR_YES.equals(isImplant)){ + vo.setIsImplant("√"); + } vo.setUseTime(enteringDate); vo.setUseDepartment(depart); vo.setPatientName(patientName); Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r26658 -r26761 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 26658) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 26761) @@ -1171,6 +1171,8 @@ if (!confirm(goods.confirmMsgs[ii])){ isContinue = true; break; + }else if(goods.confirmMsgs[ii].indexOf('需要紧急发货吗') != -1 || goods.confirmMsgs[ii].indexOf('生物监测结果为无') != -1){ + goods.isRoutine = '否'; } } }