Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r17217 -r17224 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 17217) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 17224) @@ -8206,6 +8206,10 @@ } } String barcode = tousseInstance.getBarcode(); + boolean needRoutineMonitoringWarming = false; + if(tousseInstanceManager.isNeedRoutineMonitoringWarming(barcode)){ + needRoutineMonitoringWarming = true; + } JSONObject obj = new JSONObject(); obj.put("id", tousseInstance.getId()); obj.put("tousseDefinitionId", td.getId()); @@ -8227,6 +8231,7 @@ obj.put("biologicalMonitoringNoResult", false); obj.put("biologicalMonitoringFail", false); obj.put("notSendAmount", 0); + obj.put("needRoutineMonitoringWarming", needRoutineMonitoringWarming); JSONObject jsonObject = tousseDefinitionInfoMap.get(td.getId().toString()); if(jsonObject != null){ Index: ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js =================================================================== diff -u -r16405 -r17224 --- ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js (.../auxiliaryInvoiceForm.js) (revision 16405) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js (.../auxiliaryInvoiceForm.js) (revision 17224) @@ -115,7 +115,8 @@ {name : 'biologicalMonitoringFail'}, {name : 'disposableGoodsIdSet'}, {name : 'invoicePlanIDList'}, - {name : 'invoicePlanType'} + {name : 'invoicePlanType'}, + {name : 'needRoutineMonitoringWarming'} ] }); //科室申请单的store @@ -831,6 +832,9 @@ if(addOneTousse(rows[i])){ rows[i].set('added',true); } + if(goods.needRoutineMonitoringWarming == true){ + showResult("该物品灭菌炉没有进行监测,请登记!"); + } addTousses.push(goods); } if(addTousses.length > 0){