合并

app/rehabilitation/html/followRecord.html

@@ -98,14 +98,20 @@
              </el-radio-group>
            </el-form-item>
            <el-form-item label="目前服用药物" required>
              <el-checkbox-group v-model="takingListChecked" :disabled="!editable">
              <el-checkbox-group v-model="takingListChecked" :disabled="!editable" v-if="selectTak.length==0">
                <el-checkbox v-for="(item,index) in takingList" :key="item.code" :label="index">{{ item.value }}</el-checkbox>
              </el-checkbox-group>
              <el-checkbox-group v-model="takingListChecked" :disabled="!editable" v-else>
                <el-checkbox v-for="(item,index) in selectTak" :key="item.code" :label="item.index">{{ item.value }}</el-checkbox>
              </el-checkbox-group>
            </el-form-item>
            <el-form-item label="不良事件种类">
              <el-checkbox-group v-model="adverseEventArr" :disabled="!editable">
              <el-checkbox-group v-model="adverseEventArr" :disabled="!editable" v-if="selectAdverse.length==0">
                <el-checkbox v-for="(item,index) in badEventList1" :key="item.key" :label="index">{{ item.name }}</el-checkbox>
              </el-checkbox-group>
              <el-checkbox-group v-model="adverseEventArr" :disabled="!editable" v-else>
                <el-checkbox v-for="(item,index) in selectAdverse" :key="item.key" :label="item.index">{{ item.name }}</el-checkbox>
              </el-checkbox-group>
            </el-form-item>
            <el-form-item label="其他事件">
              <el-input type="textarea" v-model="form.otherEvents" placeholder="请输入其他事件情况" :rows="3" :maxlength="200" show-word-limit :readonly="!editable"></el-input>
@@ -190,6 +196,8 @@
          var vm = this
          return {
            takingListChecked: [],
            selectTak:[],
            selectAdverse:[],
            adverseEventArr: [],
            docInfo: JSON.parse(localStorage.docInfo),
            badEventListChecked: [],
@@ -327,7 +335,7 @@
          }
          this.form.patientName = vm.serviceInfo.patientName
          this.form.followId = vm.serviceInfo.relationCode
          vm.form.followupDate = new Date(vm.serviceInfo.executeTime).format('yyyy-MM-dd HH:mm')
          this.form.followHospital = this.docInfo.hospitalName
          this.form.doctorName = this.docInfo.name
          this.form.doctorCode = this.docInfo.code
@@ -347,8 +355,16 @@
                  vm.$set(vm, 'takingListChecked', res.data.content && res.data.content.takeMedicine.split(','))
                  vm.$set(vm, 'adverseEventArr', res.data.content && res.data.content.adverseEvent.split(','))
                  vm.flag = '2'
                  vm.selectTak=vm.takingListChecked.map(function(index){
                    vm.takingList[index].index=index
                    return vm.takingList[index]
                  })
                  vm.selectAdverse=vm.adverseEventArr.map(function(index){
                    vm.badEventList1[index].index=index
                    return vm.badEventList1[index]
                  })
                }
                console.log(vm.form, '122222222222', vm.takingListChecked, vm.adverseEventArr, vm.takingList)
                console.log(vm.form, '122222222222', vm.selectTak, vm.selectAdverse)
              }
            })
          },
@@ -359,7 +375,6 @@
                var data = res.data
                vm.followData = res.data
                vm.form.sex = data.sex
                vm.form.followupDate = data.followupDate
                vm.followup = {
                  followup_id: code,
                  // status: data.status,
@@ -490,6 +505,7 @@
                        })
                        .then(function (res) {
                          console.log(res, '我是完成随访')
                          vm.close()
                        })
                      top.layer.close(loadding)
                    })

app/rehabilitation/html/guide_the_message.html

