Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java =================================================================== diff -u -r26771 -r29230 --- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java (.../BiologyMonitoringWarningTest.java) (revision 26771) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java (.../BiologyMonitoringWarningTest.java) (revision 29230) @@ -72,6 +72,8 @@ //只能按灭菌炉的实际炉次传参,否则将通不过 sr1.setFrequency(1); sr1.setStatus(""); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sr1.setSterilizationType("高温高压"); sterilizationRecordManager.saveOrUpdateSterilizationRecord(sr1, new ArrayList(), new ArrayList(), null); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java =================================================================== diff -u -r28640 -r29230 --- ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java (.../TestSecondSupplyRoom.java) (revision 28640) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java (.../TestSecondSupplyRoom.java) (revision 29230) @@ -75,6 +75,8 @@ sterilizationRecord.setSterilizationPurpose("器械包灭菌"); //只能按灭菌炉的实际炉次传参,否则将通不过 sterilizationRecord.setFrequency(1); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sterilizationRecord.setSterilizationType("高温高压"); Sterilizer sterilizer = sterilizerManager.getSterilizerByName("6号高温蒸汽灭菌炉"); @@ -591,6 +593,9 @@ //只能按灭菌炉的实际炉次传参,否则将通不过 sterilizationRecord.setFrequency(1); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sterilizationRecord.setSterilizationType("高温高压"); + Long originalRecordId = null; Collection tousseInstanceBarcodes = new ArrayList(); Collection containerBarcodes = new ArrayList(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recall/TousseInstanceRecallTests.java =================================================================== diff -u -r26269 -r29230 --- ssts-web/src/test/java/test/forgon/disinfectsystem/recall/TousseInstanceRecallTests.java (.../TousseInstanceRecallTests.java) (revision 26269) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/recall/TousseInstanceRecallTests.java (.../TousseInstanceRecallTests.java) (revision 29230) @@ -168,6 +168,8 @@ sterilizationRecord.setSterilizerName(sterilizerName); sterilizationRecord.setSterilizationUser("test1"); sterilizationRecord.setFrequency(frequency); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sterilizationRecord.setSterilizationType("高温高压"); Session session = objectDao.getHibernateSession(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java =================================================================== diff -u -r26269 -r29230 --- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java (.../SterieRecordManagerTests.java) (revision 26269) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java (.../SterieRecordManagerTests.java) (revision 29230) @@ -170,7 +170,8 @@ sterilizationRecord.setSterilizationUser("test1"); //只能按灭菌炉的实际炉次传参,否则将通不过 sterilizationRecord.setFrequency(1); - + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sterilizationRecord.setSterilizationType("高温高压"); Session session = objectDao.getHibernateSession(); Long originalRecordId = null; @@ -457,6 +458,8 @@ sterilizationRecord.setSterilizationUser("test2"); //只能按灭菌炉的实际炉次传参,否则将通不过 sterilizationRecord.setFrequency(1); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sterilizationRecord.setSterilizationType("高温高压"); Long originalRecordId = null; Collection tousseInstanceBarcodes = new ArrayList(); @@ -714,6 +717,8 @@ //只能按灭菌炉的实际炉次传参,否则将通不过 sr.setFrequency(1); sr.setStatus(""); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sr.setSterilizationType("高温高压"); Collection tousseInstanceBarcodes = Collections.singleton(ti_开胸包.getBarcode()); sterilizationRecordManager.saveOrUpdateSterilizationRecord(sr, tousseInstanceBarcodes, new ArrayList(), null); return sr; @@ -775,6 +780,8 @@ //只能按灭菌炉的实际炉次传参,否则将通不过 sr1.setFrequency(1); sr1.setStatus(""); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sr1.setSterilizationType("高温高压"); Collection tousseInstanceBarcodes = new ArrayList(); tousseInstanceBarcodes.add(ti_开胸包1.getBarcode()); tousseInstanceBarcodes.add(ti_开胸包2.getBarcode()); @@ -820,6 +827,8 @@ //只能按灭菌炉的实际炉次传参,否则将通不过 sterRecord.setFrequency(1); sterRecord.setStatus(""); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sterRecord.setSterilizationType("高温高压"); Collection tousseInstanceBarcodes = Collections.singleton(ti_开胸包.getBarcode()); sterilizationRecordManager.saveOrUpdateSterilizationRecord(sterRecord, tousseInstanceBarcodes, new ArrayList(), null); @@ -871,6 +880,8 @@ //只能按灭菌炉的实际炉次传参,否则将通不过 sterRecord.setFrequency(1); sterRecord.setStatus(""); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sterRecord.setSterilizationType("高温高压"); Collection tousseInstanceBarcodes = Collections.singleton(ti_开胸包.getBarcode()); sterilizationRecordManager.saveOrUpdateSterilizationRecord(sterRecord, tousseInstanceBarcodes, new ArrayList(), null); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java =================================================================== diff -u -r26293 -r29230 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java (.../SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java) (revision 26293) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java (.../SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java) (revision 29230) @@ -316,6 +316,8 @@ //只能按灭菌炉的实际炉次传参,否则将通不过 sterilizationRecord.setFrequency(1); sterilizationRecord.setStartDate(new Date()); + //处理测试用例不通过的问题,增加灭菌程序的设值(灭菌程序不允许为空) + sterilizationRecord.setSterilizationType("高温高压"); List tousseInstances = new ArrayList();