Browse Source

dj22

master
pengjun 2 years ago
parent
commit
593ed9366a
  1. 53
      src/components/doctorCheck/PatientRegisterBase.vue
  2. 59
      src/components/patientRegister/PatientRegisterEditQuery.vue
  3. 33
      src/components/patientRegister/PatientRegisterForChoose.vue
  4. 10
      src/components/patientRegister/PatientRegisterList.vue
  5. 1
      src/store/index.js

53
src/components/doctorCheck/PatientRegisterBase.vue

@ -65,10 +65,11 @@
<el-input :value="prBase.mobileTelephone" style="width: 120px;" size="small" disabled /> <el-input :value="prBase.mobileTelephone" style="width: 120px;" size="small" disabled />
</div> </div>
</div> </div>
<!-- 体检人员记录列表 --> <!-- 体检人员记录列表 -->
<el-dialog title="体检人员列表" :visible.sync="dialogWin.PatientRegisterForChoose" width="800px" :show-close="false" <el-dialog title="体检人员列表" :visible.sync="dialogWin.PatientRegisterForChoose" width="800px" :show-close="false"
:close-on-click-modal="false" :append-to-body="true"> :close-on-click-modal="false" :append-to-body="true">
<PatientRegisterForChoose :params="PatientRegisterForChooseParams" />
<PatientRegisterForChoose :params="PatientRegisterList" />
</el-dialog> </el-dialog>
</div> </div>
@ -104,7 +105,7 @@ export default {
mobileTelephone: '', // mobileTelephone: '', //
}, },
prBaseInit: {}, prBaseInit: {},
PatientRegisterForChooseParams: {}, //
PatientRegisterList: [], //
}; };
}, },
@ -144,7 +145,7 @@ export default {
}, 10); }, 10);
// //
this.patientRegister.photo = rd.photo
this.patientRegister.photo = rd.photo || ''
}, },
@ -157,12 +158,11 @@ export default {
isFilterPreRegistration: 'Y' // Y= N= N (CompleteFlag0null) isFilterPreRegistration: 'Y' // Y= N= N (CompleteFlag0null)
} }
// console.log(`/api/app/patientregister/getpatientregisterorpatient`, body) // console.log(`/api/app/patientregister/getpatientregisterorpatient`, body)
this.dataTransOpts.tableS.patient_register = { id: '' }
this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo }
postapi('/api/app/patientregister/getpatientregisterorpatient', body) postapi('/api/app/patientregister/getpatientregisterorpatient', body)
.then((res) => { .then((res) => {
if (res.code != -1) { if (res.code != -1) {
this.dataTransOpts.tableS.patient_register = deepCopy(res.data)
if (res.data) this.dataTransOpts.tableS.patient_register = deepCopy(res.data)
} }
}) })
.finally(() => { .finally(() => {
@ -179,11 +179,11 @@ export default {
isFilterPreRegistration: 'Y' // Y= N= N (CompleteFlag0null) isFilterPreRegistration: 'Y' // Y= N= N (CompleteFlag0null)
} }
// console.log(`/api/app/patientregister/getpatientregisterorpatient`, body) // console.log(`/api/app/patientregister/getpatientregisterorpatient`, body)
this.dataTransOpts.tableS.patient_register = { id: '' }
this.dataTransOpts.tableS.patient_register = { id: '', patientNo }
postapi('/api/app/patientregister/getpatientregisterorpatient', body) postapi('/api/app/patientregister/getpatientregisterorpatient', body)
.then((res) => { .then((res) => {
if (res.code != -1) { if (res.code != -1) {
this.dataTransOpts.tableS.patient_register = deepCopy(res.data)
if (res.data) this.dataTransOpts.tableS.patient_register = deepCopy(res.data)
} }
}) })
.finally(() => { .finally(() => {
@ -197,16 +197,35 @@ export default {
patientName: v, patientName: v,
isFilterPreRegistration: 'Y' // Y= N= N (CompleteFlag0null) isFilterPreRegistration: 'Y' // Y= N= N (CompleteFlag0null)
} }
this.PatientRegisterForChooseParams = body //
this.dialogWin.PatientRegisterForChoose = true //
this.dataTransOpts.tableS.patient_register = { id: '', patientName: v }
//
postapi('/api/app/patientregister/getlistinfilter', body)
.then(res => {
if (res.code != -1) {
if (res.data.items.length == 1) {
this.dataTransOpts.tableS.patient_register.id = res.data.items[0].id
setTimeout(() => { setTimeout(() => {
//
this.dataTransOpts.refresh.register_check.M++
this.dataTransOpts.refresh.patient_register.S++
}, 10);
// this.getPatientRegister(res.data.items[0].id)
} else if (res.data.items.length > 1) {
this.PatientRegisterList = res.data.items
this.dialogWin.PatientRegisterForChoose = true //
this.dataTransOpts.plus.PatientRegisterForChoose++
} else {
this.afterFind(this.dataTransOpts.tableS.patient_register)
}
}
})
// setTimeout(() => {
// //
// this.dataTransOpts.refresh.register_check.M++
//
this.dataTransOpts.refresh.sumDoctor.M++
this.dataTransOpts.refresh.sum_diagnosis.M++
}, 20);
// //
// this.dataTransOpts.refresh.sumDoctor.M++
// this.dataTransOpts.refresh.sum_diagnosis.M++
// }, 20);
}, },
//ID //ID
@ -290,7 +309,7 @@ export default {
handler(newVal, oldVal) { handler(newVal, oldVal) {
console.log(`watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.id}`); console.log(`watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.id}`);
this.getPatientRegister(this.dataTransOpts.tableS.patient_register.id) this.getPatientRegister(this.dataTransOpts.tableS.patient_register.id)
this.dataTransOpts.refresh.register_check.M++
// this.dataTransOpts.refresh.register_check.M++
} }
}, },
}, },

59
src/components/patientRegister/PatientRegisterEditQuery.vue

@ -26,7 +26,7 @@
<!-- 体检人员记录列表 --> <!-- 体检人员记录列表 -->
<el-dialog title="体检人员列表" :visible.sync="dialogWin.PatientRegisterForChoose" width="800px" :show-close="false" :close-on-click-modal="false" <el-dialog title="体检人员列表" :visible.sync="dialogWin.PatientRegisterForChoose" width="800px" :show-close="false" :close-on-click-modal="false"
:append-to-body="true"> :append-to-body="true">
<PatientRegisterForChoose :params="PatientRegisterForChooseParams"/>
<PatientRegisterForChoose :params="PatientRegisterList"/>
</el-dialog> </el-dialog>
@ -52,7 +52,7 @@ export default {
patientName: '', patientName: '',
tel: '' tel: ''
}, },
PatientRegisterForChooseParams:{},
PatientRegisterList:[],
}; };
}, },
@ -134,14 +134,14 @@ export default {
body = { body = {
phone:this.query.tel phone:this.query.tel
} }
this.getlistinfilter(url2,body);
this.getlistinfilter(body);
break; break;
case 'patientName': case 'patientName':
if(!this.query.patientName) return; if(!this.query.patientName) return;
body = { body = {
patientName:this.query.patientName patientName:this.query.patientName
} }
this.getlistinfilter(url2,body);
this.getlistinfilter(body);
break; break;
default: default:
return; return;
@ -159,7 +159,7 @@ export default {
this.dataTransOpts.tableS.patient_register.id = res.data.id this.dataTransOpts.tableS.patient_register.id = res.data.id
setTimeout(() => { setTimeout(() => {
this.dataTransOpts.refresh.patient_register.S++ this.dataTransOpts.refresh.patient_register.S++
}, 20);
}, 10);
// this.patientRegister.patientRegisterId = res.data.id // this.patientRegister.patientRegisterId = res.data.id
// this.patientRegister.photo = res.data.photo // this.patientRegister.photo = res.data.photo
// this.getPatientRegisterAbs(res.data.id) // this.getPatientRegisterAbs(res.data.id)
@ -170,35 +170,30 @@ export default {
}, },
// //
getlistinfilter(url,body){
// url = '/api/app/patientregister/getlistinfilter'
// postapi(url, body)
// .then((res) => {
// if (res.code != -1) {
// if(res.data.items.length == 0){
// this.$message.info("")
// }else if(res.data.items.length == 1){
// objCopy(res.data.items[0], this.form)
// this.dataTransOpts.tableS.patient_register.id = res.data.items[0].id
// setTimeout(() => {
// this.dataTransOpts.refresh.register_check_asbitem.M++
// }, 20);
// // objCopy(res.data.items[0], this.patientRegister.patientRegisterRd)
// // this.patientRegister.patientRegisterId = res.data.items[0].id
// // this.patientRegister.photo = res.data.items[0].photo
// // this.getPatientRegisterAbs(res.data.items[0].id)
// }else{
// //
// this.patientRegisters = res.data.items
// this.registerVisible = true
// }
// }
// });
this.PatientRegisterForChooseParams = body
this.dialogWin.PatientRegisterForChoose = true
getlistinfilter(body){
postapi('/api/app/patientregister/getlistinfilter', body)
.then(res => {
if (res.code != -1) {
if (res.data.items.length == 1) {
this.dataTransOpts.tableS.patient_register.id = res.data.items[0].id
setTimeout(() => { setTimeout(() => {
this.dataTransOpts.refresh.patient_register.M++
this.dataTransOpts.refresh.patient_register.S++
}, 10); }, 10);
// this.getPatientRegister(res.data.items[0].id)
} else if (res.data.items.length > 1) {
this.PatientRegisterList = res.data.items
this.dialogWin.PatientRegisterForChoose = true //
this.dataTransOpts.plus.PatientRegisterForChoose++
} else {
this.dataTransOpts.tableS.patient_register.id = ''
setTimeout(() => {
this.dataTransOpts.refresh.patient_register.S++
}, 10);
}
}
})
}, },
}, },

