Sfoglia il codice sorgente

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

hwy 1 mese fa
parent
commit
7e4ad6b9f3

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

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

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

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

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

@ -93,11 +93,13 @@ new Vue({
	  pagetotal:'',
	  checkList:[],
	  placeholder:"请选择参考信息",
		isFuzhen: null
    }
  },
  mounted: function () {
	  var vm = this
	  this.getResultList()
		this.isFuzhen = sessionStorage.getItem("isFuzhen")
	  document.addEventListener('click',function(){
		  // if(vm.referenceShow){
			 //  vm.referenceShow = false
@ -159,6 +161,9 @@ new Vue({
		arrangeDate.sectionType = 'a'
		arrangeDate.clazz = 'div-time-enable'
		p.arrangeDate = JSON.stringify(arrangeDate)
		console.log(p);
		return
		
		// "sectionType":"a","clazz":"div-time-enable"
		// 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"}

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

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

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

@ -153,7 +153,7 @@
			  社区预约
			</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>
		  <div><span class="btn w120" id="closeBtn" @click="subscribe(0)">返回</span></div>
		</template>

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

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

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

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

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

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

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

@ -82,7 +82,7 @@
        transform: translateX(-50%);
        width: 400px;
      }
      .back-btn{
      .back-btn {
        position: absolute;
        bottom: 80px;
        left: 50%;
@ -161,7 +161,7 @@
          绑定后,血氧仪测量的数据将自动同步导入您的健康记录中!
        </div>
        <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>
    </div>
    <script type="text/javascript" src="../../../js/vue.js"></script>
@ -189,7 +189,8 @@
            xuetangList: [],
            deviceObj: {},
            deviceId: null,
            dataId: null
            dataId: null,
            docInfo: {}
          }
        },
        methods: {
@ -197,18 +198,16 @@
            const vm = this
            httpRequest.get('common/device/DeviceInfo', { data: { id: this.deviceId } }).then(function (res) {
              vm.deviceObj = res.data
              if(vm.deviceObj.isMultiUser == 1){
              if (vm.deviceObj.isMultiUser == 1) {
                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 = {
                deviceSn: res.data.deviceSn,
                sim: res.data.sim,
                userType: res.data.userType
              }
              console.log(vm.query);
              
            })
          },
          tabChange(val) {
@ -248,14 +247,13 @@
            httpRequest.get('common/device/DeviceInfo', { data: { id: item.id } }).then(function (res) {
              vm.step++
              vm.deviceObj = res.data
              if(vm.deviceObj.isMultiUser == 1){
              if (vm.deviceObj.isMultiUser == 1) {
                vm.deviceObj.multiUser = JSON.parse(res.data.multiUser)
              }
              vm.query = {}
            })
          },
          bindDeviceFn() {
            return
            const vm = this
            var b = /^[0-9a-zA-Z]*$/g
            if (!b.test(this.device_sn)) {
@ -267,17 +265,75 @@
              type: this.deviceObj.categoryCode
            }
            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
          },
          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() {
          this.getXueyaList()
          this.patient = GetRequest().patient
          this.docInfo = JSON.parse(localStorage.getItem('docInfo'))
          this.deviceId = GetRequest().deviceId
          this.dataId = GetRequest().id
          if (this.dataId) {

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

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

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

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