shentun
/
peisweb
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

master
luobinjie 4 months ago
parent
2b7fd40226 484e0629f0
commit
6cc6d1e6c8
9 changed files with 93 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/components/doctorCheck/ButtonList.vue
  2. 32
      src/components/doctorCheck/CheckPicture.vue
  3. 7
      src/components/doctorCheck/PatientRegisterBase.vue
  4. 1
      src/components/doctorCheck/PatientRegisterList.vue
  5. 22
      src/components/patientRegister/PatientRegisterEdit.vue
  6. 125
      src/components/patientRegister/PatientRegisterForChoose.vue
  7. 14
      src/components/patientRegister/PatientRegisterList.vue
  8. 8
      src/components/sumDoctorCheck/ButtonList.vue
  9. 6
      src/views/fee-settings/cardRegister.vue

6
src/components/doctorCheck/ButtonList.vue
View File

@ -26,11 +26,11 @@
<!--
<div>
<el-button type="primary" class="btnClass" @click="save">保存结果</el-button>
v-show="checkPagePriv(pagePriv.privs, 'AI诊断')" :disabled="doctorBtnDisabled('save')"
</div>
-->
<div v-show="checkPagePriv(pagePriv.privs, 'AI诊断')" class="divBtnClass">
<el-button slot="reference" class="commonbutton" @click="btnAIdiagnosis(false)"
:disabled="doctorBtnDisabled('save')">AI诊断</el-button>
<div class="divBtnClass">
<el-button slot="reference" class="commonbutton" @click="btnAIdiagnosis(false)">AI诊断</el-button>
</div>
<div v-show="checkPagePriv(pagePriv.privs, '修改结果')" class="divBtnClass">
<el-button type="primary" class="commonbutton" @click="btnEdit"

32
src/components/doctorCheck/CheckPicture.vue
View File

