From 19c1626df4d15d27bf260bfc27cde262e17508f6 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Fri, 14 Nov 2025 17:29:15 +0800 Subject: [PATCH] cctj --- src/components/doctorCheck/CheckItemList.vue | 13 +- src/components/doctorCheck/CheckPicture.vue | 3 +- .../PatientRegisterEditMedicalTypeBatch.vue | 24 +- .../PatientRegisterEditPersonnelTypeBatch.vue | 162 +++ .../PatientRegisterEditRemarkBatch.vue | 153 +++ .../patientRegister/PatientRegisterList.vue | 89 +- .../patientRegister/customerOrgTreeAll.vue | 27 +- .../patientRegister/patientRegisterQuery.vue | 4 +- src/store/index.js | 4 + src/views/fee-settings/Asbitem.vue | 1007 ++++------------- 10 files changed, 693 insertions(+), 793 deletions(-) create mode 100644 src/components/patientRegister/PatientRegisterEditPersonnelTypeBatch.vue create mode 100644 src/components/patientRegister/PatientRegisterEditRemarkBatch.vue diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue index 4ca5f9b..3499b9d 100644 --- a/src/components/doctorCheck/CheckItemList.vue +++ b/src/components/doctorCheck/CheckItemList.vue @@ -305,7 +305,7 @@ export default { } }, - hisResultDetailDialogVisible: true, + hisResultDetailDialogVisible: false, }; }, @@ -352,6 +352,17 @@ export default { methods: { dddw, dictInit() { + // 获取系统参数(是否显示历次明细结果) + postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId:'doctor_check_disp_hisdetail' }) + .then(res => { + if(res.code > -1){ + let hisResultDetailDialogVisible = res.data||"N" + if(hisResultDetailDialogVisible == 'Y'){ + this.hisResultDetailDialogVisible = true + } + } + }) + //获取结果状态提示数据 getapi("/api/app/result-status").then((res) => { if (res.code != -1) { diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue index 2d80d5c..6fb88b4 100644 --- a/src/components/doctorCheck/CheckPicture.vue +++ b/src/components/doctorCheck/CheckPicture.vue @@ -462,7 +462,8 @@ export default { pictureBaseStrs: [{ fileName, localPathName: item.FilePath, - pictureBaseStr: baseHead + item.Image + pictureBaseStr: baseHead + item.Image, + isPrint:'N' }], pictureFileType: '0' //采图暂定图0,上传暂定报告1 this.pictureFileType } diff --git a/src/components/patientRegister/PatientRegisterEditMedicalTypeBatch.vue b/src/components/patientRegister/PatientRegisterEditMedicalTypeBatch.vue index c4a03fa..d3f9f86 100644 --- a/src/components/patientRegister/PatientRegisterEditMedicalTypeBatch.vue +++ b/src/components/patientRegister/PatientRegisterEditMedicalTypeBatch.vue @@ -56,7 +56,7 @@ export default { // 组件创建完成 created() { - this.asbitemBatchInit = deepCopy(this.asbitemBatch) + //this.asbitemBatchInit = deepCopy(this.asbitemBatch) }, //挂载完成 @@ -83,15 +83,25 @@ export default { //批量调整项目(确定按钮) btnOk() { - this.$message.warning({showClose:true,message:'开发中.....'}) - return + //this.$message.warning({showClose:true,message:'开发中.....'}) + //return - let url = '/api/app/RegisterCheck/UpdateBatchCheckDoctor' + let url = '/api/app/PatientRegister/BatchUpdatePatientRegisterInfoByPatientRegisterId' //if(this.doctorType == 'audit') url = '/api/app/RegisterCheck/UpdateBatchAuditDoctor' - - postapi(url, { patientRegisterIds: this.patientRegisterIds, medicalTypeId }) + /* + { + "patientRegisterIds": [ + "3fa85f64-5717-4562-b3fc-2c963f66afa6" + ], + "medicalTypeId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "personnelTypeId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + "remark": "string" + } + */ + postapi(url, { patientRegisterIds: this.patientRegisterIds, medicalTypeId:this.medicalTypeId }) .then(res => { if (res.code > -1) { + this.$message.success({showClose:true,message:'操作成功!'}) this.dialogWin.PatientRegisterEditMedicalTypeBatch = false; } }) @@ -113,7 +123,7 @@ export default { this.dict.medicalType = res.data; } }); - + }, }, diff --git a/src/components/patientRegister/PatientRegisterEditPersonnelTypeBatch.vue b/src/components/patientRegister/PatientRegisterEditPersonnelTypeBatch.vue new file mode 100644 index 0000000..99d4ada --- /dev/null +++ b/src/components/patientRegister/PatientRegisterEditPersonnelTypeBatch.vue @@ -0,0 +1,162 @@ + + + diff --git a/src/components/patientRegister/PatientRegisterEditRemarkBatch.vue b/src/components/patientRegister/PatientRegisterEditRemarkBatch.vue new file mode 100644 index 0000000..b38f7e5 --- /dev/null +++ b/src/components/patientRegister/PatientRegisterEditRemarkBatch.vue @@ -0,0 +1,153 @@ + + + diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index c6a0eb5..d517315 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -98,8 +98,8 @@ "> {{ scope.row.customerOrgGroupName }} - +
{{ scope.row[dragCol[index].prop] @@ -119,6 +120,7 @@ : "" }}
+
{{ dddw( @@ -139,6 +142,7 @@ ) }}
+
{{ scope.row[dragCol[index].prop] }}
@@ -391,6 +396,18 @@ + + + + + + + + + + @@ -443,6 +460,8 @@ import PatientRegisterEditGroupBatch from "./PatientRegisterEditGroupBatch.vue"; import PatientRegisterEditItemBatch from "./PatientRegisterEditItemBatch.vue"; import PatientRegisterEditDoctorBatch from "./PatientRegisterEditDoctorBatch.vue"; import PatientRegisterEditMedicalTypeBatch from "./PatientRegisterEditMedicalTypeBatch.vue"; +import PatientRegisterEditPersonnelTypeBatch from "./PatientRegisterEditPersonnelTypeBatch.vue"; +import PatientRegisterEditRemarkBatch from "./PatientRegisterEditRemarkBatch.vue"; import ImportOrgData from "./ImportOrgData.vue"; import LocalConfig from "../../components/common/LocalConfig.vue"; import Queue from "../../components/queue/Queue.vue"; @@ -456,6 +475,8 @@ export default { PatientRegisterEditItemBatch, // 批量调整项目 PatientRegisterEditDoctorBatch, // 批量调整检查项目医生 PatientRegisterEditMedicalTypeBatch, // 批量调整体检类别 + PatientRegisterEditPersonnelTypeBatch, // 批量调整体检类别 + PatientRegisterEditRemarkBatch, // 批量调整体检类别 ElProgressOCX, LocalConfig, ImportOrgData, @@ -538,7 +559,7 @@ export default { minWidth: 150, align: "center", }, - { label: "民族", prop: "nationId", minWidth: 55, align: "center" }, + { label: "民族", prop: "nationName", minWidth: 55, align: "center" }, //nationId { label: "身份证", prop: "idNo", minWidth: 160, align: "center" }, { label: "出生日期", prop: "birthDate", minWidth: 80, align: "center" }, { label: "邮箱", prop: "email", minWidth: 150, align: "center" }, @@ -560,7 +581,7 @@ export default { { label: "工卡号", prop: "jobCardNo", minWidth: 80, align: "center" }, { label: "婚姻状况", - prop: "maritalStatusId", + prop: "maritalStatusName", //maritalStatusId minWidth: 80, align: "center", }, @@ -572,7 +593,7 @@ export default { }, { label: "人员类别", - prop: "personnelTypeId", + prop: "personnelTypeName", //personnelTypeId minWidth: 80, align: "center", }, @@ -1860,7 +1881,8 @@ export default { }); if (subMenuPrint.length > 0) items.push({ label: "打印条码", children: subMenuPrint }); - + + // 导入结果合集 ============ start let subMenuImp = []; if ( checkPagePriv(this.pagePriv.privs, "导入检查结果") && @@ -1892,14 +1914,18 @@ export default { this.importResult("diAn", row); }, }); - if (subMenuImp.length > 0) + if (subMenuImp.length > 0){ items.push({ label: "导入结果", children: subMenuImp }); - + } + // 导入结果合集 ============ end + + // 批量操作合集 ============ start + let batchMenus = [] if ( checkPagePriv(this.pagePriv.privs, "批量更新组合项目明细") && this.multipleSelection.length > 0 ) - items.push({ + batchMenus.push({ label: "批量更新组合项目明细", onClick: () => { this.btnItemBatch(); @@ -1909,7 +1935,7 @@ export default { checkPagePriv(this.pagePriv.privs, "调整检查项目医生") && this.multipleSelection.length > 0 ) - items.push({ + batchMenus.push({ label: "调整检查项目医生", onClick: () => { // this.doctorType = 'check' @@ -1922,7 +1948,7 @@ export default { checkPagePriv(this.pagePriv.privs, "批量调整体检类别") && this.multipleSelection.length > 0 ) { - items.push({ + batchMenus.push({ label: "批量调整体检类别", onClick: () => { // this.doctorType = 'check' @@ -1931,6 +1957,39 @@ export default { }, }); } + + if ( + checkPagePriv(this.pagePriv.privs, "批量调整人员类别") && + this.multipleSelection.length > 0 + ) { + batchMenus.push({ + label: "批量调整人员类别", + onClick: () => { + // this.doctorType = 'check' + this.dataTransOpts.plus.PatientRegisterEditPersonnelTypeBatch++; //如果放在弹窗显示后面,在首次加载子组件时,会触发两次数据处理 + this.dialogWin.PatientRegisterEditPersonnelTypeBatch = true; + }, + }); + } + + if ( + checkPagePriv(this.pagePriv.privs, "批量调整备注") && + this.multipleSelection.length > 0 + ) { + batchMenus.push({ + label: "批量调整备注", + onClick: () => { + // this.doctorType = 'check' + this.dataTransOpts.plus.PatientRegisterEditRemarkBatch++; //如果放在弹窗显示后面,在首次加载子组件时,会触发两次数据处理 + this.dialogWin.PatientRegisterEditRemarkBatch = true; + }, + }); + } + if (batchMenus.length > 0){ + items.push({ label: "批量操作", children: batchMenus }); + } + // 批量操作合集 ============ end + if ( checkPagePriv(this.pagePriv.privs, "查看云胶片二维码") ) @@ -2313,16 +2372,16 @@ export default { if (e.patientRegisterNo) e.patientRegisterNo = '&' + e.patientRegisterNo if (e.patientNo) e.patientNo = '&' + e.patientNo if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) { - e.groupPack = dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName") + e.groupPack = e.medicalPackageName // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName") } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) { - e.groupPack = dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName") + e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName") } - if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName") + //if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName") if (e.idNo) e.idNo = e.idNo + '&' if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD") - if (e.maritalStatusId) e.maritalStatusId = dddw(this.dict.maritalStatus, "id", e.maritalStatusId, "displayName") + //if (e.maritalStatusId) e.maritalStatusId = dddw(this.dict.maritalStatus, "id", e.maritalStatusId, "displayName") if (e.medicalTypeId) e.medicalTypeId = dddw(this.dict.medicalType, "id", e.medicalTypeId, "displayName") - if (e.personnelTypeId) e.personnelTypeId = dddw(this.dict.personnelType, "id", e.personnelTypeId, "displayName") + //if (e.personnelTypeId) e.personnelTypeId = dddw(this.dict.personnelType, "id", e.personnelTypeId, "displayName") if (e.isVip) e.isVip = e.isVip == "Y" ? "是" : "否" if (e.isUpload) e.isUpload = e.isUpload == "Y" ? "是" : "否" if (e.qztlType) e.qztlType = dddw(this.dict.qztlType, "id", e.qztlType, "displayName") diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue index 4ec923f..f97e6b6 100644 --- a/src/components/patientRegister/customerOrgTreeAll.vue +++ b/src/components/patientRegister/customerOrgTreeAll.vue @@ -89,7 +89,6 @@ export default { //获取体检单位列表树信息 (Y:查所有单位,N:仅查顶级单位) //从性能考滤 默认只查顶级单位 - if (this.cusQuery.haveSunCus == 'Y') { this.getCustomerOrgAll() .then(res => { @@ -117,8 +116,24 @@ export default { let url = '/api/app/CustomerOrg/GetSimpleByCodeAll' if(this.LocalConfig.patientRegister.dispCustomerOrgCode == 'Y'){ url = "/api/app/customerorg/getbycodeall" - } - getapi(url) + getapi(url) + .then((res) => { + if (res.code > -1) { + let treeData = reMadeOrgTree(deepCopy(res.data), this.LocalConfig.patientRegister.dispCustomerOrgCode); + this.cusQuery.times += 1 + //console.log('getCustomerOrgAll.treeData', treeData) + //console.log('getTreeNode', getTreeNode(treeData, "treeChildren", 'id', '3a1d3736-d7c6-a9fb-c165-675335dc0e9b').treeChildren) + this.cusQuery.treeDataAll = treeData + resolve(treeData) + } else { + reject(res.message) + } + }) + .catch(err => { + reject(err) + }) + }else{ + postapi(url) .then((res) => { if (res.code > -1) { let treeData = reMadeOrgTree(deepCopy(res.data), this.LocalConfig.patientRegister.dispCustomerOrgCode); @@ -134,6 +149,8 @@ export default { .catch(err => { reject(err) }) + } + }) }, @@ -256,8 +273,8 @@ export default { console.log('filterParentNode', value) // if (!value) return true; // return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1 || data['shortName'].indexOf(value) > -1 || data['customerOrgCode'].indexOf(value) > -1; - this.customerOrgTreeAll = this.cusQuery.treeDataTop1.filter(e => { - return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1 || e.shortName.indexOf(value) > -1 + this.customerOrgTreeAll = this.cusQuery.treeDataTop1.filter(e => { + return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1 }) }, diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue index 64c756b..d4c47c6 100644 --- a/src/components/patientRegister/patientRegisterQuery.vue +++ b/src/components/patientRegister/patientRegisterQuery.vue @@ -49,8 +49,8 @@
性别 - - + +
diff --git a/src/store/index.js b/src/store/index.js index 4320e5a..436d8d5 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -528,6 +528,8 @@ export default new Vuex.Store({ PatientRegisterEditItemBatch: 0, // 刷新批量调整项目窗口 PatientRegisterEditDoctorBatch: 0, // 刷新批量调整项目检查医生窗口 PatientRegisterEditMedicalTypeBatch:0, // 刷新批量调整体检类别窗口 + PatientRegisterEditPersonnelTypeBatch:0, // 刷新批量调整人员类别窗口 + PatientRegisterEditRemarkBatch:0, // 刷新批量调整备注窗口 PatientRegisterForChoose: 0, // 体检人员查询窗口 OccDisease: 0, // 职业病 WebBooking: 0, // 网上预约 @@ -557,6 +559,8 @@ export default new Vuex.Store({ PatientRegisterEditGroupBatch: false, //批量调整分组 PatientRegisterEditDoctorBatch: false, // 批量调整检查项目医生 PatientRegisterEditMedicalTypeBatch: false, // 批量调整体检类别 + PatientRegisterEditPersonnelTypeBatch:false, // 刷新批量调整人员类别窗口 + PatientRegisterEditRemarkBatch:false, // 刷新批量调整备注窗口 MenuPageSet: false, // 设置角色菜单权限 LocalConfig: false, // 设置窗口 AsbChargeRequest: false, // 收费申请 diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue index bb6f47c..7ab2bb9 100644 --- a/src/views/fee-settings/Asbitem.vue +++ b/src/views/fee-settings/Asbitem.vue @@ -7,44 +7,21 @@ 组合项目
- - + +
-
+
- +
@@ -52,11 +29,8 @@ class="el-icon-document-remove" v-if="data.parentId == null" > --> - + {{ node.label @@ -69,39 +43,22 @@
-
- +
+ - + - +