Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r17629 -r17634 --- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17629) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17634) @@ -59,10 +59,13 @@ import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem; +import com.forgon.disinfectsystem.entity.basedatamanager.cleanmethod.CleanMethod; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.expirationdateinfo.ExpirationDateInfo; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; +import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser; +import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation; import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup; @@ -1040,7 +1043,55 @@ TaskGroup3.setTaskGroupName("器械组"); TaskGroup3.setDepartCode(Constants.ORG_UNIT_CODE_OR); TaskGroup3.setDepartName(Constants.ORG_UNIT_NAME_OR); + + TaskGroup TaskGroup4 = new TaskGroup(); + TaskGroup4.setTaskGroupName("手术器械组"); + TaskGroup4.setDepartCode(Constants.ORG_UNIT_CODE_OR); + TaskGroup4.setDepartName(Constants.ORG_UNIT_NAME_OR); + TaskGroup TaskGroup5 = new TaskGroup(); + TaskGroup5.setTaskGroupName("临床器械组"); + TaskGroup5.setDepartCode(Constants.ORG_UNIT_CODE_OR); + TaskGroup5.setDepartName(Constants.ORG_UNIT_NAME_OR); + + TaskGroup TaskGroup6 = new TaskGroup(); + TaskGroup6.setTaskGroupName("口腔科器械组"); + TaskGroup6.setDepartCode(Constants.ORG_UNIT_CODE_OR); + TaskGroup6.setDepartName(Constants.ORG_UNIT_NAME_OR); + + TaskGroup TaskGroup7 = new TaskGroup(); + TaskGroup7.setTaskGroupName("五官科器械组"); + TaskGroup7.setDepartCode(Constants.ORG_UNIT_CODE_OR); + TaskGroup7.setDepartName(Constants.ORG_UNIT_NAME_OR); + + TaskGroup TaskGroup8 = new TaskGroup(); + TaskGroup8.setTaskGroupName("南院手术器械"); + TaskGroup8.setDepartCode(Constants.ORG_UNIT_CODE_OR); + TaskGroup8.setDepartName(Constants.ORG_UNIT_NAME_OR); + + TaskGroup TaskGroup9 = new TaskGroup(); + TaskGroup9.setTaskGroupName("敷料器械组"); + TaskGroup9.setDepartCode(Constants.ORG_UNIT_CODE_OR); + TaskGroup9.setDepartName(Constants.ORG_UNIT_NAME_OR); + objectDao.saveOrUpdate(TaskGroup1); + objectDao.saveOrUpdate(TaskGroup2); + objectDao.saveOrUpdate(TaskGroup3); + objectDao.saveOrUpdate(TaskGroup4); + objectDao.saveOrUpdate(TaskGroup5); + objectDao.saveOrUpdate(TaskGroup6); + objectDao.saveOrUpdate(TaskGroup7); + objectDao.saveOrUpdate(TaskGroup8); + objectDao.saveOrUpdate(TaskGroup9); + // 材料类型初始化 + initMaterialType(); + // 初始化包装类型 + initPackingType(); + // 初始化清洗程序 + initCleanMethod(); + // 初始化清洗机设置 + initRinser(); + // 初始化灭菌程序 + initSterilisation(); // 一次性物品类型 HttpOption httpoption1 = new HttpOption(); httpoption1.setOptionListId(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE); @@ -1243,8 +1294,281 @@ objectDao.save(sterilizer2); } - + /* + * 初始化材料类型 + */ + private void initMaterialType(){ + HttpOption httpoptionMT1 = new HttpOption(); + httpoptionMT1.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT1.setOptionText("器械"); + httpoptionMT1.setOptionValue("器械"); + httpoptionMT1.setSequence(1); + objectDao.saveOrUpdate(httpoptionMT1); + + HttpOption httpoptionMT2 = new HttpOption(); + httpoptionMT2.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT2.setOptionText("金属"); + httpoptionMT2.setOptionValue("金属"); + httpoptionMT2.setSequence(2); + objectDao.saveOrUpdate(httpoptionMT2); + + HttpOption httpoptionMT3 = new HttpOption(); + httpoptionMT3.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT3.setOptionText("棉布"); + httpoptionMT3.setOptionValue("棉布"); + httpoptionMT3.setSequence(3); + objectDao.saveOrUpdate(httpoptionMT3); + + HttpOption httpoptionMT4 = new HttpOption(); + httpoptionMT4.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT4.setOptionText("无纺布"); + httpoptionMT4.setOptionValue("无纺布"); + httpoptionMT4.setSequence(4); + objectDao.saveOrUpdate(httpoptionMT4); + + HttpOption httpoptionMT5 = new HttpOption(); + httpoptionMT5.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT5.setOptionText("玻璃"); + httpoptionMT5.setOptionValue("玻璃"); + httpoptionMT5.setSequence(5); + objectDao.saveOrUpdate(httpoptionMT5); + + HttpOption httpoptionMT6 = new HttpOption(); + httpoptionMT6.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT6.setOptionText("橡胶"); + httpoptionMT6.setOptionValue("橡胶"); + httpoptionMT6.setSequence(6); + objectDao.saveOrUpdate(httpoptionMT6); + + HttpOption httpoptionMT7 = new HttpOption(); + httpoptionMT7.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT7.setOptionText("硅胶"); + httpoptionMT7.setOptionValue("硅胶"); + httpoptionMT7.setSequence(7); + objectDao.saveOrUpdate(httpoptionMT7); + + HttpOption httpoptionMT8 = new HttpOption(); + httpoptionMT8.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT8.setOptionText("木质"); + httpoptionMT8.setOptionValue("木质"); + httpoptionMT8.setSequence(8); + objectDao.saveOrUpdate(httpoptionMT8); + + HttpOption httpoptionMT9 = new HttpOption(); + httpoptionMT9.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT9.setOptionText("敷料"); + httpoptionMT9.setOptionValue("敷料"); + httpoptionMT9.setSequence(9); + objectDao.saveOrUpdate(httpoptionMT9); + + HttpOption httpoptionMT10 = new HttpOption(); + httpoptionMT10.setOptionListId(HttpOption.SYSTEMSETTING_MATERIALTYPE); + httpoptionMT10.setOptionText("塑料"); + httpoptionMT10.setOptionValue("塑料"); + httpoptionMT10.setSequence(10); + objectDao.saveOrUpdate(httpoptionMT10); + } /** + * 初始化包装类型 + */ + private void initPackingType(){ + HttpOption httpoptionPackingTpye1 = new HttpOption(); + httpoptionPackingTpye1.setOptionListId(HttpOption.SYSTEMSETTING_PACKAGING_TYPE); + httpoptionPackingTpye1.setOptionText("棉布"); + httpoptionPackingTpye1.setOptionValue("棉布"); + httpoptionPackingTpye1.setSequence(1); + objectDao.saveOrUpdate(httpoptionPackingTpye1); + + HttpOption httpoptionPackingTpye2 = new HttpOption(); + httpoptionPackingTpye2.setOptionListId(HttpOption.SYSTEMSETTING_PACKAGING_TYPE); + httpoptionPackingTpye2.setOptionText("纸塑包装"); + httpoptionPackingTpye2.setOptionValue("纸塑包装"); + httpoptionPackingTpye2.setSequence(2); + objectDao.saveOrUpdate(httpoptionPackingTpye2); + + HttpOption httpoptionPackingTpye3 = new HttpOption(); + httpoptionPackingTpye3.setOptionListId(HttpOption.SYSTEMSETTING_PACKAGING_TYPE); + httpoptionPackingTpye3.setOptionText("无纺布(双层)"); + httpoptionPackingTpye3.setOptionValue("无纺布(双层)"); + httpoptionPackingTpye3.setSequence(3); + objectDao.saveOrUpdate(httpoptionPackingTpye3); + + HttpOption httpoptionPackingTpye4 = new HttpOption(); + httpoptionPackingTpye4.setOptionListId(HttpOption.SYSTEMSETTING_PACKAGING_TYPE); + httpoptionPackingTpye4.setOptionText("灭菌盒"); + httpoptionPackingTpye4.setOptionValue("灭菌盒"); + httpoptionPackingTpye4.setSequence(4); + objectDao.saveOrUpdate(httpoptionPackingTpye4); + + HttpOption httpoptionPackingTpye5 = new HttpOption(); + httpoptionPackingTpye5.setOptionListId(HttpOption.SYSTEMSETTING_PACKAGING_TYPE); + httpoptionPackingTpye5.setOptionText("槽"); + httpoptionPackingTpye5.setOptionValue("槽"); + httpoptionPackingTpye5.setSequence(5); + objectDao.saveOrUpdate(httpoptionPackingTpye5); + + HttpOption httpoptionPackingTpye6 = new HttpOption(); + httpoptionPackingTpye6.setOptionListId(HttpOption.SYSTEMSETTING_PACKAGING_TYPE); + httpoptionPackingTpye6.setOptionText("器械盒"); + httpoptionPackingTpye6.setOptionValue("器械盒"); + httpoptionPackingTpye6.setSequence(6); + objectDao.saveOrUpdate(httpoptionPackingTpye6); + + HttpOption httpoptionPackingTpye7 = new HttpOption(); + httpoptionPackingTpye7.setOptionListId(HttpOption.SYSTEMSETTING_PACKAGING_TYPE); + httpoptionPackingTpye7.setOptionText("胶带"); + httpoptionPackingTpye7.setOptionValue("胶带"); + httpoptionPackingTpye7.setSequence(7); + objectDao.saveOrUpdate(httpoptionPackingTpye7); + } + /** + * 初始化清洗程序的数据 + */ + private void initCleanMethod(){ + CleanMethod cleanMethod1 = new CleanMethod(); + cleanMethod1.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod1.setCleanMethod("P1"); + cleanMethod1.setCleanMinutes(30); + cleanMethod1.setCleanParameter("POWER CLEAN，适用于污垢严重器械的清洗消毒。上酶，上润滑油。"); + cleanMethod1.setValue("600"); + objectDao.saveOrUpdate(cleanMethod1); + + CleanMethod cleanMethod2 = new CleanMethod(); + cleanMethod2.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod2.setCleanMethod("P2"); + cleanMethod2.setCleanMinutes(30); + cleanMethod2.setCleanParameter("OP-D-3，适用于常规器械的清洗消毒，上酶，上润滑油。"); + cleanMethod2.setValue("3000"); + objectDao.saveOrUpdate(cleanMethod2); + + CleanMethod cleanMethod3 = new CleanMethod(); + cleanMethod3.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod3.setCleanMethod("P3"); + cleanMethod3.setCleanMinutes(30); + cleanMethod3.setCleanParameter("OP-SHORT-D-3，适用于治疗碗/碗盘等的清洗消毒。上酶。"); + cleanMethod3.setValue("3000"); + objectDao.saveOrUpdate(cleanMethod3); + + CleanMethod cleanMethod4 = new CleanMethod(); + cleanMethod4.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod4.setCleanMethod("P4"); + cleanMethod4.setCleanMinutes(30); + cleanMethod4.setCleanParameter("AN-D，适用于呼吸/麻醉管道的清洗消毒（需配专用装载架）"); + cleanMethod4.setValue("3000"); + objectDao.saveOrUpdate(cleanMethod4); + + CleanMethod cleanMethod5 = new CleanMethod(); + cleanMethod5.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod5.setCleanMethod("P5"); + cleanMethod5.setCleanMinutes(30); + cleanMethod5.setCleanParameter("AN-BGA（A+B）-D，适用于污染严重的呼吸/麻醉管道的清洗（需配专用装载架）"); + cleanMethod5.setValue("3000"); + objectDao.saveOrUpdate(cleanMethod5); + + CleanMethod cleanMethod6 = new CleanMethod(); + cleanMethod6.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod6.setCleanMethod("P6"); + cleanMethod6.setCleanMinutes(30); + cleanMethod6.setCleanParameter("OP-BGA（A+B）-D，适用于污染严重器械的清洗消毒。"); + cleanMethod6.setValue("3000"); + objectDao.saveOrUpdate(cleanMethod6); + + CleanMethod cleanMethod7 = new CleanMethod(); + cleanMethod7.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod7.setCleanMethod("化学"); + cleanMethod7.setCleanMinutes(45); + cleanMethod7.setCleanParameter("化学侵泡后清洗"); + cleanMethod7.setValue("6000"); + objectDao.saveOrUpdate(cleanMethod7); + + CleanMethod cleanMethod8 = new CleanMethod(); + cleanMethod8.setBarcode(serialNumManager.getSerialNumberStr("条码")); + cleanMethod8.setCleanMethod("手工清洗"); + cleanMethod8.setCleanMinutes(30); + cleanMethod8.setCleanParameter("化学侵泡后清洗"); + cleanMethod8.setValue("600"); + objectDao.saveOrUpdate(cleanMethod8); + } + /** + * 初始化清洗机设置 + */ + private void initRinser(){ + Rinser rinser1 = new Rinser(); + rinser1.setBarcode(serialNumManager.getSerialNumberStr("条码")); + rinser1.setName("清洗机1"); + rinser1.setDepartment(Constants.ORG_UNIT_NAME_OR); + rinser1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR); + objectDao.saveOrUpdate(rinser1); + + Rinser rinser2 = new Rinser(); + rinser2.setBarcode(serialNumManager.getSerialNumberStr("条码")); + rinser2.setName("手工清洗"); + rinser2.setDepartment(Constants.ORG_UNIT_NAME_OR); + rinser2.setOrgUnitCoding(Constants.ORG_UNIT_CODE_OR); + objectDao.saveOrUpdate(rinser2); + } + /** + * 初始化灭菌程序 + */ + private void initSterilisation(){ + Sterilisation sterilisation1 = new Sterilisation(); + sterilisation1.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation1.setSterilisation("P01"); + sterilisation1.setParameter("包装工具,织品，多孔负载（134·C？10 Min）"); + objectDao.saveOrUpdate(sterilisation1); + + Sterilisation sterilisation2 = new Sterilisation(); + sterilisation2.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation2.setSterilisation("P02"); + sterilisation2.setParameter("包装，热敏材料，橡胶，多孔负载（121·C 16 Min）"); + objectDao.saveOrUpdate(sterilisation2); + + Sterilisation sterilisation3 = new Sterilisation(); + sterilisation3.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation3.setSterilisation("P03"); + sterilisation3.setParameter("单个、未包缠的器械快速过程（134°C 4 Min）"); + objectDao.saveOrUpdate(sterilisation3); + + Sterilisation sterilisation4 = new Sterilisation(); + sterilisation4.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation4.setSterilisation("P04"); + sterilisation4.setParameter("B/D测试程序"); + sterilisation4.setSterilizationPurpose("每天例行监测"); + objectDao.saveOrUpdate(sterilisation4); + + Sterilisation sterilisation5 = new Sterilisation(); + sterilisation5.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation5.setSterilisation("P05"); + sterilisation5.setParameter("自动测漏程序"); + objectDao.saveOrUpdate(sterilisation5); + + Sterilisation sterilisation6 = new Sterilisation(); + sterilisation6.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation6.setSterilisation("P06"); + sterilisation6.setParameter("包装工具、重型（134°C 4 Min）"); + objectDao.saveOrUpdate(sterilisation6); + + Sterilisation sterilisation7 = new Sterilisation(); + sterilisation7.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation7.setSterilisation("低温等离子"); + sterilisation7.setParameter("低温等离子"); + sterilisation7.setSterilizationPurpose("器械包灭菌"); + objectDao.saveOrUpdate(sterilisation7); + + Sterilisation sterilisation8 = new Sterilisation(); + sterilisation8.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation8.setSterilisation("高水平消毒"); + sterilisation8.setParameter("呼吸机管道，湿化瓶"); + objectDao.saveOrUpdate(sterilisation8); + + Sterilisation sterilisation9 = new Sterilisation(); + sterilisation9.setBarcode(serialNumManager.getSerialNumberStr("条码")); + sterilisation9.setSterilisation("超大超重"); + sterilisation9.setParameter("超大超重器械"); + sterilisation9.setSterilizationPurpose("器械包灭菌"); + objectDao.saveOrUpdate(sterilisation9); + } + /** * 初始化供应室服务临床科室配置 * 设置所有一二级供应室针对器械包与一次性物品服务所有申请科室与结算科室 *