-
-
+
+
+
+
@@ -198,13 +216,17 @@ export default {
isSelectAll: 'N', // 录入结果时，是否全选
isAutoNext: 'N',
pacsType: 'image',
+
isQueue: 'N', //启用分诊排队
queueRoom: '', //默认分诊房间
queueItemTypeIds: [], // 检查类别
isBroadcast: 'N', // 是否广播
+
+ isPacsWorklist: 'N', // 是否启用 DCM-worklist 申请
+ scheduledAet: '', //scheduledAet
},
- lisLab:{
- specimens:[], // 默认标本类型ID
+ lisLab: {
+ specimens: [], // 默认标本类型ID
}
},
LocalConfigInit: {},
@@ -264,7 +286,7 @@ export default {
});
// 标本类型
- getapi("/api/app/menuinfo/getmymenuinfolist").then((res) => {
+ getapi("/api/app/sample-type/in-filter").then((res) => {
if (res.code != -1) {
this.dict.specimens = res.data;
}
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index 528bfe0..f1b61ee 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -29,25 +29,37 @@
-
+
{{ scope.row.asbitemName }}
+
+
+
+
+
-
+
{{ scope.row.asbitemName }}
+
+
+
+
+
@@ -64,14 +76,32 @@ export default {
data() {
return {
activeNames: ['0', '1', '2', '3'],
+ LocalConfig: {
+ doctorCheck: { // 医生诊台
+ isPacsWorklist: 'N', // 是否启用 DCM-worklist 申请
+ scheduledAet: '', //scheduledAet
+ }
+ },
};
},
- created() { },
+ created() {
+ let LocalConfigStr = window.localStorage.getItem("LocalConfig") || null
+ if(LocalConfigStr){
+ try {
+ let LocalConfig = JSON.parse(LocalConfigStr)
+ if(LocalConfig?.doctorCheck?.isPacsWorklist) this.LocalConfig.doctorCheck.isPacsWorklist = LocalConfig.doctorCheck.isPacsWorklist
+ if(LocalConfig?.doctorCheck?.scheduledAet) this.LocalConfig.doctorCheck.scheduledAet = LocalConfig.doctorCheck.scheduledAet
+ } catch (error) {
+ console.log('error',error)
+ }
+ }
+ },
//挂载完成
mounted() {
this.registerCheckList(this.dataTransOpts.tableS.patient_register.id)
+
},
computed: {
@@ -147,16 +177,16 @@ export default {
if (res.data.length > 0) {
this.doctorCheck.RegisterCheckId = res.data[0].id
this.dataTransOpts.tableS.register_check.id = res.data[0].id
-
+
this.doctorCheck.asbitemName = res.data[0].asbitemName
this.doctorCheck.checkRequestNo = res.data[0].checkRequestNo
-
+
// this.doctorCheck.RegisterCheckEdit = res.data[0]
// this.$refs['doctorCheck_RegisterCheckList'].setCurrentRow(res.data[0])
} else {
- this.dataTransOpts.tableS.register_check.id = ''
+ this.dataTransOpts.tableS.register_check.id = ''
this.doctorCheck.asbitemName = ""
this.doctorCheck.checkRequestNo = ""
}
@@ -174,7 +204,20 @@ export default {
handleRegisterCheckList(registerCheckList) {
this.doctorCheck.RegisterCheckList = listOrderBy(registerCheckList, [{ colName: 'checkTypeFlag', sortType: 'A' }, { colName: 'itemTypeDisplayOrder', sortType: 'A' }, { colName: 'asbitemDisplayOrder', sortType: 'A' }])
- }
+ },
+
+ // 发送pacs申请（有DCM-Worklist才有）
+ pacsRequest(checkRequestNo){
+ let body = {
+ scheduledAet: this.LocalConfig.doctorCheck.scheduledAet,
+ checkRequestNo
+ }
+ postapi('/api/app/Worklist/CreateRegisterCheckWorklist',body).then(res => {
+ if(res.code > -1){
+ this.$message.success({showClose:true,message:"往 DCM-Worklist 发送申请成功！"})
+ }
+ })
+ },
},
diff --git a/src/views/lis/LisTakeSample.vue b/src/views/lis/LisTakeSample.vue
index 351c077..fb51e5a 100644
--- a/src/views/lis/LisTakeSample.vue
+++ b/src/views/lis/LisTakeSample.vue
@@ -14,10 +14,10 @@
-
+
+ :height="Math.floor(tableListHeight / 2)" @row-click="rowClick" size="small">
@@ -85,7 +85,7 @@ import { tcdate, dddw, arrayExistObj, deepCopy } from "../../utlis/proFunc";
export default {
components: {
-
+
},
data() {
return {
@@ -103,11 +103,16 @@ export default {
patientList: [],//人员列表
curPatient: {}, // 当前
details: [], // 收费明细
+
+ LocalConfig: {
+ lisLab: { // 实验室
+ specimens: [], // 默认标本
+ }
+ },
};
},
- created() {
- this.formInit = Object.assign({}, this.form)
+ created() {
this.dictInit();
},
@@ -169,13 +174,23 @@ export default {
this.details = row.appointRegisterAsbitemDetail
},
-
+
//数据初始化
dictInit() {
-
+ this.formInit = Object.assign({}, this.form)
this.query.startDate = new Date()
this.query.endDate = this.query.startDate
+ let LocalConfigStr = window.localStorage.getItem("LocalConfig") || null
+ if (LocalConfigStr) {
+ try {
+ let LocalConfig = JSON.parse(LocalConfigStr)
+ if (LocalConfig?.lisLab?.specimens) this.LocalConfig.lisLab.specimens = LocalConfig.lisLab.specimens
+ } catch (error) {
+ console.log('error', error)
+ }
+ }
+
},
@@ -236,7 +251,8 @@ export default {
takeSample(lisRequestNos) {
return new Promise((resolve, reject) => {
let body = {
- lisRequestNos,SampleTypeIds:[]
+ lisRequestNos,
+ sampleTypeIds: this.LocalConfig.lisLab.specimens
}
postapi('/api/app/LisRequest/SetLisRequestSamplerStatus', body)
.then(res => {