Merge remote-tracking branch 'origin/dragTerm1025-zsw' into test

# Conflicts:
#	src/api/index.js

src/components/callRecord/CallRecordManager.vue

@@ -208,7 +208,7 @@
         >
         <template slot-scope="scope">
             <span>
-              {{ scope.row.subHospitalName === null? '-' : scope.row.patientId }}
+              {{ scope.row.subHospitalName === null? '-' : scope.row.subHospitalName }}
             </span>
           </template>
         </el-table-column>
@@ -220,7 +220,7 @@
         >
         <template slot-scope="scope">
             <span>
-              {{ scope.row.subHospitalCode === null? '-' : scope.row.patientId }}
+              {{ scope.row.subHospitalCode === null? '-' : scope.row.subHospitalCode }}
             </span>
           </template>
         </el-table-column>
@@ -430,14 +430,14 @@ export default {
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        patientId: this.filter.patientId, // 患者标识
-        sceneName: this.filter.sceneName, // 服务名
+        patientId: this.filter.patientId.trim(), // 患者标识
+        sceneName: this.filter.sceneName.trim(), // 服务名
         successFlag: this.filter.successFlag,
         startGmtReq: startGmtReq,
         endGmtReq: endGmtReq,
         startGmtResp: startGmtResp,
         endGmtResp: endGmtResp,
-        subHospitalName: this.filter.subHospitalName.trim()
+        subHospitalName: this.filter.subHospitalName.trim() // 子院区
       };
       return param;
     },