关闭
@@ -83,14 +77,14 @@ import { dddw, arrayExistObj, deepCopy } from "../../utlis/proFunc";
// import
export default {
- props: ["patientRegister"],
+ props: ["refParams"],
data() {
return {
tabChoosed: '1',
- tableData: [], //组合项目数据 过滤后显示的数据
+ tableDataReq0: [], //组合项目数据 过滤后显示的数据
selectedData: [], //选中的组合项目
- hisRequestData: [], //收费申请单
- hisRequestDataDetails: [], //收费申请单明细
+ tableDataReq1: [], //检验申请申请单
+ tableDataReq1Details: [], //检验申请申请单明细
};
},
@@ -99,7 +93,7 @@ export default {
},
mounted() {
- this.initData(this.patientRegister.id);
+ this.initData(this.refParams.patientRegisterId);
},
computed: {
...mapState(["dict", "dataTransOpts", "dialogWin"]),
@@ -107,50 +101,47 @@ export default {
methods: {
initData(patientRegisterId) {
- this.tableData = []
- this.hisRequestData = []
- this.hisRequestDataDetails = []
+ this.tableDataReq0 = []
+ this.tableDataReq1 = []
+ this.tableDataReq1Details = []
if (!patientRegisterId) return
- //待收费项目
+ //待检验申请项目
this.asbList(patientRegisterId)
- // 收费申请单
+ // 检验申请申请单
this.requestList(patientRegisterId)
},
- // 待收费项目
+ // 待发 检验申请项目
asbList(patientRegisterId) {
- this.tableData = []
- postapi('/api/app/registerasbitem/GetCanChargeAsbitemsByPatientRegisterId', { patientRegisterId })
+ this.tableDataReq0 = []
+ postapi('/api/app/LisRequest/GetSendLisRequestList', { patientRegisterId, execFlag: '0' })
.then(res => {
if (res.code > -1) {
- res.data.forEach(e => {
- e.total = Number(e.chargePrice * e.amount)
- this.tableData.push(e)
- });
+ this.tableDataReq0 = res.data
}
})
},
- // 收费申请单列表查询
+ // 已发 检验申请申请单列表查询
requestList(patientRegisterId) {
- this.hisRequestData = []
- this.hisRequestDataDetails = []
- postapi('/api/app/ChargeRequest/GetChargeRequestsByPatientRegisterId', { patientRegisterId })
+ this.tableDataReq1 = []
+ this.tableDataReq1Details = []
+ postapi('/api/app/LisRequest/GetSendLisRequestList', { patientRegisterId, execFlag: '1' })
.then(res => {
if (res.code > -1) {
- this.hisRequestData = res.data
+ this.tableDataReq1 = res.data
}
})
},
setChargeRequestFlag(chargeRequestFlag) {
- let ret = '收费申请'
+ let ret = '检验申请申请'
switch (chargeRequestFlag) {
case '1':
- ret = '已收费'
+ ret = '已检验申请'
break;
case '2':
ret = '作废申请'
@@ -186,21 +177,18 @@ export default {
// 获取申请单明细
rowClick(row) {
- this.hisRequestDataDetails = []
- postapi('/api/app/ChargeRequest/GetChargeRequestAsbitemsByChargeRequestId', { chargeRequestId: row.id })
+ this.tableDataReq1Details = []
+ postapi('/api/app/LisRequest/GetRequestAsbitemByLisRequestIdList', { lisRequestId: row.lisRequestId })
.then(res => {
if (res.code > -1) {
- res.data.forEach(e => {
- e.total = Number(e.chargePrice * e.amount)
- this.hisRequestDataDetails.push(e)
- });
+ this.tableDataReq1Details = res.data
}
})
},
- // 撤消申请（作废申请）
+ // 刷新状态
refreshRequest(row) {
- console.log('refreshRequest',row)
+ console.log('refreshRequest', row)
postapi('/api/app/ChargeRequest/SyncChargeRequestFlagFromInterface', { chargeRequestId: row.id })
.then(res => {
if (res.code > -1) {
@@ -211,10 +199,11 @@ export default {
// 撤消申请（作废申请）
cancelRequest(row) {
- postapi('/api/app/ChargeRequest/CancelChargeRequest', { chargeRequestId: row.id })
+ postapi('/api/app/LisRequest/CancelThirdLisRequest', { lisRequestId: row.lisRequestId })
.then(res => {
if (res.code > -1) {
- row.chargeRequestFlag = "2"
+ // 刷新
+ this.requestList(this.refParams.patientRegisterId)
}
})
},
@@ -232,32 +221,27 @@ export default {
// 刷新
btnRefresh() {
if (this.tabChoosed == '1') {
- this.asbList(this.patientRegister.id)
+ this.asbList(this.refParams.patientRegisterId)
} else {
- this.requestList(this.patientRegister.id)
+ this.requestList(this.refParams.patientRegisterId)
}
},
- btnSubmit() {
+ // 发送申请
+ async btnSubmit() {
if (this.selectedData.length == 0) {
- this.$message.warning({ showClose: true, message: `请勾选要发送收费申请的检查项目！` });
+ this.$message.warning({ showClose: true, message: `请勾选要发送检验申请申请的检查项目！` });
return;
}
- let body = {
- patientRegisterId: this.patientRegister.id,
- registerCheckAsbitems: []
- }
- this.selectedData.forEach(e => {
- body.registerCheckAsbitems.push({ registerCheckAsbitemId: e.registerCheckAsbitemId })
- });
+ for (let index = 0; index < this.selectedData.length; index++) {
+ let e = this.selectedData[index];
+ await postapi('/api/app/LisRequest/SendThirdLisRequest', { lisRequestId: e.lisRequestId })
+
+ }
+ // 刷新
+ this.asbList(this.refParams.patientRegisterId)
- postapi("/api/app/ChargeRequest/Create", body)
- .then(res => {
- if (res.code > -1) {
- this.initData(this.patientRegister.id)
- }
- });
},
},
@@ -265,12 +249,12 @@ export default {
//监听事件
watch: {
//
- "dataTransOpts.refresh.charge.S": {
+ "refParams.brushTimes": {
// immediate: true, // 立即执行
// // deep: true, // 深度监听复杂类型内变化
handler(newVal, oldVal) {
- console.log(`watch: 收费 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `, this.patientRegister.id)
- if (newVal != oldVal) this.initData(this.patientRegister.id)
+ console.log(`watch: 检验申请 newVal: ${newVal}, oldVal: ${oldVal}, 人员ID: `, this.refParams.patientRegisterId)
+ if (newVal != oldVal) this.initData(this.refParams.patientRegisterId)
}
},
@@ -278,12 +262,12 @@ export default {
// immediate: true, // 立即执行
// // deep: true, // 深度监听复杂类型内变化
handler(newVal, oldVal) {
- console.log(`watch: 收费 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `, this.patientRegister.id)
+ console.log(`watch: 检验申请 newVal: ${newVal}, oldVal: ${oldVal}, 人员ID: `, this.refParams.patientRegisterId)
if (newVal != oldVal) {
if (newVal == '1') {
- this.asbList(this.patientRegister.id)
+ this.asbList(this.refParams.patientRegisterId)
} else {
- this.requestList(this.patientRegister.id)
+ this.requestList(this.refParams.patientRegisterId)
}
}
}
diff --git a/src/components/patientRegister/ThirdPacsRequest.vue b/src/components/patientRegister/ThirdPacsRequest.vue
index e14e152..a45049c 100644
--- a/src/components/patientRegister/ThirdPacsRequest.vue
+++ b/src/components/patientRegister/ThirdPacsRequest.vue
@@ -2,33 +2,25 @@
-
-
+
+
-
-
-
-
-
+
+
-
-
+
-
-
-
-
-
- {{ setChargeRequestFlag(scope.row.chargeRequestFlag) }}
-
-
-
-
+
+
+
+
@@ -36,25 +28,18 @@
- 刷新状态
撤消申请
+
- 申请单包含项目
-
-
-
-
-
-
-
@@ -66,7 +51,7 @@
刷新
- 收费申请
+ 检查申请
关闭
@@ -83,14 +68,14 @@ import { dddw, arrayExistObj, deepCopy } from "../../utlis/proFunc";
// import
export default {
- props: ["patientRegister"],
+ props: ["refParams"],
data() {
return {
tabChoosed: '1',
- tableData: [], //组合项目数据 过滤后显示的数据
+ tableDataReq0: [], //组合项目数据 过滤后显示的数据
selectedData: [], //选中的组合项目
- hisRequestData: [], //收费申请单
- hisRequestDataDetails: [], //收费申请单明细
+ tableDataReq1: [], //检查申请单
+ tableDataReq1Details: [], //检查申请单明细
};
},
@@ -99,7 +84,7 @@ export default {
},
mounted() {
- this.initData(this.patientRegister.id);
+ this.initData(this.refParams.patientRegisterId);
},
computed: {
...mapState(["dict", "dataTransOpts", "dialogWin"]),
@@ -107,50 +92,46 @@ export default {
methods: {
initData(patientRegisterId) {
- this.tableData = []
- this.hisRequestData = []
- this.hisRequestDataDetails = []
+ this.tableDataReq0 = []
+ this.tableDataReq1 = []
+ this.tableDataReq1Details = []
if (!patientRegisterId) return
- //待收费项目
+ //待发申请 检查项目
this.asbList(patientRegisterId)
- // 收费申请单
+ // 检查申请单
this.requestList(patientRegisterId)
},
- // 待收费项目
+ // 待检查项目
asbList(patientRegisterId) {
- this.tableData = []
- postapi('/api/app/registerasbitem/GetCanChargeAsbitemsByPatientRegisterId', { patientRegisterId })
+ this.tableDataReq0 = []
+ postapi('/api/app/RegisterCheck/GetPacsRequestListByPatientRegisterId', { patientRegisterId, execFlag: '0' })
.then(res => {
if (res.code > -1) {
- res.data.forEach(e => {
- e.total = Number(e.chargePrice * e.amount)
- this.tableData.push(e)
- });
+ this.tableDataReq0 = res.data
}
})
},
- // 收费申请单列表查询
+ // 检查申请单列表查询
requestList(patientRegisterId) {
- this.hisRequestData = []
- this.hisRequestDataDetails = []
- postapi('/api/app/ChargeRequest/GetChargeRequestsByPatientRegisterId', { patientRegisterId })
+ this.tableDataReq1 = []
+ postapi('/api/app/RegisterCheck/GetPacsRequestListByPatientRegisterId', { patientRegisterId, execFlag: '1' })
.then(res => {
if (res.code > -1) {
- this.hisRequestData = res.data
+ this.tableDataReq1 = res.data
}
})
},
setChargeRequestFlag(chargeRequestFlag) {
- let ret = '收费申请'
+ let ret = '检查申请'
switch (chargeRequestFlag) {
case '1':
- ret = '已收费'
+ ret = '已检查'
break;
case '2':
ret = '作废申请'
@@ -186,21 +167,12 @@ export default {
// 获取申请单明细
rowClick(row) {
- this.hisRequestDataDetails = []
- postapi('/api/app/ChargeRequest/GetChargeRequestAsbitemsByChargeRequestId', { chargeRequestId: row.id })
- .then(res => {
- if (res.code > -1) {
- res.data.forEach(e => {
- e.total = Number(e.chargePrice * e.amount)
- this.hisRequestDataDetails.push(e)
- });
- }
- })
+
},
- // 撤消申请（作废申请）
+ // 刷新状态
refreshRequest(row) {
- console.log('refreshRequest',row)
+ console.log('refreshRequest', row)
postapi('/api/app/ChargeRequest/SyncChargeRequestFlagFromInterface', { chargeRequestId: row.id })
.then(res => {
if (res.code > -1) {
@@ -209,12 +181,13 @@ export default {
})
},
+
// 撤消申请（作废申请）
cancelRequest(row) {
- postapi('/api/app/ChargeRequest/CancelChargeRequest', { chargeRequestId: row.id })
+ postapi('/api/app/RegisterCheck/CancelThirdPacsRequest', { registerCheckId: row.registerCheckId })
.then(res => {
if (res.code > -1) {
- row.chargeRequestFlag = "2"
+ this.requestList(this.refParams.patientRegisterId)
}
})
},
@@ -232,32 +205,27 @@ export default {
// 刷新
btnRefresh() {
if (this.tabChoosed == '1') {
- this.asbList(this.patientRegister.id)
+ this.asbList(this.refParams.patientRegisterId)
} else {
- this.requestList(this.patientRegister.id)
+ this.requestList(this.refParams.patientRegisterId)
}
},
- btnSubmit() {
+ // 发送申请
+ async btnSubmit() {
if (this.selectedData.length == 0) {
- this.$message.warning({ showClose: true, message: `请勾选要发送收费申请的检查项目！` });
+ this.$message.warning({ showClose: true, message: `请勾选要发送检查申请的检查项目！` });
return;
}
- let body = {
- patientRegisterId: this.patientRegister.id,
- registerCheckAsbitems: []
+
+ for (let index = 0; index < this.selectedData.length; index++) {
+ let e = this.selectedData[index];
+ await postapi("/api/app/RegisterCheck/SendThirdPacsRequest", { registerCheckId: e.registerCheckId })
}
- this.selectedData.forEach(e => {
- body.registerCheckAsbitems.push({ registerCheckAsbitemId: e.registerCheckAsbitemId })
- });
+ // 刷新
+ this.asbList(this.refParams.patientRegisterId)
- postapi("/api/app/ChargeRequest/Create", body)
- .then(res => {
- if (res.code > -1) {
- this.initData(this.patientRegister.id)
- }
- });
},
},
@@ -265,12 +233,12 @@ export default {
//监听事件
watch: {
//
- "dataTransOpts.refresh.charge.S": {
+ "refParams.brushTimes": {
// immediate: true, // 立即执行
// // deep: true, // 深度监听复杂类型内变化
handler(newVal, oldVal) {
- console.log(`watch: 收费 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `, this.patientRegister.id)
- if (newVal != oldVal) this.initData(this.patientRegister.id)
+ console.log(`watch: 检查申请 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `, this.refParams.patientRegisterId)
+ if (newVal != oldVal) this.initData(this.refParams.patientRegisterId)
}
},
@@ -278,12 +246,12 @@ export default {
// immediate: true, // 立即执行
// // deep: true, // 深度监听复杂类型内变化
handler(newVal, oldVal) {
- console.log(`watch: 收费 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `, this.patientRegister.id)
+ console.log(`watch: 检查申请 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `, this.refParams.patientRegisterId)
if (newVal != oldVal) {
if (newVal == '1') {
- this.asbList(this.patientRegister.id)
+ this.asbList(this.refParams.patientRegisterId)
} else {
- this.requestList(this.patientRegister.id)
+ this.requestList(this.refParams.patientRegisterId)
}
}
}