Home Explore Help
Register Sign In
raolu
/
PC-application
Watch 0
Star 0
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

hwy 1 month ago
parent
cab2caf902 4e25bc9e9a
commit
7e4ad6b9f3
11 changed files with 97 additions and 21 deletions
Unified View Show Diff Stats
  1. 3 2
      app/jbsc/appointment/appoint-hospital.js
  2. 2 2
      app/jbsc/html/appointment/appoint-commit.html
  3. 5 0
      app/jbsc/html/appointment/appoint-commit.js
  4. 3 0
      app/jbsc/html/appointment/appoint-doctor-detail.js
  5. 1 1
      app/jbsc/html/appointment/appoint-select.html
  6. 3 0
      app/jbsc/html/appointment/appoint-select.js
  7. 2 0
      app/jbsc/html/view_screening_results.html
  8. 4 0
      app/jbsc/js/statistics.js
  9. 67 11
      app/rehabilitation/html/device.html
  10. 3 3
      app/rehabilitation/html/toDoorService.html
  11. 4 2
      app/rehabilitation/js/guide_the_message.js

+ 3 - 2
app/jbsc/appointment/appoint-hospital.js
View File 

@ -15,7 +15,7 @@ Vue.component('appoint-hospital', {
 
				</li>\
 
				</li>\
 
			</ul>\
 
			</ul>\
 
			</div>',
 
			</div>',
 
  props: ['hospital','show'],
 
  props: ['hospital','show','fuzhen'],
 
  data: function () {
 
  data: function () {
 
    return {
 
    return {
 
      HosKeyword: '',
 
      HosKeyword: '',
 
@ -39,7 +39,8 @@ Vue.component('appoint-hospital', {
 
        '&callCode=' +
 
        '&callCode=' +
 
        callCode+
 
        callCode+
 
        '&surveyCode=' +
 
        '&surveyCode=' +
 
        surveyCode
 
        surveyCode + 
        '&fuzhen=' + this.fuzhen
 
      if (backToSynergy) {
 
      if (backToSynergy) {
 
        content += '&backToSynergy=1'
 
        content += '&backToSynergy=1'
 
      }
 
      }

+ 2 - 2
app/jbsc/html/appointment/appoint-commit.html
View File 

@ -89,7 +89,7 @@
 
	    </style>
 
	    </style>
 
	</head>
 
	</head>
 
	<body>
 
	<body>
 
		<div id="app">
 
		<div id="app" v-cloak>
 
			<div id="imgscode"></div>
 
			<div id="imgscode"></div>
 
			<div  class="pl30 pr30">
 
			<div  class="pl30 pr30">
 
				<visit-info :param="param"></visit-info>
 
				<visit-info :param="param"></visit-info>
 
@ -108,7 +108,7 @@
 
						<label for="killOrder2">复诊</label>
 
						<label for="killOrder2">复诊</label>
 
					</div>
 
					</div>
 
				</li>
 
				</li>
 
				<li class="" style="display: flex;">
 
				<li class="" style="display: flex;" v-if="isFuzhen==0">
 
					<span class="fc-999 mr40 w100">参考信息</span>
 
					<span class="fc-999 mr40 w100">参考信息</span>
 
					<div class="input-group" @click="referenceShow = !referenceShow">
 
					<div class="input-group" @click="referenceShow = !referenceShow">
 
					  <input
 
					  <input

+ 5 - 0
app/jbsc/html/appointment/appoint-commit.js
View File 

@ -93,11 +93,13 @@ new Vue({
 
	  pagetotal:'',
 
	  pagetotal:'',
 
	  checkList:[],
 
	  checkList:[],
 
	  placeholder:"请选择参考信息",
 
	  placeholder:"请选择参考信息",
 
		isFuzhen: null
 
    }
 
    }
 
  },
 
  },
 
  mounted: function () {
 
  mounted: function () {
 
	  var vm = this
 
	  var vm = this
 
	  this.getResultList()
 
	  this.getResultList()
 
		this.isFuzhen = sessionStorage.getItem("isFuzhen")
 
	  document.addEventListener('click',function(){
 
	  document.addEventListener('click',function(){
 
		  // if(vm.referenceShow){
 
		  // if(vm.referenceShow){
 
			 //  vm.referenceShow = false
 
			 //  vm.referenceShow = false
 
@ -159,6 +161,9 @@ new Vue({
 
		arrangeDate.sectionType = 'a'
 
		arrangeDate.sectionType = 'a'
 
		arrangeDate.clazz = 'div-time-enable'
 
		arrangeDate.clazz = 'div-time-enable'
 
		p.arrangeDate = JSON.stringify(arrangeDate)
 
		p.arrangeDate = JSON.stringify(arrangeDate)
 
		console.log(p);
 
		return
 
		
		// "sectionType":"a","clazz":"div-time-enable"
 
		// "sectionType":"a","clazz":"div-time-enable"
 
		// p.arrangeDate = JSON.stringify(p.arrangeDate)
 
		// p.arrangeDate = JSON.stringify(p.arrangeDate)
 
		// {"max":"1","startTime":"2020/4/17 8:00:00","used":"0","endTime":"2020/4/17 8:07:00","sectionType":"a","clazz":"div-time-enable"}
 
		// {"max":"1","startTime":"2020/4/17 8:00:00","used":"0","endTime":"2020/4/17 8:07:00","sectionType":"a","clazz":"div-time-enable"}

+ 3 - 0
app/jbsc/html/appointment/appoint-doctor-detail.js
View File 

@ -38,6 +38,9 @@ $(function () {
 
    })
 
    })
 
  $('.tit').html(hospital.address || hospital.hospital_name)
 
  $('.tit').html(hospital.address || hospital.hospital_name)
 
  $('.reback').click(function () {
 
  $('.reback').click(function () {
 
		// 如果是康复复诊过去预约挂号，在就诊信息页面少一个字段显示，1隐藏字段，0正常显示
 
		sessionStorage.setItem("isFuzhen",0)
 
    
    top.layer.open({
 
    top.layer.open({
 
      type: 2,
 
      type: 2,
 
      closeBtn: true, // 显示关闭按钮
 
      closeBtn: true, // 显示关闭按钮

+ 1 - 1
app/jbsc/html/appointment/appoint-select.html
View File 

@ -153,7 +153,7 @@
 
			  社区预约
 
			  社区预约
 
			</div>
 
			</div>
 
		  </div>
 
		  </div>
 
		  <appoint-hospital :hospital="hospital" v-if="selectHospital==1"></appoint-hospital>
 
		  <appoint-hospital :hospital="hospital" v-if="selectHospital==1" :fuzhen="fuzhen"></appoint-hospital>
 
		  <appoint-country :country="country" v-if="selectHospital==2"></appoint-country>
 
		  <appoint-country :country="country" v-if="selectHospital==2"></appoint-country>
 
		  <div><span class="btn w120" id="closeBtn" @click="subscribe(0)">返回</span></div>
 
		  <div><span class="btn w120" id="closeBtn" @click="subscribe(0)">返回</span></div>
 
		</template>
 
		</template>

+ 3 - 0
app/jbsc/html/appointment/appoint-select.js
View File 

@ -5,6 +5,7 @@ var patient = Request.patient,
 
  surveyCode = Request.surveyCode,
 
  surveyCode = Request.surveyCode,
 
  backToSynergy = Request.backToSynergy
 
  backToSynergy = Request.backToSynergy
 
$(function () {
 
$(function () {
 
  // $('#closeBtn').click(function () {
 
  // $('#closeBtn').click(function () {
 
  //   closeLayer()
 
  //   closeLayer()
 
@ -23,9 +24,11 @@ new Vue({
 
      selectHospital: 1,
 
      selectHospital: 1,
 
      town: '',
 
      town: '',
 
	  show:0,
 
	  show:0,
 
    fuzhen:""
 
    }
 
    }
 
  },
 
  },
 
  mounted: function () {
 
  mounted: function () {
 
    this.fuzhen = GetRequest().fuzhen
 
    // top.showSuccessMessage("提交预约挂号成功！")
 
    // top.showSuccessMessage("提交预约挂号成功！")
 
    // this.town = JSON.parse(sessionStorage.getItem('LoginUser')).town
 
    // this.town = JSON.parse(sessionStorage.getItem('LoginUser')).town
 
	if(this.show == 1){
 
	if(this.show == 1){

+ 2 - 0
app/jbsc/html/view_screening_results.html
View File 

@ -803,6 +803,8 @@
 
            var vm = this
 
            var vm = this
 
            var patient = vm.userInfo.patient_code,
 
            var patient = vm.userInfo.patient_code,
 
              callCode = ''
 
              callCode = ''
 
            // 如果是康复复诊过去预约挂号，在就诊信息页面少一个字段显示，1隐藏字段，0正常显示
 
		        sessionStorage.setItem("isFuzhen",0)
 
            top.layer.open({
 
            top.layer.open({
 
              type: 2,
 
              type: 2,
 
              closeBtn: 1, // 显示关闭按钮
 
              closeBtn: 1, // 显示关闭按钮

+ 4 - 0
app/jbsc/js/statistics.js
View File 

@ -410,6 +410,10 @@ new Vue({
 
	console.log(data,"ssss")
 
	console.log(data,"ssss")
 
      // showInfoMessage('PC上暂不支持，请打开手机端疑似高危记录进行转诊预约!')
 
      // showInfoMessage('PC上暂不支持，请打开手机端疑似高危记录进行转诊预约!')
 
      // top.layer.msg('PC上暂不支持，请打开手机端疑似高危记录进行转诊预约', { icon: 5 })
 
      // top.layer.msg('PC上暂不支持，请打开手机端疑似高危记录进行转诊预约', { icon: 5 })
 
			// 如果是康复复诊过去预约挂号，在就诊信息页面少一个字段显示，1隐藏字段，0正常显示
 
			sessionStorage.setItem("isFuzhen",0)
 
      
      top.layer.open({
 
      top.layer.open({
 
        type: 2,
 
        type: 2,
 
        closeBtn: 1, // 显示关闭按钮
 
        closeBtn: 1, // 显示关闭按钮

+ 67 - 11
app/rehabilitation/html/device.html
View File 

@ -82,7 +82,7 @@
 
        transform: translateX(-50%);
 
        transform: translateX(-50%);
 
        width: 400px;
 
        width: 400px;
 
      }
 
      }
 
      .back-btn{
 
      .back-btn {
 
        position: absolute;
 
        position: absolute;
 
        bottom: 80px;
 
        bottom: 80px;
 
        left: 50%;
 
        left: 50%;
 
@ -161,7 +161,7 @@
 
          绑定后，血氧仪测量的数据将自动同步导入您的健康记录中！
 
          绑定后，血氧仪测量的数据将自动同步导入您的健康记录中！
 
        </div>
 
        </div>
 
        <el-button class="back-btn" v-if="!dataId" @click="backFn">返回</el-button>
 
        <el-button class="back-btn" v-if="!dataId" @click="backFn">返回</el-button>
 
        <el-button class="add-device-btn" v-if="!dataId" type="primary"  @click="bindDeviceFn">立即绑定</el-button>
 
        <el-button class="add-device-btn" v-if="!dataId" type="primary" @click="bindDeviceFn">立即绑定</el-button>
 
      </template>
 
      </template>
 
    </div>
 
    </div>
 
    <script type="text/javascript" src="../../../js/vue.js"></script>
 
    <script type="text/javascript" src="../../../js/vue.js"></script>
 
@ -189,7 +189,8 @@
 
            xuetangList: [],
 
            xuetangList: [],
 
            deviceObj: {},
 
            deviceObj: {},
 
            deviceId: null,
 
            deviceId: null,
 
            dataId: null
 
            dataId: null,
 
            docInfo: {}
 
          }
 
          }
 
        },
 
        },
 
        methods: {
 
        methods: {
 
@ -197,18 +198,16 @@
 
            const vm = this
 
            const vm = this
 
            httpRequest.get('common/device/DeviceInfo', { data: { id: this.deviceId } }).then(function (res) {
 
            httpRequest.get('common/device/DeviceInfo', { data: { id: this.deviceId } }).then(function (res) {
 
              vm.deviceObj = res.data
 
              vm.deviceObj = res.data
 
              if(vm.deviceObj.isMultiUser == 1){
 
              if (vm.deviceObj.isMultiUser == 1) {
 
                vm.deviceObj.multiUser = JSON.parse(res.data.multiUser)
 
                vm.deviceObj.multiUser = JSON.parse(res.data.multiUser)
 
              }
 
              }
 
            })
 
            })
 
            httpRequest.get('doctor/device/PatientDeviceInfo',{data:{id: this.dataId}}).then(function(res){
 
            httpRequest.get('doctor/device/PatientDeviceInfo', { data: { id: this.dataId } }).then(function (res) {
 
              vm.query = {
 
              vm.query = {
 
                deviceSn: res.data.deviceSn,
 
                deviceSn: res.data.deviceSn,
 
                sim: res.data.sim,
 
                sim: res.data.sim,
 
                userType: res.data.userType
 
                userType: res.data.userType
 
              }
 
              }
 
              console.log(vm.query);
 
              
            })
 
            })
 
          },
 
          },
 
          tabChange(val) {
 
          tabChange(val) {
 
@ -248,14 +247,13 @@
 
            httpRequest.get('common/device/DeviceInfo', { data: { id: item.id } }).then(function (res) {
 
            httpRequest.get('common/device/DeviceInfo', { data: { id: item.id } }).then(function (res) {
 
              vm.step++
 
              vm.step++
 
              vm.deviceObj = res.data
 
              vm.deviceObj = res.data
 
              if(vm.deviceObj.isMultiUser == 1){
 
              if (vm.deviceObj.isMultiUser == 1) {
 
                vm.deviceObj.multiUser = JSON.parse(res.data.multiUser)
 
                vm.deviceObj.multiUser = JSON.parse(res.data.multiUser)
 
              }
 
              }
 
              vm.query = {}
 
              vm.query = {}
 
            })
 
            })
 
          },
 
          },
 
          bindDeviceFn() {
 
          bindDeviceFn() {
 
            return
 
            const vm = this
 
            const vm = this
 
            var b = /^[0-9a-zA-Z]*$/g
 
            var b = /^[0-9a-zA-Z]*$/g
 
            if (!b.test(this.device_sn)) {
 
            if (!b.test(this.device_sn)) {
 
@ -267,17 +265,75 @@
 
              type: this.deviceObj.categoryCode
 
              type: this.deviceObj.categoryCode
 
            }
 
            }
 
            httpRequest.get('doctor/device/PatientDeviceIdcard', { data: params }).then(function (res) {
 
            httpRequest.get('doctor/device/PatientDeviceIdcard', { data: params }).then(function (res) {
 
              
              if (res.status == 200) {
 
                var name = ''
 
                var others = null
 
                for (var j in res.data) {
 
                  name = res.data[j].name
 
                  others = res.data[j].others
 
                }
 
                //没被绑定
 
                if (name == '') {
 
                  if (vm.checkSuccess != null) {
 
                    vm.checkSuccess()
 
                  }
 
                  return false
 
                } else if (others != null && others == 1) {
 
                  //					$("#bang-btn").removeClass("active");
 
                  //被绑定而且被别人绑定
 
                  vm.$message.warning('该设备已被他人绑定,设备解绑后,方可再次绑定')
 
                  return false
 
                } else if (others != null && others == 0) {
 
                  //					$("#bang-btn").removeClass("active");
 
                  if (oldSn != vm.query.deviceSn) {
 
                    //新增，编辑/被自己绑定
 
                    vm.$message.warning('对不起，该居民已绑定过该设备，解绑后方可继续操作')
 
                    return
 
                  } else {
 
                    if (vm.checkSuccess != null) {
 
                      vm.checkSuccess()
 
                      return false
 
                    }
 
                  }
 
                }
 
              }
 
            })
 
            })
 
          },
 
          },
 
          backFn(){
 
          backFn() {
 
            this.step = 1
 
            this.step = 1
 
          },
 
          checkSuccess() {
 
            const vm = this
 
            const data = {
 
              deviceId: this.deviceObj.id,
 
              deviceName: this.deviceObj.name,
 
              deviceSn: this.query.deviceSn,
 
              categoryCode: this.deviceObj.categoryCode,
 
              userType: this.deviceObj.categoryCode == 1 ? '-1' : this.query.userType,
 
              user: this.patient,
 
              hospital: this.docInfo.hospital,
 
              hospitalName: this.docInfo.hospitalName,
 
              checkDoctorName: this.docInfo.doctorName
 
            }
 
            httpRequest.post('doctor/device/SavePatientDevice', { data: {data:JSON.stringify(data)} }).then(function (res) {
 
              if (res.status == '200') {
 
                vm.$message.success('绑定设备成功!')
 
                var index = parent.layer.getFrameIndex(window.name)
 
                parent.layer.close(index)
 
              }else{
 
                vm.$message.error(res.msg)
 
              }
 
            })
 
          }
 
          }
 
        },
 
        },
 
        mounted() {
 
        mounted() {
 
          this.getXueyaList()
 
          this.getXueyaList()
 
          this.patient = GetRequest().patient
 
          this.patient = GetRequest().patient
 
          this.docInfo = JSON.parse(localStorage.getItem('docInfo'))
 
          this.deviceId = GetRequest().deviceId
 
          this.deviceId = GetRequest().deviceId
 
          this.dataId = GetRequest().id
 
          this.dataId = GetRequest().id
 
          if (this.dataId) {
 
          if (this.dataId) {

+ 3 - 3
app/rehabilitation/html/toDoorService.html
View File 

@ -129,7 +129,7 @@
 
      </div>
 
      </div>
 
      <el-button type="primary" class="reservation-btn" @click="reservationFn">提交预约</el-button>
 
      <el-button type="primary" class="reservation-btn" @click="reservationFn">提交预约</el-button>
 
    </div>
 
    </div>
 
    <!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=d2GXayjVT86kMvm5FRKvGgY0EjlXdRNx"></script> -->
 
    <!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&d2GXayjVT86kMvm5FRKvGgY0EjlXdRNx"></script> -->
 
    <script type="text/javascript" src="../../../js/api-map-baidu.lite.js"></script>
 
    <script type="text/javascript" src="../../../js/api-map-baidu.lite.js"></script>
 
    <script type="text/javascript" src="../../../js/vue.js"></script>
 
    <script type="text/javascript" src="../../../js/vue.js"></script>
 
    <script type="text/javascript" src="../../../js/jquery-2.2.4.js"></script>
 
    <script type="text/javascript" src="../../../js/jquery-2.2.4.js"></script>
 
@ -220,7 +220,7 @@
 
            vm.bmap.addEventListener('click', function (e) {
 
            vm.bmap.addEventListener('click', function (e) {
 
              console.log(2)
 
              console.log(2)
 
              return
 
              // return
 
              vm.getAddress(e.point)
 
              vm.getAddress(e.point)
 
              vm.bmap.clearOverlays()
 
              vm.bmap.clearOverlays()
 
              vm.marker = new BMap.Marker(e.point) //中心点坐标红点
 
              vm.marker = new BMap.Marker(e.point) //中心点坐标红点
 
@ -344,7 +344,7 @@
 
            var param = {
 
            var param = {
 
              jsonData: JSON.stringify({
 
              jsonData: JSON.stringify({
 
                order: {
 
                order: {
 
                  proxyPatient: vm.docInfo.patient,
 
                  proxyPatient: vm.docInfo.code,
 
                  proxyPatientName: vm.docInfo.name,
 
                  proxyPatientName: vm.docInfo.name,
 
                  proxyPatientPhone: vm.docInfo.mobile,
 
                  proxyPatientPhone: vm.docInfo.mobile,
 
                  patient: vm.patient,
 
                  patient: vm.patient,

+ 4 - 2
app/rehabilitation/js/guide_the_message.js
View File 

@ -257,12 +257,14 @@ top.rehabilitationGuideVue = new Vue({
 
    //   })
 
    //   })
 
    // },
 
    // },
 
    rehabilitationReservation() {
 
    rehabilitationReservation() {
 
		// 如果是康复复诊过去预约挂号，在就诊信息页面少一个字段显示，1隐藏字段，0正常显示
 
		sessionStorage.setItem("isFuzhen",1)
 
      top.layer.open({
 
      top.layer.open({
 
        type: 2,
 
        type: 2,
 
        closeBtn: 1, // 显示关闭按钮
 
        closeBtn: 1, // 显示关闭按钮
 
        area: ['800px', '90%'],
 
        area: ['800px', '90%'],
 
        title: '预约挂号',
 
        title: '预约挂号',
 
        content: '../../jbsc/html/appointment/appoint-select.html?patient=' + this.patient + '&surveyCode='
 
        content: '../../jbsc/html/appointment/appoint-select.html?patient=' + this.patient
 
      })
 
      })
 
		},
 
		},
 
    openFollowRecordForm() {
 
    openFollowRecordForm() {
 
@ -300,7 +302,7 @@ top.rehabilitationGuideVue = new Vue({
 
				closeBtn: 1,
 
				closeBtn: 1,
 
				// shift: 5,
 
				// shift: 5,
 
				shadeClose: false, //点击遮罩关闭层
 
				shadeClose: false, //点击遮罩关闭层
 
				content: `../html/toDoorService.html?patient=${this.patient}`
 
				content: `/app/rehabilitation/html/toDoorService.html?patient=${this.patient}detailId=${this.planId}`
 
			})
 
			})
 
		},
 
		},
 
		viewGuidance: function(o){
 
		viewGuidance: function(o){