{{
- dddw(
- dict.qztlType,
- "id",
- scope.row.qztlType,
- "displayName"
- )
+ dddw(dict.qztlType, "id", scope.row.qztlType, "displayName")
}}
@@ -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();
}
},
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index b0a9273..0e4aaad 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/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);
diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue
index 1aa24fb..b410e03 100644
--- a/src/components/patientRegister/patientRegisterAsbItem.vue
+++ b/src/components/patientRegister/patientRegisterAsbItem.vue
@@ -1,7 +1,6 @@
-
@@ -53,8 +52,15 @@
-
+
+
+
+
+
+
+
{{ item.asbitemName }}
@@ -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) {
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index a99a08f..4cfb597 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/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;'">
-
+
-
+
至
-
+
- 连续扫码
-
-
+
连续扫码
+
+
条码号
-
+
档案号
-
+
姓名
-
+
检查条码
-
+
检验条码
-
+
性别
-
+
手机号
-
+
身份证
-
+