Merge branch 'master' of http://192.168.1.220:10080/EHR/app-big-data

js/api/bigDataOut-api.js

@@ -32,7 +32,7 @@
        },
         // 字典接口
         lastDictItem: function(data) {
            return httpRequest.get("/hos-admin/api/v1.0/standardCenter/lastDictItem/list",{data: data})
            return httpRequest.get("/gateway/hos-admin/api/v1.0/standardCenter/lastDictItem/list?token=ad83c2e4-aa95-44fb-8558-8911aa0d21ee&tenant_name=jkzl",{data: data})
        },
	}
	exports.bigDataOutApi = bigDataOutApi;

page/bigData/css/home.css

@@ -573,4 +573,15 @@ h4 {
	#main .div-bottom {
		bottom: 18px;
	}
}
#full{
	position:absolute;
	display: block;
	right: 23px;
	top: 27px;
	width: 36px;
	height: 60px;
	/* background-color: #f00; */
	z-index: 999;
	cursor:pointer
}

page/bigData/css/insurance.css

@@ -1,6 +1,6 @@
#app{
    width: 1920px;
    height: 1080px;
    width: 1920px!important;
    height: 1080px!important;
    background-size: 100% 100%;
    background-image: url(../images/insurance-bg.png);
}
@@ -378,10 +378,11 @@
}
#full{
	position:absolute;
	display: block;
	right: 23px;
	top: 27px;
	width: 36px;
	height: 36px;
	height: 60px;
	/* background-color: #f00; */
	z-index: 999;
	cursor:pointer

page/bigData/css/medical.css

@@ -473,4 +473,15 @@ td img {
	.div-body>.middle{
		margin: 0 0.15625rem;
	}
}
#full{
	position:absolute;
	display: block;
	right: 23px;
	top: 27px;
	width: 36px;
	height: 60px;
	/* background-color: #f00; */
	z-index: 999;
	cursor:pointer
}

page/bigData/html/home.html

@@ -100,6 +100,7 @@
				</div>
			</div>
			<div class="div-bottom"></div>
			<img src="../images/full-q.png" alt="" id="full">
		</div>
		<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=1W9gqPiqc7C9TDliPP8S9Rj9"></script>
		<script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"></script>

page/bigData/html/insurance.html

@@ -199,9 +199,7 @@
                    </table>
                </div>
        </div>
        <div id="full">
            
        </div>
        <img src="../images/full-q.png" alt="" id="full">
    </div>
    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=1W9gqPiqc7C9TDliPP8S9Rj9"></script>
    <script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"></script>

page/bigData/html/medical.html

@@ -334,6 +334,7 @@
				</div>
			</div>
			<div class="div-bottom"></div>
			<img src="../images/full-q.png" alt="" id="full">
		</div>
		<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=1W9gqPiqc7C9TDliPP8S9Rj9"></script>
		<script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"></script>

page/bigData/js/home.js

@@ -237,4 +237,27 @@ function toThousands(str) {
		str = newStr + (str + "00").substr((str + "00").indexOf("."), 3);
	}
	return str;
}
document.getElementById("full").onclick = function (event) {
	var app = document.getElementById('main');
	console.log()
	if($("#full").attr('src') == "../images/full-q.png"){
		$("#full").attr('src',"../images/full-s.png")
	}else{
		$("#full").attr('src',"../images/full-q.png")
	}
	FullScreen(app);
}
function FullScreen(el) {
	var isFullscreen = document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen;
	if (!isFullscreen) { //进入全屏,多重短路表达式
		(el.requestFullscreen && el.requestFullscreen()) ||
		(el.mozRequestFullScreen && el.mozRequestFullScreen()) ||
		(el.webkitRequestFullscreen && el.webkitRequestFullscreen()) || (el.msRequestFullscreen && el.msRequestFullscreen());
	} else { //退出全屏,三目运算符
		document.exitFullscreen ? document.exitFullscreen() :
			document.mozCancelFullScreen ? document.mozCancelFullScreen() :
			document.webkitExitFullscreen ? document.webkitExitFullscreen() : '';
	}
}

page/bigData/js/insurance.js