@@ -144,7 +144,7 @@
						<button class="btn btn-yuyue" v-if="service.type==5 && service.status!=1 && service.isMyTask==1" @click="kfzd()">发送指导</button>
						<button class="btn btn-yuyue" v-if="service.type==6 && service.status!=1 && service.isMyTask==1 && service.operate==0"  @click="sfjh()" style="width: auto">创建随访计划</button>
						<button class="btn btn-12b7f5" v-if="service.type==6 && service.status!=1 && service.isMyTask==1 && service.operate==1" @click="openFollowRecordForm" style="width: auto">记录随访表单</button>
						<button class="btn btn-12b7f5" v-if="service.type==6 && service.status==1" @click="openFollowResult" style="width: auto">查看随访结果</button>
						<button class="btn btn-12b7f5" v-if="service.type==6 && service.status==1" @click="openFollowRecordForm" style="width: auto">查看随访结果</button>
						<button class="btn btn-yuyue" v-if="service.type==7 && service.status!=1 && service.isMyTask==1 && selectCheckTyperadio!=1 && !service.appointmentTime" @click="sendSpecialistWeixinMessage(7)">提醒患者</button>
						<button class="btn btn-12b7f5" v-if="service.type==7 && service.status!=1 && service.isMyTask==1 && selectCheckTyperadio==0 && !service.appointmentTime" @click="rehabilitationReservation()">代预约</button>
						<button class="btn btn-12b7f5" v-if="selectCheckTyperadio==1 && showAppointHelpCheckBtn" @click="$refs.datePicker.pickerVisible = true">预约协诊</button>

app/rehabilitation/html/rehabilitation_management.html

@@ -348,7 +348,7 @@
											</td>
											<td class="executor">{{item.doctor_name}}</td>
											<td class="place-of-execution">{{item.hospital_name}}</td>
											<td class="view-task" @click="viewDetail(item.id,1)">查看</td>
											<td class="view-task" @click="viewDetail(item.id,1,item)">查看</td>
											<td class="task-status" :class="item.future==-1?'c-ff3b30':(item.status==0?'c-666':'')">{{item.status==0?'未完成':(item.status==1?'已完成':'已预约')}}</td>
										</tr>
										<tr v-if="!timeAxisData.length">
@@ -399,6 +399,7 @@
					</div>
				</div>
			</div>
		</div>
		<script type="text/javascript" src="../../../js/vue.js"></script>
		<script type="text/javascript" src="../../../js/jquery-2.2.4.js"></script>

app/rehabilitation/html/service_item_content.html

@@ -5,6 +5,7 @@
		<title>服务项目详情</title>
		<link rel="stylesheet" href="../../../css/bootstrap.min.css" />
		<link rel="stylesheet" type="text/css" href="../../../plugins/toastr/toastr.min.css"/>
		<link rel="stylesheet" href="../../../plugins/element-ui/element-ui.css" />
	    <link rel="stylesheet" type="text/css" href="../../../css/style.min.css"/>
	    <link rel="stylesheet" type="text/css" href="../../../css/cross.css"/>
		<link rel="stylesheet" href="../css/service_item_content.css" />
@@ -16,7 +17,7 @@
		      <div class="panel-title">
		        <a role="button" class="flex-box">
		          <div class="flex-box-item service-top">
		          	<p class="service-name"><span class="service-index" v-if="serviceData && serviceData.length>1">{{index+1}}</span><span>{{service.title}}</span></p>
		          	<p class="service-name"><span class="service-index" v-if="serviceData && serviceData.length>1">{{index+1}}1</span><span>{{service.title}}</span></p>
		         	<div class="label-group">
		         		<span class="pull-right mt5" v-if="service.statusName=='已完成'"><i class="icon icon-gouxuan icon-18 mr5"></i>{{service.statusName}}</span>
		         		<span class="label-blue">{{service.shortExecuteTime}}</span>
@@ -156,6 +157,7 @@
		<script type="text/javascript" src="../../../js/jquery-2.2.4.js"></script>
		<script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
		<script type="text/javascript" src="../../../api/http-request.js"></script>
		<script type="text/javascript" src="../../../plugins/element-ui/element-ui.js"></script>
		<script src="../../../plugins/toastr/toastr.min.js"></script>
		<script type="text/javascript" src="../../../api/rehabilitation-api.js"></script>
		<script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>

