diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index b795392..30d8ef4 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -41,7 +41,7 @@
|| dragCol[index].prop == 'qztlIsGt'
|| dragCol[index].prop == 'qztlIsWh'
|| dragCol[index].prop == 'qztlIsFj'
- ">
+ ">
{{ scope.row[dragCol[index].prop] == "Y" ? "是" : "否" }}
@@ -209,8 +209,8 @@
-
+
@@ -247,8 +247,8 @@
-
+
@@ -645,8 +645,8 @@ export default {
},
// 导入企业(青藏公司)数据
- btnImportOrgData(){
-
+ btnImportOrgData() {
+
//
this.dataTransOpts.plus.ImportOrgData++
this.dialogWin.ImportOrgData = true
@@ -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:
+ postapi(url, { patientRegisterId: row.id }).then(res => {
+ if (res.code > -1) {
+ this.$message.success({ showClose: true, message: '导入成功!' })
+ this.rowClick(row)
+ }
+ })
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 })
- }
- })
},
//通用导出
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index adcc7ec..2ff6898 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -126,11 +126,11 @@ export default {
//挂载完成
mounted() {
postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: "summary_check_doctor_alias" })
- .then(res => {
- if (res.code > -1) {
- this.summary_check_doctor_alias = JSON.parse(res.data)
- }
- })
+ .then(res => {
+ if (res.code > -1) {
+ this.summary_check_doctor_alias = JSON.parse(res.data)
+ }
+ })
},
computed: {
@@ -206,26 +206,37 @@ 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:
+ postapi(url, { patientRegisterId }).then(res => {
+ if (res.code > -1) {
+ this.$message.success({ showClose: true, message: '导入成功!' })
+ }
+ })
break;
}
- postapi(url, { patientRegisterId: this.dataTransOpts.tableS.patient_register.id }).then(res => {
- if (res.code > -1) {
- this.$message.success({ showClose: true, message: '导入成功!' })
- } else {
- this.$message.error({ showClose: true, message: res.message })
- }
- })
+
},
//保存数据
btnSave() {
-
+
let body = {
patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
summaryDoctorId: this.dataTransOpts.tableS.patient_register.summaryDoctorId || null,
@@ -466,7 +477,7 @@ export default {
this.dialogWin.OccDisease = true
},
-
+
addSummary() {
if (!this.dataTransOpts.tableS.patient_register.id) {