From ce191b6bf87a13d0fe4d776850953478ff738d78 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Thu, 25 Jan 2024 18:11:16 +0800 Subject: [PATCH] sumdoct --- src/components/doctorCheck/ButtonList.vue | 2 +- src/components/doctorCheck/PatientRegisterBase.vue | 9 ++++++--- src/components/doctorCheck/PatientRegisterList.vue | 12 ++++++++---- src/components/sumDoctorCheck/ButtonList.vue | 2 +- src/components/sumDoctorCheck/SumAsbItemStatus.vue | 8 ++++---- src/components/sumDoctorCheck/SumDiagnosis.vue | 9 ++++++--- src/request/commonapi.js | 6 +++--- src/views/fee-settings/Asbitem.vue | 8 ++++---- 8 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue index 3ef5756..14333d6 100644 --- a/src/components/doctorCheck/ButtonList.vue +++ b/src/components/doctorCheck/ButtonList.vue @@ -68,7 +68,7 @@
+ :style="`z-index:30001;border-radius: 10px;border: 1px solid #000;background-color:#FFF; position: absolute;top:70px;right:10px;width:300px;height: ${window.pageHeight - 42 - 5 - 30}px;opacity:1;`"> diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue index 4800d04..2fe78f2 100644 --- a/src/components/doctorCheck/PatientRegisterBase.vue +++ b/src/components/doctorCheck/PatientRegisterBase.vue @@ -300,7 +300,8 @@ export default { let patientRegisterNo = this.prBase.patientRegisterNo let body = { sType:1, - patientRegisterNo + patientRegisterNo, + isFilterPreRegistration:'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效) } console.log(`/api/app/patientregister/getpatientregisterorpatient`,body) postapi('/api/app/patientregister/getpatientregisterorpatient',body) @@ -320,7 +321,8 @@ export default { let patientNo = this.prBase.patientNo let body = { sType:2, - patientNo + patientNo, + isFilterPreRegistration:'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效) } console.log(`/api/app/patientregister/getpatientregisterorpatient`,body) postapi('/api/app/patientregister/getpatientregisterorpatient',body) @@ -338,7 +340,8 @@ export default { //按手机号或姓名查找客户信息 getlistinfilterByName(v){ let body={ - patientName:v + patientName:v, + isFilterPreRegistration:'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效) } this.patientRegisterChoosed = null diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index f27e94c..966964a 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -30,7 +30,7 @@ 检查状态： - + - + @@ -174,7 +174,7 @@ import moment from "moment"; import { mapState, mapMutations } from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; -import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc"; +import { dddw, objCopy, arrayReduce,deepCopy } from "../../utlis/proFunc" import CusOrgOCX from "../../components/report/CusOrgOCX.vue" @@ -195,7 +195,8 @@ export default { query:{ haveImage:false, checkAsb:'', //检查项目 - } + }, + completeFlag:[] }, quickAsb: [], @@ -224,6 +225,8 @@ export default { } }); + this.local.completeFlag = deepCopy(this.dict.completeFlag) + this.local.completeFlag.splice(0,1) //预记选项去掉 }, //快速选择组合项目时，调整可按拼间简码及简称查找 @@ -329,6 +332,7 @@ export default { if(this.local.query.haveImage) body.isPicture = 'Y' body.maxResultCount = 1000 + body.isFilterPreRegistration = 'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效) // "patientName": "string", // "sexId": "string", // "isAudit": "string", diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue index cf9b0ab..6cbd55b 100644 --- a/src/components/sumDoctorCheck/ButtonList.vue +++ b/src/components/sumDoctorCheck/ButtonList.vue @@ -41,7 +41,7 @@
+ :style="`z-index:30001;border-radius: 10px;border: 1px solid #000;background-color:#FFF; position: absolute;top:70px;right:10px;width:300px;height: ${window.pageHeight - 42 - 5 - 30}px;opacity:1;`"> diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue index be60df6..2ae1350 100644 --- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue +++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue @@ -2,27 +2,27 @@
未检组合项目：
-
+
{{ item }}
弃检组合项目：
-
+
{{ item }}
组合项目已检但无值的明细项目：
-
+
{{ item }}
组合项目已检但弃检的明细项目：
-
+
{{ item }}
diff --git a/src/components/sumDoctorCheck/SumDiagnosis.vue b/src/components/sumDoctorCheck/SumDiagnosis.vue index 489f65a..6bc2a8e 100644 --- a/src/components/sumDoctorCheck/SumDiagnosis.vue +++ b/src/components/sumDoctorCheck/SumDiagnosis.vue @@ -150,7 +150,7 @@ export default { deleteRow(index) { - this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", { + this.$confirm("此操作将删除该记录, 是否继续?", "提示", { confirmButtonText: "是", cancelButtonText: "否", type: "warning", @@ -163,10 +163,13 @@ export default { this.sumDoctorCheck.suggestionList.splice(i, 1) } } - this.sumDoctorCheck.diagnosisList.splice(index, 1) }).catch((err) => { - // + if(err == 'cancel'){ + console.log(`已取消 ${err}`) + }else{ + this.$message.error(`操作失败 ${err}`) + } }); }, diff --git a/src/request/commonapi.js b/src/request/commonapi.js index d796f3c..9cd780e 100644 --- a/src/request/commonapi.js +++ b/src/request/commonapi.js @@ -179,9 +179,9 @@ export const barcodedraganddrop = (data) => { // 组和项目获取列表 export const groupsandlist = (data) => { return request({ - url: "/api/app/asbitem/in-filter", - method: "get", - params: data, + url: "/api/app/asbitem/getasbitemlist", + method: "post", + data, }); }; // 组合项目新增 diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue index 14c14c1..d8d8f7e 100644 --- a/src/views/fee-settings/Asbitem.vue +++ b/src/views/fee-settings/Asbitem.vue @@ -1240,10 +1240,10 @@ export default { getapi("/api/app/organization-units/by-code-all").then((res) => { this.organizationUnitdata = res.data; }); - //获取组合项目 - getapi("/api/app/asbitem/in-filter").then((res) => { - this.asbitemdata = res.data.items; - }); + //获取组合项目 {isFilterActive:'Y'} + postapi('/api/app/asbitem/getasbitemlist').then(res =>{ + this.asbitemdata = res.data + }) //获取适用性别 getapi("/api/app/for-sex").then((res) => { this.forsexdata = res.data;