+
+新增
+ +新增
{{ node.label }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -86,7 +189,7 @@ import Cookies from 'js-cookie'
import AfterForm from '@/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue'
export default {
components: {
- AfterForm,
+ // AfterForm,
treeSelect
},
mixins: [],
@@ -110,6 +213,10 @@ export default {
onlyRead: {
type: Boolean,
default: false
+ },
+ isPlatform: {
+ type: Boolean,
+ default: true
}
},
inject: ['refresh'],
@@ -172,8 +279,8 @@ export default {
sort: 99,
id: 14,
type: 'hangman',
- od: '',
- os: ''
+ od: 'hbOd',
+ os: 'hbOs'
}, {
name: '视盘'
}, {
@@ -181,15 +288,15 @@ export default {
id: 15,
sort: 3,
type: 'shipman',
- od: '',
- os: ''
+ od: 'spSsjOd',
+ os: 'spSsjOs'
}, {
name: '视盘',
id: 16,
sort: 4,
type: 'shipman',
- od: '',
- os: ''
+ od: 'spCrdOd',
+ os: 'spCrdOs'
}, {
name: '视网膜'
}, {
@@ -197,8 +304,8 @@ export default {
sort: 99,
id: 17,
type: 'showing',
- od: '',
- os: ''
+ od: 'swmOd',
+ os: 'swmOs'
}, {
name: '脉络膜'
}, {
@@ -206,8 +313,8 @@ export default {
sort: 99,
id: 18,
type: 'mailbomb',
- od: '',
- os: ''
+ od: 'mlmOd',
+ os: 'mlmOs'
}, {
name: '玻璃体 vitreous'
}, {
@@ -215,8 +322,8 @@ export default {
sort: 99,
id: 19,
type: 'blit',
- od: '',
- os: ''
+ od: 'bltOd',
+ os: 'bltOs'
}, {
name: '血管'
}, {
@@ -224,8 +331,8 @@ export default {
sort: 99,
id: 20,
type: 'began',
- od: '',
- os: ''
+ od: 'xgOd',
+ os: 'xgOs'
}, {
name: '巩膜'
}, {
@@ -233,8 +340,8 @@ export default {
sort: 99,
id: 21,
type: 'gong',
- od: '',
- os: ''
+ od: 'hmOd',
+ os: 'hmOs'
}, {
name: '边缘 periphery'
}, {
@@ -242,25 +349,22 @@ export default {
sort: 99,
id: 22,
type: 'banyan',
- od: '',
- os: ''
+ od: 'byOd',
+ os: 'byOs'
}],
treeList: []
}
},
watch: {
- tableData: {
- deep: true,
- handler: (value) => {
- if (value) {
- eventBus.$emit('getAfterData', value)
- }
- }
- },
caseId: {
handler: function(newV, oldV) {
- this.getforeList().then(() => {
- this.queryOptions()
+ this.queryOptions()
+ this.getforeList()
+ this.$nextTick(() => {
+ this.tableData.forEach(item => {
+ item.flag = false
+ this.$refs.multipleTable.toggleRowSelection(item, false)
+ })
})
}
}
@@ -284,8 +388,8 @@ export default {
})
if (res.code === 0) {
if (res.data) {
- this.dataForm = res.data
- this.handleData(this.dataForm)
+ this.dataForm = this.handleData(res.data)
+ eventBus.$emit('getAfterData', this.dataForm)
}
} else {
this.$message.error(res.msg)
@@ -299,12 +403,13 @@ export default {
}
}
}
+ return data
},
// 表格复选框
- selection(value) {
- if (!value.val.id) {
- const data = this.tableData.filter(item => item.name === value.val.name)
- if (value.val.flag) {
+ selection(selection, val) {
+ if (!val.id) {
+ const data = this.tableData.filter(item => item.name === val.name)
+ if (val.flag) {
data.forEach(row => {
row.flag = false
this.$refs.afterForm.$refs.multipleTable.toggleRowSelection(row, false)
@@ -316,8 +421,8 @@ export default {
})
}
} else {
- const data = this.tableData.filter(item => item.id === value.val.id)
- if (value.val.flag) {
+ const data = this.tableData.filter(item => item.id === val.id)
+ if (val.flag) {
data.forEach(row => {
row.flag = false
})
@@ -329,11 +434,13 @@ export default {
}
},
// 保留下拉框的label，添加到数据集用于展示
- handleNode(val) {
- if (val.type === 'os') {
- this.tableData[val.index].osValue = val.event
- } else {
- this.tableData[val.index].odValue = val.event
+ handleNode(index, type, event) {
+ if (event) {
+ if (type === 'os') {
+ this.tableData[index].osValue = event
+ } else if (type === 'od') {
+ this.tableData[index].odValue = event
+ }
}
},
// 添加数据集
@@ -374,8 +481,7 @@ export default {
})
})
}
- this.sourceData = Object.assign([], this.tableData)
- eventBus.$emit('getAfterData', this.tableData)
+ // this.sourceData = Object.assign([], this.tableData)
}).catch((error) => {
console.log(error)
})
@@ -385,67 +491,42 @@ export default {
if (type === 1) {
this.tableData.forEach(item => {
if (item.sort) {
- item.od = item.os
+ this.dataForm[item.od] = this.dataForm[item.os]
item.odValue = item.osValue
- const sort = item.sort
- item.sort = ''
- this.$nextTick(() => {
- item.sort = sort
- })
}
})
} else {
this.tableData.forEach(item => {
if (item.sort) {
- item.os = item.od
+ this.dataForm[item.os] = this.dataForm[item.od]
item.osValue = item.odValue
- const sort = item.sort
- item.sort = ''
- this.$nextTick(() => {
- item.sort = sort
- })
}
})
}
},
// 移动
- moveHandle(val) {
- if (val.row.id) {
- if (val.type === 1) {
- this.tableData[val.index].od = val.row.os
- this.tableData[val.index].odValue = val.row.osValue
- } else {
- this.tableData[val.index].os = val.row.od
- this.tableData[val.index].osValue = val.row.odValue
+ moveHandle(index, type, row) {
+ if (row.id) {
+ if (type === 1) { // 左移
+ this.dataForm[row.od] = this.dataForm[row.os]
+ this.tableData[index].odValue = row.osValue
+ } else { // 右移
+ this.dataForm[row.os] = this.dataForm[row.od]
+ this.tableData[index].osValue = row.odValue
}
- const sort = this.tableData[val.index].sort
- this.tableData[val.index].sort = ''
- this.$nextTick(() => {
- this.tableData[val.index].sort = sort
- })
} else {
- if (val.type === 1) {
+ if (type === 1) {
this.tableData.forEach(item => {
- if (item.name === val.row.name) {
- item.od = item.os
+ if (item.name === row.name) {
+ this.dataForm[item.od] = this.dataForm[item.os]
item.odValue = item.osValue
- const sort = item.sort
- item.sort = ''
- this.$nextTick(() => {
- item.sort = sort
- })
}
})
} else {
this.tableData.forEach(item => {
- if (item.name === val.row.name) {
- item.os = item.od
+ if (item.name === row.name) {
+ this.dataForm[item.os] = this.dataForm[item.od]
item.osValue = item.odValue
- const sort = item.sort
- item.sort = ''
- this.$nextTick(() => {
- item.sort = sort
- })
}
})
}
@@ -473,13 +554,13 @@ export default {
}
},
// 新增树
- addTree(val) {
+ addTree(item, event) {
this.title = '新增子级'
this.addType = 1
this.form.name = ''
- this.type = val.event.type
- this.parentId = val.event.id
- this.treeFlag = val.event.flag
+ this.type = event.type
+ this.parentId = event.id
+ this.treeFlag = event.flag
this.dialogFormVisible = true
},
// 新增保存树-眼睛部位下拉选择
@@ -576,7 +657,7 @@ export default {
})
})
} else {
- this.tableData = Object.assign([], this.sourceData)
+ // this.tableData = Object.assign([], this.sourceData)
}
},
// 点击保存模板后弹框
@@ -628,7 +709,7 @@ export default {
const { data: res } = await this.$http.post('/treetemplate/addTree', params)
if (res.code === 0) {
this.dialogFormVisible = false
- this.queryTreeCase()
+ await this.queryTreeCase()
this.$message.success('保存成功')
} else {
this.$message.error(res.msg)
diff --git a/src/components/360View/business.vue b/src/components/360View/business.vue
index 70f940d..e07a070 100644
--- a/src/components/360View/business.vue
+++ b/src/components/360View/business.vue
@@ -27,7 +27,7 @@
描述项模板
-
+
+
+
+ 视盘：视神经
+
+
+
+ +
+
+
+
+
+
- 发送
建立屈光档案
+预约激光治疗
diff --git a/src/components/360View/commonForm/deveopmentFIle-copy.vue b/src/components/360View/commonForm/deveopmentFIle-copy.vue
index 4708f8c..373a080 100644
--- a/src/components/360View/commonForm/deveopmentFIle-copy.vue
+++ b/src/components/360View/commonForm/deveopmentFIle-copy.vue
@@ -563,7 +563,29 @@ export default {
}
},
handleDelete() {
- this.$emit('del')
+ const params = {
+ id: this.caseId
+ }
+ this.$confirmFun('你确定要删除吗？').then(async() => {
+ await this.deleteNewForm()
+ const { data: res } = await this.$http.post('/case/delete', params)
+ if (res.code === 0) {
+ this.$message.success('删除成功')
+ await this.$parent.getFormList()
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
+ async deleteNewForm() {
+ const params = {
+ id: this.caseId
+ }
+ const { data: res } = await this.$http.post('/qgfyda/delQgfyda', params)
+ if (res.code === 0) {
+ } else {
+ this.$message.error(res.msg)
+ }
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
diff --git a/src/components/360View/commonForm/eyesVision.vue b/src/components/360View/commonForm/eyesVision.vue
index ca51b75..8a448b6 100644
--- a/src/components/360View/commonForm/eyesVision.vue
+++ b/src/components/360View/commonForm/eyesVision.vue
@@ -99,16 +99,16 @@
-
+
VA:
-
- /
-
-
- X
-
+
+
+
+
+
+
@@ -347,16 +347,16 @@
-
+
VA:
-
- /
-
-
- X
-
+
+
+
+
+
+
@@ -816,7 +816,7 @@ export default {
this.formData.ctJin = this.formData.ctJin.replace('>', '>')
}
if (!this.formData.id) {
- this.queryProject()
+ await this.queryProject()
this.formData.ctYuan = this.formData.ctJin = '正位'
this.formData.ctYqyd = '正常'
this.formData.worth1 = this.formData.worth3 = '4个'
@@ -936,7 +936,7 @@ export default {
}
const { data: res } = await this.$http.post('/sysgnjc/saveSysgnjc', params)
if (res.code === 0) {
- this.getSysgnjc()
+ await this.getSysgnjc()
this.$message.success('保存成功')
} else {
this.$message.error(res.msg)
@@ -944,7 +944,29 @@ export default {
},
// 删除
handleDelete() {
- this.$emit('del')
+ const params = {
+ id: this.caseId
+ }
+ this.$confirmFun('你确定要删除吗？').then(async() => {
+ await this.deleteNewForm()
+ const { data: res } = await this.$http.post('/case/delete', params)
+ if (res.code === 0) {
+ this.$message.success('删除成功')
+ await this.$parent.getFormList()
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
+ async deleteNewForm() {
+ const params = {
+ id: this.caseId
+ }
+ const { data: res } = await this.$http.post('/sysgnjc/delSysgnjc', params)
+ if (res.code === 0) {
+ } else {
+ this.$message.error(res.msg)
+ }
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
@@ -1019,7 +1041,7 @@ export default {
}
#operation-record {
height: 100%;
- overflow: auto;
+ overflow: auto;
.operation-record-table {
width: 100%;
diff --git a/src/components/360View/commonForm/optometryForm-copy.vue b/src/components/360View/commonForm/optometryForm-copy.vue
index ba8c16e..ba7429f 100644
--- a/src/components/360View/commonForm/optometryForm-copy.vue
+++ b/src/components/360View/commonForm/optometryForm-copy.vue
@@ -540,19 +540,26 @@ export default {
caseId: {
handler: function(newV, oldV) {
this.queryForm()
- this.initWebSoket()
+ if (this.isSearch === '3') {
+ this.initWebSoket()
+ }
}
}
},
- beforeUnmount() {
- clearTimeout(this.timeoutObj)
- clearTimeout(this.serverTimeoutObj)
- this.ws.close()
+ destroyed() {
+ if (this.isSearch === '3') {
+ clearTimeout(this.timeoutnum)
+ clearTimeout(this.timeoutObj)
+ clearTimeout(this.serverTimeoutObj)
+ this.ws.close()
+ }
},
mounted() {
this.queryForm()
- this.initWebSoket()
this.getPatientData()
+ if (this.isSearch === '3') {
+ this.initWebSoket()
+ }
},
methods: {
// 设置签名
@@ -713,37 +720,38 @@ export default {
// wss://127.0.0.1:8030/data
// const url = 'ws://47.110.224.240:8036/xiangan-crf/websocket/0071'
// const url = 'ws://192.168.0.167:8036/xiangan-crf/websocket/0071'/
- const url = 'ws://127.0.0.1:8030/data'
- const self = this
- this.ws = new WebSocket(url)
- this.ws.onopen = function() {
- console.log('连接成功')
- self.start()
- }
- this.ws.onclose = function() {
- // console.log('连接关闭')
- self.reconnect()
- }
- this.ws.onerror = function() {
- // console.log('连接失败')
- self.reconnect()
- }
- this.ws.onmessage = function(msg) {
- const message = JSON.parse(msg.data)
- // const data = JSON.parse(msg.data)
- // const message = JSON.parse(data.msgTxt)
- console.log(message)
- self.dataForm.ygjcDsOd = message.RData.DS
- self.dataForm.ygjcDcOd = message.RData.DC
- self.dataForm.ygjcAOd = message.RData.AXIS
- self.dataForm.ygjcVaOd = message.RData.VA
- self.dataForm.ygjcAddOd = message.RData.ADD
- self.dataForm.ygjcDsOs = message.LData.DS
- self.dataForm.ygjcDcOs = message.LData.DC
- self.dataForm.ygjcAOs = message.LData.AXIS
- self.dataForm.ygjcVaOs = message.LData.VA
- self.dataForm.ygjcAddOs = message.LData.ADD
- self.resetHeart()
+ try {
+ const url = 'ws://127.0.0.1:8030/data'
+ const self = this
+ this.ws = new WebSocket(url)
+ this.ws.onopen = function() {
+ console.log('连接成功')
+ self.start()
+ }
+ this.ws.onclose = function() {
+ }
+ this.ws.onerror = function() {
+ self.reconnect()
+ }
+ this.ws.onmessage = function(msg) {
+ const message = JSON.parse(msg.data)
+ // const data = JSON.parse(msg.data)
+ // const message = JSON.parse(data.msgTxt)
+ console.log(message)
+ self.dataForm.ygjcDsOd = message.RData.DS
+ self.dataForm.ygjcDcOd = message.RData.DC
+ self.dataForm.ygjcAOd = message.RData.AXIS
+ self.dataForm.ygjcVaOd = message.RData.VA
+ self.dataForm.ygjcAddOd = message.RData.ADD
+ self.dataForm.ygjcDsOs = message.LData.DS
+ self.dataForm.ygjcDcOs = message.LData.DC
+ self.dataForm.ygjcAOs = message.LData.AXIS
+ self.dataForm.ygjcVaOs = message.LData.VA
+ self.dataForm.ygjcAddOs = message.LData.ADD
+ self.resetHeart()
+ }
+ } catch (e) {
+ console.log(e)
}
},
// 处理字符串
@@ -794,7 +802,29 @@ export default {
}).catch(() => {})
},
handleDelete() {
- this.$emit('del')
+ const params = {
+ id: this.caseId
+ }
+ this.$confirmFun('你确定要删除吗？').then(async() => {
+ await this.deleteNewForm()
+ const { data: res } = await this.$http.post('/case/delete', params)
+ if (res.code === 0) {
+ this.$message.success('删除成功')
+ await this.$parent.getFormList()
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
+ async deleteNewForm() {
+ const params = {
+ id: this.caseId
+ }
+ const { data: res } = await this.$http.post('/ygbgd/delYgbgdInfo', params)
+ if (res.code === 0) {
+ } else {
+ this.$message.error(res.msg)
+ }
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
@@ -974,18 +1004,6 @@ export default {
.el-date-editor.el-input__inner {
width: 140px;
}
- //.el-checkbox__input.is-checked + .el-checkbox__label {
- // color: #606266;
- //}
- //.el-checkbox__input.is-checked .el-checkbox__inner,
- //.el-checkbox__input.is-indeterminate .el-checkbox__inner {
- // background: #767676;
- // border-color: #767676;
- //}
- //.el-checkbox__inner:hover,
- //.el-checkbox__inner {
- // border-color: #767676;
- //}
.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
background: none !important;
}
diff --git a/src/components/360View/commonForm/threeVision.vue b/src/components/360View/commonForm/threeVision.vue
index 4c7f369..148c932 100644
--- a/src/components/360View/commonForm/threeVision.vue
+++ b/src/components/360View/commonForm/threeVision.vue
@@ -9,8 +9,7 @@
-
-
-
+
-
-
+
三级视功能检查报告单
@@ -21,61 +20,290 @@
+
-
-
-
-
+
OD
OS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ R
L
L
R
-
+
TITMUS(近):
-
-
- 报告描述:
-
+
-
-
- 视光师:
- ![]()
-
-
-
- 医师:
-
+ 视光师:
+ ![]()
-
+
- {{ scope.row.name }}
+ {{ scope.row.name }}
日期：
-
-
+
+
OD:
+
+ /
+
+
+ X
+
-
-
+
+
OS:
+
+ /
+
+
+ X
+
-
-
+
+
-
-
+
+
@@ -123,29 +378,53 @@
-
-
+
+
-
-
-
+
+
+ @D(
+
-
@@ -166,31 +445,63 @@
-
- TNO(近):
-
+
+
+ TNO(近):
+
+
+
-
+ AC/A:
+
-
+
-
+ 异常视网膜对应:
+
-
-
+ 分开/集合：
+
+
+
-
-
+
+
+ @N(
-
+
+
+
@@ -102,7 +123,7 @@
-
- RDD(远):
-
+
@@ -222,18 +533,203 @@ export default {
},
data() {
return {
+ ctList: [
+ {
+ name: '正位',
+ id: '1'
+ },
+ {
+ name: '△BI',
+ id: '2'
+ },
+ {
+ name: '△BO',
+ id: '3'
+ }
+ ],
+ retinaList: [
+ {
+ name: '是',
+ id: '1'
+ },
+ {
+ name: '否',
+ id: '2'
+ }
+ ],
+ checkList: [
+ {
+ name: '老虎/笼子（10°）',
+ id: '1'
+ },
+ {
+ name: '门/人（8°）',
+ id: '2'
+ },
+ {
+ name: '圆环/边框(1°/5°)',
+ id: '3'
+ },
+ {
+ name: '超人/月球（3°）',
+ id: '4'
+ },
+ {
+ name: '花心/花蕊（1°）',
+ id: '5'
+ }
+ ],
+ checkTwoList: [
+ {
+ name: '猫（10°）',
+ id: '1'
+ },
+ {
+ name: '机器猫（8°）',
+ id: '2'
+ },
+ {
+ name: '花（3°）',
+ id: '3'
+ },
+ {
+ name: '三人组（3°）',
+ id: '4'
+ },
+ {
+ name: '小车（1°）',
+ id: '5'
+ }
+ ],
+ separateList: [
+ {
+ name: '+',
+ id: '1'
+ },
+ {
+ name: '-',
+ id: '2'
+ }
+ ],
+ worthList: [
+ {
+ name: '5个',
+ id: '1'
+ },
+ {
+ name: '4个',
+ id: '2'
+ },
+ {
+ name: '3个',
+ id: '3'
+ },
+ {
+ name: '2个',
+ id: '4'
+ }
+ ],
+ titmusList: [
+ {
+ name: '苍蝇图（+）',
+ id: '1'
+ },
+ {
+ name: '800"',
+ id: '2'
+ },
+ {
+ name: '400"',
+ id: '3'
+ },
+ {
+ name: '200"',
+ id: '4'
+ },
+ {
+ name: '140"',
+ id: '5'
+ },
+ {
+ name: '100"',
+ id: '6'
+ },
+ {
+ name: '80"',
+ id: '7'
+ },
+ {
+ name: '60"',
+ id: '8'
+ },
+ {
+ name: '50"',
+ id: '9'
+ }
+ ],
+ tnoList: [
+ {
+ name: '480"',
+ id: '1'
+ },
+ {
+ name: '240"',
+ id: '2'
+ },
+ {
+ name: '120"',
+ id: '3'
+ },
+ {
+ name: '60"',
+ id: '4'
+ },
+ {
+ name: '无',
+ id: '5'
+ }
+ ],
+ rddList: [
+ {
+ name: '400"',
+ id: '1'
+ },
+ {
+ name: '200"',
+ id: '2'
+ },
+ {
+ name: '100"',
+ id: '3'
+ },
+ {
+ name: '60"',
+ id: '4'
+ },
+ {
+ name: '无',
+ id: '5'
+ }
+ ],
dataForm: {
+ idList: [],
+ jzNumber: '',
patientId: '',
patientName: '',
patientSex: '',
patientAge: '',
// 屈光状态
- qgztOd: '',
- qgztOs: '',
+ qgztOd1: '',
+ qgztOd2: '',
+ qgztOd3: '',
+ qgztOs1: '',
+ qgztOs2: '',
+ qgztOs3: '',
qgztOdVa: '',
qgztOsVa: '',
// CT+Prism
ctPrism: '',
+ ctPrismDw: '',
// 检查画片
tssjcJchp: '',
// 主观斜视角
@@ -245,8 +741,10 @@ export default {
// 检查画片融合
rhgnjcJchp: '',
// 融合点
- rhgnjcRhd1: '',
- rhgnjcRhd2: '',
+ rhgnjcRhd: '',
+ // 同时检查-分开/集合
+ rhgnjcFkjh1: '',
+ rhgnjcFkjh2: '',
// Worth-4-dot
worth1: '',
worth2: '',
@@ -258,90 +756,90 @@ export default {
rdd: '',
// 同视机九方位检查
jfwjcOd1: '',
+ jfwjcOd1n: '',
jfwjcOd2: '',
+ jfwjcOd2n: '',
jfwjcOd3: '',
+ jfwjcOd3n: '',
jfwjcOd4: '',
+ jfwjcOd4n: '',
jfwjcOd5: '',
+ jfwjcOd5n: '',
jfwjcOd6: '',
+ jfwjcOd6n: '',
jfwjcOd7: '',
+ jfwjcOd7n: '',
jfwjcOd8: '',
+ jfwjcOd8n: '',
jfwjcOd9: '',
+ jfwjcOd9n: '',
jfwjcOs1: '',
+ jfwjcOs1n: '',
jfwjcOs2: '',
+ jfwjcOs2n: '',
jfwjcOs3: '',
+ jfwjcOs3n: '',
jfwjcOs4: '',
+ jfwjcOs4n: '',
jfwjcOs5: '',
+ jfwjcOs5n: '',
jfwjcOs6: '',
+ jfwjcOs6n: '',
jfwjcOs7: '',
+ jfwjcOs7n: '',
jfwjcOs8: '',
+ jfwjcOs8n: '',
jfwjcOs9: '',
+ jfwjcOs9n: '',
// 报告描述
bgms: '',
- ygsSign: '',
- ysSign: '',
+ sgsSign: '',
riQi: ''
},
tableData: [
{
name: '基础信息',
- type: ''
+ type: 'title'
},
{
name: '屈光状态',
- OD: '',
- VA: '',
type: ''
}, {
name: '屈光状态a',
- OS: '',
- VA: '',
type: ''
}, {
name: 'CT+Prism',
- ct: '',
type: ''
}, {
name: '同时视检查',
- type: ''
+ type: 'title'
}, {
name: '检查画片',
- value: '',
type: '1'
}, {
- name: '主观斜视角',
- od: '',
- os: ''
+ name: '主观斜视角'
}, {
- name: '客观斜视角',
- od: '',
- os: ''
+ name: '客观斜视角'
}, {
- name: '融合功能检查'
+ name: '融合功能检查',
+ type: 'title'
}, {
name: '检查画片',
- value: '',
type: '2'
}, {
name: '融合点',
- od: '',
- os: '',
type: ''
}, {
- name: 'Worth-4-dot',
- a: '',
- b: '',
- c: '',
- d: ''
+ name: 'Worth-4-dot'
}, {
name: '立体式检查',
- value: ''
+ type: 'title'
}, {
- name: 'TITMUS(近)',
- a: '',
- b: '',
- c: ''
+ name: 'TITMUS(近)'
}, {
- name: '同视机九方位检查'
+ name: '同视机九方位检查',
+ type: 'title'
+
}, {
name: 'ODOS',
a: '',
@@ -363,14 +861,28 @@ export default {
q: '',
r: ''
}, {
- name: '报告描述',
- value: ''
+ name: '报告描述:'
}, {
- name: '签名',
- a: '',
- b: '',
- c: ''
- }]
+ name: '签名'
+ }],
+ machineData: [
+ {
+ name: '1'
+ },
+ {
+ name: '2'
+ }, {
+ name: '3'
+ },
+ {
+ name: '4'
+ },
+ {
+ name: '5'
+ }, {
+ name: '6'
+ }
+ ]
}
},
watch: {
@@ -385,23 +897,59 @@ export default {
this.getPatientData()
},
methods: {
- getSysgnjc() {
- this.$http.get('/sjsgnjc/getSysgnjc', { params: {
+ async getSysgnjc() {
+ const { data: res } = await this.$http.get('/sjsgnjc/getSysgnjc', { params: {
caseId: this.caseId,
patientId: this.patientId
- }}).then(data => {
- this.dataForm = data.data.data
+ }})
+ if (res.code === 0) {
+ this.dataForm = res.data
+ this.dataForm.jzNumber = window.localStorage.getItem('jzNumber')
if (!this.dataForm.id) {
+ await this.queryProject()
+ this.dataForm.tssjcJchp = '老虎/笼子（10°）'
+ this.dataForm.rhgnjcJchp = '三人组（3°）'
+ this.dataForm.titmus = '60"'
+ this.dataForm.tno = '60"'
+ this.dataForm.rdd = '100"'
+ this.dataForm.worth1 = this.dataForm.worth3 = '4个'
+ this.dataForm.worth2 = this.dataForm.worth4 = '融像'
this.setSign()
}
- })
+ }
+ },
+ // 获取报告单id
+ async queryProject() {
+ const project = window.localStorage.getItem('projectItem') ? JSON.parse(window.localStorage.getItem('projectItem')) : []
+ const { data: res } = await this.$http.get(
+ '/patient/getZlItemDict',
+ {
+ params: {
+ caseName: '三级视功能检查报告单'
+ }
+ }
+ )
+ if (res.code === 0) {
+ const data = res.data || []
+ const list = []
+ if (data.length) {
+ for (let i = 0; i < data.length; i++) {
+ for (let j = 0; j < project.length; j++) {
+ if (data[i].itemId === project[j].porjectCode) {
+ list.push(project[j].id)
+ }
+ }
+ }
+ this.dataForm.idList = list
+ }
+ } else {
+ this.$message.error(res.msg)
+ }
},
setSign() {
const userData = JSON.parse(window.localStorage.getItem('qg-userData'))
const date = this.$moment().format('YYYY-MM-DD')
- const mzName = window.localStorage.getItem('mzDoctorName')
- this.dataForm.ygsSign = userData.signImgBase
- this.dataForm.ysSign = mzName
+ this.dataForm.sgsSign = userData.signImgBase
this.dataForm.riQi = date
},
async getPatientData() {
@@ -422,6 +970,17 @@ export default {
this.$message.error(res.msg)
}
},
+ selectWorth(val, type) {
+ if (val === '5个') {
+ type === 'od' ? this.dataForm.worth2 = '复视' : this.dataForm.worth4 = '复视'
+ } else if (val === '4个') {
+ type === 'od' ? this.dataForm.worth2 = '融像' : this.dataForm.worth4 = '融像'
+ } else if (val === '3个') {
+ type === 'od' ? this.dataForm.worth2 = '右眼抑制' : this.dataForm.worth4 = '右眼抑制'
+ } else if (val === '2个') {
+ type === 'od' ? this.dataForm.worth2 = '左眼抑制' : this.dataForm.worth4 = '左眼抑制'
+ }
+ },
// 保存
async handleSaveTable() {
const data = JSON.parse(JSON.stringify(this.dataForm))
@@ -431,17 +990,40 @@ export default {
}
const { data: res } = await this.$http.post('/sjsgnjc/savesjsgnjc', params)
if (res.code === 0) {
+ await this.getSysgnjc()
this.$message.success('保存成功')
} else {
this.$message.error(res.msg)
}
},
handleDelete() {
- this.$emit('del')
+ const params = {
+ id: this.caseId
+ }
+ this.$confirmFun('你确定要删除吗？').then(async() => {
+ await this.deleteNewForm()
+ const { data: res } = await this.$http.post('/case/delete', params)
+ if (res.code === 0) {
+ this.$message.success('删除成功')
+ await this.$parent.getFormList()
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
+ async deleteNewForm() {
+ const params = {
+ id: this.caseId
+ }
+ const { data: res } = await this.$http.post('/sjsgnjc/delSysgnjc', params)
+ if (res.code === 0) {
+ } else {
+ this.$message.error(res.msg)
+ }
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
- if (rowIndex === 0 || rowIndex === 4 || rowIndex === 8 || rowIndex === 12 || rowIndex === 17 || rowIndex === 15 || rowIndex === 16 || rowIndex === 14) {
+ if (rowIndex === 0 || rowIndex === 4 || rowIndex === 8 || rowIndex === 12 || rowIndex === 17 || rowIndex === 15 || rowIndex === 14) {
return {
rowspan: 1,
colspan: 3
@@ -463,6 +1045,11 @@ export default {
rowspan: 1,
colspan: 2
}
+ } else if (rowIndex === 16) {
+ return {
+ rowspan: 1,
+ colspan: 2
+ }
} else if (rowIndex === 0 || rowIndex === 4 || rowIndex === 8 || rowIndex === 9 || rowIndex === 12 || rowIndex === 14 || rowIndex === 15 || rowIndex === 16 || rowIndex === 17) {
return {
rowspan: 0,
@@ -482,218 +1069,23 @@ export default {
}
-
+
diff --git a/src/components/360View/dataInfo.vue b/src/components/360View/dataInfo.vue
index e00ca89..8feb248 100644
--- a/src/components/360View/dataInfo.vue
+++ b/src/components/360View/dataInfo.vue
@@ -9,39 +9,58 @@
+ RDD(近):
+
+
- 结膜：充血{{ scope.row.odValue }}
+ 结膜：充血
- 结膜：分泌物{{ scope.row.odValue }}
+ 结膜：分泌物
- 视盘：视神经{{ scope.row.odValue }}
+ 视盘：视神经
- 视盘：CDR{{ scope.row.odValue }}
+ 视盘：CDR
-
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -50,6 +69,7 @@
@@ -61,28 +81,28 @@
球镜 DS：{{ scope.row.odSph }}
柱镜 DC：{{ scope.row.odCyl }}
轴位 Axis：{{ scope.row.odAx }}
-等效球镜：{{ scope.row.odSe }}
+矫正视力(VA)：{{ scope.row.odVa }}
+下加光(ADD)：{{ scope.row.odAdd }}
柱镜 DC：{{ scope.row.odCyl }}
轴位 Axis：{{ scope.row.odAx }}
矫正视力VA：{{ scope.row.odVa }}
+下加光(ADD)：{{ scope.row.odAdd }}
-
- 结膜：充血{{ scope.row.osValue }}
-
-
- 结膜：分泌物{{ scope.row.osValue }}
-
-
- 视盘：视神经{{ scope.row.osValue }}
-
-
- 视盘：CDR{{ scope.row.osValue }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -91,6 +111,7 @@
球镜 DS：{{ scope.row.odSph }}
柱镜 DC：{{ scope.row.odCyl }}
轴位 Axis：{{ scope.row.odAx }}
-等效球镜：{{ scope.row.odSe }}
+矫正视力(VA)：{{ scope.row.odVa }}
+下加光(ADD)：{{ scope.row.odAdd }}
柱镜 DC：{{ scope.row.odCyl }}
轴位 Axis：{{ scope.row.odAx }}
矫正视力VA：{{ scope.row.odVa }}
+下加光(ADD)：{{ scope.row.odAdd }}
@@ -228,7 +249,11 @@ export default {
onCopy() {
this.coryData = []
this.foreList.forEach((item, index) => {
- this.coryData.push(item.name, item.odValue ? item.odValue : '', item.osValue ? item.osValue : '', 'abcde')
+ if (item.sort === 5 || item.sort === 6) {
+ this.coryData.push(item.name, item.odSph, item.odCyl, item.odAx, item.odVa, item.odAdd, 'abcde')
+ } else {
+ this.coryData.push(item.name, item.odValue ? item.odValue : '', item.osValue ? item.osValue : '', 'abcde')
+ }
})
this.coryData = this.removeBlock(JSON.stringify(this.coryData))
this.clipboard && this.clipboard.destroy()
@@ -265,6 +290,7 @@ export default {
// 引入专科检查
addExamine() {
eventBus.$emit('sendDataToExamine', this.foreList)
+ this.$parent.closeByButton()
}
}
}
diff --git a/src/components/360View/forePart/index-copy.vue b/src/components/360View/forePart/index-copy.vue
index 4cc4cdc..d856e5f 100644
--- a/src/components/360View/forePart/index-copy.vue
+++ b/src/components/360View/forePart/index-copy.vue
@@ -627,8 +627,8 @@ export default {
sort: 99,
id: 1,
type: 'anion',
- od: '',
- os: ''
+ od: 'yanjOd',
+ os: 'yanjOs'
}, {
name: '结膜'
}, {
@@ -636,15 +636,15 @@ export default {
id: 2,
sort: 1,
type: 'jimmy',
- od: '',
- os: ''
+ od: 'jiemCxOd',
+ os: 'jiemCxOs'
}, {
name: '结膜',
id: 3,
sort: 2,
type: 'jimmy',
- od: '',
- os: ''
+ od: 'jiemFmwOd',
+ os: 'jiemFmwOs'
}, {
name: '泪器'
}, {
@@ -652,8 +652,8 @@ export default {
sort: 99,
id: 4,
type: 'liq',
- od: '',
- os: ''
+ od: 'leiqOd',
+ os: 'leiqOs'
}, {
name: '角膜'
}, {
@@ -661,8 +661,8 @@ export default {
sort: 99,
id: 5,
type: 'Giacomo',
- od: '',
- os: ''
+ od: 'jiaomOd',
+ os: 'jiaomOs'
}, {
name: '前房'
}, {
@@ -670,8 +670,8 @@ export default {
sort: 99,
id: 6,
type: 'Jianfeng',
- od: '',
- os: ''
+ od: 'qianfOd',
+ os: 'qianfOs'
}, {
name: '虹膜'
}, {
@@ -679,8 +679,8 @@ export default {
sort: 99,
id: 7,
type: 'mongo',
- od: '',
- os: ''
+ od: 'hongmOd',
+ os: 'hongmOs'
}, {
name: '瞳孔'
}, {
@@ -688,8 +688,8 @@ export default {
sort: 99,
id: 8,
type: 'tonguing',
- od: '',
- os: ''
+ od: 'tongkOd',
+ os: 'tongkOs'
}, {
name: '晶状体'
}, {
@@ -697,8 +697,8 @@ export default {
sort: 99,
id: 9,
type: 'jingling',
- od: '',
- os: ''
+ od: 'jingztOd',
+ os: 'jingztOs'
}, {
name: '睫状体'
}, {
@@ -706,8 +706,8 @@ export default {
sort: 99,
id: 10,
type: 'jingles',
- od: '',
- os: ''
+ od: 'jieztOd',
+ os: 'jieztOs'
}, {
name: '眼位'
}, {
@@ -715,8 +715,8 @@ export default {
sort: 99,
id: 11,
type: 'yawn',
- od: '',
- os: ''
+ od: 'yanwOd',
+ os: 'yanwOs'
}, {
name: '眼眶'
}, {
@@ -724,8 +724,8 @@ export default {
sort: 99,
id: 12,
type: 'yanking',
- od: '',
- os: ''
+ od: 'yankOd',
+ os: 'yankOs'
}, {
name: '眼球运动'
}, {
@@ -733,36 +733,30 @@ export default {
sort: 99,
id: 13,
type: 'yang',
- od: '',
- os: ''
+ od: 'yanqydOd',
+ os: 'yanqydOs'
}]
}
},
watch: {
- tableData: {
- deep: true,
- handler: (value) => {
- if (value) {
- eventBus.$emit('getForeData', value)
- }
- }
- },
caseId: {
handler: function(newV, oldV) {
- this.getforeList().then(() => {
- this.queryOptions()
+ this.queryOptions()
+ this.getforeList()
+ this.$nextTick(() => {
+ this.tableData.forEach(item => {
+ item.flag = false
+ this.$refs.multipleTable.toggleRowSelection(item, false)
+ })
})
}
}
},
- created() {
- },
mounted() {
this.userData = JSON.parse(window.localStorage.getItem('qg-userData'))
this.doctorId = this.userData.id
- this.getforeList().then(() => {
- this.queryOptions()
- })
+ this.queryOptions()
+ this.getforeList()
// 查询左侧病历树
this.queryTreeCase()
},
@@ -776,8 +770,8 @@ export default {
})
if (res.code === 0) {
if (res.data) {
- this.dataForm = res.data
- this.handleData(this.dataForm)
+ this.dataForm = this.handleData(res.data)
+ eventBus.$emit('getForeData', this.dataForm)
}
} else {
this.$message.error(res.msg)
@@ -791,6 +785,7 @@ export default {
}
}
}
+ return data
},
// 表格复选框
selection(selection, val) {
@@ -822,10 +817,12 @@ export default {
},
// 保留下拉框的label，添加到数据集用于展示
handleNode(index, type, event) {
- if (type === 'os') {
- this.tableData[index].osValue = event
- } else {
- this.tableData[index].odValue = event
+ if (event) {
+ if (type === 'os') {
+ this.tableData[index].osValue = event
+ } else if (type === 'od') {
+ this.tableData[index].odValue = event
+ }
}
},
// 添加数据集
@@ -835,7 +832,7 @@ export default {
const data = selectData.filter(item => {
return item.type !== undefined
})
- eventBus.$emit('sendForData', data)
+ eventBus.$emit('sendForData', JSON.parse(JSON.stringify(data)))
},
// 获取下拉选择项,把数据封装进表格中
queryOptions() {
@@ -866,8 +863,7 @@ export default {
})
})
}
- this.sourceData = Object.assign([], this.tableData)
- eventBus.$emit('getForeData', this.tableData)
+ // this.sourceData = Object.assign([], this.tableData)
}).catch((error) => {
})
},
@@ -876,25 +872,15 @@ export default {
if (type === 1) {
this.tableData.forEach(item => {
if (item.sort) {
- item.od = item.os
+ this.dataForm[item.od] = this.dataForm[item.os]
item.odValue = item.osValue
- const sort = item.sort
- item.sort = ''
- this.$nextTick(() => {
- item.sort = sort
- })
}
})
} else {
this.tableData.forEach(item => {
if (item.sort) {
- item.os = item.od
+ this.dataForm[item.os] = this.dataForm[item.od]
item.osValue = item.odValue
- const sort = item.sort
- item.sort = ''
- this.$nextTick(() => {
- item.sort = sort
- })
}
})
}
@@ -902,41 +888,26 @@ export default {
// 移动
moveHandle(index, type, row) {
if (row.id) {
- if (type === 1) {
- this.tableData[index].od = row.os
+ if (type === 1) { // 左移
+ this.dataForm[row.od] = this.dataForm[row.os]
this.tableData[index].odValue = row.osValue
- } else {
- this.tableData[index].os = row.od
+ } else { // 右移
+ this.dataForm[row.os] = this.dataForm[row.od]
this.tableData[index].osValue = row.odValue
}
- const sort = this.tableData[index].sort
- this.tableData[index].sort = ''
- this.$nextTick(() => {
- this.tableData[index].sort = sort
- })
} else {
if (type === 1) {
this.tableData.forEach(item => {
if (item.name === row.name) {
- item.od = item.os
+ this.dataForm[item.od] = this.dataForm[item.os]
item.odValue = item.osValue
- const sort = item.sort
- item.sort = ''
- this.$nextTick(() => {
- item.sort = sort
- })
}
})
} else {
this.tableData.forEach(item => {
if (item.name === row.name) {
- item.os = item.od
+ this.dataForm[item.os] = this.dataForm[item.od]
item.osValue = item.odValue
- const sort = item.sort
- item.sort = ''
- this.$nextTick(() => {
- item.sort = sort
- })
}
})
}
@@ -1069,7 +1040,7 @@ export default {
})
})
} else {
- this.tableData = Object.assign([], this.sourceData)
+ // this.tableData = Object.assign([], this.sourceData)
}
},
// 点击保存模板后弹框
@@ -1095,7 +1066,7 @@ export default {
const { data: res } = await this.$http.post('/treetemplate/addTreeCase', params)
if (res.code === 0) {
this.templateFlag = false
- this.queryTreeCase()
+ await this.queryTreeCase()
this.$message.success('保存成功')
} else {
this.$message.error(res.msg)
@@ -1121,7 +1092,7 @@ export default {
const { data: res } = await this.$http.post('/treetemplate/addTree', params)
if (res.code === 0) {
this.dialogFormVisible = false
- this.queryTreeCase()
+ await this.queryTreeCase()
this.$message.success('保存成功')
} else {
this.$message.error(res.msg)
@@ -1156,8 +1127,8 @@ export default {
const { data: res } = await this.$http.post(url, params)
if (res.code === 0) {
this.$message.success('删除成功')
- this.queryTreeCase()
- this.getforeList('2')
+ await this.queryTreeCase()
+ await this.getforeList('2')
} else {
this.$message.error(res.msg)
}
diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue
index 579c604..ebaa051 100644
--- a/src/components/360View/index1.vue
+++ b/src/components/360View/index1.vue
@@ -53,19 +53,33 @@
:data="timeAxisNodeInfo"
style="width: 100%;height: 100%;overflow: auto"
>
+
- {{ scope.row.isMain === '1' ? '是' : '否' }}
+ {{ scope.row.isMain === 'Y' ? '是' : '否' }}
+
@@ -73,40 +87,37 @@
:data="timeAxisNodeInfo"
style="width: 100%;height: 100%;overflow: auto"
>
+
{{ scope.row.opTime ? scope.row.opTime.substring(0, 10) : '' }}
@@ -114,7 +125,6 @@
{{ scope.row.isMain === '1' ? '是' : '否' }}
@@ -127,25 +137,33 @@
:data="timeAxisNodeInfo"
style="width: 100%;height: 100%;overflow: auto"
>
+
@@ -154,24 +172,24 @@
:data="timeAxisNodeInfo"
style="width: 100%;height: 100%;overflow: auto"
>
+
{{ scope.row.inDate ? scope.row.inDate.substring(0, 10) : '' }}
@@ -179,7 +197,6 @@
{{ scope.row.outDate ? scope.row.outDate.substring(0, 10) : '' }}
@@ -317,11 +334,23 @@ export default {
eventBus.$off('sendForData')
eventBus.$on('sendForData', data => {
const arr = this.foreList.concat(data)
- const id = 'id'
- this.foreList = arr.reduce((all, next) => all.some((item) => item[id] == next[id]) ? all : [...all, next], [])
+ // const id = 'id'
+ this.foreList = this.unique(arr)
+ // this.foreList = arr.reduce((all, next) => all.some((item) => item[id] == next[id]) ? all : [...all, next], [])
this.openDataDrink()
})
},
+ unique(list) {
+ for (let i = 0; i < list.length - 1; i++) {
+ for (let j = i + 1; j < list.length; j++) {
+ if (list[i].id === list[j].id) {
+ list.splice(i, 1)
+ j--
+ }
+ }
+ }
+ return list
+ },
openDataDrink() {
this.dataType = 2
this.display = true
@@ -360,10 +389,15 @@ export default {
},
// 360浏览器
handlePacs() {
- const { href } = this.$router.resolve({
- name: 'pacsManage'
- })
+ const baseUrl = 'http://z1.huimucloud.com:8085'
+ // const baseUrl = 'http://10.80.5.32:8026'
+ // const baseUrl = 'http://192.168.0.85:8001'
+ const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
window.open(href, '_blank')
+ // const { href } = this.$router.resolve({
+ // name: 'pacsManage'
+ // })
+ // window.open(href, '_blank')
},
// 关闭360弹框
closePacs() {
diff --git a/src/components/360View/itemSelect/index.vue b/src/components/360View/itemSelect/index.vue
index 276e49d..32420dc 100644
--- a/src/components/360View/itemSelect/index.vue
+++ b/src/components/360View/itemSelect/index.vue
@@ -131,7 +131,7 @@ export default {
b: ''
}
const value = this.value
- if (this.multiple) { // 多选
+ if (this.multiple && value) { // 多选
if (Array.isArray(value) && value.length > 0) {
const labelArr = []
const a = []
@@ -147,15 +147,17 @@ export default {
a.push(item.a)
b.push(item.b)
})
- label.a = a.join(',')
- label.b = b.join(',')
+ label.a = a.length ? a.join(',') : ''
+ label.b = b.length ? b.join(',') : ''
+ if (label.a) {
+ this.$emit('handleNode', label.a)
+ }
}
} else { // 单选
if (value) {
label = this.queryTree(this.options, value)
}
}
- this.$emit('handleNode', label.a)
return label.a
},
// 默认展开
diff --git a/src/components/360View/medicalRecord/callMedical/index.vue b/src/components/360View/medicalRecord/callMedical/index.vue
index 32d6a32..3591ac6 100644
--- a/src/components/360View/medicalRecord/callMedical/index.vue
+++ b/src/components/360View/medicalRecord/callMedical/index.vue
@@ -103,6 +103,7 @@ export default {
this.id = item.id
this.name = item.name
this.$parent.name = item.name
+ this.$parent.caseId = item.id
this.$parent.jsonText = item.jsonText
this.$parent.isPlatform = this.isSearch === item.platform
},
diff --git a/src/components/360View/medicalRecord/index.vue b/src/components/360View/medicalRecord/index.vue
index 3f3362f..bc27bc0 100644
--- a/src/components/360View/medicalRecord/index.vue
+++ b/src/components/360View/medicalRecord/index.vue
@@ -18,7 +18,7 @@
@addRecord="addRecord"
/>
-
+
diff --git a/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue b/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue
index e515d50..98b15f0 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue
@@ -4,12 +4,7 @@
ref="multipleTable"
:data="tableData"
style="margin: 8px 8px 0 0"
- @select="selection"
>
-
-
-
-
-
视盘：视神经
-
-
-
- -
-
-
@@ -106,38 +89,172 @@