diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue index 98a2e67..bb0eb4a 100644 --- a/src/components/doctorCheck/ButtonList.vue +++ b/src/components/doctorCheck/ButtonList.vue @@ -22,13 +22,7 @@
下一人 -
- +
AI诊断
@@ -90,37 +84,13 @@
重置
- - - +
- - - - - - + @@ -207,7 +174,6 @@ import PatientRegisterEdit from "../../components/patientRegister/PatientRegiste import PatientRegisterList from "./PatientRegisterList.vue"; import CheckDetails from "../../components/sumDoctorCheck/CheckDetails.vue"; -import SumItemsType from "../../components/sumDoctorCheck/SumItemsType.vue"; import SumItems from "../../components/sumDoctorCheck/SumItems.vue"; import SumHistory from "../../components/sumDoctorCheck/SumHistory.vue"; import OccDisease from "../../components/occDisease/OccDisease.vue" @@ -220,7 +186,6 @@ export default { PatientRegisterEdit, PatientRegisterList, CheckDetails, - SumItemsType, SumItems, SumHistory, OccDisease, diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 6053ff7..8f175f5 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -320,7 +320,7 @@ export default { } } - this.getCheckItemList(this.dataTransOpts.tableS.register_check.id); + this.getCheckItemList(this.refParams.registerCheckId); this.userInfo.operatorType = window.sessionStorage.getItem("operatorType") || '0'; this.userInfo.userId = window.sessionStorage.getItem("userId") || null; this.userInfo.user = window.sessionStorage.getItem("user") || null; @@ -329,7 +329,6 @@ export default { computed: { ...mapState([ "window", - "dataTransOpts", "dict", "dialogWin", "doctorCheck", @@ -1255,7 +1254,7 @@ export default { { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" }, { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" }, { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" }, - { Name: "orgSign", Value: this.dataTransOpts.tableS.patient_register.isPatientOccupationalDisease == 'Y' ? "pic/orgSignOcc.png" : "pic/orgSign.png" }, + //{ Name: "orgSign", Value: this.dataTransOpts.tableS.patient_register.isPatientOccupationalDisease == 'Y' ? "pic/orgSignOcc.png" : "pic/orgSign.png" }, { Name: 'picExtOne', Value: 'pic/hisLog.jpg' }, { Name: 'resultSign', Value: 'pic/resultSign.png' }, ], @@ -1317,7 +1316,7 @@ export default { watch: { //检查项目未切换换时 也可以强制刷新数据 // "dataTransOpts.refresh.register_check_item.M": { - "dataTransOpts.refresh.register_check_item.M": { + "refParams.brushItemList": { // immediate: true, handler(newVal, oldVal) { console.log( diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue index b545b19..090fd03 100644 --- a/src/components/doctorCheck/CheckPicture.vue +++ b/src/components/doctorCheck/CheckPicture.vue @@ -104,15 +104,15 @@
姓名 - +
性别 - +
年龄 - +
@@ -220,7 +220,7 @@ export default { components: { CheckPictureUpload, PacsTemplate, PacsCutPic }, - props: ["doctorBtnDisabled", "save"], + props: ["doctorBtnDisabled", "save","patient_register","refParams"], data() { return { sysConfig: {}, // @@ -316,8 +316,8 @@ export default { } - if (this.dataTransOpts.tableS.register_check.id) { - this.getCheckPictures(this.dataTransOpts.tableS.register_check.id); + if (this.refParams.registerCheckId) { + this.getCheckPictures(this.refParams.registerCheckId); } }, @@ -327,9 +327,7 @@ export default { "dict", "dialogWin", "dataTransOpts", - "doctorCheck", - "patientRegister", - "customerOrg" + "doctorCheck" ]), lmoment(date, forMat) { return moment(new Date(date)).format(forMat); @@ -442,9 +440,9 @@ export default { let toOutShell = { barCode: this.doctorCheck.checkRequestNo, - patientName: this.dataTransOpts.tableS.patient_register.patientName, - sexName: this.dataTransOpts.tableS.patient_register.sexName, - age: (this.dataTransOpts.tableS.patient_register.age || '') + '', + patientName: this.patient_register.patientName, + sexName: this.patient_register.sexName, + age: (this.patient_register.age || '') + '', asbitemName: this.doctorCheck.checkRequestNo || 'temp' } // console.log('this.$peisAPI.imageAcquisition', JSON.stringify(toOutShell)) @@ -488,7 +486,7 @@ export default { if (dotIndex > -1) fileName = fileName.substring(dotIndex + 1, pointIndex || fileName.length); let body = { - registerCheckId: this.dataTransOpts.tableS.register_check.id, + registerCheckId: this.refParams.registerCheckId, pictureBaseStrs: [{ fileName, localPathName: item.FilePath, @@ -504,7 +502,7 @@ export default { console.log('btnGetPic err', error) } } - this.getCheckPictures(this.dataTransOpts.tableS.register_check.id) + this.getCheckPictures(this.refParams.registerCheckId) } else { console.log('this.$peisAPI.imageAcquisition', lres.message) } @@ -524,7 +522,7 @@ export default { // console.log('接收壳端热键采图参数 acceptHotKeyData', oprType, data) //this.$message.success({ showClose: true, message: '调用热键成功' }) - if (!this.dataTransOpts.tableS.register_check.id) { + if (!this.refParams.registerCheckId) { console.log("没有选中检查项目") return } @@ -562,7 +560,7 @@ export default { if (res.code < 0) { console.log('热键更新图片打印标识失败：', res.message) } else { - this.getCheckPictures(this.dataTransOpts.tableS.register_check.id) + this.getCheckPictures(this.refParams.registerCheckId) } }) .catch(err => { @@ -580,7 +578,7 @@ export default { .then(res => { if (res.code > -1) { this.checkPictures.splice(count - 1, 1) - this.getCheckPictures(this.dataTransOpts.tableS.register_check.id) + this.getCheckPictures(this.refParams.registerCheckId) } else { console.log("热键删除图片打印标识失败：", res.message) } @@ -618,7 +616,7 @@ export default { if (dotIndex > -1) fileName = Date.now() + fileName.substring(dotIndex + 1, pointIndex || fileName.length); let body = { - registerCheckId: this.dataTransOpts.tableS.register_check.id, + registerCheckId: this.refParams.registerCheckId, pictureBaseStrs: [{ fileName, localPathName: item.FilePath, @@ -630,7 +628,7 @@ export default { hadoopPost('pacsApi', '/api/app/RegisterCheckPicture/InstrumentMapping', body) .then(() => { - this.getCheckPictures(this.dataTransOpts.tableS.register_check.id) + this.getCheckPictures(this.refParams.registerCheckId) }) .catch(err => { console.log('热键采图失败', err) @@ -843,7 +841,7 @@ export default { .then(res => { let lres = JSON.parse(res) if (lres.code > -1) { - this.getCheckPictures(this.dataTransOpts.tableS.register_check.id); + this.getCheckPictures(this.refParams.registerCheckId); } else { console.log('裁图失败', lres.message) } @@ -961,11 +959,11 @@ export default { rCopyPic(imageSeq) { let body = { registerCheckPictureIds: [], - registerCheckId: this.dataTransOpts.tableS.register_check.id + registerCheckId: this.refParams.registerCheckId } this.dataTransOpts.doctorCutPics.forEach(e => { body.registerCheckPictureIds.push(e.id) - e.registerCheckId = this.dataTransOpts.tableS.register_check.id + e.registerCheckId = this.refParams.registerCheckId }); postapi('/api/app/RegisterCheckPicture/BatchUpdateRegisterCheckIdByRegisterCheckPictureId', body) @@ -1127,7 +1125,7 @@ export default { .then(res => { if (res.code > -1) { // 人员信息 - this.dataTransOpts.tableS.patient_register = res.data.patientRegisterDetail + this.patient_register = res.data.patientRegisterDetail // 组合项目 this.doctorCheck.RegisterCheckList = [res.data.registerCheckDetail] @@ -1166,11 +1164,12 @@ export default { //监听事件 watch: { //检查项目未切换换时 也可以强制刷新数据 - "dataTransOpts.refresh.register_check_item.M": { + // "dataTransOpts.refresh.register_check_item.M": { + "refParams.brushItemList": { // immediate: true, handler(newVal, oldVal) { - console.log(`watch 检查图片 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`); - if (newVal != oldVal) this.getCheckPictures(this.dataTransOpts.tableS.register_check.id); + console.log(`watch 检查图片 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.refParams.registerCheckId}`); + if (newVal != oldVal) this.getCheckPictures(this.refParams.registerCheckId); } }, diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue index 9775563..6deac22 100644 --- a/src/components/doctorCheck/CheckSumSug.vue +++ b/src/components/doctorCheck/CheckSumSug.vue @@ -160,7 +160,7 @@ export default { components: { Queue }, - props: ["registerCheckId", "isCheckPicture", "optGrant", "addSummary", "btnMakeDiagnosis", "save", "audit", "unAudit", "btnLineUp", "doctorBtnDisabled"], + props: ["refParams", "isCheckPicture", "optGrant", "addSummary", "btnMakeDiagnosis", "save", "audit", "unAudit", "btnLineUp", "doctorBtnDisabled","patient_register"], data() { return { queueParams: {}, @@ -354,13 +354,13 @@ export default { // 分诊排队 fnQueue() { - if (!this.dataTransOpts.tableS.patient_register.id) { + if (!this.patient_register.id) { this.$message.warning({ showClose: true, message: '未获取到人员信息' }) return } this.queueParams = { - patientRegisterId: this.dataTransOpts.tableS.patient_register.id + patientRegisterId: this.patient_register.id } this.dataTransOpts.plus.queue++ this.dialogWin.queue = true @@ -468,14 +468,15 @@ export default { // this.checkSuggestionList(newVal) // }, //检查项目未切换换时 也可以强制刷新数据 - "dataTransOpts.refresh.register_check.S": { + // "dataTransOpts.refresh.register_check.S": { + "refParams.brushItemList": { immediate: true, handler(newVal, oldVal) { - console.log(`watch 小结 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`); + console.log(`watch 小结 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.refParams.registerCheckId}`); if (newVal != oldVal) { - this.checkSummaryList(this.dataTransOpts.tableS.register_check.id) - this.checkSuggestionList(this.dataTransOpts.tableS.register_check.id) - this.getPreResult(this.dataTransOpts.tableS.register_check.id) + this.checkSummaryList(this.refParams.registerCheckId) + this.checkSuggestionList(this.refParams.registerCheckId) + this.getPreResult(this.refParams.registerCheckId) } } }, diff --git a/src/components/doctorCheck/RegisterCheckEdit.vue b/src/components/doctorCheck/RegisterCheckEdit.vue index bb16d8e..78b7f9c 100644 --- a/src/components/doctorCheck/RegisterCheckEdit.vue +++ b/src/components/doctorCheck/RegisterCheckEdit.vue @@ -63,7 +63,7 @@ export default { }, computed: { - ...mapState(["window", "dataTransOpts", "dict", "doctorCheck", "patientRegister", "customerOrg"]), + ...mapState(["window", "dict", "doctorCheck"]), }, methods: { diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue index 2e3b4d0..27fc827 100644 --- a/src/components/doctorCheck/RegisterCheckList.vue +++ b/src/components/doctorCheck/RegisterCheckList.vue @@ -79,7 +79,7 @@ import { arrayExistObj, listOrderBy, setCheckStatusColor } from "../../utlis/pro export default { components: {}, - props:["refParams"], + props:["refParams","patient_register"], data() { return { sysConfig: {}, //项目配置参数 @@ -137,7 +137,7 @@ export default { //挂载完成 mounted() { - this.registerCheckList(this.dataTransOpts.tableS.patient_register.id) + this.registerCheckList(this.refParams.id) }, @@ -220,14 +220,9 @@ export default { this.doctorCheck.RegisterCheckId = row.id this.doctorCheck.asbitemName = row.asbitemName - this.doctorCheck.checkRequestNo = row.checkRequestNo + this.doctorCheck.checkRequestNo = row.checkRequestNo // 云胶片用到 this.doctorCheck.checkTypeFlag = row.checkTypeFlag - //console.log('rowClick this.doctorCheck.checkRequestNo',this.doctorCheck.checkRequestNo) - this.dataTransOpts.tableS.register_check.id = row.id - - this.dataTransOpts.refresh.register_check.S++ - this.dataTransOpts.refresh.register_check_item.M++ - + // 将点击的数据返回至主组件 this.$emit("clickAsbBak",row) @@ -358,7 +353,7 @@ export default { let token = window.sessionStorage.getItem('token') let barcodeNo = row.checkRequestNo if(this.pacs_interface_barcode_type == '1'){ - barcodeNo = this.dataTransOpts.tableS.patient_register.patientRegisterNo + barcodeNo = this.patient_register.patientRegisterNo } let url = '' @@ -413,45 +408,49 @@ export default { if (this.registerCheckList0.length > 0) { this.doctorCheck.RegisterCheckId = this.registerCheckList0[0].id - this.dataTransOpts.tableS.register_check.id = this.registerCheckList0[0].id + //this.dataTransOpts.tableS.register_check.id = this.registerCheckList0[0].id this.doctorCheck.asbitemName = this.registerCheckList0[0].asbitemName this.doctorCheck.checkRequestNo = this.registerCheckList0[0].checkRequestNo // 默认选中第一个组合项目 setTimeout(() => { - this.$refs['registerCheckList0'].setCurrentRow(this.registerCheckList0[0]) + this.$refs['registerCheckList0'].setCurrentRow(this.registerCheckList0[0]) + this.rowClick0(this.registerCheckList0[0]) }, 20); } else if(this.registerCheckList1.length > 0){ this.doctorCheck.RegisterCheckId = this.registerCheckList1[0].id - this.dataTransOpts.tableS.register_check.id = this.registerCheckList1[0].id + //this.dataTransOpts.tableS.register_check.id = this.registerCheckList1[0].id this.doctorCheck.asbitemName = this.registerCheckList1[0].asbitemName this.doctorCheck.checkRequestNo = this.registerCheckList1[0].checkRequestNo // 默认选中第一个组合项目 setTimeout(() => { - this.$refs['registerCheckList1'].setCurrentRow(this.registerCheckList1[0]) + this.$refs['registerCheckList1'].setCurrentRow(this.registerCheckList1[0]) + this.rowClick1(this.registerCheckList1[0]) }, 20); } else if(this.registerCheckList2.length > 0){ this.doctorCheck.RegisterCheckId = this.registerCheckList2[0].id - this.dataTransOpts.tableS.register_check.id = this.registerCheckList2[0].id + //this.dataTransOpts.tableS.register_check.id = this.registerCheckList2[0].id this.doctorCheck.asbitemName = this.registerCheckList2[0].asbitemName this.doctorCheck.checkRequestNo = this.registerCheckList2[0].checkRequestNo // 默认选中第一个组合项目 setTimeout(() => { - this.$refs['registerCheckList2'].setCurrentRow(this.registerCheckList2[0]) + this.$refs['registerCheckList2'].setCurrentRow(this.registerCheckList2[0]) + this.rowClick2(this.registerCheckList2[0]) }, 20); } else if(this.registerCheckList3.length > 0){ this.doctorCheck.RegisterCheckId = this.registerCheckList3[0].id - this.dataTransOpts.tableS.register_check.id = this.registerCheckList3[0].id + //this.dataTransOpts.tableS.register_check.id = this.registerCheckList3[0].id this.doctorCheck.asbitemName = this.registerCheckList3[0].asbitemName this.doctorCheck.checkRequestNo = this.registerCheckList3[0].checkRequestNo // 默认选中第一个组合项目 setTimeout(() => { - this.$refs['registerCheckList3'].setCurrentRow(this.registerCheckList3[0]) + this.$refs['registerCheckList3'].setCurrentRow(this.registerCheckList3[0]) + this.rowClick3(this.registerCheckList3[0]) }, 20); // if (res.data.length > 0) { @@ -463,14 +462,11 @@ export default { // this.doctorCheck.checkRequestNo = res.data[0].checkRequestNo } else { - this.dataTransOpts.tableS.register_check.id = '' + this.doctorCheck.asbitemName = "" this.doctorCheck.checkRequestNo = "" + this.rowClick({id:'',}) } - - this.dataTransOpts.refresh.register_check.S++ //刷新检查医生 - this.dataTransOpts.refresh.register_check_item.M++ //刷新检查明细 - } }) .catch((err) => { @@ -495,31 +491,7 @@ export default { } }) }, - - // 刷新当前项目状态 - brushCheckStatus(registerCheckId){ - let lfind = -1 - lfind = arrayExistObj(this.registerCheckList0,'id',registerCheckId) - if(lfind > -1){ - this.registerCheckList0[lfind].completeFlag = this.refParams.checkCompleteFlag - return - } - lfind = arrayExistObj(this.registerCheckList1,'id',registerCheckId) - if(lfind > -1){ - this.registerCheckList1[lfind].completeFlag = this.refParams.checkCompleteFlag - return - } - lfind = arrayExistObj(this.registerCheckList2,'id',registerCheckId) - if(lfind > -1){ - this.registerCheckList2[lfind].completeFlag = this.refParams.checkCompleteFlag - return - } - lfind = arrayExistObj(this.registerCheckList3,'id',registerCheckId) - if(lfind > -1){ - this.registerCheckList3[lfind].completeFlag = this.refParams.checkCompleteFlag - return - } - }, + }, @@ -535,12 +507,11 @@ export default { }, // 保存后，触发更新项目的状态，并判断是否自动下一项目 - "refParams.brushCheckStatus": { + "refParams.doctorAutoNext": { // immediate:true, handler(newVal, oldVal) { console.log(`watch 自动下一个项目 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.refParams.registerCheckId}`); if(newVal != oldVal && newVal > 0){ - this.brushCheckStatus(this.refParams.registerCheckId) this.doctorAutoNext(this.refParams.registerCheckId) } } diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue index 7db4a98..3e627ec 100644 --- a/src/components/patientRegister/PatientRegisterRecoverList.vue +++ b/src/components/patientRegister/PatientRegisterRecoverList.vue @@ -10,12 +10,12 @@ - + - + @@ -31,13 +31,13 @@
{{ scope.row.customerOrgParentName == scope.row.customerOrgName ? "" : scope.row.customerOrgName }}
 - - + + - - - - + + + + - + - - + + - - + + - - - + + + - + - + - - - - + + + + - - + + - + diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue index 32fe6d3..310b883 100644 --- a/src/views/doctorCheck/doctorCheck.vue +++ b/src/views/doctorCheck/doctorCheck.vue @@ -24,7 +24,7 @@
- + @@ -35,26 +35,27 @@
+ :refParams="refParamsQuery" />
-
- +
+
- +
- +
- + @@ -62,26 +63,188 @@
-
- +
+
+
+ 人员列表 +
+
+ 体检日期 +
+
+ 增加人员 +
+
+ 编辑人员 +
+
+ 删除人员 +
+
+ 上一人 +
+
+ 下一人 +
+
+ AI诊断 +
+
+ 修改结果 +
+
+ 删除结果 +
+
+ 放弃明细项目检查 +
+
+ 放弃项目检查 +
+
+ 删除明细项目 +
+
+ 取消审核 +
+
+ 历次结果 +
+
+ 体检报告 +
+
+ 总检 +
+
+ 职业病 +
+
+ + + 导入结果 + + + 导入检查结果 + 导入检验结果 + 导入迪安结果 + + +
+
+ 重置 +
+ +
+ + + +
+
-
+
+ +
+
+

AI诊断内容：

+ + + +
+
+ + + +
+ +
+
+
+ 关闭 + AI重新诊断 +
+
+ + + + + + +
+ 体检日期 + +
+ + 取 消 + 确 定 + + + + +
+ + + + + + + + + + + + + + + +
+ + + + +
@@ -836,4 +1700,7 @@ export default { @import '../../assets/css/global_input.css'; @import '../../assets/css/global_table.css'; @import '../../assets/css/global.css'; +.divBtnClass { + margin-top: 5px; +} \ No newline at end of file diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue index 7827cdf..89f3e16 100644 --- a/src/views/doctorCheck/sumDoctorCheck.vue +++ b/src/views/doctorCheck/sumDoctorCheck.vue @@ -686,7 +686,7 @@ export default { created() { if (this.$route.query.patient_register) { - this.patient_register = this.$route.query.patient_register + this.patient_register = Object.assign({},this.$route.query.patient_register) } else { this.patient_register = { id: '', patientRegisterNo: '' } }