diff --git a/public/files/公交集团预约人员名单导入模板.xlsx b/public/files/公交集团预约人员名单导入模板.xlsx new file mode 100644 index 0000000..afa3587 Binary files /dev/null and b/public/files/公交集团预约人员名单导入模板.xlsx differ diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 4888011..3b71e80 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -27,10 +27,11 @@
{{ dddw(resultStatus, 'id', scope.row.resultStatusId, 'dataInputPrompt') }}
- + @@ -365,7 +366,11 @@ export default { rowResultDisabled(row) { return row.isCalculationItem == 'Y' || this.doctorCheck.RegisterCheckEdit.completeFlag == '1' || this.doctorCheck.RegisterCheckEdit.completeFlag == '2' }, - + btnCritical(row){ + this.dialogWin.FollowCriticalCheck=true + this.doctorCheck.combinationCriticalValue=false + this.doctorCheck.singleDetailedProject=row + }, //项目列为计算函数 computeFun(index) { // 有计算项的，才调用计算函数 diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue index aa70540..ad25db3 100644 --- a/src/components/doctorCheck/CheckPicture.vue +++ b/src/components/doctorCheck/CheckPicture.vue @@ -23,6 +23,8 @@ :disabled="doctorBtnDisabled('btnExpPic')">导入图片 裁剪图片 + 清理pacs结果 @@ -496,6 +498,20 @@ export default { this.uploadSeq++; this.dialogCheckPictureUpload = true; }, + btnClean(){ + if (!this.doctorCheck.RegisterCheckId) { + this.$message.warning({ showClose: true, message: "未选中组合项目！" }); + return; + } + postapi("/api/app/PacsBusiness/DeletePacsCheckDicomDataByRegisterCheckId", { + registerCheckId:this.doctorCheck.RegisterCheckId + }) + .then((res) => { + if (res.code > -1) { + + } + }); + }, // 裁图/修图/ btnCutPicBak() { diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue index 6c7e799..7c56a77 100644 --- a/src/components/doctorCheck/CheckSumSug.vue +++ b/src/components/doctorCheck/CheckSumSug.vue @@ -341,6 +341,7 @@ export default { // 危急值 btnCritical() { this.dialogWin.FollowCriticalCheck = true + this.doctorCheck.combinationCriticalValue=true }, //删除小结 diff --git a/src/components/follow/FollowCriticalCheck.vue b/src/components/follow/FollowCriticalCheck.vue index 61b17b4..ea6367d 100644 --- a/src/components/follow/FollowCriticalCheck.vue +++ b/src/components/follow/FollowCriticalCheck.vue @@ -3,47 +3,111 @@
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -94,20 +158,18 @@ export default { peisid: null, startPoint: -1, // 多选起点 -1 表示选择 endPoint: -1, // 多选终点 -1 表示未选择 - - tableData: [ - { + tableData: { criticalRangeValue: "", //危急值范围 isCriticalValue: "Y", //危急值标志 criticalValueContent: "", // 危急值 - criticalValueCreatorId: "", // 登记人 - criticalValueCreationTime: "", // 登记时间 - isCriticalValueAudit: "N", // 审核 - isReview: 'N', // 复查 - isCriticalValueSmsComplete: "N", // 短信 - isCriticalValuePhoneComplete: "N", // 电话随访 - } - ], //表格数据 + criticalValueCreatorName:"", + criticalValueCreationTime:"", + isCriticalValueAudit:"", + isReview:"N", + isFollowUp:"N", + followUpCreatorName:"", + followUpCreationTime:"" + }, tableDataCurrentRow: {}, // 当前被选中的行 multipleSelection: [], //选中的数据列表 @@ -210,7 +272,16 @@ export default { this.loadOpts.maxResultCount = Number(this.LocalConfig.normal.maxResultCount || 100) this.loadOptsInit = Object.assign({}, this.loadOpts) - + // this.tableData=this.doctorCheck.RegisterCheck + if(this.doctorCheck.combinationCriticalValue){ + // getapi(`/api/app/registercheck/getregistercheck?id=${this.doctorCheck.RegisterCheckId}`) + // .then(res => { + // this.tableData=res.data + // }) + this.tableData=this.doctorCheck.RegisterCheckEdit + }else{ + this.tableData=this.doctorCheck.singleDetailedProject + } }, //挂载完成 @@ -220,9 +291,9 @@ export default { this.peisid = window.sessionStorage.getItem('peisid'); - this.$nextTick(() => { - this.scrollFull() - }) + // this.$nextTick(() => { + // this.scrollFull() + // }) }, @@ -235,6 +306,7 @@ export default { "elProgress", "patientRegister", "customerOrg", + "doctorCheck" ]), }, methods: { @@ -590,11 +662,32 @@ export default { // 导入企业(青藏公司)数据 btnImportOrgData() { - - // - this.dataTransOpts.plus.ImportOrgData++ - this.dialogWin.ImportOrgData = true - + if(this.doctorCheck.combinationCriticalValue){ + postapi('/api/app/RegisterCheck/UpdateRegisterCheckCritical',{ + registerCheckId:this.doctorCheck.RegisterCheckId, + isCriticalValue:this.tableData.isCriticalValue, + isFollowUp:this.tableData.isFollowUp, + criticalValueContent:this.tableData.criticalValueContent, + isCriticalValueAudit:this.tableData.isCriticalValueAudit, + isReview:this.tableData.isReview + }).then(res => { + this.dialogWin.FollowCriticalCheck = false + this.tableData=this.$options.data.tableData + }) + }else{ + postapi('/api/app/RegisterCheckItem/UpdateRegisterCheckItemCritical',{ + registerCheckId:this.tableData.registerCheckId, + isCriticalValue:this.tableData.isCriticalValue, + isFollowUp:this.tableData.isFollowUp, + criticalValueContent:this.tableData.criticalValueContent, + isCriticalValueAudit:this.tableData.isCriticalValueAudit, + isReview:this.tableData.isReview, + itemId:this.tableData.itemId + }).then(res => { + this.dialogWin.FollowCriticalCheck = false + this.tableData=this.$options.data.tableData + }) + } }, //体检次数 相关操作 diff --git a/src/components/follow/FollowList.vue b/src/components/follow/FollowList.vue index a7214ae..9b6bc03 100644 --- a/src/components/follow/FollowList.vue +++ b/src/components/follow/FollowList.vue @@ -2,123 +2,85 @@
-
+
- - - - \ No newline at end of file diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue index df07bd7..71a990f 100644 --- a/src/views/doctorCheck/doctorCheck.vue +++ b/src/views/doctorCheck/doctorCheck.vue @@ -60,7 +60,7 @@
-
+