lincl 2 years ago
parent
commit
0921fee9d7
2 changed files with 18 additions and 2 deletions
  1. 5 1
      api/http-request.js
  2. 13 1
      app/statistics/js/comprehensive-query.js

+ 5 - 1
api/http-request.js

@ -1,4 +1,5 @@
(function($) {
    window.ajaxInsArr = {}
    var publish_version = true;
    var isInner = false; //发布线上后有内外网的配置
    var docInfo = "app_storage";
@ -76,7 +77,7 @@
    function httpGet(url, options) {
        //发送ajax请求
        return new Promise(function(resolve, reject) {
            $.ajax(server + url,
            window.ajaxInsArr[url] = $.ajax(server + url,
                $.extend({}, {
                    type: 'GET',
                    dataType: 'JSON',
@ -88,6 +89,9 @@
                        request.setRequestHeader("userAgent", JSON.stringify(agent));
                    },
                    error: function(res) {
                        if(res.statusText == "abort"){
                        }
                        reject(res)
                    },
                    success: function(res) {

+ 13 - 1
app/statistics/js/comprehensive-query.js

@ -588,6 +588,7 @@ new Vue({
		getConsultList:function() {
			var vm = this
			vm.loadingTwo = true
			vm.lastAjax = "statisticsExport/getConsultList"
			statisticAPI.getConsultList({
				year :vm.radio=='1'?vm.chooseYear:'',     //签约年度
				startDate :vm.radio=='2'?vm.searchJsonTime.start:'',   //开始时间
@ -615,6 +616,7 @@ new Vue({
		// 签约分析
		getSignList:function() {
			var vm = this
			vm.lastAjax = "statisticsExport/getSignList"
			vm.loadingTwo = true
			var handleDataList = []
			vm.serverType = ''
@ -660,6 +662,7 @@ new Vue({
		getSickList:function() {
			var vm = this
			// vm.diseaseData
			vm.lastAjax = "statisticsExport/getSickList"
			vm.loadingTwo = true
			var handleDataList = []
			vm.diseaseDataType = ''
@ -703,6 +706,7 @@ new Vue({
		getBirthdayPatientList:function() {
			var vm = this
			vm.loadingTwo = true
			vm.lastAjax = "statisticsExport/getBirthdayPatientList"
			statisticAPI.getBirthdayPatientList({
				patientName:vm.form3.resident,   // 居民姓名
				doctorName:vm.form3.family,   //医生姓名
@ -737,6 +741,7 @@ new Vue({
		getPrescriptionList:function() {
			var vm = this
			vm.loadingTwo = true
			vm.lastAjax = "statisticsExport/getPrescriptionList"
			statisticAPI.getPrescriptionList({
				patientName:vm.form5.resident,   // 居民姓名
				doctorName :vm.form5.family,   //医生姓名
@ -772,9 +777,10 @@ new Vue({
		// 上门服务分析明细
		getDoorServiceList:function() {
			var vm = this
			vm.lastAjax = ""
			vm.loadingTwo = true
			var handleDataList = []
			vm.serviceTypeDataType = ''
			vm.serviceTypeDataType = 'statisticsExport/getDoorServiceList'
			vm.serviceTypeData.forEach(function(res){
				handleDataList.push(res.num)
			})
@ -835,6 +841,7 @@ new Vue({
		physicalSignData:function() {
			var vm = this
			vm.loadingTwo = true
			vm.lastAjax = "statisticsExport/getHealthList"
			statisticAPI.getHealthList(vm.getHealthParameter()).then(function(res){
				if(res.status == 200) {
					// console.log(res,"体征数据")
@ -874,6 +881,7 @@ new Vue({
		upTransferAppointment:function() {
			var vm = this
			vm.loadingTwo = true
			vm.lastAjax = "statisticsExport/getDoctorReservationList"
			statisticAPI.getDoctorReservationList(vm.reservationParameter()).then(function(res){
				if(res.status == 200) {
					// console.log(res,"上转预约")
@ -909,6 +917,7 @@ new Vue({
		wechatBinding:function() {
			var vm = this
			vm.loadingTwo = true
			vm.lastAjax = "statisticsExport/getWexinBindingList"
			statisticAPI.getWexinBindingList(vm.wexinBindingParameter()).then(function(res){
				if(res.status == 200) {
					// console.log(res,"微信绑定")
@ -948,6 +957,7 @@ new Vue({
		residentIntegral:function() {
			var vm = this
			vm.loadingTwo = true
			vm.lastAjax = "statisticsExport/patinetIntegralAnalysis"
			statisticAPI.patinetIntegralAnalysis(vm.residentIntegralParameter()).then(function(res){
				if(res.status == 200) {
					vm.loadingTwo = false
@ -985,6 +995,7 @@ new Vue({
		interview:function() {
			var vm = this
			vm.loadingTwo = true
			vm.lastAjax = "statisticsExport/findPatientFollowListByCondition"
			statisticAPI.findPatientFollowListByCondition(vm.interviewParameter()).then(function(res){
				if(res.status == 200) {
					vm.loadingTwo = false
@ -1594,6 +1605,7 @@ new Vue({
		},
		detailFunction:function(id) {
			var vm = this
			ajaxInsArr[vm.lastAjax]&&ajaxInsArr[vm.lastAjax].abort()
			if(id == 33) {
				// 咨询分析
				vm.getConsultList()