33
src/components/patientRegister/PatientRegisterForChoose.vue

@ -183,7 +183,7 @@ export default {
// //
mounted() { mounted() {
this.getPatientregisterList()
}, },
computed: { computed: {
...mapState([ ...mapState([
@ -200,28 +200,7 @@ export default {
moment,dddw,deepCopy, moment,dddw,deepCopy,
getPatientregisterList(){ getPatientregisterList(){
this.patientRegisterId = "" //ID
// params = {
// patientName:v,
// isFilterPreRegistration:'Y' // Y= N= N (CompleteFlag0null)
// }
postapi('/api/app/patientregister/getlistinfilter', this.params).then(res => {
if (res.code != -1) {
if(res.data.items.length == 0){
this.dataTransOpts.tableS.patient_register.id = ''
setTimeout(() => {
this.dataTransOpts.refresh.patient_register.S++
}, 20);
this.dialogWin.PatientRegisterForChoose = false
this.$message.warning('未找到相关信息')
}else if(res.data.items.length == 1){
this.rowDblclick(res.data.items[0])
}else{
this.patientRegisters = res.data.items
}
}
})
this.patientRegisters = this.params
}, },
@ -244,7 +223,7 @@ export default {
this.dataTransOpts.tableS.patient_register.id = this.patientRegisterId this.dataTransOpts.tableS.patient_register.id = this.patientRegisterId
setTimeout(() => { setTimeout(() => {
this.dataTransOpts.refresh.patient_register.S++ this.dataTransOpts.refresh.patient_register.S++
}, 20);
}, 10);
this.dialogWin.PatientRegisterForChoose = false this.dialogWin.PatientRegisterForChoose = false
}, },
@ -253,12 +232,12 @@ export default {
// //
watch: { watch: {
// //
"dataTransOpts.refresh.patient_register.M":{
immediate: true, //
"dataTransOpts.plus.PatientRegisterForChoose":{
// immediate: true, //
// deep: true, // // deep: true, //
handler(newVal,oldVal){ handler(newVal,oldVal){
console.log(`watch: 刷新体检人员列表 newVal: ${newVal} oldVal:${oldVal}`) console.log(`watch: 刷新体检人员列表 newVal: ${newVal} oldVal:${oldVal}`)
this.getPatientregisterList()
if(newVal != oldVal) this.getPatientregisterList()
} }
}, },
}, },

10
src/components/patientRegister/PatientRegisterList.vue

@ -686,16 +686,6 @@ export default {
// register_check_asbitem // register_check_asbitem
if (lfind > -1) { if (lfind > -1) {
this.dataTransOpts.refresh.register_check_asbitem.M++ this.dataTransOpts.refresh.register_check_asbitem.M++
// setTimeout(() => {
// this.$refs['info'].setCurrentRow(currentRow)
// this.setForm(currentRow)
// // this.patientRegister.query.customerOrgParentId = this.tableData[lfind].customerOrgParentId;
// this.patientRegister.customerOrgGroupChange = 0; //0
// this.patientRegister.medicalPackageChange = 0; //0
// // this.getCustomerOrgGroup(this.tableData[lfind].customerOrgParentId);
// this.dict.asbItem = [...this.dict.asbItemAll];
// this.getPatientRegisterAbs(currentRow.id);
// }, 100)
} }
}, },

1
src/store/index.js

@ -360,6 +360,7 @@ export default new Vuex.Store({
clearPatientRegisterQuery: 0, //清空人员登记界面查询条件 clearPatientRegisterQuery: 0, //清空人员登记界面查询条件
PatientRegisterEditGroupBatch: 0, //刷新批量调整分组窗口 PatientRegisterEditGroupBatch: 0, //刷新批量调整分组窗口
PatientRegisterEditItemBatch: 0, //刷新批量调整项目窗口 PatientRegisterEditItemBatch: 0, //刷新批量调整项目窗口
PatientRegisterForChoose:0, // 体检人员查询窗口
} }
}, },

Loading…
Cancel
Save