diff --git "a/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py" "b/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py"
index bd7faf8390a293b070ca4743b4de696be1486d76..31fc6e2afb36da978a866ea35b2947cffb3b604a 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py"
@@ -22,10 +22,13 @@ import time
 module = "b5_spd3_core_business_flow"
 
 
-def test1():
+def test1(type=1):
     delData().Delete_user()#删除用户
     # 院区新增
-    execute_command("python runner_test.py tag id2263-4 debug sit")
+    if type==1:
+        execute_command("python runner_test.py tag id2263-4 debug sit")
+    elif type==2:
+        branch_add()
     # 新增科室
     execute_command(
         "python runner_test.py tag id2263-19,id2263-20,id2263-21,id2263-22,id2263-23,id2263-24,id2263-25,id2263-26 debug sit")
@@ -263,16 +266,15 @@ def grants_user(orgName='d69a68df361a4289b2262e4ef75b55a5', mgrRangeId='feb0cc16
     else:
         commonFuc().check_text_exist('error', result)
 def test3():
-    delData().Delete_probeInfo()
+    # delData().Delete_probeInfo()
     # 院区新增
     # branch_add()
     # 新增科室
     # execute_command(
     #     "python runner_test.py tag id2263-19,id2263-20,id2263-21,id2263-22,id2263-23,id2263-24,id2263-25,id2263-26 debug sit")
-    # 一键导入所有产品
     execute_command(
-            "python runner_test.py tag id2263-24 debug sit")
-
+        "python runner_test.py tag d2263-24 debug sit")
+    # 一键导入所有产品
     execute_command("python runner_test.py tag id2263-48 debug sit")
     # 导入同步过来的新产品，防止因同步时间差导致新建的产品没有导入过来
     for i in range(1, 6):
@@ -293,7 +295,7 @@ def test3():
     # # r_d0库房管理_库区设置_人员管理_添加人员_查询人员
     execute_command("python runner_test.py tag id2263-233 debug sit")
     # # r_d2库房管理_库区设置_人员管理_添加人员
-    execute_command("python runner_test.py tag id2263-235 debug sit")
+    # execute_command("python runner_test.py tag id2263-235 debug sit")
     # # r_d4库房管理_库区设置_货位管理_添加货位
     execute_command("python runner_test.py tag id2263-237 debug sit")
     # # 科室管理-科室人员查询 设置科室负责人
@@ -303,13 +305,18 @@ try:
     # delData().Delete_business_Data()#删除业务数据
     # delData().Del_reporter_data() # 删除报表数据
     #==============删除业务数据和报表数据
-    # test1()
-    test3()#不新增院区
+    test1(2)
+    # test3()
     test2()# 科室添加产品信息(产品是从外网同步过来的)
     dept_query_all()# 科室查询，将科室id写入文件中
     grants_user()#给用户授权
     # delData().Delete_branch_by_id()#删除院区数据
-
+    # flag=commonFuc().get_business_data(module,'flag')
+    # if flag=="True":
+    #     test3()
+    #     test2()  # 科室添加产品信息(产品是从外网同步过来的)
+    #     dept_query_all()  # 科室查询，将科室id写入文件中
+    #     grants_user()  # 给用户授权
     commonFuc().check_text_exist_result_text('succees', 'succees')
 except Exception as e:
     commonFuc().check_text_exist_result_text('succees','error')
diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5
index 0e594fc2e5cbf8c47543053b7bce95d3885528b4..b7b5978f2b197bc5873194d33054300386a47974 100644
--- a/data/b2_herp3_bs/message5
+++ b/data/b2_herp3_bs/message5
@@ -1,3 +1,3 @@
 部门和库区信息:
   dept1_id: 9b15c86f70a64f2ab83e207bde345419
-  stockAreaId: 0f4a4eb5ea084e7f936f069aa6039bc8
+  stockAreaId: d6ce9f2970974f57bec70ee770f4d3c3
diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7
index ab3d38e45653e96dde9a747fc7276c83a5e1975b..3d9a37e6e53f7f2a342233e635b58e44915794d7 100644
--- a/data/b2_herp3_bs/message7
+++ b/data/b2_herp3_bs/message7
@@ -1,4 +1,4 @@
 shelfinfo:
-  shelfid: 0f4a4eb5ea084e7f936f069aa6039bc8
-  shelfCode: areah03472010
+  shelfid: d6ce9f2970974f57bec70ee770f4d3c3
+  shelfCode: areah03472013
   areaName: 自动化测试
diff --git a/report/summary.html b/report/summary.html
index a4a125ef2f63b72b4ecb6f8952b9860a961293a4..1c3e1a6e6b2de606f3d12061fc08d766446e3106 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -56,7 +56,7 @@
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1分41秒</td>
+            <td class='details-col-elapsed'>1分18秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -74,7 +74,7 @@
         <tr width="600">
             <td class="details-col-elapsed"><a href='../log/a_a4_流程四_基础模块设置/log.html' target='_blank'>a_a4_流程四_基础模块设置</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">101.62</td>
+            <td class="details-col-elapsed">77.941</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>