From 135b58ea667c051c35b03906ada9b30b34017278 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Fri, 15 Dec 2023 14:58:58 +0800 Subject: [PATCH] sumdoctoer --- src/components/doctorCheck/ButtonList.vue | 3 +- .../doctorCheck/PatientRegisterList.vue | 11 +++- src/components/sumDoctorCheck/ButtonList.vue | 19 ++---- .../sumDoctorCheck/CheckDetails.vue | 12 +++- .../sumDoctorCheck/SumAsbItemStatus.vue | 13 +++- .../sumDoctorCheck/SumDiagnosis.vue | 7 +- src/components/sumDoctorCheck/SumHistory.vue | 11 ++-- src/components/sumDoctorCheck/SumItems.vue | 9 ++- .../sumDoctorCheck/SumItemsType.vue | 9 ++- src/components/sumDoctorCheck/SumSug.vue | 66 +++++++++++-------- src/views/doctorCheck/sumDoctorCheck.vue | 21 ++---- 11 files changed, 103 insertions(+), 78 deletions(-) diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue index 11215a1..5838b5a 100644 --- a/src/components/doctorCheck/ButtonList.vue +++ b/src/components/doctorCheck/ButtonList.vue @@ -200,7 +200,7 @@ export default { }, computed: { - ...mapState(["dict", "patientRegister", "doctorCheck"]), + ...mapState(["dict", "patientRegister", "doctorCheck","sumDoctorCheck"]), }, methods: { @@ -674,6 +674,7 @@ export default { //总检 toSumDoctorCheck() { + this.sumDoctorCheck.sumPREdit = Object.assign({},this.doctorCheck.prBase) this.$router.push({ path: "/sumDoctorCheck" }); }, diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index f83526a..16d7f34 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -258,18 +258,25 @@ export default { //点击体检次数行 rowClick(row) { + this.doctorCheckPrBaseInit() this.doctorCheck.prBase.patientRegisterNo = row.patientRegisterNo objCopy(row, this.doctorCheck.prBase) //基本信息 this.patientRegister.photo = row.photo - + this.sumPREditInit() objCopy(row, this.sumDoctorCheck.sumPREdit) //总检信息 + }, + //双击选中客户记录后，并半闭列表 rowDblclick(row){ this.rowClick(row) - this.doctorCheck.doctorCheckDialogVisible = false + if(this.win == 'doctorCheck'){ + this.doctorCheck.doctorCheckDialogVisible = false + }else{ + this.sumDoctorCheck.sumDoctorCheckDialogVisible = false + } }, ldddw(arrayData, key, value, display) { diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue index 6cd7536..87f341e 100644 --- a/src/components/sumDoctorCheck/ButtonList.vue +++ b/src/components/sumDoctorCheck/ButtonList.vue @@ -42,11 +42,11 @@ --> + :wrapperClosable="false" :modal="false" :size="300"> - @@ -103,6 +103,8 @@ export default { //to医生诊台 toDoctorCheck() { + // this.doctorCheck.prBase = Object.assign({},this.sumDoctorCheck.sumPREdit) + // this.patientRegister.photo = this.doctorCheck.prBase.photo this.$router.push({ path: "/doctorCheck" }); }, @@ -444,18 +446,7 @@ export default { //监听事件() watch: { - //1级单位值改变，分组改变 - "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) { - console.log( - "watch patientRegister.query.CustomerOrgParentId newVal：", - newVal, - " oldVal：", - oldVal - ); - if (newVal != oldVal && newVal !== this.dict.personOrgId) { - this.getCustomerOrgGroup(newVal); - } - }, + }, }; diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue index 47c24e2..acdd85d 100644 --- a/src/components/sumDoctorCheck/CheckDetails.vue +++ b/src/components/sumDoctorCheck/CheckDetails.vue @@ -73,6 +73,10 @@ export default { methods: { //获取结果明细 CheckDetails(RegisterId) { + if(!RegisterId){ + this.tableData = [] + return + } console.log(`/api/app/sumsummaryreport/getdetailedresultslist?PatientRegisterId=${RegisterId}`) getapi(`/api/app/sumsummaryreport/getdetailedresultslist?PatientRegisterId=${RegisterId}`) .then((res) => { @@ -86,6 +90,7 @@ export default { }); }, + mergeSummarys(array,itemKey){ let ret = '' array.forEach(e => { @@ -98,9 +103,10 @@ export default { //监听事件 watch: { //检查项目切换 - "sumDoctorCheck.sumPREdit.id"(newVal, oldVal) { - console.log("watch sumDoctorCheck.sumPREdit.id newVal：", newVal, " oldVal：", oldVal); - if (newVal != oldVal && newVal != '') { + "sumDoctorCheck.sumPREdit.id":{ + immediate:true, + handler(newVal, oldVal) { + console.log("watch sumDoctorCheck.sumPREdit.id newVal：", newVal, " oldVal：", oldVal); this.CheckDetails(newVal); } }, diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue index 7ee5449..be60df6 100644 --- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue +++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue @@ -62,6 +62,12 @@ export default { }, methods: { getSumAsbItemStatus(PatientRegisterId) { + this.data.unCheckedAsbitem = []; + this.data.giveUpAsbitem = []; + this.data.checkedNullValueItem = []; + this.data.checkedGiveUpItem = []; + + if(!PatientRegisterId) return getapi(`/api/app/patientregister/getpatientregisteritemstatus?PatientRegisterId=${PatientRegisterId}`).then(res => { if (res.code != -1) { this.data.unCheckedAsbitem = res.data.unCheckedAsbitem; @@ -76,9 +82,10 @@ export default { //监听事件 watch: { //人员ID切换 - "patientRegisterId"(newVal, oldVal) { - console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal); - if (newVal != oldVal && newVal != '') { + "patientRegisterId":{ + immediate:true, + handler(newVal, oldVal) { + console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal); this.getSumAsbItemStatus(newVal); } }, diff --git a/src/components/sumDoctorCheck/SumDiagnosis.vue b/src/components/sumDoctorCheck/SumDiagnosis.vue index 8242c8e..9e5a5e3 100644 --- a/src/components/sumDoctorCheck/SumDiagnosis.vue +++ b/src/components/sumDoctorCheck/SumDiagnosis.vue @@ -139,6 +139,8 @@ export default { //查询 getDiagnosisList(PatientRegisterId) { + this.sumDoctorCheck.diagnosisList = [] + if(!PatientRegisterId) return // /api/app/sumdiagnosis/getsumdiagnosislistinpatientregisterid?PatientRegisterId=3fa85f64-5717-4562-b3fc-2c963f66afa6 getapi(`/api/app/sumdiagnosis/getsumdiagnosislistinpatientregisterid?PatientRegisterId=${PatientRegisterId}`) .then((res) => { @@ -173,8 +175,9 @@ export default { //监听事件 watch: { - "patientRegisterId"(newVal, oldVal){ - if(newVal && newVal != oldVal){ + "patientRegisterId":{ + immediate:true, + handler(newVal, oldVal){ this.getDiagnosisList(newVal) } }, diff --git a/src/components/sumDoctorCheck/SumHistory.vue b/src/components/sumDoctorCheck/SumHistory.vue index e032575..8afe996 100644 --- a/src/components/sumDoctorCheck/SumHistory.vue +++ b/src/components/sumDoctorCheck/SumHistory.vue @@ -57,7 +57,9 @@ export default { // "sumSummarys": "* 乙肝两对半：\n(01)无免疫\n* 身高体重：\n(01)重度脂肪肝\n* 血常规：\n(01)白细胞计数升高\n* 心电图：\n(01)右眼近视\n", // "sumSuggestions": "* 乙肝两对半：\n(01)接种疫苗\n* 身高体重：\n(01)减肥、锻炼\n* 血常规：\n(01)注意休息\n* 心电图：\n(01)护眼及注意用眼卫生\n" // }, - SumHistory(patientId) { + SumHistory(patientId) { + this.tableData = [] + if(!patientId) return console.log(`/api/app/sumsummaryreport/gethistoricalreviewlist?PatientId=${patientId}`) getapi(`/api/app/sumsummaryreport/gethistoricalreviewlist?PatientId=${patientId}`) .then((res) => { @@ -80,9 +82,10 @@ export default { //监听事件 watch: { //检查项目切换 - "sumDoctorCheck.sumPREdit.patientId"(newVal, oldVal) { - console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal); - if (newVal != oldVal && newVal != '') { + "sumDoctorCheck.sumPREdit.patientId":{ + immediate:true, + handler(newVal, oldVal) { + console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal); this.SumHistory(newVal) } }, diff --git a/src/components/sumDoctorCheck/SumItems.vue b/src/components/sumDoctorCheck/SumItems.vue index 3f4e79f..37d2e94 100644 --- a/src/components/sumDoctorCheck/SumItems.vue +++ b/src/components/sumDoctorCheck/SumItems.vue @@ -64,6 +64,8 @@ export default { //获取检查组合项目 registerCheckList(patientId) { + this.RegisterCheckList = [] + if(!patientId) return console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`) getapi(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`) .then((res) => { @@ -151,9 +153,10 @@ export default { //监听事件 watch: { //检查项目切换 - "sumDoctorCheck.sumPREdit.patientId"(newVal, oldVal) { - console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal); - if (newVal != oldVal && newVal != '') { + "sumDoctorCheck.sumPREdit.patientId":{ + immediate:true, + handler(newVal, oldVal) { + console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal); this.registerCheckList(newVal) } }, diff --git a/src/components/sumDoctorCheck/SumItemsType.vue b/src/components/sumDoctorCheck/SumItemsType.vue index 7b3c486..4bf1d55 100644 --- a/src/components/sumDoctorCheck/SumItemsType.vue +++ b/src/components/sumDoctorCheck/SumItemsType.vue @@ -41,6 +41,8 @@ export default { methods: { //获取结果明细 3a0c6589-9989-4d7f-ba54-61e5b0138220 SumItems(patientId) { + this.orgData = [] + if(!patientId) return console.log(`/api/app/sumsummaryreport/getitemtypecontrastlist?PatientId=${patientId}`) getapi(`/api/app/sumsummaryreport/getitemtypecontrastlist?PatientId=${patientId}`) .then((res) => { @@ -96,9 +98,10 @@ export default { //监听事件 watch: { //检查项目切换 - "sumDoctorCheck.sumPREdit.patientId"(newVal, oldVal) { - console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal); - if (newVal != oldVal && newVal != '') { + "sumDoctorCheck.sumPREdit.patientId":{ + immediate:true, + handler(newVal, oldVal) { + console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal); this.SumItems(newVal) } }, diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue index dac1e7a..5951db8 100644 --- a/src/components/sumDoctorCheck/SumSug.vue +++ b/src/components/sumDoctorCheck/SumSug.vue @@ -32,14 +32,17 @@ - -