diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue index 08c4a16..f67b788 100644 --- a/src/components/sumDoctorCheck/CheckDetails.vue +++ b/src/components/sumDoctorCheck/CheckDetails.vue @@ -10,12 +10,14 @@ cellspacing="0" bordercolor="#909399" style="border-collapse:collapse;"> {{ item2.asbitemName }} - {{ '检查日期:' + item2.checkDate + ' 检查医生:' + item2.checkDoctorName }} + {{ '检查日期:' + item2.checkDate + ' 检查医生:' + item2.checkDoctorName }} - 项目 + 项目 结果 + 上次结果 + 上上次结果 参考值 警告参考值 单位 @@ -24,15 +26,17 @@ {{ item3.itemName }} - {{ item3.itemResult }} - {{ item3.referenceRangeValue }} - {{ item3.criticalRangeValue }} - {{ item3.unit }} - {{ item3.resultStatusName }} + {{ item3.itemResult }} + {{ item3.previousItemResult }} + {{ item3.previousTwoItemResult }} + {{ item3.referenceRangeValue }} + {{ item3.criticalRangeValue }} + {{ item3.unit }} + {{ item3.resultStatusName }} - 小结:{{ mergeSummarys(item2.summarys, 'summary') }} + @@ -44,7 +48,7 @@ import { mapState } from 'vuex'; import Sortable from "sortablejs"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; -import { arrayExistObj } from '@/utlis/proFunc'; +import { arrayExistObj,getColorStr } from '@/utlis/proFunc'; export default { components: {}, props: ["patientRegisterId"], @@ -71,6 +75,7 @@ export default { }, methods: { + getColorStr, //获取结果明细 CheckDetails(patientRegisterId) { if (!patientRegisterId) { @@ -91,13 +96,16 @@ export default { }); }, + mergeSummarys(array, itemKey) { let ret = '' - array.forEach(e => { - return ret += ';' + e[itemKey] + array.forEach((e,i) => { + let splitStr = "
" + if(i == 0) splitStr = "" + return ret += splitStr + e[itemKey] }) - return ret.substring(1, ret.length) + return ret } }, diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js index 12f9142..0dfd741 100644 --- a/src/utlis/proFunc.js +++ b/src/utlis/proFunc.js @@ -312,6 +312,19 @@ const setData = (obj, item, v) => { exports.setData = setData; +function getColorStr(intColor) { + let color = '000000' + try { + color += Number(intColor).toString(16) + color = color.substring(color.length - 6) + } catch (error) { + console.log('getColorStr',error) + } + return '#' + color +} +exports.getColorStr = getColorStr; + +