@ -29,7 +29,7 @@
</div>
<!-- -->
<div :style="`overflow-x: scroll;width:${Math.floor((window.pageWidth - 200 - 110 - 15 - 4))}px;`"
@contextmenu.prevent="onContextmenu">
@contextmenu.prevent="onContextmenu" ref="DivPic">
<div style="display: flex;">
<div class="demo-image__preview" v-for="(item, index) in checkPictures" :key="item.id"
style="display: inline-block; padding: 0 0 0 2px">
@ -74,6 +74,12 @@
</div>
</div>
</div>
<div>
<table :width="`${getPicing ? 300:0}px;`"></table>
<!--是否采图进行时，采图时自动滚到最右边-->
<!--暴力滚动 element.scrollLeft = element.scrollWidth;-->
<!--平滑滚动 element.scrollTo({ left: element.scrollWidth, behavior: 'smooth' });-->
</div>
</div>
</div>
@ -261,7 +267,8 @@ export default {
// 裁图
dialogWinCutPic: false,
cutPicParam: {},
pictureFileType: '1'
pictureFileType: '1',
getPicing:false, //是否采图中
};
},
@ -357,6 +364,9 @@ export default {
this.checkPictures.forEach(e => {
e.isPrintTrans = e.isPrint == "Y" ? true : false
});
// 标记采图中，让滚动条滑到最右边……
if(this.getPicing) this.setGetPicing()
}
});
},
@ -409,6 +419,16 @@ export default {
}
},
// 标记采图中，让滚动条滑到最右边……
setGetPicing(){
let obj = this.$refs['DivPic']
console.log('obj',obj)
this.$nextTick(() => {
//obj.scrollTo({ left: obj.scrollWidth, behavior: 'smooth' })
obj.scrollLeft = obj.scrollWidth
})
},
// 采图
btnGetPic() {
if (!this.doctorCheck.RegisterCheckId) {
@ -442,6 +462,10 @@ export default {
let lres = JSON.parse(res)
console.log('this.$peisAPI.imageAcquisition', lres)
if (lres.code > -1) {
// 标记采图中，让滚动条滑到最右边……
this.getPicing = true
this.setGetPicing()
for (let i = 0; i < lres.data.length; i++) {
let item = lres.data[i];
@ -505,6 +529,10 @@ export default {
return
}
// 标记采图中，让滚动条滑到最右边……
this.getPicing = true
this.setGetPicing()
// 设置图片打印或不打印
if (oprType == 'print' || oprType == 'unPrint') {
let count = this.checkPictures.length

7
src/components/doctorCheck/PatientRegisterBase.vue
View File

@ -362,6 +362,13 @@ export default {
} else if (res.data.items.length > 1) {
this.PatientRegisterList = res.data.items
if(Array.isArray(this.PatientRegisterList) && this.PatientRegisterList.length > 0){
this.PatientRegisterList.forEach(e => {
e.groupPack = e.medicalPackageName||e.customerOrgGroupName
e.org = e.customerOrgParentName||e.customerOrgName
e.dept = e.customerOrgParentName == e.customerOrgName ? '':e.customerOrgName
});
}
this.dialogWin.PatientRegisterForChoose = true // 弹窗
this.dataTransOpts.plus.PatientRegisterForChoose++
} else {

1
src/components/doctorCheck/PatientRegisterList.vue
View File

@ -83,7 +83,6 @@
<el-option label="已审核" value="Y" />
</el-select>
</div>
<div class="query">
<el-button class="commonbutton" type="primary" @click="btnQuery" size="small"
style="width:50px;height:26px;margin: 2px 0 2px -3px;">查询</el-button>

22
src/components/patientRegister/PatientRegisterEdit.vue
View File

@ -2009,8 +2009,8 @@ export default {
this.$message.warning({ showClose: true, message: fields[Object.keys(fields)[0]][0].message });
return false
}
// 手机号必填时，再验证手机号是否合法
if (this.rules['mobileTelephone']) {
// 手机号非必填时，如有填手机号，也要再验证手机号是否合法
if (this.form['mobileTelephone']) {
if (!isValidMobileNumber(this.form['mobileTelephone'])) {
this.$message.warning({ showClose: true, message: '请填写正确的手机号！' });
return false
@ -2604,9 +2604,9 @@ export default {
this.printing = true
if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) {
if (this.merge_lis_pacs_label == '1') {
this.guidePrintEasy('0008', isPreview, toOutShell)
this.lisPrint('0002', isPreview, toOutShell)
.then(res => {
return this.lisPrint('0002', isPreview, toOutShell)
return this.guidePrintEasy('0008', isPreview, toOutShell)
})
// .then(res => {
// return this.pacsPrint('0004', isPreview, toOutShell)
@ -2621,12 +2621,12 @@ export default {
this.printing = false
})
} else {
this.guidePrintEasy('0008', isPreview, toOutShell)
this.lisPrint('0002', isPreview, toOutShell)
.then(res => {
return this.lisPrint('0002', isPreview, toOutShell)
return this.pacsPrint('0004', isPreview, toOutShell)
})
.then(res => {
return this.pacsPrint('0004', isPreview, toOutShell)
return this.guidePrintEasy('0008', isPreview, toOutShell)
})
.then(res => {
resolve(res)
@ -2640,9 +2640,9 @@ export default {
}
} else if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1) {
this.guidePrintEasy('0008', isPreview, toOutShell)
this.lisPrint('0002', isPreview, toOutShell)
.then(res => {
return this.lisPrint('0002', isPreview, toOutShell)
return this.guidePrintEasy('0008', isPreview, toOutShell)
})
.then(res => {
resolve(res)
@ -2654,9 +2654,9 @@ export default {
this.printing = false
})
} else if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) {
this.guidePrintEasy('0008', isPreview, toOutShell)
this.pacsPrint('0004', isPreview, toOutShell)
.then(res => {
return this.pacsPrint('0004', isPreview, toOutShell)
return this.guidePrintEasy('0008', isPreview, toOutShell)
})
.then(res => {
resolve(res)

125
src/components/patientRegister/PatientRegisterForChoose.vue
View File

@ -3,44 +3,17 @@
<div>
<el-table :data="patientRegisters" border width="800" height="480" highlight-current-row
@row-click="registerRowClick" @row-dblclick="rowDblclick" size="small">
<el-table-column prop="patientRegisterNo" label="条码号" width="150" />
<el-table-column prop="patientNo" label="档案号" />
<el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
<el-table-column prop="patientName" label="姓名" />
<el-table-column prop="sexId" label="性别">
<template slot-scope="scope">
<div>{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
</template>
</el-table-column>
<el-table-column prop="patientRegisterNo" label="条码号" min-width="110" align="center"/>
<el-table-column prop="patientNo" label="档案号" align="center"/>
<el-table-column prop="medicalTimes" label="次数" align="center" />
<el-table-column prop="patientName" label="姓名" align="center"/>
<el-table-column prop="sexName" label="性别" align="center" />
<el-table-column prop="age" label="年龄" />
<el-table-column prop="customerOrgParentName" label="单位" width="180">
<template slot-scope="scope">
<div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
</template>
</el-table-column>
<el-table-column prop="customerOrgName" label="部门" width="180">
<template slot-scope="scope">
<div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
</template>
</el-table-column>
<el-table-column label="分组/套餐" width="150">
<template slot-scope="scope">
<div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
{{ dddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
</div>
<div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
{{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
</div>
</template>
</el-table-column>
<el-table-column prop="nationId" label="民族">
<template slot-scope="scope">
<div>
{{ dddw(dict.nation, "nationId", scope.row.nationId, "displayName") }}
</div>
</template>
</el-table-column>
<el-table-column prop="idNo" label="身份证" width="150" />
<el-table-column prop="org" label="单位" min-width="180" show-overflow-tooltip />
<el-table-column prop="dept" label="部门" min-width="150" show-overflow-tooltip />
<el-table-column prop="groupPack" label="分组/套餐" min-width="150" show-overflow-tooltip />
<el-table-column prop="nationName" label="民族" show-overflow-tooltip/>
<el-table-column prop="idNo" label="身份证" min-width="150" show-overflow-tooltip/>
<el-table-column prop="birthDate" label="出生日期" width="100">
<template slot-scope="scope">
<div v-if="scope.row.birthDate">
@ -48,93 +21,49 @@
</div>
</template>
</el-table-column>
<el-table-column prop="email" label="邮箱" width="180" />
<el-table-column prop="mobileTelephone" label="手机" width="100" />
<el-table-column prop="telephone" label="电话" width="100" />
<el-table-column prop="address" label="地址" width="300" />
<el-table-column prop="medicalCardNo" label="体检卡号" />
<el-table-column prop="jobCardNo" label="工卡号" />
<el-table-column prop="maritalStatusId" label="婚姻状况">
<template slot-scope="scope">
<div>
{{ dddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
</div>
</template>
</el-table-column>
<el-table-column prop="medicalTypeId" label="体检类别">
<template slot-scope="scope">
<div v-if="scope.row.medicalTypeId !== dict.personOrgId">
{{ dddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
</div>
</template>
</el-table-column>
<el-table-column prop="personnelTypeId" label="人员类别">
<template slot-scope="scope">
<div v-if="scope.row.personnelTypeId !== dict.personOrgId">
{{ dddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
</div>
</template>
</el-table-column>
<el-table-column prop="email" label="邮箱" min-width="150" show-overflow-tooltip/>
<el-table-column prop="mobileTelephone" label="手机" min-width="130" align="center" show-overflow-tooltip/>
<el-table-column prop="telephone" label="电话" min-width="130" align="center" show-overflow-tooltip/>
<el-table-column prop="address" label="地址" width="300" show-overflow-tooltip/>
<el-table-column prop="medicalCardNo" label="体检卡号" align="center" show-overflow-tooltip/>
<el-table-column prop="jobCardNo" label="工卡号" align="center" show-overflow-tooltip/>
<el-table-column prop="maritalStatusName" label="婚姻" align="center" />
<el-table-column prop="medicalTypeName" label="体检类别" show-overflow-tooltip/>
<el-table-column prop="personnelTypeName" label="人员类别" show-overflow-tooltip/>
<el-table-column prop="jobPost" label="职务" />
<el-table-column prop="jobTitle" label="职称" />
<el-table-column prop="salesman" label="介绍人" />
<el-table-column prop="isVip" label="是否VIP">
<el-table-column prop="isVip" label="是否VIP" align="center" >
<template slot-scope="scope">
<div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="登记人" />
<el-table-column prop="creationTime" label="登记日期" width="100">
<el-table-column prop="creatorName" label="登记人" align="center" />
<el-table-column prop="creationTime" label="登记日期" width="100" align="center" >
<template slot-scope="scope">
<div v-if="scope.row.creationTime">{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
</template>
</el-table-column>
<el-table-column prop="isUpload" label="是否上传">
<el-table-column prop="isUpload" label="上传" align="center">
<template slot-scope="scope">
<div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
</template>
</el-table-column>
<el-table-column prop="completeFlag" label="体检进度">
<el-table-column prop="completeFlag" label="体检进度" align="center">
<template slot-scope="scope">
<div>{{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
</template>
</el-table-column>
<el-table-column prop="guidePrintTimes" label="打印" width="50">
<el-table-column prop="guidePrintTimes" label="打印" width="50" align="center">
<template slot-scope="scope">
<i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 24px;color: green;"></i>
</template>
</el-table-column>
<el-table-column prop="isLock" label="锁住">
<el-table-column prop="isLock" label="锁住" align="center">
<template slot-scope="scope">
<div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
</template>
</el-table-column>
<!--
"sexHormoneTermId": "00000000-0000-0000-0000-000000000000",
"interposeMeasure": null,
"medicalConclusionId": "00000000-0000-0000-0000-000000000000",
"reportPrintTimes": 0,
"isMedicalStart": "N",
"medicalStartDate": "6/28/2023",
"isRecoverGuide": "N",
"summaryDate": "",
"summaryDoctor": null,
"isAudit": "N",
"auditDoctor": null,
"auditDate": "",
"isNameHide": "N",
"isPhoneFollow": "N",
"thirdInfo": null,
"guidePrintTimes": null,
"remark": null,
"medicalCenterId": "00000000-0000-0000-0000-000000000000",
"customerOrgRegisterId": "00000000-0000-0000-0000-000000000000",
"lastModifierName": "",
"lastModificationTime": null,
"lastModifierId": null,
"creatorId": null,
"id": "3a0c196d-a6d0-37fe-5c32-4806bdc4530f"
-->
</el-table-column>
</el-table>
<div style="display: flex;margin-top: 5px;justify-content:space-between;">
<div></div>

14
src/components/patientRegister/PatientRegisterList.vue
View File

@ -1000,9 +1000,9 @@ export default {
return new Promise((resolve, reject) => {
// this.merge_lis_pacs_label == '1' 合并检验检查条码
if (this.merge_lis_pacs_label == '1') {
this.guidePrintPromise("0008", false, row)
this.lisPrint(row, "0002", false)
.then((res) => {
return this.lisPrint(row, "0002", false);
return this.guidePrintPromise("0008", false, row);
})
// .then((res) => {
// return this.pacsPrint(row, "0004", false);
@ -1014,12 +1014,12 @@ export default {
reject(err);
});
} else {
this.guidePrintPromise("0008", false, row)
this.lisPrint(row, "0002", false)
.then((res) => {
return this.lisPrint(row, "0002", false);
return this.pacsPrint(row, "0004", false);
})
.then((res) => {
return this.pacsPrint(row, "0004", false);
return this.guidePrintPromise("0008", false, row);
})
.then((res) => {
resolve(res);
@ -1036,9 +1036,9 @@ export default {
// 临时加
printGuidePacs(row) {
return new Promise((resolve, reject) => {
this.guidePrintPromise("0008", false, row)
this.pacsPrint(row, "0004", false)
.then((res) => {
return this.pacsPrint(row, "0004", false);
return this.guidePrintPromise("0008", false, row);
})
.then((res) => {
resolve(res);

8
src/components/sumDoctorCheck/ButtonList.vue
View File

@ -20,10 +20,10 @@
v-show="checkPagePriv(pagePriv.privs, '导入迪安结果')">导入迪安结果</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div v-show="checkPagePriv(pagePriv.privs, 'AI诊断')" class="listBtn">
<el-button slot="reference" class="commonbutton" @click="btnAIdiagnosis(false)"
:disabled="sumBtnDisabled('save')">AI诊断</el-button>
</div>
<!--AI诊断不控制权限 v-show="checkPagePriv(pagePriv.privs, 'AI诊断')" :disabled="sumBtnDisabled('save')"-->
<div class="listBtn">
<el-button slot="reference" class="commonbutton" @click="btnAIdiagnosis(false)">AI诊断</el-button>
</div>
<div v-show="checkPagePriv(pagePriv.privs, '保存')" class="listBtn">
<el-button type="primary" class="commonbutton" @click="btnSave"

6
src/views/fee-settings/cardRegister.vue
View File

@ -557,16 +557,18 @@ export default {
],
expiryDate: [
{ required: true, message: "请填写卡有效期", trigger: "blur" },
],
],
customerName: [
{ required: true, message: "请填写卡主姓名", trigger: "blur" },
],
],
/*
idNo: [
{ required: true, message: "请填写卡主身份证", trigger: "blur" },
],
mobileTelephone: [
{ required: true, message: "请填写卡主手机号", trigger: "blur" },
],
*/
isActive: [
{ required: true, message: "请填写卡启用状态", trigger: "blur" },
],

Write Preview
Loading…
Cancel
Save