Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java =================================================================== diff -u -r33952 -r33955 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java (.../TestMainProcess.java) (revision 33952) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java (.../TestMainProcess.java) (revision 33955) @@ -56,11 +56,17 @@ private SignProxy signProxy = new SignProxy(); private UseRecordProxy useRecordProxy = new UseRecordProxy(); private static JSONObject nomalTousseProcessJsonObj;//普通器械包闭环流程用例参数 + private static JSONObject traceDisinfetionProcessJsonObj;//追溯的消毒物品闭环流程用例参数 + private static JSONObject notTracetraceDisinfetionProcessJsonObj;//不追溯的消毒物品闭环流程用例参数 + private static JSONObject disposableGoodProcessJsonObj;//一次性物品闭环流程用例参数 @BeforeClass public static void setUp_class(){ Utils.init(); nomalTousseProcessJsonObj = Utils.testcaseData.getJSONObject("test_main_process_of_normal_tousse"); + traceDisinfetionProcessJsonObj = Utils.testcaseData.getJSONObject("test_main_process_of_trace_disinfetion"); + disposableGoodProcessJsonObj = Utils.testcaseData.getJSONObject("test_main_process_of_disposable_good"); + notTracetraceDisinfetionProcessJsonObj = Utils.testcaseData.getJSONObject("test_main_process_of_not_trace_disinfetion"); } @Story("普通器械包闭环流程") @@ -199,6 +205,219 @@ Assert.assertTrue(result.contains(expect)); } + + @Story("追溯的消毒物品闭环流程") + @Test + public void test_main_process_of_trace_disinfetion() throws InterruptedException { + JSONObject applyUser = traceDisinfetionProcessJsonObj.getJSONObject("apply_user");//申领科室用户 + JSONObject handleUser = traceDisinfetionProcessJsonObj.getJSONObject("handle_user");//处理科室用户 + JSONArray applyTousseList = traceDisinfetionProcessJsonObj.getJSONArray("apply_tousse_list");//申领物品集合 + String applyDepart = traceDisinfetionProcessJsonObj.getString("apply_depart");//申领科室 + String handleDepart = traceDisinfetionProcessJsonObj.getString("handle_depart");//处理科室 + String applyType = traceDisinfetionProcessJsonObj.getString("application_type");//申请单类型 + JSONArray recyclingBasketBarcodes = traceDisinfetionProcessJsonObj.getJSONArray("recycling_basket_barcodes");//回收篮筐条码 + JSONArray secondaryRecyclingBasketBarcodes = traceDisinfetionProcessJsonObj.getJSONArray("secondary_recycling_basket_barcodes");//二次回收篮筐条码 + + String disinfectMachineBarcode = traceDisinfetionProcessJsonObj.getJSONObject("wash_machine").getString("machineBarcode");//清洗机条码 + String disinfectProgramBarcode = traceDisinfetionProcessJsonObj.getJSONObject("wash_program").getString("programBarcode");//清洗程序条码 + String taskGroup = traceDisinfetionProcessJsonObj.getString("task_group");//装配任务 + JSONObject useRecordParams = traceDisinfetionProcessJsonObj.getJSONObject("useRecordParams");//使用记录录入的参数 + String expect = traceDisinfetionProcessJsonObj.getString("expect");//预期结果 + + String hospitalNum = useRecordParams.getString("hospitalNum");//住院号 + String treatmentNum = useRecordParams.getString("treatmentNum");//诊疗号 + String circuitNurse = useRecordParams.getString("circuitNurse");//巡回护士 + String operationRoom = useRecordParams.getString("operationRoom");//手术间 + String patientName = useRecordParams.getString("patientName");//手术间 + String patientAge = useRecordParams.getString("patientAge");//手术间 + String patientSex = useRecordParams.getString("patientSex");//性别 + String patientArea = useRecordParams.getString("patientArea");//病区 + String departNameOfPatient = useRecordParams.getString("departNameOfPatient");//病人所在科室 + String patientRoom = useRecordParams.getString("patientRoom");//病室 + String patientBed = useRecordParams.getString("patientBed");//床位 + String patientIDCard = useRecordParams.getString("patientIDCard");//身份证号 + String doctorName = useRecordParams.getString("doctorName");//医生 + String operation = useRecordParams.getString("operation");//手术名称 + String operationScheduleId = useRecordParams.getString("operationScheduleId");//手术单号 + String visitTimes = useRecordParams.getString("visitTimes");//住院次数 + String specialInfection = useRecordParams.getString("specialInfection");//感染类型 + String remark = useRecordParams.getString("remark");//备注 + + //临床科室用户登录 + loginProxy.go_login_by_btn(applyUser.getString("username"), applyUser.getString("password")); + + //申领 + personalDesktopProxy.go_apply(); + applyProxy.apply_goods(applyType,handleDepart, applyTousseList); + + //临床科室用户退出登录 + personalDesktopProxy.exit_system(); + + //处理科室用户登录 + loginProxy.go_login_by_btn(handleUser.getString("username"), handleUser.getString("password")); + + //回收 + personalDesktopProxy.go_recycle(); + awaitForRecycleProxy.choose_most_recent_application_by_type(applyType); + recycleProxy.recycle_by_normal_into_basket(handleUser.getString("barcode"), handleUser.getString("barcode"), recyclingBasketBarcodes); + + //关闭回收页面并跳转到个人桌面窗口 + Utils.switchBetweenTwoWins(); + + //清洗 + personalDesktopProxy.go_wash(); + washProxy.disinfect_by_scan_barcodes(disinfectMachineBarcode, disinfectProgramBarcode, handleUser.getString("barcode"), recyclingBasketBarcodes); + + //装配 + Utils.driver.navigate().refresh(); + personalDesktopProxy.go_pack(taskGroup); + packProxy.normal_packing(recyclingBasketBarcodes,handleUser.getString("barcode"),handleUser.getString("barcode")); + + Thread.sleep(2000);//等待装配完成 + List packingBarcodeList = Utils.getToussesBarcodes();//获取装配条码 + logger.debug("本次装配产生的包实例条码："+packingBarcodeList); + + //将装配条码从List转换为JSONArray + JSONArray packingBarcodes = new JSONArray(); + JSONObject barcode = new JSONObject(); + for(int i=0;i