Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r17227 -r17236 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 17227) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 17236) @@ -2720,7 +2720,7 @@ * @param barcode * @return true 当器械包的灭菌炉有配了定期监测,并且没有录入了相关的定期监测记录;其他情况均返回false */ - public boolean isNeedRoutineMonitoringWarming(String barcode){ + public boolean isNeedRoutineMonitoringWarning(String barcode){ boolean haveRoutineMonitoring = false; if(StringUtils.isBlank(barcode)){ return haveRoutineMonitoring; Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java =================================================================== diff -u -r17203 -r17236 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 17203) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 17236) @@ -414,7 +414,7 @@ * @param barcode * @return true 当器械包的灭菌炉有配了定期监测,并且没有录入了相关的定期监测记录;其他情况均返回false */ - public boolean isNeedRoutineMonitoringWarming(String barcode); + public boolean isNeedRoutineMonitoringWarning(String barcode); /** * 将器械包的集合设置仓库属性。如果targetWareHouse为null,则将包实例的仓库id设置为null,仓库名称设置为""; Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r17224 -r17236 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 17224) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 17236) @@ -8207,7 +8207,7 @@ } String barcode = tousseInstance.getBarcode(); boolean needRoutineMonitoringWarming = false; - if(tousseInstanceManager.isNeedRoutineMonitoringWarming(barcode)){ + if(tousseInstanceManager.isNeedRoutineMonitoringWarning(barcode)){ needRoutineMonitoringWarming = true; } JSONObject obj = new JSONObject(); Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r17217 -r17236 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 17217) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 17236) @@ -1547,8 +1547,8 @@ setTousseInstancesBelongToThisComboTousse(data, vo); updateVO(barcode, vo); // 判断器械包是否需要做定期监测的提示 - if(tousseInstanceManager.isNeedRoutineMonitoringWarming(barcode)){ - result.addProperty("isNeedRoutineMonitoringWarming", true); + if(tousseInstanceManager.isNeedRoutineMonitoringWarning(barcode)){ + result.addProperty("isNeedRoutineMonitoringWarning", true); } result.add("data", gson.toJsonTree(Collections.singleton(vo), gsonType)); return result; @@ -1585,8 +1585,8 @@ // vo.setFrequency(frequency); // vo.setTousseDefinitionId(tousseDefinitionId); // 判断器械包是否需要做定期监测的提示 - if(tousseInstanceManager.isNeedRoutineMonitoringWarming(barcode)){ - result.addProperty("isNeedRoutineMonitoringWarming", true); + if(tousseInstanceManager.isNeedRoutineMonitoringWarning(barcode)){ + result.addProperty("isNeedRoutineMonitoringWarning", true); } setTousseInstancesBelongToThisComboTousse(data, vo); } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r17170 -r17236 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 17170) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 17236) @@ -599,7 +599,7 @@ top.Ext.getCmp('scanText').focus(); return; } - if(result.isNeedRoutineMonitoringWarming != undefined && result.isNeedRoutineMonitoringWarming == true){ + if(result.isNeedRoutineMonitoringWarning != undefined && result.isNeedRoutineMonitoringWarning == true){ showResult("该物品灭菌炉没有进行监测,请登记!"); } // 验证灭菌筐内的物品是否符合发货条件,扫描的器械包数量是否大于申请数量