Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java =================================================================== diff -u -r17128 -r18481 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java (.../SterilizationRecordManagerTests.java) (revision 17128) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java (.../SterilizationRecordManagerTests.java) (revision 18481) @@ -5,6 +5,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +16,9 @@ import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.directory.model.OrgUnit; +import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager; +import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation; import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; @@ -34,7 +39,8 @@ private TousseInstanceManager tousseInstanceManager; @Autowired private PackingManager packingManager; - + @Autowired + private SterilizerManager sterilizerManager; @Test public void testSaveSterilizationRecord() { try { @@ -89,9 +95,11 @@ Date startDate = new SimpleDateFormat("yyyy-MM-dd HH:mm") .parse(date); startDate = new Date(); + + Sterilizer sterilizer1 = sterilizerManager.getSterilizerByName("1号高温蒸汽灭菌炉"); SterilizationRecord sterilizationRecord = new SterilizationRecord(); sterilizationRecord.setStartDate(startDate); - sterilizationRecord.setSterilizer(new Sterilizer()); + sterilizationRecord.setSterilizer(sterilizer1); sterilizationRecord.setOrgUnitCoding(AcegiHelper.getLoginUser() .getOrgUnitCodingFromSupplyRoomConfig()); sterilizationRecord.setOrgUnitCoding("");