Commit b42671fb by tangyufeng

1.智能分组, 其他文字修改

parent 5b537046
......@@ -10,6 +10,7 @@
"dependencies": {
"@vue/composition-api": "^1.6.2",
"core-js": "^3.6.5",
"dayjs": "^1.11.7",
"element-ui": "^2.15.6",
"jquery": "^3.6.0",
"js-cookie": "^3.0.1",
......@@ -5100,6 +5101,11 @@
"node": ">=0.10"
}
},
"node_modules/dayjs": {
"version": "1.11.7",
"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz",
"integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
},
"node_modules/de-indent": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
......@@ -19378,6 +19384,11 @@
"assert-plus": "^1.0.0"
}
},
"dayjs": {
"version": "1.11.7",
"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz",
"integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
},
"de-indent": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
......@@ -10,6 +10,7 @@
"dependencies": {
"@vue/composition-api": "^1.6.2",
"core-js": "^3.6.5",
"dayjs": "^1.11.7",
"element-ui": "^2.15.6",
"jquery": "^3.6.0",
"js-cookie": "^3.0.1",
......
......@@ -5,30 +5,31 @@
* @LastEditTime: 2023-01-06 17:16:34
* @Description:
*/
import Vue from 'vue'
import App from './App.vue'
import store from './store'
import router from '@/router/index'
import Vue from "vue";
import App from "./App.vue";
import store from "./store";
import router from "@/router/index";
Vue.config.productionTip = false;
import http from '@/utils/http.js'
import http from "@/utils/http.js";
Vue.prototype.$http = http;
import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
import ElementUI from "element-ui";
import "element-ui/lib/theme-chalk/index.css";
Vue.use(ElementUI);
import VueCompositionApi from '@vue/composition-api'
Vue.use(VueCompositionApi)
import VueCompositionApi from "@vue/composition-api";
Vue.use(VueCompositionApi);
//引入 dayjs
import dayjs from "dayjs";
import "dayjs/locale/zh-cn";
dayjs.locale("zh-cn");
new Vue({
store,
router,
render: h => h(App),
}).$mount('#app')
\ No newline at end of file
render: (h) => h(App),
}).$mount("#app");
......@@ -62,7 +62,7 @@
<div class="outsetgrouping_top2_message_right">
<span class="outsetgrouping_top2_message_right_tu6"><img src="../assets/img/jiner.png" alt="" /></span>
<div class="outsetgrouping_top2_message_right_t3">
预计DRG支付费用:<span>{{ casehisObj ? casehisObj.drgs.actualfee : "" }}</span>
预计DIP支付费用:<span>{{ casehisObj ? casehisObj.drgs.actualfee : "" }}</span>
</div>
</div>
</div>
......@@ -103,11 +103,11 @@
<span>入组编码:{{ item.code }}</span>
<span>入组名称:{{ item.coreName }}</span>
<span>病种分值:{{ item.score }}</span>
<span>预计DRG支付费用:{{ item.unitfee }}</span>
<span>预计DIP支付费用:{{ item.unitfee }}</span>
</div>
<!-- <div class="outsetgrouping_centent_totalnum_left_text_msg2_text5">
<span>预计DRG支付费用:{{ item.unitfee }}</span
<span>预计DIP支付费用:{{ item.unitfee }}</span
><span>院内历年平均费用:{{ item.avgFee }}</span
><span>院内历年平均住院天数:{{ item.avgInHosDay }}</span>
</div> -->
......@@ -275,7 +275,7 @@
</div>
<div class="outaddrecordEnrollment_centent_totalnum_left_text3">
<span>预计DRG支付费用:{{ item.unitfee }}</span
<span>预计DIP支付费用:{{ item.unitfee }}</span
><span>院内历年平均费用:{{ item.avgFee }}</span
><span>院内历年平均住院天数:{{ item.avgInHosDay }}</span>
</div>
......
......@@ -54,9 +54,8 @@
<span>基准点数:{{ item.score }}</span>
</div>
<div class="outaddrecordEnrollment_centent_totalnum_left_text3">
<span>预计DRG支付费用:{{ item.unitfee }}</span
<span>预计DIP支付费用:{{ item.unitfee }}</span
><span>院内历年平均费用:{{ item.avgFee }}</span
><span>院内历年平均住院天数:{{ item.avgInHosDay }}</span>
</div>
......@@ -84,45 +83,28 @@
</div>
</div>
<div class="outaddrecordEnrollment_pagination">
</div>
<div class="outaddrecordEnrollment_pagination"></div>
</div>
</el-dialog>
</template>
<script lang="ts">
import { getItem, setItem, clear } from "../utils/auth";
import http from "../utils/http";
import { reactive, toRefs, onMounted, nextTick, computed } from "@vue/composition-api";
import { getItem, setItem, clear } from '../utils/auth';
import http from '../utils/http';
import {
reactive,
toRefs,
onMounted,
nextTick,
computed,
} from "@vue/composition-api";
import { decimal } from '../utils/decimal';
import { initEcharts, categoryChart11 } from '../utils/echarts'
import { decimal } from "../utils/decimal";
import { initEcharts, categoryChart11 } from "../utils/echarts";
export default {
props: {
dialogVisible: Boolean, //弹出层是否显示
},
setup() {
const state = reactive({
outaddsearchForm: {
diagName: '',
opsName: '',
diagName: "",
opsName: "",
},
addCorePercents: [],
addnodataShow: true, //没有搜索时显示
......@@ -133,11 +115,9 @@ export default {
addgroupArr2: [],
});
//获取主诊断模糊数据
function addgroupListMe() {
http
.post(`/medical/get/GetDiagOpss?diagName=${state.outaddsearchForm.diagName}&type=${1}`, {})
http.post(`/medical/get/GetDiagOpss?diagName=${state.outaddsearchForm.diagName}&type=${1}`, {})
.then((data) => {
state.addgroupList = data;
for (let item of state.addgroupList) {
......@@ -149,22 +129,21 @@ export default {
.catch((error) => {});
}
function addquerySearchGroup(queryString, cb) {
if(state.outaddsearchForm.diagName.length>0){
if (state.outaddsearchForm.diagName.length > 0) {
addgroupListMe();
}
state.addgroupArr=[];
state.addgroupArr = [];
cb(state.addgroupArr);
}
//清空输入框的值时触发
const addclear=()=>{
state.addCorePercents=[]
state.addnodataShow=true
}
const addclear = () => {
state.addCorePercents = [];
state.addnodataShow = true;
};
//获取主手术模糊数据
function addgroupListMe2() {
http
.post(`/medical/get/GetDiagOpss?diagName=${state.outaddsearchForm.opsName}&type=${2}`, {})
http.post(`/medical/get/GetDiagOpss?diagName=${state.outaddsearchForm.opsName}&type=${2}`, {})
.then((data) => {
state.addgroupList2 = data;
for (let item of state.addgroupList2) {
......@@ -176,24 +155,19 @@ export default {
.catch((error) => {});
}
function addquerySearchGroup2(queryString, cb) {
if(state.outaddsearchForm.opsName.length>0){
if (state.outaddsearchForm.opsName.length > 0) {
addgroupListMe2();
}
state.addgroupArr2=[];
state.addgroupArr2 = [];
cb(state.addgroupArr2);
}
//获取列表数据
const addgetlist = () => {
http
.post(`/medical/get/GetaddCorePercents`,
{
http.post(`/medical/get/GetaddCorePercents`, {
// PageNumber:state.currentPage,
diagName:state.outaddsearchForm.diagName,
opsName:state.outaddsearchForm.opsName,
diagName: state.outaddsearchForm.diagName,
opsName: state.outaddsearchForm.opsName,
// pageSize:state.pageSize,
})
.then((data) => {
......@@ -204,21 +178,17 @@ export default {
}
// state.totalCount = data.totalCount;
for (var i = 0; i < state.addCorePercents.length; i++) {
initEcharts(categoryChart11("药占比",state.addCorePercents[i].drugPercent,'#2CABE3'), `indexChart11${i}`);
initEcharts(categoryChart11("耗材占比",state.addCorePercents[i].materialsPercent,'#71D875'), `indexChart11two${i}`);
initEcharts(categoryChart11("检查占比",state.addCorePercents[i].inspectPercent,'#F35E77'), `indexChart11tree${i}`);
initEcharts(categoryChart11("检验占比",state.addCorePercents[i].testPercent,'#FFB321'), `indexChart11fore${i}`);
initEcharts(categoryChart11("其他",state.addCorePercents[i].otherPercent,'#C05EF3'), `indexChart11file${i}`);
initEcharts(categoryChart11("药占比", state.addCorePercents[i].drugPercent, "#2CABE3"), `indexChart11${i}`);
initEcharts(categoryChart11("耗材占比", state.addCorePercents[i].materialsPercent, "#71D875"), `indexChart11two${i}`);
initEcharts(categoryChart11("检查占比", state.addCorePercents[i].inspectPercent, "#F35E77"), `indexChart11tree${i}`);
initEcharts(categoryChart11("检验占比", state.addCorePercents[i].testPercent, "#FFB321"), `indexChart11fore${i}`);
initEcharts(categoryChart11("其他", state.addCorePercents[i].otherPercent, "#C05EF3"), `indexChart11file${i}`);
}
})
.catch((error) => {
});
.catch((error) => {});
};
//查询
const addsearch = () => {
state.addCorePercents = [];
addgetlist();
if (state.outaddsearchForm.diagName) {
......@@ -231,17 +201,12 @@ export default {
};
onMounted(() => {
if (state.outaddsearchForm.diagName.length > 0) {
addgetlist();
}
});
return {
...toRefs(state),
decimal,
......@@ -252,14 +217,13 @@ export default {
addquerySearchGroup2,
addgroupListMe2,
addclear,
};
},
};
</script>
<style lang="scss">
@import 'styles/mixin.scss';
@import "styles/mixin.scss";
.outaddrecordEnrollment {
height: calc(100% - 50px);
......@@ -506,6 +470,5 @@ export default {
}
}
}
}
</style>
......@@ -58,7 +58,7 @@
<span class="outpatientDetails_msg_tu4"><img src="../assets/img/zu.png" alt="" /></span>
<span>分组:{{ HistoryInfo.doctorName }}</span>
<span>病种分值:{{ decimal(HistoryInfo.rw) }}</span>
<span>预计DRG支付费用:{{ decimal(HistoryInfo.actualfee) }}</span>
<span>预计DIP支付费用:{{ decimal(HistoryInfo.actualfee) }}</span>
<span>总费用:{{ decimal(HistoryInfo.totalFee) }}</span>
<span>预计盈亏:{{ decimal(HistoryInfo.profitLoss) }}</span>
<!-- <span>院内历年平均费用:{{ decimal(HistoryInfo.avgFee) }}</span>
......@@ -99,7 +99,7 @@
></span
>
</div>
<div class="outpatientDetails_fenqu_di_bb_div3">
<!-- <div class="outpatientDetails_fenqu_di_bb_div3">
<span class="outpatientDetails_fenqu_di_bb_div3_span1" :style="{ width: lowwidth + '%' }"> 0 </span>
<span class="outpatientDetails_fenqu_di_bb_div3_span2" :style="{ width: contentwidth + '%' }">
{{ Math.round(lowMagnification) }}
......@@ -108,7 +108,7 @@
<span class="outpatientDetails_fenqu_di_bb_div3_span2_nmm1">{{ Math.round(highMagnification) }}</span>
<span class="outpatientDetails_fenqu_di_bb_div3_span2_nmm2">{{ Math.round(heightnum) }}</span>
</span>
</div>
</div> -->
</div>
</div>
</div>
......@@ -149,7 +149,7 @@
{{ scope.row.proportion != undefined ? decimal(scope.row.proportion) + "%" : "" }}
</template>
</el-table-column>
<el-table-column prop="coreTotalFee" label="预计DRG设定费用(参考)" width="100" header-align="center" align="right">
<el-table-column prop="coreTotalFee" label="预计DIP设定费用(参考)" width="100" header-align="center" align="right">
<template slot-scope="scope">
{{ decimal(scope.row.coreTotalFee) }}
</template>
......@@ -845,7 +845,7 @@ export default {
}
span:nth-child(2) {
margin-left: 21px;
width: 200px;
flex: 1;
height: 39px;
background-color: #fff;
font-size: 14px;
......@@ -858,7 +858,7 @@ export default {
padding-left: 10px;
}
span:nth-child(3) {
width: 200px;
flex: 1;
height: 39px;
background-color: #fff;
font-size: 14px;
......@@ -871,7 +871,7 @@ export default {
align-items: center;
}
span:nth-child(4) {
width: 258px;
flex: 1;
height: 39px;
background-color: #fff;
font-size: 14px;
......@@ -884,7 +884,7 @@ export default {
align-items: center;
}
span:nth-child(5) {
width: 200px;
flex: 1;
height: 39px;
background-color: #fff;
font-size: 14px;
......@@ -897,7 +897,7 @@ export default {
padding-left: 10px;
}
span:nth-child(6) {
width: 200px;
flex: 1;
height: 39px;
background-color: #fff;
font-size: 14px;
......@@ -910,7 +910,7 @@ export default {
align-items: center;
}
span:nth-child(n + 7) {
width: 258px;
flex: 1;
height: 39px;
background-color: #fff;
font-size: 14px;
......
......@@ -5,27 +5,27 @@
* @LastEditTime: 2023-02-28 09:38:48
* @Description:
*/
const path = require('path')
const path = require("path");
function resolve(dir) {
return path.join(__dirname, dir)
return path.join(__dirname, dir);
}
module.exports = {
publicPath: './', //导出路径
assetsDir: 'web', //静态资源文件夹
publicPath: "./", //导出路径
assetsDir: "web", //静态资源文件夹
productionSourceMap: false,
devServer: {
//测试环境代理
port: 8066, //测试端口
proxy: {
'/api': {
"/api": {
//target: 'http://192.168.18.166:8099/',
//target: 'http://192.168.18.166:8100/', //drg测试站点
target: 'http://192.168.18.166:8033/', //dip测试站点
target: "http://192.168.18.166:8033/", //dip测试站点
changeOrigin: true,
pathRewrite: {
'^/': '/',
"^/": "/",
},
},
},
......@@ -33,7 +33,7 @@ module.exports = {
configureWebpack: {
resolve: {
alias: {
'@': resolve('src'),
"@": resolve("src"),
},
},
},
......@@ -48,4 +48,4 @@ module.exports = {
// }
},
},
}
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment