Merge remote-tracking branch 'origin/main'

# Conflicts:
#	yudao-server/src/main/resources/application.yaml

yudao-server/src/main/resources/application.yaml

@@ -233,7 +233,8 @@ yudao:
       - /admin-api/inspect/patient/getUSTj #同步超声
       - /admin-api/inspect/patient/generateReport # pdf生成
       - /admin-api/inspect/patient/updatePatientSupplement #公卫患者信息补充扩展
-      - /admin-api/inspect/patient/PushJYPatientInfo #回传公卫体检信息
+      - /admin-api/inspect/patient/PushJYPatientInfo  #推送给公卫
+      - /admin-api/inspect/patient/getworkload  #获取卫生院工作量
   websocket:
     enable: true # websocket的开关
     path: /infra/ws # 路径
@@ -282,7 +283,8 @@ yudao:
       - /admin-api/inspect/patient/getUSTj #同步超声
       - /admin-api/inspect/patient/generateReport # pdf生成存放
       - /admin-api/inspect/patient/updatePatientSupplement #公卫患者信息补充扩展
-      - /admin-api/inspect/patient/PushJYPatientInfo #回传公卫体检信息
+      - /admin-api/inspect/patient/PushJYPatientInfo  #推送给公卫
+      - /admin-api/inspect/patient/getworkload  #获取卫生院工作量
       - /adminInspect/admin-api/inspect/department/getList
       - /adminInspect/admin-api/inspect/patient/getUSPatientInfo
       - /adminInspect/admin-api/system/captcha/get
@@ -298,7 +300,8 @@ yudao:
       - /adminInspect/admin-api/inspect/patient/getUSTj #同步超声
       - /adminInspect/admin-api/inspect/patient/generateReport #pdf生成存放
       - /adminInspect/admin-api/inspect/patient/updatePatientSupplement #公卫患者信息补充扩展
-      - /adminInspect/admin-api/inspect/patient/PushJYPatientInfo #回传公卫体检信息
+      - /adminInspect/admin-api/inspect/patient/PushJYPatientInfo #推送给公卫
+      - /adminInspect/admin-api/inspect/patient/getworkload  #获取卫生院工作量
     ignore-tables:
       - system_tenant
       - system_tenant_package