shentun
/
peisweb
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

dj

master
pengjun 2 years ago
parent
5febb1b44f
commit
cfdce3db8f
5 changed files with 205 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/components/doctorCheck/CheckItemList.vue
  2. 19
      src/components/patientRegister/PatientRegisterEdit.vue
  3. 2
      src/components/sumDoctorCheck/CheckDetails.vue
  4. 109
      src/components/sumDoctorCheck/SumItems.vue
  5. 4
      src/views/doctorCheck/sumDoctorCheck.vue

16
src/components/doctorCheck/CheckItemList.vue
View File

@ -6,7 +6,7 @@
<el-table-column prop="result" label="结果" min-width="200"> <el-table-column prop="result" label="结果" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;"> <div style="display: flex;">
<el-autocomplete style="width: 100%;" type="textarea" v-model="scope.row.result" placeholder="请输入结果值"
<el-autocomplete style="width: 100%;font: 14px 'Microsoft YaHei';" type="textarea" v-model="scope.row.result" placeholder="请输入结果值"
:disabled="rowResultDisabled(scope.row)" :autosize="{ minRows: 1, maxRows: 10 }" :trigger-on-focus="false" :disabled="rowResultDisabled(scope.row)" :autosize="{ minRows: 1, maxRows: 10 }" :trigger-on-focus="false"
:fetch-suggestions="querySearch" :data-lineModeFlag="scope.row.lineModeFlag" :fetch-suggestions="querySearch" :data-lineModeFlag="scope.row.lineModeFlag"
@input="madeTooltips(scope.$index); computeFun(scope.$index)" v-bind:class="scope.row.class"> @input="madeTooltips(scope.$index); computeFun(scope.$index)" v-bind:class="scope.row.class">
@ -34,14 +34,14 @@
<div style="overflow-y:auto; height:300px;width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;"> <div style="overflow-y:auto; height:300px;width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
<div v-for="item in moreResult.data" :key="item.id" style="margin: 5px;cursor:pointer;" <div v-for="item in moreResult.data" :key="item.id" style="margin: 5px;cursor:pointer;"
@click="clickResult(item)" @dblclick="dblclickResult(item)"> @click="clickResult(item)" @dblclick="dblclickResult(item)">
<el-tag size="samll" style="color: #303133;">{{ item.result }}</el-tag>
<el-tag size="samll" style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 14px; color: #303133;background-color: white;">{{ item.result }}</el-tag>
</div> </div>
</div> </div>
<div>特殊符号：</div> <div>特殊符号：</div>
<div style="overflow-y:auto; width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;"> <div style="overflow-y:auto; width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
<div v-for="item in symbols" :key="item.id" style="margin: 1px; 2px;cursor:pointer;" <div v-for="item in symbols" :key="item.id" style="margin: 1px; 2px;cursor:pointer;"
@click="insertSymbols(item.displayName)"> @click="insertSymbols(item.displayName)">
<el-tag style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 15px;color: #303133;">
<el-tag style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 15px;color: #303133;background-color: white;">
{{ item.displayName }} {{ item.displayName }}
</el-tag> </el-tag>
</div> </div>
@ -596,60 +596,70 @@ export default {
::v-deep .tipsNormal .el-textarea__inner { ::v-deep .tipsNormal .el-textarea__inner {
background-color: v-bind("tipsNormal.backgroundColor") !important; background-color: v-bind("tipsNormal.backgroundColor") !important;
color: v-bind("tipsNormal.color") !important; color: v-bind("tipsNormal.color") !important;
font-family: "Microsoft YaHei";
} }
/*错误*/ /*错误*/
::v-deep .tipsError .el-textarea__inner { ::v-deep .tipsError .el-textarea__inner {
background-color: v-bind("tipsError.backgroundColor") !important; background-color: v-bind("tipsError.backgroundColor") !important;
color: v-bind("tipsError.color") !important; color: v-bind("tipsError.color") !important;
font-family: "Microsoft YaHei";
} }
/*阴性 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */ /*阴性 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */
::v-deep .tipsNegative .el-textarea__inner { ::v-deep .tipsNegative .el-textarea__inner {
background-color: v-bind("tipsNegative.backgroundColor") !important; background-color: v-bind("tipsNegative.backgroundColor") !important;
color: v-bind("tipsNegative.color") !important; color: v-bind("tipsNegative.color") !important;
font-family: "Microsoft YaHei";
} }
/*弱阳性 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */ /*弱阳性 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */
::v-deep .tipsLowPositive .el-textarea__inner { ::v-deep .tipsLowPositive .el-textarea__inner {
background-color: v-bind("tipsLowPositive.backgroundColor") !important; background-color: v-bind("tipsLowPositive.backgroundColor") !important;
color: v-bind("tipsLowPositive.color") !important; color: v-bind("tipsLowPositive.color") !important;
font-family: "Microsoft YaHei";
} }
/*阳性 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */ /*阳性 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */
::v-deep .tipsPositive .el-textarea__inner { ::v-deep .tipsPositive .el-textarea__inner {
background-color: v-bind("tipsPositive.backgroundColor") !important; background-color: v-bind("tipsPositive.backgroundColor") !important;
color: v-bind("tipsPositive.color") !important; color: v-bind("tipsPositive.color") !important;
font-family: "Microsoft YaHei";
} }
/*偏低 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */ /*偏低 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */
::v-deep .tipsLow .el-textarea__inner { ::v-deep .tipsLow .el-textarea__inner {
background-color: v-bind("tipsLow.backgroundColor") !important; background-color: v-bind("tipsLow.backgroundColor") !important;
color: v-bind("tipsLow.color") !important; color: v-bind("tipsLow.color") !important;
font-family: "Microsoft YaHei";
} }
/*偏高 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */ /*偏高 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */
::v-deep .tipsHigh .el-textarea__inner { ::v-deep .tipsHigh .el-textarea__inner {
background-color: v-bind("tipsHigh.backgroundColor") !important; background-color: v-bind("tipsHigh.backgroundColor") !important;
color: v-bind("tipsHigh.color") !important; color: v-bind("tipsHigh.color") !important;
font-family: "Microsoft YaHei";
} }
/*超低 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */ /*超低 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */
::v-deep .tipsSuperLow .el-textarea__inner { ::v-deep .tipsSuperLow .el-textarea__inner {
background-color: v-bind("tipsSuperLow.backgroundColor") !important; background-color: v-bind("tipsSuperLow.backgroundColor") !important;
color: v-bind("tipsSuperLow.color") !important; color: v-bind("tipsSuperLow.color") !important;
font-family: "Microsoft YaHei";
} }
/*超高 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */ /*超高 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */
::v-deep .tipsSuperHigh .el-textarea__inner { ::v-deep .tipsSuperHigh .el-textarea__inner {
background-color: v-bind("tipsSuperHigh.backgroundColor") !important; background-color: v-bind("tipsSuperHigh.backgroundColor") !important;
color: v-bind("tipsSuperHigh.color") !important; color: v-bind("tipsSuperHigh.color") !important;
font-family: "Microsoft YaHei";
} }
/*文字性危及值 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */ /*文字性危及值 v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'") */
::v-deep .tipsSuper .el-textarea__inner { ::v-deep .tipsSuper .el-textarea__inner {
background-color: v-bind("tipsSuper.backgroundColor") !important; background-color: v-bind("tipsSuper.backgroundColor") !important;
color: v-bind("tipsSuper.color") !important; color: v-bind("tipsSuper.color") !important;
font-family: "Microsoft YaHei";
} }
</style> </style>

19
src/components/patientRegister/PatientRegisterEdit.vue
View File

@ -156,9 +156,9 @@
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<el-form-item label="民族" prop="nationId" label-width="50px"> <el-form-item label="民族" prop="nationId" label-width="50px">
<el-select v-model="form.nationId" placeholder="请选择" filterable clearable
default-first-option :filter-method="filterMethod"
:style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'" size="small">
<el-select v-model="form.nationId" placeholder="请选择" filterable clearable default-first-option
:filter-method="filterMethod" :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'"
size="small">
<el-option v-for="item in nation" :key="item.id" :label="item.displayName" :value="item.id" /> <el-option v-for="item in nation" :key="item.id" :label="item.displayName" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -406,7 +406,8 @@
<el-button type="success" class="commonbutton" @click="toCharge(form)" :disabled="!form.id">收费</el-button> <el-button type="success" class="commonbutton" @click="toCharge(form)" :disabled="!form.id">收费</el-button>
</div> </div>
<div v-show="checkPagePriv(pagePriv.privs, '收费申请')" class="btn"> <div v-show="checkPagePriv(pagePriv.privs, '收费申请')" class="btn">
<el-button type="success" class="commonbutton" @click="chargeRequest(form)" :disabled="!form.id">收费申请</el-button>
<el-button type="success" class="commonbutton" @click="chargeRequest(form)"
:disabled="!form.id">收费申请</el-button>
</div> </div>
<!-- <!--
<div class="btn"> <div class="btn">
@ -500,8 +501,8 @@
</el-dialog> </el-dialog>
<!-- 收费申请 --> <!-- 收费申请 -->
<el-dialog title="收费申请" :visible.sync="dialogWin.AsbChargeRequest" width="800px"
:show-close="false" :close-on-click-modal="false" :append-to-body="true" @close="closeDialogCharge">
<el-dialog title="收费申请" :visible.sync="dialogWin.AsbChargeRequest" width="800px" :show-close="false"
:close-on-click-modal="false" :append-to-body="true" @close="closeDialogCharge">
<AsbChargeRequest :patientRegister="form" /> <AsbChargeRequest :patientRegister="form" />
</el-dialog> </el-dialog>
</div> </div>
@ -949,7 +950,8 @@ export default {
this.form.customerOrgRegisterId = customerOrgRegisterList[customerOrgRegisterList.length - 1].id this.form.customerOrgRegisterId = customerOrgRegisterList[customerOrgRegisterList.length - 1].id
} }
} }
if (this.form.customerOrgRegisterId) return getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${this.form.customerOrgRegisterId}`) //获取单位分组
// /api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${this.form.customerOrgRegisterId}
if (this.form.customerOrgRegisterId) return postapi('/api/app/CustomerOrgGroup/GetListForPatentRegisterByFilter', { customerOrgRegisterId: this.form.customerOrgRegisterId }) //获取单位分组
} }
}).then(res => { }).then(res => {
if (res && res.code != -1) { if (res && res.code != -1) {
@ -1077,7 +1079,8 @@ export default {
//获取体检次数下的分组 //获取体检次数下的分组
getCustomerOrgGroup(customerOrgRegisterId) { getCustomerOrgGroup(customerOrgRegisterId) {
this.patientRegister.customerOrgGroup = [] this.patientRegister.customerOrgGroup = []
getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${customerOrgRegisterId}`).then(res => {
// /api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${customerOrgRegisterId}`
postapi('/api/app/CustomerOrgGroup/GetListForPatentRegisterByFilter', { customerOrgRegisterId }).then(res => {
if (res.code != - 1) { if (res.code != - 1) {
this.patientRegister.customerOrgGroup = res.data; this.patientRegister.customerOrgGroup = res.data;
} }

2
src/components/sumDoctorCheck/CheckDetails.vue
View File

@ -9,7 +9,7 @@
<table v-for="(item2, index2) in item.asbitems" :key="index + '-' + index2" width="100%" border="1" <table v-for="(item2, index2) in item.asbitems" :key="index + '-' + index2" width="100%" border="1"
cellspacing="0" bordercolor="#909399" style="border-collapse:collapse;"> cellspacing="0" bordercolor="#909399" style="border-collapse:collapse;">
<tr height="24"> <tr height="24">
<td width="200">{{ item2.asbitemName }}</td>
<td width="200">{{ item2.asbitemNames }}</td>
<td width="604" colspan="7">{{ '检查日期：' + item2.checkDate.substring(0,10) + ' 检查医生：' + item2.checkDoctorName }}</td> <td width="604" colspan="7">{{ '检查日期：' + item2.checkDate.substring(0,10) + ' 检查医生：' + item2.checkDoctorName }}</td>
</tr> </tr>

109
src/components/sumDoctorCheck/SumItems.vue
View File

@ -12,8 +12,7 @@
style="font-size: 18px;color: red;" /> style="font-size: 18px;color: red;" />
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="已检" placement="top"> <el-tooltip class="item" effect="dark" content="已检" placement="top">
<i v-show="scope.row.completeFlag == '1'" class="el-icon-success"
style="font-size: 18px;color: green;" />
<i v-show="scope.row.completeFlag == '1'" class="el-icon-success" style="font-size: 18px;color: green;" />
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="弃检" placement="top"> <el-tooltip class="item" effect="dark" content="弃检" placement="top">
<i v-show="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 18px;" /> <i v-show="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 18px;" />
@ -25,14 +24,42 @@
</el-table> </el-table>
</div> </div>
<div :style="'width:' + (window.pageWidth - 180 - 110 - 15) + 'px;'"> <div :style="'width:' + (window.pageWidth - 180 - 110 - 15) + 'px;'">
<!--
<el-table :data="tableData" :height="divHeight" border highlight-current-row> <el-table :data="tableData" :height="divHeight" border highlight-current-row>
<el-table-column prop="itemName" label="项目" width="150" /> <el-table-column prop="itemName" label="项目" width="150" />
<el-table-column prop="unitName" label="单位" width="80" align="center" /> <el-table-column prop="unitName" label="单位" width="80" align="center" />
<el-table-column prop="referenceRangeValue" label="参考范围" width="80" align="center" /> <el-table-column prop="referenceRangeValue" label="参考范围" width="80" align="center" />
<el-table-column v-for="(item, index) of tableCols" :label="item" :prop="item" :key="index" min-width="150"
<el-table-column v-for="(item, index) of tableCols" :label="item.substring(0,10)" :prop="item" :key="index" min-width="150"
align="center"> align="center">
<template slot-scope="scope">
<div>{{ scope.row[item] }}</div>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
-->
<table width="100%" style="font-size:14px;text-align: center;border-collapse:collapse;" border="1"
cellspacing="0" bordercolor="#909399" >
<col width="150">
<col width="50">
<col width="80">
<thead>
<tr height="30">
<td width="150">项目</td>
<td width="50">单位</td>
<td width="80">参考范围</td>
<td v-for="(item, index) of tableCols" :key="index" min-width="150">{{ item.substring(0, 10) }}</td>
</tr>
</thead>
<tbody v-for="(item, index) of tableData" :key="index">
<tr height="30">
<td style="text-align: left;font-weight: bolder;"><div style="padding: 0 5px;">{{ item.itemName }}</div></td>
<td>{{ item.unitName }}</td>
<td>{{ item.referenceRangeValue }}</td>
<td v-for="(item2, index2) of tableCols" :key="index2" min-width="150">{{ item[item2] }}</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
</template> </template>
@ -85,8 +112,8 @@ export default {
registerCheckList(patientId) { registerCheckList(patientId) {
this.RegisterCheckList = [] this.RegisterCheckList = []
if (!patientId) return if (!patientId) return
console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`)
getapi(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`)
// console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`)
postapi('/api/app/SumSummaryReport/GetHorizontalComparisonAsbitems', { patientId })
.then((res) => { .then((res) => {
console.log("获取横向对比 SumItems", res.data); console.log("获取横向对比 SumItems", res.data);
if (res.code != -1) { if (res.code != -1) {
@ -114,8 +141,8 @@ export default {
// "checkDate": "2023-07-14", // "checkDate": "2023-07-14",
// "resultValue": "阴性" // "resultValue": "阴性"
SumItems(patientId, asbitemId) { SumItems(patientId, asbitemId) {
console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonlist?PatientId=${patientId}&AsbitemId=${asbitemId}`)
getapi(`/api/app/sumsummaryreport/gethorizontalcomparisonlist?PatientId=${patientId}&AsbitemId=${asbitemId}`)
// console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonlist?PatientId=${patientId}&AsbitemId=${asbitemId}`)
postapi('/api/app/SumSummaryReport/GetHorizontalComparisons', { patientId, asbitemId })
.then((res) => { .then((res) => {
console.log("获取横向对比 SumItems", res.data); console.log("获取横向对比 SumItems", res.data);
if (res.code != -1) { if (res.code != -1) {
@ -128,8 +155,8 @@ export default {
}, },
//交叉报表 //交叉报表
crossTableOld(tableData) {
crossTable(tableData) {
this.tableData = [] //显示数据 this.tableData = [] //显示数据
this.tableRows = [] //动态行 this.tableRows = [] //动态行
this.tableCols = [] //动态列 this.tableCols = [] //动态列
@ -137,7 +164,8 @@ export default {
// console.log('tableData', tableData) // console.log('tableData', tableData)
tableData.forEach(e => { tableData.forEach(e => {
if (this.tableRows.indexOf(e.itemName) == - 1) this.tableRows.push(e.itemName) if (this.tableRows.indexOf(e.itemName) == - 1) this.tableRows.push(e.itemName)
if (this.tableCols.indexOf(e.checkDate) == - 1) this.tableCols.push(e.checkDate)
let checkDate = e.checkDate.substring(0, 10)
if (this.tableCols.indexOf(checkDate) == - 1) this.tableCols.push(checkDate)
}); });
this.tableCols.sort(); this.tableCols.sort();
@ -164,7 +192,70 @@ export default {
// console.log('this.tableCols', this.tableCols) // console.log('this.tableCols', this.tableCols)
// console.log('this.tableData', this.tableData) // console.log('this.tableData', this.tableData)
}, },
crossTable(tableData) {
// [
// {
// "regsterCheckId": "00000000-0000-0000-0000-000000000000",
// "checkDate": "2018-06-08T00:00:00",
// "summarys": [
// {
// "summary": "体重指数:23.89 诊断为：正常"
// }
// ],
// "registerCheckItems": [
// {
// "itemName": "身高",
// "unitName": "",
// "referenceRangeValue": "",
// "resultValue": "176",
// "reportFontColor": 0
// }
this.tableData = [] //显示数据
this.tableCols = [] //动态列
// console.log('tableData', tableData)
// this.tableCols.push('itemName')
// this.tableCols.push('unitName')
// this.tableCols.push('referenceRangeValue')
let summary = { itemName: '小结', unitName: '', referenceRangeValue: '' }
tableData.forEach((e, i) => {
let lsummary = ''
e.summarys.forEach((s, i) => {
let splitStr = '<br>'
if (i == 0) splitStr = ''
lsummary += splitStr + (s.summary || '')
});
summary[e.checkDate] = lsummary
// 获取列数
if (this.tableCols.indexOf(e.checkDate) == - 1) this.tableCols.push(e.checkDate)
// 获取行及数据
let row = {}
e.registerCheckItems.forEach(r => {
let lfind = arrayExistObj(this.tableData, 'itemName', r.itemName)
if (lfind > -1) {
this.tableData[lfind][e.checkDate] = r.resultValue
this.tableData[lfind][e.checkDate + '_color'] = r.reportFontColor
} else {
row = {
itemName: r.itemName,
unitName: r.unitName,
referenceRangeValue: r.referenceRangeValue
}
row[e.checkDate] = r.resultValue
row[e.checkDate + '_color'] = r.reportFontColor
this.tableData.push(row)
}
})
});
this.tableData.push(summary)
},
}, },

4
src/views/doctorCheck/sumDoctorCheck.vue
View File

@ -37,11 +37,11 @@
</el-tab-pane> </el-tab-pane>
<!-- <!--
<el-tab-pane label="危急值" name="3"> </el-tab-pane> <el-tab-pane label="危急值" name="3"> </el-tab-pane>
-->
<el-tab-pane label="项目对比" name="4"> <el-tab-pane label="项目对比" name="4">
<SumItemsType :patientId="dataTransOpts.tableS.patient_register.patientId" /> <SumItemsType :patientId="dataTransOpts.tableS.patient_register.patientId" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="横向对比" name="5">
-->
<el-tab-pane label="历次结果" name="5">
<SumItems :patientId="dataTransOpts.tableS.patient_register.patientId" /> <SumItems :patientId="dataTransOpts.tableS.patient_register.patientId" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="历次综述" name="6"> <el-tab-pane label="历次综述" name="6">

Write Preview
Loading…
Cancel
Save