@@ -108,7 +108,8 @@ new Vue({
				// console.log(datas[1])
				vm.middleData1 = toThousands(datas[1].obj.VIEW_22_0004[0].HC_22_1001/10000);
				vm.middleData2 = ((datas[1].obj.VIEW_22_0004[0].HC_22_1001-datas[1].obj.VIEW_22_0004[0].HC_22_1006)/datas[1].obj.VIEW_22_0004[0].HC_22_1006*100).toFixed(2);
				if(vm.middleData2 == NaN){
				console.log(vm.middleData2)
				if(vm.middleData2 == 'NaN'){
					vm.middleData2 = 0;
				}
				vm.middleData3 = toThousands(datas[1].obj.VIEW_22_0004[0].HC_22_1006/10000);
@@ -354,7 +355,13 @@ function toThousands(num) {
	return (num || 0).toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') + str;
}
document.getElementById("full").onclick = function (event) {
	var app = document.getElementById('app')
	var app = document.getElementById('app');
	console.log()
	if($("#full").attr('src') == "../images/full-q.png"){
		$("#full").attr('src',"../images/full-s.png")
	}else{
		$("#full").attr('src',"../images/full-q.png")
	}
	FullScreen(app);
}
function FullScreen(el) {

page/bigData/js/medical.js

@@ -329,4 +329,27 @@ function toThousands(str) {
		str = newStr + (str + "00").substr((str + "00").indexOf("."), 3);
	}
	return str;
}
document.getElementById("full").onclick = function (event) {
	var app = document.getElementById('app');
	console.log()
	if($("#full").attr('src') == "../images/full-q.png"){
		$("#full").attr('src',"../images/full-s.png")
	}else{
		$("#full").attr('src',"../images/full-q.png")
	}
	FullScreen(app);
}
function FullScreen(el) {
	var isFullscreen = document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen;
	if (!isFullscreen) { //进入全屏,多重短路表达式
		(el.requestFullscreen && el.requestFullscreen()) ||
		(el.mozRequestFullScreen && el.mozRequestFullScreen()) ||
		(el.webkitRequestFullscreen && el.webkitRequestFullscreen()) || (el.msRequestFullscreen && el.msRequestFullscreen());
	} else { //退出全屏,三目运算符
		document.exitFullscreen ? document.exitFullscreen() :
			document.mozCancelFullScreen ? document.mozCancelFullScreen() :
			document.webkitExitFullscreen ? document.webkitExitFullscreen() : '';
	}
}

page/bigDataOut/css/zidian.css

@@ -2,10 +2,11 @@ body {
    margin: 0;
    height: 100%;
    background-color: #fff;
    overflow-y: hidden;
}
html {
    height: 100%;
    height: 92%;
}
.header {
@@ -76,6 +77,7 @@ aside {
.el-main {
    padding: 0;
    padding-right: 20px;
    position: relative;
}
.el-table th {
@@ -85,4 +87,17 @@ aside {
.el-pagination__jump {
    position: relative;
    top: -9px;
}
.el-pagination {
    text-align: right;
}
.el-pagination__total {
    position: absolute;
    left: 30px;
}
.el-icon-search{
    position: absolute;
    right:40px;
    cursor: pointer;
}

page/bigDataOut/html/zidian.html

@@ -12,33 +12,33 @@
</head>
<body>
    <div id="app">
    <div id="app" >
        <nav class="header">
            <span id="text">查看字典</span>
            <span id="close">X</span>
            <span id="close" @click='windowClose'>X</span>
        </nav>
        <el-container style="height: 100%;">
            <el-aside style="width: 200px; ">
                <el-menu active-text-color="#2eaafa" :default-openeds="['1']">
                    <el-menu-item class="ellipsis" title="检验专业代码" index="1-0">
                        <img src="../images/icon_jianchazhuanyedaima-weidianji.png" alt=""> 检验专业代码</el-menu-item>
                    <el-menu-item class="ellipsis" title="检验专业分类" index="1-1">
                        <img src="../images/icon-JIANYANZHUANYEFENLEI.png" alt=""> 检验专业分类</el-menu-item>
                    <el-menu-item class="ellipsis" title="检验专业代码" index="1-0" @click="daimaClick">
                        检验专业代码</el-menu-item>
                    <el-menu-item class="ellipsis" title="检验专业分类" index="1-1" @click="fenleiClick">
                        检验专业分类</el-menu-item>
            </el-aside>      
            <el-main style="height: 100%;overflow: hidden;">
                <div class="flex">
                    <span id="searchtext"> 字典项：</span>
                    <el-input placeholder="请输入内容" id="typeSearch" v-model="searchKey">
                    </el-input>
                    <i class="el-icon-search" @click='searchClick'></i>
                </div>
                <el-table :data="tableData" border style="width: 100%" :data.native="tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)">
                    <el-table-column prop="CV08.50.301" label="序号">
                    <el-table-column prop="code" label="序号">
                    </el-table-column>
                    <el-table-column prop="STD_MEDICINE" label="值域编码">
                    <el-table-column prop="hashCode" label="值域编码">
                    </el-table-column>
                    <el-table-column prop="STD_CHECK_ITEM" label="值域名称">
                    <el-table-column prop="desc" label="值域名称">
                    </el-table-column>
                </el-table>
                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -64,14 +64,30 @@
                    pageSize: 10,    //    每页的数据 
                    pageSizeArr: [10, 20, 30, 50],
                    searchKey: '',
                    total: 50,
                    tableData: []
                    total: 0,
                    tableData: [],
                    hidden: true,
                    code: "STD_CHECK_ITEM",
                }
            },
          
            mounted: function () {
        this.getData()
    },
                this.getData()
            },
            methods: {
                daimaClick: function () {
                this.code = 'STD_CHECK_ITEM',
                    this.initData()
            },
            fenleiClick: function () {
                this.code = 'TD_LAB_EXAM_TYPE',
                    this.initData()
            },
                windowClose: function () {
                    top.layer.close(top.layer.getFrameIndex(window.name))
                },
                handleCurrentChange: function (val) {
                    this.currentPage = val;
                    this.getData()
@@ -91,17 +107,22 @@
                getData: function () {
                    var vm = this;
                    var params = {
                        code:"CV04.10.015"
                        code: this.code,
                        size: 15,
                        page: 1
                    }
                    if(this.searchKey) {
                        params.filters = "code?" + this.searchKey + " ;hashCode?" + this.searchKey + ";desc?"+ this.searchKey
                    }
                    // GlobalEventBus.$emit('setLoading', {
                    //     loading: true
                    // }); //等待效果
                    GlobalEventBus.$emit('setLoading', {
                        loading: true
                    }); //等待效果
                    bigDataOutApi.lastDictItem(params).then(function (res) {
                        console.log(res)
                        GlobalEventBus.$emit('setLoading');
                        vm.tableData = res.detailModelList;
                        vm.total = res.totalCount;
                        vm.tableData = res;
                        vm.total = res.length;
                        
                    }).catch(function (err) {
                        console.log(err)
                        GlobalEventBus.$emit('setLoading');

page/bigDataOut/js/handleChangeViewA.js

@@ -5,7 +5,7 @@ Vue.component('comA', {
    </el-date-picker>\
    <div class="search" @click="searchClick">搜  索</div>\
        <span class="span">一周就医次数>=3次的患者记录</span>\
           <el-table :data="tableData" border style="width: 100%" :data.native="tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)"">\
           <el-table :data="tableData" border style="width: 100%" :data.native="tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)">\
                        <el-table-column prop="patient_name" label="姓名">\
                        </el-table-column>\
                        <el-table-column prop="result" label="就医次数">\
@@ -46,7 +46,7 @@ Vue.component('comA', {
            tableData: [],
            pageSizeArr: [10, 20, 30, 50],
            total: 0,
            value4:new Date(),
            value4: new Date(),
        }
    },
@@ -73,7 +73,7 @@ Vue.component('comA', {
        getData: function () {
            var vm = this;
            var params = {
                time:this.value4.format('yyyy-MM-dd'),
                time: this.value4.format('yyyy-MM-dd'),
                size: 15,
                page: 1,
            }
@@ -90,26 +90,26 @@ Vue.component('comA', {
                GlobalEventBus.$emit('setLoading');
            })
        },
        handleClick:function(row) {
            demographic_id=row.demographic_id,
            blurry_type='',
            searchParam=''
            var url =  httpRequest.server+'/profile/app/medication/html/jiuzhen-item.html?'+
            'healthProblemName='+'&demographic_id='+demographic_id+'&blurry_type='+blurry_type+'&searchParam='+searchParam
        handleClick: function (row) {
            demographic_id = row.demographic_id,
                blurry_type = '',
                searchParam = ''
            var url = httpRequest.server + '/profile/app/medication/html/jiuzhen-item.html?' +
                'healthProblemName=' + '&demographic_id=' + demographic_id + '&blurry_type=' + blurry_type + '&searchParam=' + searchParam
            console.log(url)
        //    window.open(url)
        var width=(0.5212*window.screen.width)+'px';
        var height=(0.7878*window.screen.height)+'px';
        top.layer.open({
            id:'Lay_xiangqingA',
            type:2,
            title:false,
            closeBtn:0,
            shade:0.5,
            shadeClose:true,
            area:[width,height],
            content:url
        })
            //    window.open(url)
            var width = (0.5212 * window.screen.width) + 'px';
            var height = (0.7878 * window.screen.height) + 'px';
            top.layer.open({
                id: 'Lay_xiangqingA',
                type: 2,
                title: false,
                closeBtn: 0,
                shade: 0.5,
                shadeClose: true,
                area: [width, height],
                content: url
            })
        }
    }
})

page/bigDataOut/js/handleChangeViewD.js

@@ -11,7 +11,7 @@ Vue.component('comD',{
      <el-input paceholder="请输入药品名称"  v-model="drugName">\
      </el-input>\
      </div>\
        <a href="">  查看药品字典  </a>\
        <a href="#" @click="handleZidian">  查看药品字典  </a>\
        <span>就诊类型：</span>  \
                      <el-select v-model="eventType" placeholder="请选择">\
                            <el-option v-for="item in event_type" :key="item.code" :label="item.name" :value="item.code">\
@@ -61,11 +61,6 @@ Vue.component('comD',{
            tableData: [],
            pageSizeArr: [10, 20, 30, 50],
            total: 0,
            pickerOptions1: {
                disabledDate(time) {
                  return time.getTime() > Date.now();
                },
              },
              event_type: [{
                "code": '0',
                "name": '门急诊'
@@ -83,6 +78,9 @@ Vue.component('comD',{
    },
    mounted: function () {
        this.getData()
        console.log()
       
    },
    methods: {
        handleCurrentChange: function (val) {
@@ -105,7 +103,6 @@ Vue.component('comD',{
        },
        getData: function () {
            var vm = this;
            debugger
            var params = {
               start:this.value1.format('yyyy-MM-dd'),
               end:this.value2.format('yyyy-MM-dd'),
@@ -121,20 +118,25 @@ Vue.component('comD',{
                console.log(res)
                GlobalEventBus.$emit('setLoading');
                vm.tableData = res.detailModelList;
                vm.total = res.totalCount;
                vm.total = res.totalCount; 
                debugger
                vm.tableData = vm.tableData.map(function(item){
                    item.event_date = new Date(item.event_date).format('yyyy-MM-dd-hh-mm-ss')
                    return item;
                })
            }).catch(function (err) {
                console.log(err)
                GlobalEventBus.$emit('setLoading');
            })
        },
        handleClick:function(row) {
            demographic_id='',
            blurry_type='',
            searchParam=''
            var url =  httpRequest.server+'/profile/app/medication/html/medication.html?'+
            'healthProblemName='+'&demographic_id='+demographic_id+'&blurry_type='+blurry_type+'&searchParam='+searchParam
            console.log(row)
            demographic_id=row.demographic_id,
            medication=row.HDSD00_04_023,
            eventdate=row.event_date
            var url =  httpRequest.server+'/app-ehr-browser/app/medication/html/medication.html?'+
            'healthProblemName='+'&demographic_id='+demographic_id+'&medication='+medication+'&eventdate='+eventdate
            console.log(url)
        //    window.open(url)
        var width=(0.5212*window.screen.width)+'px';
        var height=(0.7878*window.screen.height)+'px';
        top.layer.open({
@@ -147,6 +149,22 @@ Vue.component('comD',{
            area:[width,height],
            content:url
        })
        },
        handleZidian:function(){
            var url ='../html/zidian.html'
            console.log(url)
            var width=(0.5212*window.screen.width)+'px';
        var height=(0.6528*window.screen.height)+'px';
        top.layer.open({
            id:'Lay_zidian',
            type:2,
            title:false,
            closeBtn:0,
            shade:0.5,
            shadeClose:true,
            area:[width,height],
            content:url
        })
        }
    }
})