Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js =================================================================== diff -u -r41408 -r41412 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 41408) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 41412) @@ -2122,8 +2122,19 @@ } function arrContainsMonitoringPackageRule(rules, rule) { for (var i = 0; i < rules.length; i++) { - if (rules[i].trigger === rule.trigger && rules[i].frequency === rule.frequency) { - return true; + if (rules[i].trigger === rule.trigger) { + if (rules[i].frequency === rule.frequency) { + return true; + } + if (rules[i].frequency === -1 || rule.frequency === -1) { // 如果其中一个炉次是全部,则不能再添加其他炉次 + return true; + } + if (rules[i].frequency === -2 && rule.frequency !== 1) { // 如果已经有个第一炉除外的,则其他的不能再有非第一炉的 + return true; + } + if (rule.frequency === -2 && rules[i].frequency !== 1) { // 如果已经有个非第一炉的的,则不能再添加第一炉除外的 + return true; + } } } return false;