pengjun 3 weeks ago
parent
commit
8e7d474058
  1. 1
      src/store/index.js
  2. 8
      src/views/customerReport/positiveResultsList.vue
  3. 12
      src/views/doctorCheck/doctorCheck.vue

1
src/store/index.js

@ -569,6 +569,7 @@ export default new Vuex.Store({
charge: false, // 收费窗口 charge: false, // 收费窗口
PatientList: false, // 体检人员档案列表 PatientList: false, // 体检人员档案列表
PatientRegisterEdit: false, // 体检人员登记 新增/编辑 PatientRegisterEdit: false, // 体检人员登记 新增/编辑
PatientRegisterEdit2: false, // 医生诊台 新增/编辑
PatientRegisterForChoose: false, // 体检人员登记列表 PatientRegisterForChoose: false, // 体检人员登记列表
PatientRegisterEditItemBatch: false, //批量调整项目 PatientRegisterEditItemBatch: false, //批量调整项目
PatientRegisterEditGroupBatch: false, //批量调整分组 PatientRegisterEditGroupBatch: false, //批量调整分组

8
src/views/customerReport/positiveResultsList.vue

@ -419,7 +419,9 @@ export default {
btnQuery() { btnQuery() {
let body = {}, let body = {},
customerOrgs = [], customerOrgs = [],
diagnosisIds = [];
diagnosisIds = [],
suggestionTitles =[];
if (this.diagnosis.dataCusOrgOCX.length > 0) { if (this.diagnosis.dataCusOrgOCX.length > 0) {
this.diagnosis.dataCusOrgOCX.forEach((e) => { this.diagnosis.dataCusOrgOCX.forEach((e) => {
let rd = { let rd = {
@ -450,13 +452,15 @@ export default {
if (this.diagnosis.dataAsbitemOCX.length > 0) { if (this.diagnosis.dataAsbitemOCX.length > 0) {
this.diagnosis.dataAsbitemOCX.forEach((e) => { this.diagnosis.dataAsbitemOCX.forEach((e) => {
diagnosisIds.push(e.id); diagnosisIds.push(e.id);
suggestionTitles.push(e.displayName)
}); });
} }
body.customerOrgs = customerOrgs; body.customerOrgs = customerOrgs;
body.diagnosisIds = diagnosisIds; body.diagnosisIds = diagnosisIds;
body.suggestionTitles = suggestionTitles;
if (this.completeFlag) body.completeFlag = this.completeFlag; if (this.completeFlag) body.completeFlag = this.completeFlag;
body.isAudit = this.classification;
if (this.classification) body.isAudit = this.classification;
//console.log('/api/app/peisreport/getregisterasbitemchargestatus',body) //console.log('/api/app/peisreport/getregisterasbitemchargestatus',body)
if (this.format == 0) { if (this.format == 0) {

12
src/views/doctorCheck/doctorCheck.vue

@ -200,10 +200,10 @@
<FollowCriticalCheck /> <FollowCriticalCheck />
</el-dialog> </el-dialog>
<!-- 体检人员登记 --> <!-- 体检人员登记 -->
<el-dialog :title="patient_register.id ? '体检人员--编辑' : '体检人员--新增'" :visible.sync="dialogWin.PatientRegisterEdit"
<el-dialog :title="patient_register.id ? '体检人员--编辑' : '体检人员--新增'" :visible.sync="dialogWin.PatientRegisterEdit2"
:close-on-click-modal="false" fullscreen @close="closeDialogWinPatientRegisterEdit"> :close-on-click-modal="false" fullscreen @close="closeDialogWinPatientRegisterEdit">
<!-- :formInitData="formData" --> <!-- :formInitData="formData" -->
<PatientRegisterEdit style="z-index:30001;" :isDoctor="'1'" :patientRegisterId="patient_register.id"
<PatientRegisterEdit2 style="z-index:30001;" :isDoctor="'1'" :patientRegisterId="patient_register.id"
:editTimes="editTimes" :refreshRegister="refreshRegister" /> :editTimes="editTimes" :refreshRegister="refreshRegister" />
</el-dialog> </el-dialog>
<el-dialog title="设置体检日期" style="z-index:30002;" :visible.sync="dialogVisibleSetStartDate" <el-dialog title="设置体检日期" style="z-index:30002;" :visible.sync="dialogVisibleSetStartDate"
@ -274,7 +274,7 @@ import FollowCriticalCheck from "../../components/follow/FollowCriticalCheck.vue
import moment from 'moment'; import moment from 'moment';
import Follow from "@/components/follow/follow.vue"; import Follow from "@/components/follow/follow.vue";
import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
import PatientRegisterEdit2 from "../../components/patientRegister/PatientRegisterEdit.vue";
import PatientRegisterList from "../../components/doctorCheck/PatientRegisterList.vue"; import PatientRegisterList from "../../components/doctorCheck/PatientRegisterList.vue";
import CheckDetails from "../../components/sumDoctorCheck/CheckDetails.vue"; import CheckDetails from "../../components/sumDoctorCheck/CheckDetails.vue";
@ -299,7 +299,7 @@ export default {
PacsImgPreview, PacsImgPreview,
PacsDcmPreview, PacsDcmPreview,
FollowCriticalCheck, FollowCriticalCheck,
PatientRegisterEdit,
PatientRegisterEdit2, //
PatientRegisterList, PatientRegisterList,
CheckDetails, CheckDetails,
SumItems, SumItems,
@ -1206,7 +1206,7 @@ export default {
//this.formData = Object.assign({},this.formInitData,{medicalStartDate:moment(this.medicalStartDate).format('yyyy-MM-DD')}) //this.formData = Object.assign({},this.formInitData,{medicalStartDate:moment(this.medicalStartDate).format('yyyy-MM-DD')})
// this.patient_register.id = '' // this.patient_register.id = ''
this.dataTransOpts.tableS.patient_register.id = '' this.dataTransOpts.tableS.patient_register.id = ''
this.dialogWin.PatientRegisterEdit = true
this.dialogWin.PatientRegisterEdit2 = true
setTimeout(() => { setTimeout(() => {
this.dataTransOpts.refresh.patient_register.S++ this.dataTransOpts.refresh.patient_register.S++
}, 20); }, 20);
@ -1263,7 +1263,7 @@ export default {
// this.formData = Object.assign({},this.doctorCheck.prBase) // this.formData = Object.assign({},this.doctorCheck.prBase)
//console.log(this.patientRegister.patientRegisterRd,this.patientRegister.prList) //console.log(this.patientRegister.patientRegisterRd,this.patientRegister.prList)
this.dialogWin.PatientRegisterEdit = true;
this.dialogWin.PatientRegisterEdit2 = true;
setTimeout(() => { setTimeout(() => {
this.dataTransOpts.refresh.patient_register.S++ this.dataTransOpts.refresh.patient_register.S++
}, 20); }, 20);

Loading…
Cancel
Save