diff --git "a/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py" "b/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py"
index 8f29caa0ee56fe5babe3f841d6e885914b8e0b0b..f4ba64ca21d9c693c531ea2de2c0b540322b2210 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py"
@@ -80,17 +80,18 @@ def operationApply(): # 高值跟台申请
try:
- set_dept_lead()#设置科室负责人
- # 设置默认科室,切换到二级科室,使用科室管理功能
- updateUserLoginDefaultRange(get_listUserMgrRangePage(2))
- # get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
- herpService_mcmsDeptGoodsInfo_getByProvIdPage()
- operationApply()
- approval_center()
- updateUserLoginDefaultRange(get_listUserMgrRangePage(1))
- approval_center()
- #内网查询手术通知单号
- orderno=Search_OrderNO()
+ set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
+
+ # set_dept_lead()#设置科室负责人
+ # # 设置默认科室,切换到二级科室,使用科室管理功能
+ # updateUserLoginDefaultRange(get_listUserMgrRangePage(2))
+ # herpService_mcmsDeptGoodsInfo_getByProvIdPage()
+ # operationApply()
+ # approval_center()
+ # updateUserLoginDefaultRange(get_listUserMgrRangePage(1))
+ # approval_center()
+ # #内网查询手术通知单号
+ # orderno=Search_OrderNO()
# height_value_order_dp(orderno)
commonFuc().check_text_exist_result_text('succeed', 'succeed')
except:
diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py
index b90687f12f2e8882cf2939685b6fd922f2b84108..5d9cf1d4c8005ade85d9e749a02e0e97fe6ad643 100644
--- a/air_case/public1/public1/public1.py
+++ b/air_case/public1/public1/public1.py
@@ -7,6 +7,7 @@ from common.common_func import commonFuc
from common.fileUtls import FileUtils
import json
import time
+from common.timeUtils import timeUtils
# 添加[]
from common.timeUtils import timeUtils
@@ -297,15 +298,16 @@ def get_stockAreaId(dept_id, stockId): # 获取库区id,参数是部门id和仓
# 获取token和projectCode
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# print( token,projectCode,uxid,corpId,info)
-
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_stockShelf_page_url")
- # url=url+userid
- print(url)
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
commonFuc().get_business_data(module, "X-APP-CODE"))
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_stockShelf_page_url")
+ # url=url+userid
+ print(url)
+
+
# 请求体
request_body = commonFuc().get_business_data(module, "payload62_4", dept_id, stockId)
print('request_body查询库区id', request_body)
@@ -375,44 +377,57 @@ def set_dept_user(dept_id, deptName, type=1):
# 获取token和projectCode
token1, projectCode1, uxid1, corpId1, info1 = login_system(username, password).get_token()
# 登录获取用户id等信息，使用创建的用户登录============结束
- # 内网登录
- username = commonFuc().get_business_data(module, "username")
- ## print('医院名称',username)
- password = commonFuc().get_business_data(module, "password")
- # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
- # 获取token和projectCode
- token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+ # # 内网登录
+ # username = commonFuc().get_business_data(module, "username")
+ # ## print('医院名称',username)
+ # password = commonFuc().get_business_data(module, "password")
+ # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+ # # 获取token和projectCode
+ # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
# print( token,projectCode,uxid,corpId,info)
-
- # r_d2库房管理_库区设置_人员管理_添加人员
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_stockUser_insert_url")
- print('url库房管理_库区设置_人员管理_添加人员', url)
+ # 查询库区是否已经存在人员，不需要重复添加========
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
- commonFuc().get_business_data(module, "json_contentType"), token,
+ commonFuc().get_business_data(module, "json_contentType"), token1,
commonFuc().get_business_data(module, "X-APP-CODE"))
-
- # # 请求体
- request_body = commonFuc().get_business_data(module, "payload62_9_1_1", dept_id, deptName, get_hosid(), stockAreaId,
- username1, uxid1, username1)
- print('url库房管理_库区设置_人员管理_添加人员request_body', request_body)
-
- request_body_json = get_process_list(request_body)
- # # # # 发送请求
- result = commonFuc().http_post(url, request_body_json, headers)
- print('resultbbbbbbbbbbb', result)
- # 断言
- code = commonFuc().analysis_json('code', result)
- data = commonFuc().analysis_json('data', result)
- data1 = commonFuc().analysis_json('data', data)
- # print(type(data1))
- # pageSize = commonFuc().analysis_json('pageSize', data)
- # print(pageSize, type(pageSize))
- if code == 0 and data == 1:
- commonFuc().check_text_exist(0, result)
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_stockUser_page_url")
+ request_body = commonFuc().get_business_data(module, "payload65_3", dept_id, stockId, get_hosid())
+ print('查询库区是否已经存在人员', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ userCode = commonFuc().analysis_json('userCode',commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+ if userCode !=username1:
+ # 查询库区是否已经存在人员，不需要重复添加===============
+
+ # r_d2库房管理_库区设置_人员管理_添加人员
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_stockUser_insert_url")
+ print('url库房管理_库区设置_人员管理_添加人员', url)
+ # 获取请求头信息
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token1,
+ commonFuc().get_business_data(module, "X-APP-CODE"))
+
+ # # 请求体
+ request_body = commonFuc().get_business_data(module, "payload62_9_1_1", dept_id, deptName, get_hosid(), stockAreaId,
+ username1, uxid1, username1)
+ print('url库房管理_库区设置_人员管理_添加人员request_body', request_body)
+
+ request_body_json = get_process_list(request_body)
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body_json, headers)
+ print('resultbbbbbbbbbbb', result)
+ # 断言
+ code = commonFuc().analysis_json('code', result)
+ data = commonFuc().analysis_json('data', result)
+ data1 = commonFuc().analysis_json('data', data)
+ # print(type(data1))
+ # pageSize = commonFuc().analysis_json('pageSize', data)
+ # print(pageSize, type(pageSize))
+ if code == 0 and data == 1:
+ commonFuc().check_text_exist(0, result)
+ else:
+ commonFuc().check_text_exist('error', result)
else:
- commonFuc().check_text_exist('error', result)
-
+ print('库区已经存在人员，无需重复添加')
def call_login(type=1): # type=1外网登录 2内网登录
module = "b2_herp3_bs"
@@ -955,28 +970,28 @@ def SaveCacheBatch2(headers):
# settleMonth2 = i['settleMonth']
# hosGoodsId2 = i['hosGoodsId']
- detailList2=commonFuc().analysis_json('detailList',list_a)[1]
- print('detailList2',detailList2)
- pid2 = commonFuc().analysis_json('pid',detailList2)
- settleMonth2 = commonFuc().analysis_json('settleMonth',detailList2)
- hosGoodsId2 = commonFuc().analysis_json('hosGoodsId',detailList2)
- batchCode2= commonFuc().analysis_json('batchCode',detailList2)
- distrDetailId2 = commonFuc().analysis_json('distrDetailId',detailList2)
- distrId2 = commonFuc().analysis_json('distrId',detailList2)
- distrOrderNo2 = commonFuc().analysis_json('distrOrderNo',detailList2)
- settlePrice2 = commonFuc().analysis_json('settlePrice',detailList2)
- maxSettleQty2 = commonFuc().analysis_json('maxSettleQty',detailList2)
- maxSettleAmount2 = commonFuc().analysis_json('maxSettleAmount',detailList2)
- curSettleQty2 = commonFuc().analysis_json('curSettleQty',detailList2)
- curSettleAmount2 = commonFuc().analysis_json('curSettleAmount',detailList2)
- leftSettleQty2 = commonFuc().analysis_json('leftSettleQty',detailList2)
- leftSettleAmount2 = commonFuc().analysis_json('leftSettleAmount',detailList2)
- balanceDetId2 =commonFuc().analysis_json('balanceDetId',detailList2)
- purMode2=commonFuc().analysis_json('purMode',detailList2)
- barCode2=commonFuc().analysis_json('barCode',detailList2)
- viewId2=commonFuc().analysis_json('viewId',detailList2)
- provId2=commonFuc().analysis_json('provId',detailList2)
- branchId2=commonFuc().analysis_json('branchId',detailList2)
+ detailList2 = commonFuc().analysis_json('detailList', list_a)[1]
+ print('detailList2', detailList2)
+ pid2 = commonFuc().analysis_json('pid', detailList2)
+ settleMonth2 = commonFuc().analysis_json('settleMonth', detailList2)
+ hosGoodsId2 = commonFuc().analysis_json('hosGoodsId', detailList2)
+ batchCode2 = commonFuc().analysis_json('batchCode', detailList2)
+ distrDetailId2 = commonFuc().analysis_json('distrDetailId', detailList2)
+ distrId2 = commonFuc().analysis_json('distrId', detailList2)
+ distrOrderNo2 = commonFuc().analysis_json('distrOrderNo', detailList2)
+ settlePrice2 = commonFuc().analysis_json('settlePrice', detailList2)
+ maxSettleQty2 = commonFuc().analysis_json('maxSettleQty', detailList2)
+ maxSettleAmount2 = commonFuc().analysis_json('maxSettleAmount', detailList2)
+ curSettleQty2 = commonFuc().analysis_json('curSettleQty', detailList2)
+ curSettleAmount2 = commonFuc().analysis_json('curSettleAmount', detailList2)
+ leftSettleQty2 = commonFuc().analysis_json('leftSettleQty', detailList2)
+ leftSettleAmount2 = commonFuc().analysis_json('leftSettleAmount', detailList2)
+ balanceDetId2 = commonFuc().analysis_json('balanceDetId', detailList2)
+ purMode2 = commonFuc().analysis_json('purMode', detailList2)
+ barCode2 = commonFuc().analysis_json('barCode', detailList2)
+ viewId2 = commonFuc().analysis_json('viewId', detailList2)
+ provId2 = commonFuc().analysis_json('provId', detailList2)
+ branchId2 = commonFuc().analysis_json('branchId', detailList2)
# hosId2 = j['hosId']
# provId2 = j['provId']
# branchId2 = j['branchId']
@@ -1252,7 +1267,7 @@ def herpService_mcmsDeptGoodsInfo_getByProvIdPage(): # 高值跟台获取产品
FileUtils().w_info8(info, module, '产品信息', titlename, 'message19')
-def height_value_order_dp(orderno, type=2): # 高值跟台配送
+def height_value_order_dp(orderno): # 高值跟台配送
# # 登录获取用户id等信息，使用创建的用户登录===========开始
info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
# print(info)
@@ -1264,12 +1279,12 @@ def height_value_order_dp(orderno, type=2): # 高值跟台配送
print('username,password', username, password)
# # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
# # 获取token和projectCode
- token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+ token, projectCode, uxid, corpId, info = login(username, password,1)
# 登录获取用户id等信息，使用创建的用户登录============结束
# =========================查询待确认订单======================
module = "b5_spd3_core_business_flow"
- url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "purchase_page_url")
+ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "hdiFusion_operation_page_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
@@ -1278,18 +1293,14 @@ def height_value_order_dp(orderno, type=2): # 高值跟台配送
hos_id = branch_id[0:5]
exeProvId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"]
- if type == 1:
- orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号', 'message7')["orderNo1"]
- print(orderNo1)
- elif type == 2:
- orderNo1 = orderno
- print(orderNo1)
- elif type == 3:
- orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message12')["orderNo1"]
- print(orderNo1)
- else:
- orderNo1 = 'orderNo1'
- request_body = commonFuc().get_business_data(module, "payload1_1_1", orderNo1, hos_id, exeProvId)
+
+ orderNo1 = orderno
+
+ dateValue1 = timeUtils().get_time_add(-30, 2)
+ dateValue2 = timeUtils().get_time_hms(30, 2)
+
+ request_body = commonFuc().get_business_data(module, "payload1_1_1", dateValue1, dateValue2, orderNo1, exeProvId,
+ hos_id, dateValue1, dateValue2)
# print('request_body',request_body)
# 发送请求
while True:
@@ -1345,11 +1356,10 @@ def height_value_order_dp(orderno, type=2): # 高值跟台配送
# =========================查询待确认订单======================
# ==============================确认订单==================
- module = "a6_mdm3_dp"
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "ensure_url")
- request_body = commonFuc().get_business_data(module, "payload2", id1, uxid)
+ request_body = commonFuc().get_business_data(module, "payload26", id1, uxid)
# print('request_body',request_body)
# 发送请求
@@ -1363,29 +1373,15 @@ def height_value_order_dp(orderno, type=2): # 高值跟台配送
else:
commonFuc().check_text_exist('error', result)
# ==============================确认订单==================
- # ==============================配送==================
- # url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "purchase_page_url")
- #
- # request_body = commonFuc().get_business_data(module, "payload3_1_1",exeProvId,hos_id)
- # # 发送请求
- # result = commonFuc().http_post(url, request_body, headers)
- # print('result', result)
- # #断言
- # code=commonFuc().analysis_json('code',result)
- # data=commonFuc().analysis_json('data',result)
- # total=commonFuc().analysis_json('total',data)
- # data1 = commonFuc().analysis_json('data', data)
- # id1=commonFuc().analysis_json('id', data1[0])
- # print('id1',id1)
# ==================a3获取订单详细信息中的子表id_3_0医院
# a1订单配送列表数据查询_全部
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "detail_id_url")
-
- request_body = commonFuc().get_business_data(module, "payload4", id1)
+ url=url+id1+"/3"
+ # request_body = commonFuc().get_business_data(module, "payload4", id1)
# print('request_body',request_body)
# 发送请求
- result = commonFuc().http_post(url, request_body, headers)
+ result = commonFuc().http_get(url,headers)
print('resulta3获取订单详细信息中的子表id_3_0医院', result)
# 断言
code = commonFuc().analysis_json('code', result)
@@ -1411,7 +1407,6 @@ def height_value_order_dp(orderno, type=2): # 高值跟台配送
# ==================a3获取订单详细信息中的子表id_3_0医院
# ==================订单配送========================
- module = "a6_mdm3_dp"
# a1订单配送列表数据查询_全部
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submit_url")
# 获取请求头信息
@@ -1423,16 +1418,7 @@ def height_value_order_dp(orderno, type=2): # 高值跟台配送
print('info从message9文件中获取信息', info)
# print('info', info)
list_a = info['list_a']
- # print('list_a',list_a,type(list_a))
- # list_a = ','.join(map(str, list_a))
- # import json
- # new_request_body = list_a.replace("'", '"')
- # new_request_body1 = new_request_body.replace("None", 'null')
- # print('new_request_body1',new_request_body1)
- #
- # list_a2 = json.loads(new_request_body1)
- # print('list_a2', list_a2)
- # print('list_a2', type(list_a2))
+
hosGoodsId = 'hosGoodsId'
mdmGoodsCode = 'mdmGoodsCode'
goodsCode = 'goodsCode'
@@ -1451,18 +1437,11 @@ def height_value_order_dp(orderno, type=2): # 高值跟台配送
# # #获取日期
productDate = timeUtils().get_time_hms(5)
expdtDate = timeUtils().get_time_add(190, 2)
- if type == 1:
- request_body = commonFuc().get_business_data(module, "payload9_2_1_1", id1, id1, hosId, provId, billMode,
- createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
- goodsCode, pkgDefId, productDate, expdtDate, erpCode, id2)
- elif type == 2:
- request_body = commonFuc().get_business_data(module, "payload9_2_1_2", id1, id1, hosId, provId, billMode,
+
+
+ request_body = commonFuc().get_business_data(module, "payload9_2_1_2", id1, id1, hosId, provId, billMode,
createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
goodsCode, productDate, expdtDate, erpCode, id2)
- elif type == 3:
- request_body = commonFuc().get_business_data(module, "payload9_2_1_3", id1, id1, hosId, provId, billMode,
- createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
- goodsCode, pkgDefId, productDate, expdtDate, erpCode, id2)
print('request_body', request_body)
# 发送请求
diff --git a/data/a6_mdm3_dp/data b/data/a6_mdm3_dp/data
index 6f161daee70c4b211d774a28227cebe3bb3223ac..61edeec08d3f46e9910391de9363ecc6eaab1593 100644
--- a/data/a6_mdm3_dp/data
+++ b/data/a6_mdm3_dp/data
@@ -29,7 +29,6 @@ json_headers2: {
"payload1": {"pageNum":1,"pageSize":50,"orderBy":"last_modified desc, order_no desc","queryObject":{"dateValue":["",""],"hosId":"h0347","exeProvId":"p10d95","pageType":1,"tabIdx":"1","startDate":"","endDate":""}}
"payload1_1_1": {"pageNum":1,"pageSize":50,"orderBy":"last_modified desc, order_no desc","queryObject":{"dateValue":["",""],"orderNo":"%s",hosId":"%s","exeProvId":"%s","pageType":1,"tabIdx":"1","startDate":"","endDate":""}}
-
"payload1_1": {"pageNum":1,"pageSize":50,"orderBy":"last_modified desc, order_no desc","queryObject":{"dateValue":["",""],"hosId":"h0028","exeProvId":"p10d95","pageType":1,"tabIdx":"1","startDate":"","endDate":""}}
"payload2": {"id":"%s","version":0,"hosVersion":3,"userId":"%s","detailList":[]}
diff --git a/data/b2_herp3_bs/data b/data/b2_herp3_bs/data
index 043e7032c8154e4b0d35608591d41715b6798643..89f41cbe7b2e201424993e1ed0b42d057a24c31f 100644
--- a/data/b2_herp3_bs/data
+++ b/data/b2_herp3_bs/data
@@ -479,6 +479,7 @@ json_headers2: {
"payload65": '[{"id":"3a8395c5578745a6a7cf6b48ae166ce6","lastModified":"2024-01-22 09:09:29","version":0,"createTime":"2024-01-22 09:09:29","createUser":"UID-050151","lastModifiedUser":"UID-050151","businessType":0,"procType":0,"modelName":"默认审批流","judgeType":"111","rangeType":0,"rangeData":null,"modelJson":"[{\"no\":0,\"nodeName\":\"运营主管\",\"assigneeType\":2}]","nodeQty":1,"sortNo":0,"modelList":[{"no":0,"nodeName":"运营主管","assigneeType":2,"assignee":null}],"rangeDataFirst":null,"rangeDataSecond":null}]'
"payload65_1": '[{"id":"3a8395c5578745a6a7cf6b48ae166ce6","lastModified":"2024-03-07 08:44:05","version":0,"createTime":"2024-03-07 08:44:05","createUser":"h0347:UID-042066","lastModifiedUser":"h0347:UID-042066","businessType":0,"procType":0,"modelName":"默认审批流","judgeType":"111","rangeType":0,"rangeData":null,"modelJson":"[{\"no\":0,\"nodeName\":\"运营主管\",\"assigneeType\":2}]","nodeQty":1,"sortNo":0,"modelList":[{"no":0,"nodeName":"运营主管","assigneeType":2,"assignee":null}],"rangeDataFirst":null,"rangeDataSecond":null},{"businessType":0,"judgeType":"","modelList":[{"assigneeType":0,"nodeName":"test","assignee":"UID-048618"}],"modelName":"test","rangeDataFirst":999999,"rangeDataSecond":null,"rangeType":3}]'
"payload65_2": '[{"id":"3a8395c5578745a6a7cf6b48ae166ce6","lastModified":"2024-03-07 09:32:20","version":0,"createTime":"2024-03-07 09:32:20","createUser":"h0347:UID-042066","lastModifiedUser":"h0347:UID-042066","businessType":0,"procType":0,"modelName":"默认审批流","judgeType":"111","rangeType":0,"rangeData":null,"modelJson":"[{\"no\":0,\"nodeName\":\"运营主管\",\"assigneeType\":2}]","nodeQty":1,"sortNo":0,"modelList":[{"no":0,"nodeName":"运营主管","assigneeType":2,"assignee":null}],"rangeDataFirst":null,"rangeDataSecond":null},{"businessType":0,"judgeType":"","modelList":[{"assigneeType":0,"nodeName":"zzzz","assignee":"UID-050151"}],"modelName":"zzzz","rangeDataFirst":2222,"rangeDataSecond":44444,"rangeType":2}]'
+"payload65_3": {"queryObject":{"deptId":"%s","stockAreaId":"%s","hosId":"%s"},"pageNum":1,"pageSize":50}
checkDict: {"code": 0,'msg': None,'data': True}
diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data
index 2a0cbc5ab1a20fff248a739a1fb7983c4e2b10ac..860790d253a2cbc60a01c2000b480b195c2f971b 100644
--- a/data/b5_spd3_core_business_flow/data
+++ b/data/b5_spd3_core_business_flow/data
@@ -18,11 +18,15 @@
"herpService_stock_hdiBarcode_scan_url": "/api/herpService/stock/hdiBarcode/scan/"
"herpService_stock_review_pass_submit_url": "/api/herpService/stock/out/review/pass/submit"
"herpService_mcmsOutBalance_listVoPage_url": "/api/herpService/mcmsOutBalance/listVoPage"
-"platformService_listUserMgrRangePage_url": "/api/herpService/mcmsOutBalance/listVoPage"
+"platformService_listUserMgrRangePage_url": "/api/platformService/userOnline/listUserMgrRangePage"
"platformService_updateUserLoginDefaultRange_url": "/api/platformService/userOnline/updateUserLoginDefaultRange/"
"herpService_mcmsDeptGoodsInfo_getByProvIdPage_url": "/api/herpService/basic/mcmsDeptGoodsInfo/getByProvIdPage"
"herpService_operationApply_listPage_url": "/api/herpService/operationApply/listPage"
"herpService_operationApply_submit_url": "/api/herpService/operationApply/submit"
+"hdiFusion_operation_page_url": "/api/hdiFusion/bill/operation/page"
+"ensure_url": "/api/hdiFusion/bill/operation/ensure"
+"detail_id_url": "/api/hdiFusion/bill/operation/detail/"
+"submit_url": "/api/hdiFusion/bill/distr/operation/submit"
"username": "xhs1009"
@@ -63,4 +67,6 @@ json_headers2: {
"payload22": {"pageNum":1,"pageSize":50,"queryObject":{"orderNo":"","settleMonth":"","hosId":"%s"},"hosId":"%s"}
"payload23": {"pageNum":1,"pageSize":50,"queryObject":{"userId":"%s","keyword":""}}
"payload25": {"pageNum":1,"pageSize":50,"queryObject":{"subProvName":"","goodsName":"%s","goodsSpec":"","provId":"%s"}}
-"payload24": {"recAddressId":"%s","expireDate":"%s 14:03:47","remark":"自动化测试","patientInHosId":"123456","patientName":"张三","sex":1,"age":44,"operName":"血管扩张术","operDoctor":"李四","operDate":"%s 14:04:13","bedNum":"2","oprationHouse":"设备科一手术间","surDeptName":"","recAddress":"默认库区","provGoodsVOList":[{"id":null,"lastModified":null,"version":null,"createTime":null,"createUser":null,"lastModifiedUser":null,"hosId":null,"provId":"%s","subProvId":null,"clientType":null,"invitationCode":null,"contactWay":null,"contactUser":null,"tbStatus":null,"activeFlag":null,"auditor":null,"auditTime":null,"auditComment":null,"provCode":"%s","provName":"%s","subProvName":null,"goodsVOList":[{"hosGoodsId":"%s","hosGoodsCode":"%s","provId":"%s","subProvId":"%s","subProvName":"%s","goodsName":"%s","goodsSpec":"%s","goodsGeneralName":null,"goodsMfrsId":"%s","goodsMfrsName":"%s","unit":"%s","price":"%s","miCode":"","miDjmc":"","goodsNum":1}]}]}
\ No newline at end of file
+"payload24": {"recAddressId":"%s","expireDate":"%s 14:03:47","remark":"自动化测试","patientInHosId":"123456","patientName":"张三","sex":1,"age":44,"operName":"血管扩张术","operDoctor":"李四","operDate":"%s 14:04:13","bedNum":"2","oprationHouse":"设备科一手术间","surDeptName":"","recAddress":"默认库区","provGoodsVOList":[{"id":null,"lastModified":null,"version":null,"createTime":null,"createUser":null,"lastModifiedUser":null,"hosId":null,"provId":"%s","subProvId":null,"clientType":null,"invitationCode":null,"contactWay":null,"contactUser":null,"tbStatus":null,"activeFlag":null,"auditor":null,"auditTime":null,"auditComment":null,"provCode":"%s","provName":"%s","subProvName":null,"goodsVOList":[{"hosGoodsId":"%s","hosGoodsCode":"%s","provId":"%s","subProvId":"%s","subProvName":"%s","goodsName":"%s","goodsSpec":"%s","goodsGeneralName":null,"goodsMfrsId":"%s","goodsMfrsName":"%s","unit":"%s","price":"%s","miCode":"","miDjmc":"","goodsNum":1}]}]}
+"payload1_1_1": {"pageNum":1,"pageSize":50,"queryObject":{"dateValue":["%s 14:20:37","%s 14:20:37"],"orderNo":"%s","provId":"%s","pageType":2,"hosIdList":["%s"],"status":"10","startDate":"%s 00:00:00","endDate":"%s 23:59:59"}}
+"payload26": {"id":"%s","version":0,"hosVersion":3,"userId":"%s"}
diff --git a/report/summary.html b/report/summary.html
index 5aad94f6167e4ac7254527d54d689c9f6ff6316a..811e9973b4ba1f67b7a146fb20df2b52babfb067 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -55,9 +55,9 @@
| 1 |
- 1 |
- 0分22秒 |
- 100.0% |
+ 0 |
+ 0分7秒 |
+ 0.0% |
@@ -73,8 +73,8 @@
| a_b1流程八_高值跟台业务流程 |
- 成功 |
- 22.219 |
+ 失败 |
+ 7.269 |
xiaohesheng |