Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r20045 -r20139 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 20045) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 20139) @@ -2494,6 +2494,7 @@ params.put("sterilizationRecordId", srRecord.getId()); params.put("sterilizationUser", srRecord.getSterilizationUser()); params.put("sterilizerName", srRecord.getSterilizerName()); + params.put("orgUnitCoding", srRecord.getOrgUnitCoding()); params.put("startDate", startDateStr); params.put("endDate", endDaeStr); params.put("status", srRecord.getStatus()); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r17768 -r20139 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 17768) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 20139) @@ -229,9 +229,15 @@ if (barcodeDevice instanceof Sterilizer) { // 灭菌器 Sterilizer sterilizer = (Sterilizer) barcodeDevice; - int maxFrequency = sterilizationRecordManager.getMaxFrequency( - sterilizer, Long.valueOf(id)); - result = "success:" + sterilizer.getName() + "," + maxFrequency; + + //校验使用此灭菌炉的科室,不允许其他科室使用 + if (StringTools.equals(sterilizer.getOrgUnitCoding(), AcegiHelper.getCurrentOrgUnitCode())) { + int maxFrequency = sterilizationRecordManager.getMaxFrequency( + sterilizer, Long.valueOf(id)); + result = "success:" + sterilizer.getName() + "," + maxFrequency; + } else { + result = "failure:该灭炉不属于本科室!"; + } } else { result = "failure:没有条码所对应的灭菌炉!"; } @@ -267,9 +273,9 @@ } /** - * 获取消毒设备的消毒方式 - * - * @param rinserName + * 获取灭菌炉的灭菌程序(注意:会校验此灭菌程序是否属于指定的灭菌炉). + * @param barcode 灭菌程序的条码 + * @param sterilizerName 灭菌炉名称 * @return */ public String getSterilizationType(String barcode, String sterilizerName) { Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r19677 -r20139 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 19677) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 20139) @@ -287,8 +287,11 @@ ); } } -//扫描灭菌炉 -function getSterilization(barcode,recordId){ + +/** + * 扫描灭菌炉 + */ +function getSterilization(barcode, recordId){ if(barcode != null && barcode.length > 0){ DWREngine.setAsync(false); SterilizationRecordTableManager.getRinserSterilizationType(barcode,recordId,function setSterilizationType(result){ @@ -305,7 +308,10 @@ DWREngine.setAsync(true); } } -//扫描灭菌程序 + +/** + * 扫描灭菌程序 + */ function loadSterilizationType(barcode,sterilizerName){ DWREngine.setAsync(false); SterilizationRecordTableManager.getSterilizationType(barcode,sterilizerName,function setSterilizationType(result){