dj

src/components/patientRegister/PatientRegisterList.vue

@@ -209,8 +209,8 @@
       </el-dialog>
 
       <!-- 导入企业数据 -->
-      <el-dialog title="导入企业数据" :visible.sync="dialogWin.ImportOrgData" width="800px" 
-        :append-to-body="true" :close-on-click-modal="false">
+      <el-dialog title="导入企业数据" :visible.sync="dialogWin.ImportOrgData" width="800px" :append-to-body="true"
+        :close-on-click-modal="false">
         <ImportOrgData />
       </el-dialog>
 
@@ -247,8 +247,8 @@
       </el-dialog>
 
       <!--通用本地参数设置-->
-      <el-dialog title="本地参数设置" :visible.sync="dialogWin.LocalConfig" :close-on-click-modal="false" :append-to-body="true"
-        width="800px" height="600px">
+      <el-dialog title="本地参数设置" :visible.sync="dialogWin.LocalConfig" :close-on-click-modal="false"
+        :append-to-body="true" width="800px" height="600px">
         <LocalConfig />
       </el-dialog>
 
@@ -1313,18 +1313,28 @@ export default {
       switch (checkType) {
         case 'pacs':
           url = '/api/app/ImportPacsResult/ImportResultByPatientRegisterId'
+          postapi(url, { patientRegisterId: row.id })
+            .then(res => {
+              if (res.code > -1) {
+                return postapi('/api/app/ImportElectrocardiogramResult/ImportElectrocardiogramResultByPatientRegisterId', { patientRegisterId: row.id })
+              }
+            })
+            .then(res => {
+              if (res && res.code > -1) {
+                this.$message.success({ showClose: true, message: '导入成功！' })
+                this.rowClick(row)
+              }
+            })
           break;
         default:
-          break;
-      }
           postapi(url, { patientRegisterId: row.id }).then(res => {
             if (res.code > -1) {
               this.$message.success({ showClose: true, message: '导入成功！' })
               this.rowClick(row)
-        } else {
-          this.$message.error({ showClose: true, message: res.message })
             }
           })
+          break;
+      }
     },
 
     //通用导出

src/components/sumDoctorCheck/ButtonList.vue

@@ -206,21 +206,32 @@ export default {
             }
 
             let url = '/api/app/ImportLisResult/ImportResultByPatientRegisterId'
+            let patientRegisterId = this.dataTransOpts.tableS.patient_register.id
             switch (checkType) {
                 case 'pacs':
                     url = '/api/app/ImportPacsResult/ImportResultByPatientRegisterId'
+                    postapi(url, { patientRegisterId })
+                        .then(res => {
+                            if (res.code > -1) {
+                                return postapi('/api/app/ImportElectrocardiogramResult/ImportElectrocardiogramResultByPatientRegisterId', { patientRegisterId })
+                            }
+                        })
+                        .then(res => {
+                            if (res && res.code > -1) {
+                                this.$message.success({ showClose: true, message: '导入成功！' })
+                            }
+                        })
                     break;
                 default:
-                    break;
-            }
-
-            postapi(url, { patientRegisterId: this.dataTransOpts.tableS.patient_register.id }).then(res => {
+                    postapi(url, { patientRegisterId }).then(res => {
                         if (res.code > -1) {
                             this.$message.success({ showClose: true, message: '导入成功！' })
-                } else {
-                    this.$message.error({ showClose: true, message: res.message })
                         }
                     })
+                    break;
+            }
+
+
         },
 
         //保存数据