app/rehabilitation/js/guide_the_message.js

@@ -266,6 +266,7 @@ top.rehabilitationGuideVue = new Vue({
      })
		},
    openFollowRecordForm() {
		var vm=this
      top.layer.open({
        type: 2,
        area: ['600px', '700px'],
@@ -276,7 +277,11 @@ top.rehabilitationGuideVue = new Vue({
        closeBtn: 1,
        // shift: 5,
        shadeClose: false, //点击遮罩关闭层
        content: '../../rehabilitation/html/followRecord.html?serviceInfo=' + encodeURIComponent(JSON.stringify(this.service)) + '&planDetailId=' + this.planid
        content: '../../rehabilitation/html/followRecord.html?serviceInfo=' + encodeURIComponent(JSON.stringify(this.service)) + '&planDetailId=' + this.planid,
		end: function () {
			// 未点击确定按钮，点击关闭按钮
			vm.getServiceItem()
		  }
      })
    },
		qwapp: function() {

app/rehabilitation/js/rehabilitation_management.js

@@ -314,12 +314,24 @@
					location.href = "../../recover/html/personal-manage.html?patientCode=" + vm.patientCode+'&planId='+vm.planId
				})
			},
			viewDetail:function(planids,type){
			viewDetail:function(planids,type,item){
				var vm=this;
				console.log(planids,type,item,'dsaaaaaaa')
				if(!planids){
					layer.msg('无服务项',{icon:5})
					return ;
				}
				if(vm.planInfo.disease=='3'&&vm.scList.length==0&&item&&item.code=='6'&&vm.loginDoctor.doctorType!='1'){
					this.$confirm('提示该居民近一年没有进行冠心病风险评估，请先进行评估，再进行随访登记', '提示', {
					  confirmButtonText: '确定',
					  cancelButtonText: '取消',
					  type: 'warning'
					}).then(function(){
                         vm.gotoSc()
					})
					return false
				}
				if(type==1){ // 单个服务项
					layer.open({
						type: 2,
@@ -348,7 +360,7 @@
					closeBtn:1,
					shift: 5,
					shadeClose: false, //点击遮罩关闭层
					content: '../../rehabilitation/html/service_item_content.html?planids='+planids+'&planId='+httpData['planId']+'&patient='+vm.patientCode+'&patientName='+vm.planInfo.patientName,
					content: '../../rehabilitation/html/service_item_content.html?planids='+planids+'&planId='+httpData['planId']+'&patient='+vm.patientCode+'&patientName='+vm.planInfo.patientName+'&disease='+vm.planInfo.disease+'&scLenght='+vm.scList.length,
					end:function(){
						vm.goToLoadData(true);	
					}

app/rehabilitation/js/service_item_content.js

@@ -131,6 +131,28 @@ methods:{
	},
	clickItem:function(service){
		var vm=this
		var age=service.age=='0'?'':service.age
		if(httpData.disease=='3'&&httpData.scLenght==0&&service.itemType=='6'&&docInfo.doctorType!='1'){
			vm.$confirm('提示该居民近一年没有进行冠心病风险评估，请先进行评估，再进行随访登记', '提示', {
				confirmButtonText: '确定',
				cancelButtonText: '取消',
				type: 'warning'
			  }).then(function(){
				top.layer.open({
					type: 2,
					area: ['820px', '648px'],
					shade: 0.5,
					title: 'ASCVD风险评估',
					fixed: true, //不固定
					maxmin: true,
					closeBtn:1,
					shift: 5,
					shadeClose: false, //点击遮罩关闭层
					content: '../../jbsc/html/questionnaire.html?fliter_code=6bcd306aaafb4e4381071346d86fadbb1'+'&fliter_title=ASCVD风险评估'+'&resident_code='+service.patient+'&resident_name='+vm.patientName+"&surveyStatus=2"+'&age='+age
				});
			  })
			  return false
		}
		layer.open({
			type: 2,
			area: ['97%', '640px'],