pengjun 3 months ago
parent
commit
dfd860a2d9
  1. 243
      src/components/patientRegister/PatientRegisterList.vue
  2. 18
      src/components/patientRegister/customerOrgTreeAll.vue
  3. 50
      src/components/patientRegister/patientRegisterAsbItem.vue
  4. 279
      src/components/patientRegister/patientRegisterQuery.vue
  5. 6
      src/components/report/TurnoverReport.vue
  6. 2
      src/components/report/TurnoverReportM.vue
  7. 2
      src/components/report/TurnoverReportP.vue
  8. 9
      src/utlis/tree.js
  9. 65
      src/views/customerOrg/patientRegister.vue

243
src/components/patientRegister/PatientRegisterList.vue

@ -30,22 +30,12 @@
{{
scope.row.isAudit == "Y"
? "已审核"
: dddw(
dict.completeFlag,
"id",
scope.row.completeFlag,
"displayName"
)
: dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName")
}}
</div>
<div v-else-if="dragCol[index].prop == 'qztlType'">
{{
dddw(
dict.qztlType,
"id",
scope.row.qztlType,
"displayName"
)
dddw(dict.qztlType, "id", scope.row.qztlType, "displayName")
}}
</div>
<div v-else-if="dragCol[index].prop == 'guidePrintTimes'">
@ -705,6 +695,7 @@ export default {
UTable,
UTableColumn,
},
props: ["refQueryCondition"],
data() {
return {
pagePriv: {
@ -713,6 +704,7 @@ export default {
},
patient_register_query_idno: 'Y', //
patient_register_query_name: 'N', //
patient_register_read_idno_upPhoto: 'N', //
peisid: null,
startPoint: -1, // -1
endPoint: -1, // -1
@ -1055,6 +1047,16 @@ export default {
}
});
// --
postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId",
{ sysParmId: "patient_register_read_idno_upPhoto" }
).then((res) => {
if (res.code > -1) {
this.patient_register_read_idno_upPhoto = res.data || "N";
}
});
},
//
@ -1448,7 +1450,7 @@ export default {
this.patientRegister.patientRegisterRd = deepCopy(formData);
if (!this.patientRegister.patientRegisterRd.id) {
this.patientRegister.patientRegisterRd.customerOrgId =
this.patientRegister.query.customerOrgId;
this.refQueryCondition.customerOrgId;
}
},
@ -1549,8 +1551,8 @@ export default {
});
return;
}
let customerOrgId = this.patientRegister.query.customerOrgId;
console.log('btnAdd.this.refQueryCondition',this.refQueryCondition)
let customerOrgId = this.refQueryCondition.customerOrgId;
if (!customerOrgId) {
this.$message.warning({ showClose: true, message: "请选择单位或个人" });
return;
@ -1760,8 +1762,8 @@ export default {
this.tableDataCurrentRow = {}; //
if (
!(
this.patientRegister.query.isSeries == "Y" &&
this.patientRegister.query.patientRegisterNo
this.refQueryCondition.isSeries == "Y" &&
this.refQueryCondition.patientRegisterNo
)
) {
this.tableData = [];
@ -1797,68 +1799,68 @@ export default {
maxResultCount: this.loadOpts.maxResultCount,
};
// console.log(`this.patientRegister.query`, this.patientRegister.query);
if (this.patientRegister.query.customerOrgFlag) {
// if (this.patientRegister.query.CustomerOrgParentId) {
// body.customerOrgId = this.patientRegister.query.CustomerOrgParentId;
// console.log(`this.refQueryCondition`, this.refQueryCondition);
if (this.refQueryCondition.customerOrgFlag) {
// if (this.refQueryCondition.CustomerOrgParentId) {
// body.customerOrgId = this.refQueryCondition.CustomerOrgParentId;
// } else {
// if (this.patientRegister.query.customerOrgId)
// body.customerOrgId = this.patientRegister.query.customerOrgId;
// if (this.refQueryCondition.customerOrgId)
// body.customerOrgId = this.refQueryCondition.customerOrgId;
// }
if (this.patientRegister.query.customerOrgId)
body.customerOrgId = this.patientRegister.query.customerOrgId;
if (this.refQueryCondition.customerOrgId)
body.customerOrgId = this.refQueryCondition.customerOrgId;
//
try {
if (
this.patientRegister.query.customerOrgId &&
this.patientRegister.query.customerOrgId != this.dict.personOrgId &&
this.patientRegister.query.customerOrgRegister.id
this.refQueryCondition.customerOrgId &&
this.refQueryCondition.customerOrgId != this.dict.personOrgId &&
this.refQueryCondition.customerOrgRegister.id
) {
body.customerOrgRegisterId =
this.patientRegister.query.customerOrgRegister.id;
this.refQueryCondition.customerOrgRegister.id;
body.customerOrgGroupIds =
this.patientRegister.query.customerOrgGroupIds;
this.refQueryCondition.customerOrgGroupIds;
}
} catch (error) {
console.error(error);
}
}
if (this.patientRegister.query.sex)
body.sexId = this.patientRegister.query.sex;
if (this.refQueryCondition.sex)
body.sexId = this.refQueryCondition.sex;
if (
this.patientRegister.query.medicalTypeIds &&
this.patientRegister.query.medicalTypeIds.length > 0
this.refQueryCondition.medicalTypeIds &&
this.refQueryCondition.medicalTypeIds.length > 0
)
body.medicalTypeIds = this.patientRegister.query.medicalTypeIds;
body.medicalTypeIds = this.refQueryCondition.medicalTypeIds;
if (
this.patientRegister.query.completeFlags &&
this.patientRegister.query.completeFlags.length > 0
this.refQueryCondition.completeFlags &&
this.refQueryCondition.completeFlags.length > 0
)
body.completeFlags = this.patientRegister.query.completeFlags;
body.completeFlags = this.refQueryCondition.completeFlags;
if (
this.patientRegister.query.personnelTypeIds &&
this.patientRegister.query.personnelTypeIds.length > 0
this.refQueryCondition.personnelTypeIds &&
this.refQueryCondition.personnelTypeIds.length > 0
)
body.personnelTypeIds = this.patientRegister.query.personnelTypeIds;
body.personnelTypeIds = this.refQueryCondition.personnelTypeIds;
if (this.patientRegister.query.isRecoverGuide)
body.isRecoverGuide = this.patientRegister.query.isRecoverGuide;
if (this.refQueryCondition.isRecoverGuide)
body.isRecoverGuide = this.refQueryCondition.isRecoverGuide;
//StartDate EndDate
if (
this.patientRegister.query.startDate &&
this.patientRegister.query.endDate
this.refQueryCondition.startDate &&
this.refQueryCondition.endDate
) {
body.dateType = this.patientRegister.query.dateType;
body.startDate = moment(this.patientRegister.query.startDate).format(
body.dateType = this.refQueryCondition.dateType;
body.startDate = moment(this.refQueryCondition.startDate).format(
"yyyy-MM-DD"
);
body.endDate = moment(this.patientRegister.query.endDate).format(
body.endDate = moment(this.refQueryCondition.endDate).format(
"yyyy-MM-DD"
);
if (body.startDate > body.endDate) {
@ -1870,56 +1872,73 @@ export default {
}
}
if (this.patientRegister.query.phone)
body.phone = this.patientRegister.query.phone;
//
if (this.patientRegister.query.patientName) {
body.patientName = this.patientRegister.query.patientName;
if(this.patient_register_query_name == 'Y'){
body = {
patientName: this.patientRegister.query.patientName,
if (this.refQueryCondition.phone)
body.phone = this.refQueryCondition.phone;
//
let photo = ''
switch (this.refQueryCondition.queryType) {
case 'patientName': //
if (this.refQueryCondition.patientName) {
body.patientName = this.refQueryCondition.patientName;
if (this.patient_register_query_name == 'Y') {
body = {
patientName: this.refQueryCondition.patientName,
skipCount: this.loadOpts.skipCount,
maxResultCount: this.loadOpts.maxResultCount,
};
}
}
break;
case 'idCardNo': //
if (this.refQueryCondition.idCardNo) {
body.idNo = this.refQueryCondition.idCardNo;
if (this.patient_register_query_idno == 'Y') {
body = {
idNo: this.refQueryCondition.idCardNo,
skipCount: this.loadOpts.skipCount,
maxResultCount: this.loadOpts.maxResultCount,
};
}
}
if(this.refQueryCondition.photo) photo = this.refQueryCondition.photo;
break;
case 'patientNo': //
if (this.refQueryCondition.patientNo)
body = {
patientNo: this.refQueryCondition.patientNo,
skipCount: this.loadOpts.skipCount,
maxResultCount: this.loadOpts.maxResultCount,
};
}
}
//
if (this.patientRegister.query.idCardNo) {
body.idNo = this.patientRegister.query.idCardNo;
if(this.patient_register_query_idno == 'Y'){
body = {
idNo: this.patientRegister.query.idCardNo,
break;
case 'patientRegisterNo': //
if (this.refQueryCondition.patientRegisterNo)
body = {
patientRegisterNo: this.refQueryCondition.patientRegisterNo,
skipCount: this.loadOpts.skipCount,
maxResultCount: this.loadOpts.maxResultCount,
};
break;
case 'pacsNo': //
if (this.refQueryCondition.pacsNo)
body = {
pacsNo: this.refQueryCondition.pacsNo,
skipCount: this.loadOpts.skipCount,
maxResultCount: this.loadOpts.maxResultCount,
};
}
break;
case 'lisNo': //
if (this.refQueryCondition.lisNo)
body = {
lisNo: this.refQueryCondition.lisNo,
skipCount: this.loadOpts.skipCount,
maxResultCount: this.loadOpts.maxResultCount,
};
break;
default:
break;
}
if (this.patientRegister.query.patientNo)
body = {
patientNo: this.patientRegister.query.patientNo,
skipCount: this.loadOpts.skipCount,
maxResultCount: this.loadOpts.maxResultCount,
};
if (this.patientRegister.query.patientRegisterNo)
body = {
patientRegisterNo: this.patientRegister.query.patientRegisterNo,
skipCount: this.loadOpts.skipCount,
maxResultCount: this.loadOpts.maxResultCount,
};
// console.log("/api/app/patientregister/getlistinfilter", body);
let upPhoto = "patient_register_read_idno_upPhoto"; //
let upPhotoParam = await postapi(
"/api/app/SysParmValue/GetSysParmValueBySysParmId",
{ sysParmId: upPhoto }
);
let photo = this.patientRegister.photo;
this.patientRegister.photo = "";
// /api/app/PatientRegister/GetPatientRegisterWithCharge
// /api/app/patientregister/getlistinfilter
postapi(
@ -1944,7 +1963,7 @@ export default {
}
// 2()
if (upPhotoParam == "Y" && photo) {
if (this.patient_register_read_idno_upPhoto == "Y" && photo) {
if (!e.photo) {
savePeoplePhoto(e.id, photo);
}
@ -1953,11 +1972,11 @@ export default {
// ()
console.log(
"this.patientRegister.query",
this.patientRegister.query.isSeries,
this.patientRegister.query.patientRegisterNo
"this.refQueryCondition",
this.refQueryCondition.isSeries,
this.refQueryCondition.patientRegisterNo
);
if (this.patientRegister.query.isSeries == "Y" && this.patientRegister.query.patientRegisterNo) {
if (this.refQueryCondition.isSeries == "Y" && this.refQueryCondition.patientRegisterNo) {
//
for (let index = curLoad.length - 1; index > -1; index--) {
const e = curLoad[index];
@ -2474,7 +2493,7 @@ export default {
//
btnGroupBatch() {
let customerOrgId = this.patientRegister.query.customerOrgId;
let customerOrgId = this.refQueryCondition.customerOrgId;
if (!customerOrgId) {
this.$message.warning({ showClose: true, message: "请选择单位" });
return;
@ -2498,7 +2517,7 @@ export default {
//
btnAsbBatch() {
let customerOrgId = this.patientRegister.query.customerOrgId;
let customerOrgId = this.refQueryCondition.customerOrgId;
if (!customerOrgId) {
this.$message.warning({ showClose: true, message: "请选择单位" });
return;
@ -3092,23 +3111,23 @@ export default {
//
watch: {
"patientRegister.query.customerOrgId": {
// immediate: true, //
// deep: true, //
handler(newVal, oldVal) {
//// console.log('watch:patientRegister.query.customerOrgId:',newVal,oldVal)
//
if (newVal && newVal != oldVal) {
this.tableData = [];
this.dataTransOpts.tableM.register_check_asbitem = [];
}
},
},
// "refQueryCondition.customerOrgId": {
// // immediate: true, //
// // deep: true, //
// handler(newVal, oldVal) {
// //// console.log('watch:refQueryCondition.customerOrgId:',newVal,oldVal)
// //
// if (newVal && newVal != oldVal) {
// this.tableData = [];
// this.dataTransOpts.tableM.register_check_asbitem = [];
// }
// },
// },
//
"patientRegister.query.times"(newVal, oldVal) {
"refQueryCondition.queryConditionTimes"(newVal, oldVal) {
if (newVal != oldVal) {
//alert('')
console.log('触发查询 refQueryCondition.queryConditionTimes', oldVal, newVal)
this.Query();
}
},

18
src/components/patientRegister/customerOrgTreeAll.vue

@ -57,7 +57,7 @@
import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { tcdate, deepCopy, reMadeOrgTree, arrayExistObj } from "../../utlis/proFunc";
import { filterTreeNode } from "../../utlis/tree";
import { filterTreeNode, getTreePids } from "../../utlis/tree";
import { setDBCom, getDBCom } from "../../utlis/indexedDB";
@ -65,6 +65,7 @@ import { madeTree, getTreeAllChildIdsById, getTreeNode } from "@/utlis/tree";
import { now } from "moment";
export default {
components: {},
//props: ['changeTreeCurrOrg'],
data() {
return {
filterText: '',
@ -145,7 +146,6 @@ export default {
},
methods: {
//
getOrgDatas() {
return new Promise((resolve, reject) => {
@ -345,7 +345,7 @@ export default {
// org = this.customerOrgTreeAll.filter(e => {
// return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1
// })
org = filterTreeNode(this.customerOrgTreeAll,"treeChildren",['label','simpleCode'],[value,value.toUpperCase()])
org = filterTreeNode(this.customerOrgTreeAll, "treeChildren", ['label', 'simpleCode'], [value, value.toUpperCase()])
this.customerOrgTreeSeo = org.slice(0, 100)
} else {
this.customerOrgTreeSeo = this.customerOrgTreeAll.slice(0, 100)
@ -370,11 +370,13 @@ export default {
//
treeclick(data) {
// console.log('data',data)
this.patientRegister.query.customerOrgId = data.id;
this.patientRegister.query.customerOrgName = data.displayName;
this.dataTransOpts.plus.PatientRegisterEditQuery++
// this.patientRegister.query.customerOrgId = data.id;
// this.patientRegister.query.customerOrgName = data.displayName;
// this.dataTransOpts.plus.PatientRegisterEditQuery++
//
let parentNodes = getTreePids(this.customerOrgTreeSeo, "treeChildren", "parentId", "id", data.id)
let dataTrans = Object.assign({}, data, { parentNodes })
this.$emit('changeTreeCurrOrg', dataTrans)
//ID
// this.getCustomerOrgParentId(data.id);

50
src/components/patientRegister/patientRegisterAsbItem.vue

@ -1,7 +1,6 @@
<template>
<div style="display: flex;">
<el-table :data="dataTransOpts.tableM.register_check_asbitem" border
:width="tableWidth"
<el-table :data="dataTransOpts.tableM.register_check_asbitem" border :width="tableWidth"
:height="window.pageHeight < 600 ? 124 : Math.floor((window.pageHeight - 228) / 3)" size="small"
highlight-current-row :summary-method="getSummaries" show-summary ref="patientRegister.patientRegisterAbs">
<el-table-column type="index" label="序号" width="50" align="center" />
@ -53,8 +52,15 @@
</el-table>
<div
:style="`overflow-y:auto; height:${tableHeight}px;width:${tableWidth}px;background-color: white; margin-left:10px;border: 1px #DCDFE6;`">
<el-tag style="color:#000;margin-top: 5px;margin-left: 5px;"
v-for="item in dataTransOpts.tableM.register_check_asbitem" :key="item.id" size="small">
<el-tag v-for="item in dataTransOpts.tableM.register_check_asbitem"
:style="`color:${checkFlagToColor(item)};margin-top: 5px;margin-left: 5px;`" :key="item.id" size="small">
<el-tooltip class="item" effect="dark" content="该项目已收费" placement="left">
<i v-if="item.isCharge == 'Y'" class="el-icon-wallet" :style="`padding-right: 2px; font-size: 16px;color: purple;color: ${checkFlagToColor(item)};`" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="标五角星表示属于分组或套餐的项目" placement="left">
<i v-if="item.isBelongGroupPackage == 'Y'" class="el-icon-star-on"
style="padding-right: 2px; font-size: 16px;color: purple;" />
</el-tooltip>
{{ item.asbitemName }}
</el-tag>
</div>
@ -93,12 +99,12 @@ export default {
computed: {
...mapState(["window", "dataTransOpts", "dict", "patientRegister"]),
tableHeight(){
tableHeight() {
return this.window.pageHeight < 600 ? 120 : Math.floor((this.window.pageHeight - 240) / 3)
},
tableWidth(){
return Math.floor((this.window.pageWidth - 380)/2)
tableWidth() {
return Math.floor((this.window.pageWidth - 380) / 2)
},
},
methods: {
@ -115,21 +121,35 @@ export default {
*/
},
//
checkFlagToColor(item){
let color = 'black'
switch (item?.checkCompleteFlag) {
case '0':
color = 'red'
break;
case '2':
color = 'blue'
break;
default:
break;
}
return color
},
//
getAsbItems(row) {
if (this.asbItems.length == 0) {
postapi('/api/app/Asbitem/GetSimpleAsbitemWithDetails')
.then(res => {
if (res.code > -1){
this.asbItems = res.data
this.getAsbItemsDetail(row)
}
})
.then(res => {
if (res.code > -1) {
this.asbItems = res.data
this.getAsbItemsDetail(row)
}
})
} else {
this.getAsbItemsDetail(row)
}
}
},
getAsbItemsDetail(row) {

279
src/components/patientRegister/patientRegisterQuery.vue

@ -5,72 +5,65 @@
:style="'display: flex;flex-wrap: wrap;height: 80px;width: 1216px;background-color: #fff;border-radius: 8px;margin-bottom: 15px;align-items: center;padding: 10px;width:' + (window.pageWidth - (orgEnable == 'Y' ? 0 : 200) - 110 - 10) + 'px;'">
<div class="query">
<el-select v-model="patientRegister.query.dateType" placeholder="请选择" style="width: 80px" size="small">
<el-select v-model="query.dateType" placeholder="请选择" style="width: 80px" size="small">
<el-option label="登记日期" :value="'1'" />
<el-option label="体检日期" :value="'2'" />
<el-option label="登记或体检" :value="'3'" />
</el-select>
<!-- dateType 1 登记2 体检3 体检或登记-->
<el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small"
style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
<el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"
value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
<span class="spanClass"></span>
<el-date-picker v-model="patientRegister.query.endDate" type="date" placeholder="截止日期" size="small"
style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
<el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small" style="width:90px;"
value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
</div>
<div class="query">
<span class="spanClass">连续扫码</span>
<el-checkbox v-model="patientRegister.query.isSeries" size="small" true-label="Y" false-label="N" />
</div>
<span class="spanClass">连续扫码</span>
<el-checkbox v-model="query.isSeries" size="small" true-label="Y" false-label="N" />
</div>
<div class="query">
<span class="spanClass">条码号</span>
<el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
style="width: 120px" />
<el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small" clearable style="width: 120px" />
</div>
<div class="query">
<span class="spanClass">档案号</span>
<el-input placeholder="档案号" v-model="patientRegister.query.patientNo" size="small" clearable
style="width: 80px" @input="changeValue" />
<el-input placeholder="档案号" v-model="query.patientNo" size="small" clearable style="width: 80px"
@input="changeValue" />
</div>
<div class="query">
<span class="spanClass">姓名</span>
<el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
style="width: 60px" />
<el-input placeholder="姓名" v-model="query.patientName" size="small" clearable style="width: 60px" />
</div>
<div class="query">
<span class="spanClass">检查条码</span>
<el-input placeholder="检查条码" v-model="patientRegister.query.pacsNo" size="small" clearable
style="width: 120px" />
<el-input placeholder="检查条码" v-model="query.pacsNo" size="small" clearable style="width: 120px" />
</div>
<div class="query">
<span class="spanClass">检验条码</span>
<el-input placeholder="检验条码" v-model="patientRegister.query.lisNo" size="small" clearable
style="width: 120px" />
<el-input placeholder="检验条码" v-model="query.lisNo" size="small" clearable style="width: 120px" />
</div>
<div class="query">
<span class="spanClass">性别</span>
<el-select v-model="patientRegister.query.sex" placeholder="性别" style="width: 50px" size="small" clearable>
<el-select v-model="query.sex" placeholder="性别" style="width: 50px" size="small" clearable>
<el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
</el-option>
</el-select>
</div>
<div class="query">
<span class="spanClass">手机号</span>
<el-input placeholder="手机号/电话" v-model="patientRegister.query.phone" size="small" clearable
style="width: 100px" />
<el-input placeholder="手机号/电话" v-model="query.phone" size="small" clearable style="width: 100px" />
</div>
<div class="query">
<span class="spanClass">身份证</span>
<el-input placeholder="身份证" v-model="patientRegister.query.idCardNo" size="small" clearable
style="width: 150px" />
<el-input placeholder="身份证" v-model="query.idCardNo" size="small" clearable style="width: 150px" />
</div>
<div class="query">
<el-tooltip class="item" effect="dark" content="单位作为查询条件" placement="top">
<el-checkbox v-model="patientRegister.query.customerOrgFlag"></el-checkbox>
<el-checkbox v-model="query.customerOrgFlag"></el-checkbox>
</el-tooltip>
<el-input placeholder="请选择单位" v-model="patientRegister.query.customerOrgName" size="small" disabled
style="width: 120px" />
<el-input placeholder="请选择单位" v-model="query.customerOrgName" size="small" disabled style="width: 120px" />
<!--
<el-cascader v-model="patientRegister.query.customerOrgId" :options="patientRegister.customerOrgTreeAll"
<el-cascader v-model="query.customerOrgId" :options="patientRegister.customerOrgTreeAll"
:props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" placeholder="请选择单位"
:show-all-levels="false" clearable :disabled="orgEnable == 'Y' ? false : true" size="small"
style="width:120px;">
@ -79,45 +72,44 @@
</div>
<div v-show="dispTimes" class="query">
<span class="spanClass">次数</span>
<el-select v-model="patientRegister.query.customerOrgRegister" placeholder="次数" clearable
@change="changeCustomerOrgRegister" style="width: 50px;" size="small" value-key="id">
<el-select v-model="query.customerOrgRegister" placeholder="次数" clearable @change="changeCustomerOrgRegister"
style="width: 50px;" size="small" value-key="id">
<el-option v-for="item in customerOrgRegisterList" :key="item.id" :label="item.medicalTimes" :value="item">{{
item.medicalTimes + '次' }}</el-option>
</el-select>
</div>
<div v-show="dispTimes" class="query">
<span class="spanClass">分组</span>
<el-select v-model="patientRegister.query.customerOrgGroupIds" placeholder="请选择" clearable filterable
style="width: 150px" size="small" multiple collapse-tags>
<el-select v-model="query.customerOrgGroupIds" placeholder="请选择" clearable filterable style="width: 150px"
size="small" multiple collapse-tags>
<el-option v-for="item in dict.customerOrgGroup" :key="item.id" :label="item.displayName" :value="item.id" />
</el-select>
</div>
<div class="query">
<span class="spanClass">体检类别</span>
<el-select v-model="patientRegister.query.medicalTypeIds" placeholder="请选择" clearable filterable
style="width: 170px" size="small" multiple collapse-tags>
<el-select v-model="query.medicalTypeIds" placeholder="请选择" clearable filterable style="width: 170px"
size="small" multiple collapse-tags>
<el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
</el-select>
</div>
<div class="query">
<span class="spanClass">状态</span>
<el-select v-model="patientRegister.query.completeFlags" placeholder="请选择" clearable style="width: 100px"
size="small" multiple collapse-tags>
<el-select v-model="query.completeFlags" placeholder="请选择" clearable style="width: 100px" size="small" multiple
collapse-tags>
<el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
</el-option>
</el-select>
</div>
<div class="query">
<span class="spanClass">人员类别</span>
<el-select v-model="patientRegister.query.personnelTypeIds" placeholder="请选择" clearable filterable
style="width: 170px" size="small" multiple collapse-tags>
<el-select v-model="query.personnelTypeIds" placeholder="请选择" clearable filterable style="width: 170px"
size="small" multiple collapse-tags>
<el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName" :value="item.id" />
</el-select>
</div>
<div class="query">
<span class="spanClass">表回收</span>
<el-select v-model="patientRegister.query.isRecoverGuide" placeholder="请选择" clearable style="width: 80px"
size="small" >
<el-select v-model="query.isRecoverGuide" placeholder="请选择" clearable style="width: 80px" size="small">
<el-option label="未回收" value="N" />
<el-option label="已回收" value="Y" />
</el-select>
@ -142,10 +134,11 @@
import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { getPagePriv, checkPagePriv, parsIcCardtoLocal, deepCopy } from '../../utlis/proFunc'
import moment from "moment";
export default {
components: {},
props: ["orgEnable"],
props: ["orgEnable", "refParams"],
data() {
return {
pagePriv: {
@ -154,6 +147,38 @@ export default {
},
dialogVisible: false,
customerOrgRegisterList: [],
query: { //
queryType: '', // patientRegisterNo/patientNo
dateType: 'creationTime', //
dateRange: null, //
startDate: null,
endDate: null,
containRefuse: true, //
times: 0, //
customerOrgId: "", //ID
customerOrgTopId: "", //ID
customerOrgFlag: true, //
customerOrgRegister: { id: '' }, //
customerOrgGroupIds: [], //
checkAsbs: null,
patientRegisterNo: '',
pacsNo: '',
lisNo: '',
patientName: '', //
sex: '', //
idCardNo: '', //
isReportPrint: '', //
isSeries: 'N',
isSmsComplete: "N",
isPhoneComplete: "N",
diagnosisLevelId: [],
medicalTypeIds: [],
completeFlags: [],
medicalConclusionId: [],
personnelTypeIds: [],
isRecoverGuide: '',
photo: '', //
},
};
},
@ -162,23 +187,26 @@ export default {
let userPriv = window.sessionStorage.getItem('userPriv')
if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
let ldate = new Date();
this.patientRegister.query.startDate = ldate;
this.patientRegister.query.endDate = ldate;
this.patientRegister.query.dateType = '2'
let ldate = moment(new Date()).format('yyyy-MM-DD');
this.query.startDate = ldate;
this.query.endDate = ldate;
this.query.dateType = '2'
},
//
mounted() {
this.init(this.patientRegister.query.customerOrgId)
//
this.dictInit()
//
this.enterToQuery()
},
computed: {
...mapState(["pickerOptions", "window", "dict", "dataTransOpts", "patientRegister", "customerOrg"]),
...mapState(["pickerOptions", "window", "dict", "dataTransOpts", "customerOrg"]),
dispTimes() {
return this.patientRegister.query.customerOrgFlag && this.patientRegister.query.customerOrgId && this.patientRegister.query.customerOrgId != this.dict.personOrgId
return this.query.customerOrgFlag && this.query.customerOrgId && this.query.customerOrgId != this.dict.personOrgId
}
},
@ -186,54 +214,27 @@ export default {
checkPagePriv,
btnClear() {
this.patientRegister.query.patientRegisterNo = ''
this.patientRegister.query.patientNo = ''
this.patientRegister.query.patientName = ''
this.patientRegister.query.pacsNo = ''
this.patientRegister.query.lisNo = ''
this.patientRegister.query.sex = ''
this.patientRegister.query.phone = ''
this.patientRegister.query.idCardNo = ''
this.patientRegister.query.medicalTypeIds = null
this.patientRegister.query.completeFlags = null
this.patientRegister.query.personnelTypeIds = null
this.patientRegister.query.isRecoverGuide = null
this.query.patientRegisterNo = ''
this.query.patientNo = ''
this.query.patientName = ''
this.query.pacsNo = ''
this.query.lisNo = ''
this.query.sex = ''
this.query.phone = ''
this.query.idCardNo = ''
this.query.medicalTypeIds = []
this.query.completeFlags = []
this.query.personnelTypeIds = []
this.query.isRecoverGuide = ''
},
changeValue (e) {
changeValue(e) {
this.$forceUpdate()
},
init(customerOrgId) {
if (!customerOrgId || customerOrgId == this.dict.personOrgId) {
this.patientRegister.query.customerOrgRegister = null
this.customerOrgRegisterList = []
if (customerOrgId == this.dict.personOrgId) {
let today = new Date()
this.patientRegister.query.startDate = today
this.patientRegister.query.endDate = today
}
return
}
// ID
getapi(`/api/app/customer-org/parent/${customerOrgId}`).then(res => {
if (res.code > - 1) {
this.patientRegister.query.CustomerOrgParentId = res.data
return getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`)
}
}).then(res => {
if (res && res.code > -1) {
this.customerOrgRegisterList = res.data;
if (res.data.length > 0) {
this.patientRegister.query.customerOrgRegister = res.data[res.data.length - 1];
this.changeCustomerOrgRegister(res.data[res.data.length - 1])
}
// this.patientRegister.query.times++
// console.log('this.patientRegister.query.customerOrgRegister',this.patientRegister.query.customerOrgRegister)
}
});
//
dictInit() {
//
getapi("/api/app/medical-type/in-filter").then((res) => {
if (res.code > -1) {
@ -247,24 +248,65 @@ export default {
this.dict.personnelType = res.data;
}
});
},
changeOrgId(customerOrgId) {
if (!customerOrgId || customerOrgId == this.dict.personOrgId) {
this.query.customerOrgRegister = null
this.customerOrgRegisterList = []
if (customerOrgId == this.dict.personOrgId) {
let today = new Date()
this.query.startDate = today
this.query.endDate = today
}
return
}
this.query.customerOrgId = customerOrgId
this.query.customerOrgName = this.refParams.customerOrgName
// ID (ID)
if (this.refParams?.parentNodes.length > 1) {
this.query.customerOrgTopId = this.refParams.parentNodes[1]
} else {
this.query.customerOrgTopId = customerOrgId
}
// getapi(`/api/app/customer-org/parent/${customerOrgId}`).then(res => {
// if (res.code > - 1) {
// = res.data
// //
// return getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${this.query.customerOrgTopId}`)
// }
// })
getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${this.query.customerOrgTopId}`)
.then(res => {
if (res && res.code > -1) {
this.customerOrgRegisterList = res.data;
if (res.data.length > 0) {
this.query.customerOrgRegister = res.data[res.data.length - 1];
this.changeCustomerOrgRegister(res.data[res.data.length - 1])
}
// this.query.times++
// console.log('this.query.customerOrgRegister',this.query.customerOrgRegister)
}
});
},
//
btnQuery() {
this.patientRegister.query.times++;
console.log("this.patientRegister.query", this.patientRegister.query);
btnQuery(queryType) {
this.query.queryType = queryType
this.$emit('triggerQuery', this.query)
},
//
changeCustomerOrgRegister(v) {
// console.log('changeCustomerOrgRegister')
this.patientRegister.query.startDate = new Date(v.beginTime)
this.query.startDate = new Date(v.beginTime)
if (v.isComplete == 'Y') {
this.patientRegister.query.endDate = new Date(v.endTime)
this.query.endDate = new Date(v.endTime)
} else {
this.patientRegister.query.endDate = new Date()
this.query.endDate = new Date()
}
if (v && v.id) this.getCustomerOrgGroup(v.id)
},
@ -272,7 +314,7 @@ export default {
//
getCustomerOrgGroup(customerOrgRegisterId) {
// console.log('getCustomerOrgGroup')
this.patientRegister.query.customerOrgGroupIds = []
this.query.customerOrgGroupIds = []
this.dict.customerOrgGroup = []
// /api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${customerOrgRegisterId}`
postapi('/api/app/CustomerOrgGroup/GetListForPatentRegisterByFilter', { customerOrgRegisterId }).then(res => {
@ -290,7 +332,7 @@ export default {
return
}
this.btnClear()
this.$peisAPI.peopleIcCard().then(res => {
console.log('peopleIcCard', res)
let lres = JSON.parse(res)
@ -303,13 +345,13 @@ export default {
// this.form.nationId = idNos.nationId
// this.form.idNo = idNos.IDCode
// this.form.address = idNos.Address
this.patientRegister.photo = 'data:image/bmp;base64,' + idNos.Photo //
this.query.photo = 'data:image/bmp;base64,' + idNos.Photo //
this.patientRegister.query.patientName = idNos.Name
this.patientRegister.query.sex = idNos.sexId
this.patientRegister.query.idCardNo = idNos.IDCode
this.query.patientName = idNos.Name
this.query.sex = idNos.sexId
this.query.idCardNo = idNos.IDCode
this.patientRegister.query.times++;
this.query.times++;
} else {
this.$message.error({ showClose: true, message: lres.message })
@ -324,8 +366,8 @@ export default {
onQueryByPacsNo(checkRequestNo) {
postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', { checkRequestNo }).then(res => {
if (res.code > 0) {
this.patientRegister.query.patientRegisterNo = res.data.patientRegisterNo
this.patientRegister.query.times++;
this.query.patientRegisterNo = res.data.patientRegisterNo
this.btnQuery("patientRegisterNo")
}
})
},
@ -334,13 +376,13 @@ export default {
onQueryByLisNo(lisRequestNo) {
postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', { lisRequestNo }).then(res => {
if (res.code > 0) {
this.patientRegister.query.patientRegisterNo = res.data.patientRegisterNo
this.patientRegister.query.times++;
this.query.patientRegisterNo = res.data.patientRegisterNo
this.btnQuery("patientRegisterNo")
}
})
},
//
//
enterToQuery() {
// console.log('enterToTab');
this.$nextTick(() => {
@ -359,11 +401,20 @@ export default {
let placeholder = input.getAttribute('placeholder')
switch (placeholder) {
case '条码号':
if (input.value) this.btnQuery('patientRegisterNo')
input.select()
break;
case '档案号':
if (input.value) this.btnQuery('patientNo')
input.select()
break;
case '姓名':
case '预约手机号':
if (input.value) this.btnQuery('patientName')
input.select()
break;
//case '':
case '身份证':
if (input.value) this.patientRegister.query.times++;
if (input.value) this.btnQuery('idCardNo')
input.select()
break;
case '检查条码':
@ -395,14 +446,16 @@ export default {
});
});
},
},
watch: {
"dataTransOpts.plus.PatientRegisterEditQuery": {
"refParams.PatientRegisterQueryTimes": {
// immediate: true,
handler(newVal, oldVal) {
console.log(`watch 体检单位切换 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.patientRegister.query.customerOrgId}`);
if (newVal != oldVal) this.init(this.patientRegister.query.customerOrgId)
console.log(`watch 体检单位切换 newVal:${newVal} oldVal:${oldVal}`, `customerOrgId: ${this.refParams.customerOrgId}`);
if (newVal != oldVal) this.changeOrgId(this.refParams.customerOrgId)
}
},
},

6
src/components/report/TurnoverReport.vue

@ -27,7 +27,7 @@
<div class="query">
<span class="spanClass">体检单位</span>
<el-select v-model="query.customerOrgIds" placeholder="请选择体检单位" :filter-method="filterMethod"
default-first-option clearable filterable style="margin-left: 10px" size="small" multiple collapse-tags>
default-first-option clearable filterable style="margin-left: 10px;width:300px;" size="small" multiple collapse-tags>
<el-option v-for="item in customerOrg" :key="item.id" :label="item.displayName" :value="item.id">
{{ item.displayName }}
</el-option>
@ -46,7 +46,7 @@
<div class="query">
<span class="spanClass">体检类别</span>
<el-select v-model="query.medicalTypeIds" placeholder="请选择体检类别" :filter-method="filterMethod"
default-first-option clearable filterable style="margin-left: 10px" size="small" multiple collapse-tags>
default-first-option clearable filterable style="margin-left: 10px;width:200px;" size="small" multiple collapse-tags>
<el-option v-for="item in medicalType" :key="item.id" :label="item.displayName" :value="item.id">
{{ item.displayName }}
</el-option>
@ -55,7 +55,7 @@
<div class="query">
<span class="spanClass">人员类别</span>
<el-select v-model="query.personnelTypeIds" placeholder="请选择人员类别" :filter-method="filterMethod"
default-first-option clearable filterable style="margin-left: 10px" size="small" multiple collapse-tags>
default-first-option clearable filterable style="margin-left: 10px;width:200px;" size="small" multiple collapse-tags>
<el-option v-for="item in personnelType" :key="item.id" :label="item.displayName" :value="item.id">
{{ item.displayName }}
</el-option>

2
src/components/report/TurnoverReportM.vue

@ -27,7 +27,7 @@
<div class="query">
<span class="spanClass">体检类别</span>
<el-select v-model="query.medicalTypeIds" placeholder="请选择体检类别" :filter-method="filterMethod"
default-first-option clearable filterable style="margin-left: 10px" size="small" multiple collapse-tags>
default-first-option clearable filterable style="margin-left: 10px;width:200px;" size="small" multiple collapse-tags>
<el-option v-for="item in medicalType" :key="item.id" :label="item.displayName" :value="item.id">
{{ item.displayName }}
</el-option>

2
src/components/report/TurnoverReportP.vue

@ -27,7 +27,7 @@
<div class="query">
<span class="spanClass">人员类别</span>
<el-select v-model="query.personnelTypeIds" placeholder="请选择人员类别" :filter-method="filterMethod"
default-first-option clearable filterable style="margin-left: 10px" size="small" multiple collapse-tags>
default-first-option clearable filterable style="margin-left: 10px;width:200px;" size="small" multiple collapse-tags>
<el-option v-for="item in personnelType" :key="item.id" :label="item.displayName" :value="item.id">
{{ item.displayName }}
</el-option>

9
src/utlis/tree.js

@ -48,10 +48,11 @@ function getTreePids(tree, childNodeName, pidName, idName, idVal) {
treeNode = getTreeNode(tree, lchildNodeName, lidName, idVal);
//console.log('treeNode',treeNode);
if (treeNode) {
pids.push(treeNode[lpidName]);
getTreePids(tree, lchildNodeName, lpidName, lidName, treeNode[lpidName]).forEach(e => {
pids.unshift(e);
});
pids.unshift(treeNode[lpidName]);
pids = [].concat(getTreePids(tree, lchildNodeName, lpidName, lidName, treeNode[lpidName]),pids)
// getTreePids(tree, lchildNodeName, lpidName, lidName, treeNode[lpidName]).forEach(e => {
// pids.unshift(e);
// });
}
return pids;

65
src/views/customerOrg/patientRegister.vue

@ -3,25 +3,25 @@
<div>
<div class="contenttitle">
体检登记 /<span class="contenttitleBold">体检人员登记</span>
</div>
</div>
<div style="display: flex;">
<!-- 单位树组件 -->
<div :style="'margin-right:10px;background-color: #fff;border-radius: 8px;width:208px; height:' +
(window.pageHeight < 600 ? 450 : window.pageHeight - 100) +
'px;'
">
<!-- -->
<CustomerOrgTreeAll />
">
<!-- 单位树组件 -->
<CustomerOrgTreeAll @changeTreeCurrOrg="changeTreeCurrOrg" />
</div>
<div :style="'display:block;width:' +
(window.pageWidth - 200 - 35) +
'px;'">
<!-- 查询条件 -->
<PatientRegisterQuery />
<PatientRegisterQuery :refParams="refParamsQuery" @triggerQuery="triggerQuery" />
<!-- 人员列表信息 -->
<PatientRegisterList />
<PatientRegisterList :refQueryCondition="queryCondition" />
</div>
</div>
</div>
@ -30,7 +30,7 @@
<script>
import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { tcdate } from "../../utlis/proFunc";
import { tcdate, deepCopy } from "../../utlis/proFunc";
import CustomerOrgTreeAll from "../../components/patientRegister/customerOrgTreeAll.vue";
import PatientRegisterQuery from "../../components/patientRegister/patientRegisterQuery.vue";
import PatientRegisterList from "../../components/patientRegister/PatientRegisterList.vue";
@ -45,6 +45,18 @@ export default {
return {
CustomerOrgTreeStyle: "",
CustomerOrgRightStyle: "margin-left: 10px;",
//
refParamsQuery: {
customerOrgId: '',
customerOrgName: '',
parentNodes:[],
PatientRegisterQueryTimes: 0 //ID
},
//
queryCondition: {
queryConditionTimes: 0
},
};
},
@ -65,10 +77,10 @@ export default {
},
computed: {
...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg"]),
...mapState(["window", "dataTransOpts", "dict", "patientRegister", "customerOrg"]),
},
methods: {
methods: {
//
dictInit() {
//
@ -107,7 +119,7 @@ export default {
this.dict.medicalType = res.data;
}
});
//
getapi("/api/app/personnel-type/in-filter").then((res) => {
if (res.code == 1) {
@ -181,11 +193,39 @@ export default {
console.log("dict", this.dict);
},
//
changeTreeCurrOrg(org) {
// console.log('.changeTreeCurrOrg',org)
this.refParamsQuery.customerOrgId = org.id
this.refParamsQuery.customerOrgName = org.displayName
this.refParamsQuery.parentNodes = org.parentNodes //
this.refParamsQuery.PatientRegisterQueryTimes++
//
this.queryCondition.customerOrgId = org.id
this.queryCondition.customerOrgName = org.displayName
// ID (ID)
if (org?.parentNodes.length > 1) {
this.queryCondition.customerOrgTopId = this.refParams.parentNodes[1]
} else {
this.queryCondition.customerOrgTopId = org.id
}
},
//
triggerQuery(queryCondition) {
//console.log('.triggerQuery1', queryCondition)
this.queryCondition = Object.assign(this.queryCondition, queryCondition, { queryConditionTimes: Number(this.queryCondition.queryConditionTimes) + 1 })
//console.log('.triggerQuery2', this.queryCondition)
},
},
//()
watch: {
},
};
</script>
@ -196,6 +236,7 @@ export default {
@import '../../assets/css/global_input.css';
@import '../../assets/css/global_table.css';
@import '../../assets/css/global.css';
.box {
display: flex;
}

Loading…
Cancel
Save