diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue index 5ec7426..e42c529 100644 --- a/src/components/doctorCheck/PatientRegisterBase.vue +++ b/src/components/doctorCheck/PatientRegisterBase.vue @@ -7,11 +7,11 @@
档案号 - +
姓名 - +
性别 @@ -66,18 +66,18 @@
- - + + diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue index 521ea8b..8c1b8e5 100644 --- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue +++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue @@ -2,29 +2,30 @@
未检组合项目：
-
- {{ item }} +
+ {{ + item }}
弃检组合项目：
- {{ item }} + {{ item + }}
组合项目已检但无值的明细项目：
- {{ item }} + {{ item + }}
组合项目已检但弃检的明细项目：
- {{ item }} + {{ + item }}
@@ -52,26 +53,29 @@ export default { //挂载完成 mounted() { - if (this.patientRegisterId) { - this.getSumAsbItemStatus(this.patientRegisterId); - } + + this.getSumAsbItemStatus(this.dataTransOpts.tableS.patient_register.id); + }, computed: { - ...mapState(["window","dict", "doctorCheck", "sumDoctorCheck"]), - sumHeight(){ - let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight + ...mapState(["window", "dict","dataTransOpts", "doctorCheck", "sumDoctorCheck"]), + sumHeight() { + let tempHeight = this.window.pageHeight < 600 ? 600 : this.window.pageHeight return tempHeight - 320 }, }, methods: { getSumAsbItemStatus(PatientRegisterId) { - this.data.unCheckedAsbitem = []; - this.data.giveUpAsbitem = []; - this.data.checkedNullValueItem = []; - this.data.checkedGiveUpItem = []; - if(!PatientRegisterId) return + if (!PatientRegisterId) { + this.data.unCheckedAsbitem = []; + this.data.giveUpAsbitem = []; + this.data.checkedNullValueItem = []; + this.data.checkedGiveUpItem = []; + return + } + getapi(`/api/app/patientregister/getpatientregisteritemstatus?PatientRegisterId=${PatientRegisterId}`).then(res => { if (res.code != -1) { this.data.unCheckedAsbitem = res.data.unCheckedAsbitem; @@ -86,13 +90,22 @@ export default { //监听事件 watch: { //人员ID切换 - "patientRegisterId":{ - immediate:true, + // "patientRegisterId":{ + // immediate:true, + // handler(newVal, oldVal) { + // console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal); + // this.getSumAsbItemStatus(newVal); + // } + // }, + // 虚拟表 触发强制刷新 （sumDoctor.M 合并包含：综述、建议、对比、历史等，不包含总检诊断） + "dataTransOpts.refresh.sumDoctor.M": { + // immediate:true, handler(newVal, oldVal) { - console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal); - this.getSumAsbItemStatus(newVal); + console.log(`watch 总检--检查状态汇总 newVal: ${newVal}, oldVal: ${oldVal} patientRegisterId: ${this.dataTransOpts.tableS.patient_register.id}`); + this.getSumAsbItemStatus(this.dataTransOpts.tableS.patient_register.id); } }, + }, }; @@ -100,7 +113,7 @@ export default { +} + diff --git a/src/components/sumDoctorCheck/SumDiagnosis.vue b/src/components/sumDoctorCheck/SumDiagnosis.vue index 2d4dd14..a17e0a6 100644 --- a/src/components/sumDoctorCheck/SumDiagnosis.vue +++ b/src/components/sumDoctorCheck/SumDiagnosis.vue @@ -62,13 +62,15 @@ export default { if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName)) this.dictInit(); - this.getDiagnosisList(this.patientRegisterId); + }, //挂载完成 - mounted() { }, + mounted() { + this.getDiagnosisList(this.dataTransOpts.tableS.patient_register.id); + }, computed: { - ...mapState(["window", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck", "report"]), + ...mapState(["window", "dict","dataTransOpts", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck", "report"]), sumHeight(){ let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight return tempHeight - 352 @@ -191,11 +193,12 @@ export default { }, //监听事件 - watch: { - "patientRegisterId":{ - immediate:true, - handler(newVal, oldVal){ - this.getDiagnosisList(newVal) + watch: { + "dataTransOpts.refresh.sum_diagnosis.M": { + // immediate:true, + handler(newVal, oldVal) { + console.log(`watch 总检--诊断 newVal: ${newVal}, oldVal: ${oldVal} patientRegisterId: ${this.dataTransOpts.tableS.patient_register.id}`); + this.getDiagnosisList(this.dataTransOpts.tableS.patient_register.id); } }, }, diff --git a/src/components/sumDoctorCheck/SumHistory.vue b/src/components/sumDoctorCheck/SumHistory.vue index 6dc8522..c2e5d96 100644 --- a/src/components/sumDoctorCheck/SumHistory.vue +++ b/src/components/sumDoctorCheck/SumHistory.vue @@ -1,5 +1,5 @@ - diff --git a/src/components/sumDoctorCheck/SumItems.vue b/src/components/sumDoctorCheck/SumItems.vue index 526f79e..80a1cb3 100644 --- a/src/components/sumDoctorCheck/SumItems.vue +++ b/src/components/sumDoctorCheck/SumItems.vue @@ -57,13 +57,11 @@ export default { //挂载完成 mounted() { - // if(this.sumDoctorCheck.sumPREdit.patientId){ - // this.registerCheckList(this.sumDoctorCheck.sumPREdit.patientId); - // } + this.registerCheckList(this.patientId) }, computed: { - ...mapState(['window', 'dict', 'doctorCheck', 'sumDoctorCheck']), + ...mapState(['window', 'dict', 'dataTransOpts', 'doctorCheck', 'sumDoctorCheck']), divHeight() { let tempHeight = this.window.pageHeight < 600 ? 600 : this.window.pageHeight @@ -90,7 +88,7 @@ export default { console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`) getapi(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`) .then((res) => { - console.log("获取项目对比 SumItems", res.data); + console.log("获取横向对比 SumItems", res.data); if (res.code != -1) { this.RegisterCheckList = res.data; if (res.data.length > 0) this.rowClick(res.data[0]) @@ -119,7 +117,7 @@ export default { console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonlist?PatientId=${patientId}&AsbitemId=${asbitemId}`) getapi(`/api/app/sumsummaryreport/gethorizontalcomparisonlist?PatientId=${patientId}&AsbitemId=${asbitemId}`) .then((res) => { - console.log("获取项目对比 SumItems", res.data); + console.log("获取横向对比 SumItems", res.data); if (res.code != -1) { this.crossTable(res.data); } @@ -172,13 +170,13 @@ export default { }, //监听事件 - watch: { - //检查项目切换 - "patientId": { - immediate: true, + watch: { + // 虚拟表 触发强制刷新 （sumDoctor.M 合并包含：综述、建议、对比、历史等，不包含总检诊断） + "dataTransOpts.refresh.sumDoctor.M":{ + // immediate:true, handler(newVal, oldVal) { - console.log("watch patientId newVal：", newVal, " oldVal：", oldVal); - this.registerCheckList(newVal) + console.log(`watch 总检--横向对比 newVal: ${newVal}, oldVal: ${oldVal} patientId: ${this.patientId}`); + this.registerCheckList(this.patientId) } }, }, diff --git a/src/components/sumDoctorCheck/SumItemsType.vue b/src/components/sumDoctorCheck/SumItemsType.vue index 9ac4299..ee54009 100644 --- a/src/components/sumDoctorCheck/SumItemsType.vue +++ b/src/components/sumDoctorCheck/SumItemsType.vue @@ -28,13 +28,11 @@ export default { //挂载完成 mounted() { - // if(this.patientId){ - // this.SumItems(this.patientId); - // } + this.SumItems(this.patientId) }, computed: { - ...mapState(['window', 'dict', 'doctorCheck', 'sumDoctorCheck']), + ...mapState(['window', 'dict','dataTransOpts', 'doctorCheck', 'sumDoctorCheck']), divHeight() { let tempHeight = this.window.pageHeight < 600 ? 600 : this.window.pageHeight @@ -100,13 +98,13 @@ export default { }, //监听事件 - watch: { - //检查项目切换 - "patientId": { - immediate: true, + watch: { + // 虚拟表 触发强制刷新 （sumDoctor.M 合并包含：综述、建议、对比、历史等，不包含总检诊断） + "dataTransOpts.refresh.sumDoctor.M":{ + // immediate:true, handler(newVal, oldVal) { - console.log("watch patientId newVal：", newVal, " oldVal：", oldVal); - this.SumItems(newVal) + console.log(`watch 总检--项目对比 newVal: ${newVal}, oldVal: ${oldVal} patientId: ${this.patientId}`); + this.SumItems(this.patientId) } }, }, diff --git a/src/components/sumDoctorCheck/SumPREdit.vue b/src/components/sumDoctorCheck/SumPREdit.vue index af957c5..cfabda9 100644 --- a/src/components/sumDoctorCheck/SumPREdit.vue +++ b/src/components/sumDoctorCheck/SumPREdit.vue @@ -1,56 +1,40 @@ @@ -63,32 +47,56 @@ export default { components: {}, data() { return { - users:[], - + users: [], + }; }, - created() {}, + created() { }, //挂载完成 mounted() { this.dictInit() + this.getPatientRegister(this.dataTransOpts.tableS.patient_register.id); }, computed: { - ...mapState(["dict", "doctorCheck","sumDoctorCheck"]), + ...mapState(["dict", "dataTransOpts", "doctorCheck", "sumDoctorCheck"]), }, - methods: { + methods: { // 初始化字典数据 - dictInit(){ + dictInit() { getapi('/api/identity/users/getlist') - .then(res =>{ - if(res.code != -1){ - this.users = res.data.items - } - }) + .then(res => { + if (res.code != -1) { + this.users = res.data.items + } + }) + }, + + // 获取体检登记信息（总检状态） + getPatientRegister(patientRegisterId) { + if (!patientRegisterId) { + this.sumDoctorCheck.sumPREdit = {} + return + } + postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${patientRegisterId}`) + .then(res => { + if (res.code != -1) this.sumDoctorCheck.sumPREdit = res.data + }) + + }, + + }, + //监听事件 + watch: { + "dataTransOpts.refresh.sumDoctor.M": { + // immediate:true, + handler(newVal, oldVal) { + console.log(`watch 总检状态 newVal: ${newVal}, oldVal: ${oldVal} patientRegisterId: ${this.dataTransOpts.tableS.patient_register.id}`); + this.getPatientRegister(this.dataTransOpts.tableS.patient_register.id); + } }, - }, }; diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue index 965610a..769395c 100644 --- a/src/components/sumDoctorCheck/SumSug.vue +++ b/src/components/sumDoctorCheck/SumSug.vue @@ -108,10 +108,13 @@ export default { mounted() { this.rowDrop(); this.rowDropSuggestion(); + + this.summaryList(this.dataTransOpts.tableS.patient_register.id) + this.suggestionList(this.dataTransOpts.tableS.patient_register.id) }, computed: { - ...mapState(['window', 'dict', 'doctorCheck', 'sumDoctorCheck']), + ...mapState(['window', 'dict','dataTransOpts', 'doctorCheck', 'sumDoctorCheck']), sumHeight(){ let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight @@ -352,13 +355,13 @@ export default { //监听事件 watch: { - //检查项目切换 - "patientRegisterId":{ - immediate:true, + // 虚拟表 触发强制刷新 （sumDoctor.M 合并包含：综述、建议、对比、历史等，不包含总检诊断） + "dataTransOpts.refresh.sumDoctor.M":{ + // immediate:true, handler(newVal, oldVal) { - console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal); - this.summaryList(newVal) - this.suggestionList(newVal) + console.log(`watch 总检--综述建议 newVal: ${newVal}, oldVal: ${oldVal} patientRegisterId: ${this.dataTransOpts.tableS.patient_register.id}`); + this.summaryList(this.dataTransOpts.tableS.patient_register.id) + this.suggestionList(this.dataTransOpts.tableS.patient_register.id) } }, diff --git a/src/store/index.js b/src/store/index.js index e9a178f..d6548e8 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -304,6 +304,9 @@ export default new Vuex.Store({ register_check: { S: 0, M: 0 }, // 体检人员登记的项目（合并后） register_check_item: { S: 0, M: 0 }, // 体检人员登记的明细项目 role_menu_info: { S: 0, M: 0 }, // 角色对应的菜单 + sum_diagnosis: { S: 0, M: 0 }, // 总检诊断 + + sumDoctor:{ S: 0, M: 0 }, // 虚拟表 触发强制刷新 （sumDoctor.M 合并包含：综述、建议、对比、历史等，不包含总检诊断） }, //表当前数据（单条记录 S--single） tableS: { @@ -317,11 +320,12 @@ export default new Vuex.Store({ customer_org_group_detail: { id: '' }, // 单位分组包含的组合项目明细 charge: { id: '' }, // 收费 menu_info: { id: '' }, // 菜单与页面 - patient_register: { id: '' }, - register_asbitem: { id: '' }, - register_check: { id: '' }, - register_check_item: { id: '' }, + patient_register: { id: '' }, // 体检人员记录 + register_asbitem: { id: '' }, // 体检人员登记的项目（合并前） + register_check: { id: '' }, // 体检人员登记的项目（合并后） + register_check_item: { id: '' }, // 体检人员登记的明细项目 role_menu_info: { id: '' }, // 角色对应的菜单 + sum_diagnosis: { id: '' }, // 总检诊断 }, //表当前数据（多条记录 M--more） tableM: { @@ -335,11 +339,12 @@ export default new Vuex.Store({ customer_org_group_detail: [], // 单位分组包含的组合项目明细 charge: [], // 收费 menu_info: [], // 菜单与页面 - patient_register: [], - register_asbitem: [], - register_check: [], - register_check_item: [], + patient_register: [], // 体检人员记录 + register_asbitem: [], // 体检人员登记的项目（合并前） + register_check: [], // 体检人员登记的项目（合并后） + register_check_item: [], // 体检人员登记的明细项目 role_menu_info: [], // 角色对应的菜单 + sum_diagnosis: [], // 总检诊断 }, plus: { clearPatientRegisterQuery: 0,