diff --git a/public/sysConfig.json b/public/sysConfig.json
index 956b438..9b82a0f 100644
--- a/public/sysConfig.json
+++ b/public/sysConfig.json
@@ -1,7 +1,7 @@
{
- "apiurl": "http://192.168.1.138:9527",
+ "apiurl": "http://192.168.5.52:9530",
"softName": "神豚体检管理系统",
- "pacsApi": "http://192.168.1.138:9527",
+ "pacsApi": "http://192.168.5.52:9530",
"dcmViewers": "https://app.mzaktj.com:4436",
"pacsApiHttps": "https://app.mzaktj.com:8042",
"dict":{
diff --git a/src/components/report/TurnoverReportOrg.vue b/src/components/report/TurnoverReportOrg.vue
index f2ea0c5..1491179 100644
--- a/src/components/report/TurnoverReportOrg.vue
+++ b/src/components/report/TurnoverReportOrg.vue
@@ -158,6 +158,7 @@ export default {
tableData: [
{
itemTypeName: 'CT',
+ djrs: 4, yjrs: 2, bzje: 6, ysje: 8, ssje: 10,
itemDetails: [
{
asbitemName: '胸部CT', djrs: 4, yjrs: 2, bzje: 6, ysje: 8, ssje: 10,
@@ -176,7 +177,7 @@ export default {
]
}
], //原始数据
- asyncCols:['C座','B座'], // 动态体检中心
+ asyncCols: ['C座', 'B座'], // 动态体检中心
tableDataTrans: [], //转换后数据
};
},
@@ -334,6 +335,16 @@ export default {
}
});
+ //获取体检中心
+ getapi("/api/app/organization-units/by-code-all").then((res) => {
+ if (res.code > -1) {
+ this.dict.medicalCenter = res.data;
+ this.asyncCols = []
+ res.data.forEach(e => {
+ this.asyncCols.push(e.displayName)
+ });
+ }
+ });
},
//通用导出
@@ -396,6 +407,86 @@ export default {
}
},
+ //
+ tableDataTran() {
+ this.tableDataTrans = []
+ // tableData: [
+ // {
+ // itemTypeName: 'CT',
+ // itemDetails: [
+ // {
+ // asbitemName: '胸部CT', djrs: 4, yjrs: 2, bzje: 6, ysje: 8, ssje: 10,
+ // details: [
+ // { org: 'C座', djrs: 3, yjrs: 2, bzje: 3, ysje: 4, ssje: 6 },
+ // { org: 'B座', djrs: 1, yjrs: 0, bzje: 3, ysje: 4, ssje: 2 }
+ // ]
+ // },
+ // {
+ // asbitemName: '头部CT', djrs: 2, yjrs: 1, bzje: 3, ysje: 4, ssje: 5,
+ // details: [
+ // { org: 'C座', djrs: 2, yjrs: 1, bzje: 3, ysje: 4, ssje: 5 },
+ // { org: 'B座', djrs: 0, yjrs: 0, bzje: 0, ysje: 0, ssje: 0 }
+ // ]
+ // }
+ // ]
+ // }
+ // ], //原始数据
+
+ let pojo = {};
+ this.tableData.forEach(e1 => {
+ pojo = Object.assign({}, { itemTypeName: e1.itemTypeName })
+ if (e1.itemDetails.length > 0) {
+ let asb_pojos = []
+ e1.itemDetails.forEach(e2 => {
+ asb_pojo = this.tableDataTranForOrg(e2)
+ pojo = Object({}, pojo, asb_pojo)
+ this.tableDataTrans.push(pojo)
+ asb_pojos.push(pojo)
+ });
+
+ // 如果有多条记录时，再增加一条科室汇总
+ if(e1.itemDetails.length > 1){
+ // pojo
+ }
+
+ }
+
+
+ });
+
+ },
+
+
+
+ // 将多行体检中心数据 ，转成列形式数据
+ tableDataTranForOrg(asbitem) {
+ let initData = { asb_djrs: 0, asb_yjrs: 0, asb_bzje: 0, asb_ysje: 0, asb_ssje: 0 }
+ let asb_pojo = Object.assign({}, { asbitemName: asbitem.asbitemName }, initData)
+ let lfind
+ this.asyncCols.forEach(col => {
+ lfind = arrayExistObj(asbitem.details, 'org', col)
+ if (lfind > -1) {
+ asb_pojo[`${col}_djrs`] = asbitem.details[lfind].djrs
+ asb_pojo[`${col}_yjrs`] = asbitem.details[lfind].yjrs
+ asb_pojo[`${col}_bzje`] = asbitem.details[lfind].bzje
+ asb_pojo[`${col}_ysje`] = asbitem.details[lfind].ysje
+ asb_pojo[`${col}_ssje`] = asbitem.details[lfind].ssje
+
+ asb_pojo.asb_djrs = Number(asb_pojo.asb_djrs) + asbitem.details[lfind].djrs
+ asb_pojo.asb_yjrs = Number(asb_pojo.asb_yjrs) + asbitem.details[lfind].yjrs
+ asb_pojo.asb_bzje = Number(asb_pojo.asb_bzje) + asbitem.details[lfind].bzje
+ asb_pojo.asb_ysje = Number(asb_pojo.asb_ysje) + asbitem.details[lfind].ysje
+ asb_pojo.asb_ssje = Number(asb_pojo.asb_ssje) + asbitem.details[lfind].ssje
+ } else {
+ asb_pojo[`${col}_djrs`] = 0
+ asb_pojo[`${col}_yjrs`] = 0
+ asb_pojo[`${col}_bzje`] = 0
+ asb_pojo[`${col}_ysje`] = 0
+ asb_pojo[`${col}_ssje`] = 0
+ }
+ });
+ return asb_pojo
+ },
// 按钮查询
btnQuery() {
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index b323f84..5157b5d 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -93,17 +93,17 @@
AI诊断
+ v-show="checkPagePriv(pagePriv.privs, '放弃明细项目检查') && !LocalConfig?.doctorCheck?.moreBtns?.includes('放弃明细项目检查')">
放弃明细项目检查
+ v-show="checkPagePriv(pagePriv.privs, '放弃项目检查') && !LocalConfig?.doctorCheck?.moreBtns?.includes('放弃项目检查')">
放弃项目检查
+ v-show="checkPagePriv(pagePriv.privs, '删除明细项目') && !LocalConfig?.doctorCheck?.moreBtns?.includes('删除明细项目')">
删除明细项目
@@ -157,7 +157,7 @@
重置
+ v-show="checkPagePriv(pagePriv.privs, '知情同意书') && !LocalConfig?.doctorCheck?.moreBtns?.includes('知情同意书')">
知情同意书
@@ -168,16 +168,16 @@
放弃明细项目检查
放弃项目检查
删除明细项目
知情同意书
@@ -537,6 +537,7 @@ export default {
let LocalConfig = window.localStorage.getItem("LocalConfig") || null
try {
this.LocalConfig = Object.assign({}, deepCopy(this.LocalConfigInit), JSON.parse(LocalConfig) || {})
+ if(!this.LocalConfig?.doctorCheck?.moreBtns) this.LocalConfig.doctorCheck.moreBtns = '放弃明细项目检查,放弃项目检查,删除明细项目,知情同意书'
} catch (error) {
console.log('window.localStorage.getItem("LocalConfig")', error)