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

app/followup/index.html

@@ -26,17 +26,36 @@
        if (Request.userAgent) {
            window.localStorage.setItem(httpRequest.agentName, decodeURIComponent(Request.userAgent))
        }
        var version1;
        var version2;
        if (Request.type == '5' || Request.type == '6') {
            fangshiAPI.getPostpartumVisitDetails({ followupId: followupId || '3' }).then(function (res) {
                if (res.status == 200) {
                    version = isAdd != '1' ? res.data.version : lastedVersion
                    location.replace('../../app/followup/' + version + '/html/fangshi-detail-5,6.html?id=' + followupId + "&version=" + version)
                     version1=res.data?res.data.version:''
                     bindEvent()
                } else {
                    top.toastr.error(res.msg);
                }
            })
            fangshiAPI.getNewbornFamilyVisitRecord({ followupId: followupId || '2' }).then(function (res) {
                if (res.status == 200) {
                    version2=res.data?res.data.version:''
                    bindEvent()
                } else {
                    top.toastr.error(res.msg);
                }
            })
        } if (Request.type == '7') {
        }
        function bindEvent(){
            if(isAdd==1){
                version=lastedVersion
                location.replace('../../app/followup/' + version + '/html/fangshi-detail-5,6.html?id=' + followupId + "&version=" + version)
            }else{
                version=version1||version2
                location.replace('../../app/followup/' + version + '/html/fangshi-detail-5,6.html?id=' + followupId + "&version=" + version)
            }
        }
        if (Request.type == '7') {
            fangshiAPI.getFollowupSevereMentalDisorder({ followupId: followupId || '1' }).then(function (res) {
                if (res.status == 200) {
                    version = res.data != null ? res.data.version : lastedVersion
@@ -56,13 +75,13 @@
                }
            })
        } if (Request.type == '9') {
            fangshiAPI.getPhthisisFirstCheckRecord({ followupId:followupId }).then(function (res) {
            fangshiAPI.getPhthisisFirstCheckRecord({ followupId: followupId }).then(function (res) {
                if (res.status == 200) {
                    if (isAdd=='1') {//第一次肺结核
                        version =lastedVersion
                    if (isAdd == '1') {//第一次肺结核
                        version = lastedVersion
                        location.replace('../../app/followup/' + version + '/html/fangshi-detail-9.html?id=' + followupId + "&version=" + version)
                    } else {
                        version =res.data.version 
                        version = res.data.version
                        location.replace('../../app/followup/' + version + '/html/fangshi-detail-10.html?id=' + followupId + "&version=" + version)
                    }
                } else {

app/followup/v1/html/fangshi-detail-7.html

@@ -606,7 +606,8 @@
                        rehabilitation_sociability: '0',
                        rehabilitation_other: "0"
                    },
                    followupId: Request['id']
                    followupId: Request['id'],
                    version:Request['version']
                }
            },
            computed: {
@@ -832,7 +833,7 @@
                    })
                    this.severeMentalDisorderData.create_time = null
                    this.severeMentalDisorderData.version = '1'
                    this.severeMentalDisorderData.version = this.version
                    fangshiAPI.saveFollowupSevereMentalDisorder({ followupId: this.followupId || '1', severeMentalDisorderData: JSON.stringify(this.severeMentalDisorderData) }).then(function (res) {
                        if (res.status == 200) {
                            //判断是否完成随访，未完成则将完成按钮显示出来

app/followup/v1/html/fangshi-detail-8.html

@@ -344,7 +344,7 @@
						<div class="ui-col-1">
							<el-input :readonly="!editable" v-model="oldmanData.exercise_type" placeholder="" clearable></el-input>
						</div>
						<div class="ui-col-0 lh27">年</div>
						<div class="ui-col-0 lh27"></div>
					</div>
				</td>
			</tr>
@@ -443,7 +443,7 @@
				</td>
			</tr>
			<tr>
				<td class="col-w120 c-t-center">平均饮酒年龄</td>
				<td class="col-w120 c-t-center">开始饮酒年龄</td>
				<td class="ui-grid" style="border: 0;">
					<div class="ui-col-1">
						<el-input :readonly="!editable" v-model="oldmanData.start_drinking_age" placeholder="" clearable></el-input>
@@ -688,7 +688,7 @@
					运动功能
				</td>
				<td colspan="4">
					<el-radio-group :disabled="!editable" v-model="oldmanData.fundus">
					<el-radio-group :disabled="!editable" v-model="oldmanData.motor_function">
						<el-radio :label="1">1 可顺利完成</el-radio>
						<el-radio :label="2">2 无法独立完成任何一个动作</el-radio>
					</el-radio-group>
@@ -778,9 +778,11 @@
					<div class="ui-grid">
						<div class="ui-col-0"> 呼吸音:</div>
						<div class="ui-col-1">
							<el-radio-group :disabled="!editable" v-model="oldmanData.barrel_chest">
							<el-radio-group :disabled="!editable" v-model="oldmanData.breath_sounds">
								<el-radio :label="1">1 正常</el-radio>
								<el-radio :label="2">2 异常</el-radio>
								<el-radio :label="2" class="setinput">2 异常
									<el-input :readonly="breath_sounds_abnormal_dis||!editable" v-model="oldmanData.breath_sounds_abnormal" clearable></el-input>
								</el-radio>
							</el-radio-group>
						</div>
					</div>
@@ -791,7 +793,7 @@
					<div class="ui-grid">
						<div class="ui-col-0"> 罗 &#x3000;音:</div>
						<div class="ui-col-1">
							<el-radio-group :disabled="!editable" v-model="oldmanData.barrel_chest">
							<el-radio-group :disabled="!editable" v-model="oldmanData.rale">
								<el-radio :label="1">1 无</el-radio>
								<el-radio :label="2">2 干罗音</el-radio>
								<el-radio :label="3">3 湿罗音</el-radio>
@@ -1211,14 +1213,14 @@
							</p>
							<p>
								尿酸 :
								<el-input class="col-w60" :readonly="!editable" v-model="oldmanData.albumin" min=0 type="number"></el-input> mmo/L
								<el-input class="col-w60" :readonly="!editable" v-model="oldmanData.uric_acid" min=0 type="number"></el-input> mmo/L
							</p>
						</div>
						<div class="setinput ml40">
							<p>
								血尿素氮:
								<el-input class="col-w60" :readonly="!editable" v-model="oldmanData.uric_acid" min=0 type="number"></el-input> mmo/L
								<el-input class="col-w60" :readonly="!editable" v-model="oldmanData.blood_urea_nitrogen" min=0 type="number"></el-input> mmo/L
							</p>
							<p>
								血钠浓度 :
@@ -1581,10 +1583,10 @@
					<el-input :readonly="!editable" v-model="oldmanData.admission_reason1" placeholder="" clearable></el-input>
				</td>
				<td class="c-t-center">
					<el-input :readonly="!editable" v-model="oldmanData.building_bed_hospiatl_name1" placeholder="" clearable></el-input>
					<el-input :readonly="!editable" v-model="oldmanData.admission_hospital_name1" placeholder="" clearable></el-input>
				</td>
				<td class="c-t-center">
					<el-input :readonly="!editable" v-model="oldmanData.building_bed_number1" placeholder="" clearable></el-input>
					<el-input :readonly="!editable" v-model="oldmanData.admission_number1" placeholder="" clearable></el-input>
				</td>
			</tr>
			<tr class="setPicker">
@@ -1601,10 +1603,10 @@
					<el-input :readonly="!editable" v-model="oldmanData.admission_reason2" placeholder="" clearable></el-input>
				</td>
				<td class="c-t-center">
					<el-input :readonly="!editable" v-model="oldmanData.building_bed_hospiatl_name2" placeholder="" clearable></el-input>
					<el-input :readonly="!editable" v-model="oldmanData.admission_hospital_name2" placeholder="" clearable></el-input>
				</td>
				<td class="c-t-center">
					<el-input :readonly="!editable" v-model="oldmanData.building_bed_number2" placeholder="" clearable></el-input>
					<el-input :readonly="!editable" v-model="oldmanData.admission_number2" placeholder="" clearable></el-input>
				</td>
			</tr>
			<tr>
@@ -2066,6 +2068,7 @@
						health_examination_abnormal2_dis: true,
						health_examination_abnormal3_dis: true,
						health_examination_abnormal4_dis: true,
						breath_sounds_abnormal_dis:true,
						dietary_habit_check: [],
						symptom_check: [],
						breast_check: [],
@@ -2104,6 +2107,12 @@
					this.getStatus()
				},
				computed: {
					rale:function(){
						return this.oldmanData.rale
					},
					breath_sounds:function(){
						return this.oldmanData.breath_sounds
					},
					dust_protective_measures: function () {
						return this.oldmanData.dust_protective_measures
					},
@@ -2288,6 +2297,14 @@
							this.oldmanData.other_drinking_type = ''
						}
					},
					breath_sounds:function(i){
						if(i=='2'){
							this.breath_sounds_abnormal_dis=false
						}else{
							this.breath_sounds_abnormal_dis=true
							this.oldmanData.breath_sounds_abnormal=''
						}
					},
					other_system_disease: function (i) {
						if (i == '2') {
							this.other_system_disease_has_dis = false
@@ -2453,7 +2470,7 @@
							this.oldmanData.tenderness_has = ''
						}
					},
					barrel_chest: function (i) {
					rale: function (i) {
						if (i == '4') {
							this.rale_abnormal_dis = false
						} else {
@@ -2610,7 +2627,7 @@
					//获取当前随访状态信息  Request['id']||'1'
					getStatus: function () {
						var vm = this
						fangshiAPI.getFollowupInfo({ followupId:this.followupId|| '1888107' }).then(function (res) {
						fangshiAPI.getFollowupInfo({ followupId: this.followupId || '1888107' }).then(function (res) {
							if (res.status == 200) {
								vm.sfStatus = res.data.status
							} else {
@@ -2618,8 +2635,8 @@
							}
						})
					},
					getFinishfChild:function(msg){
						this.finishedBtn=msg
					getFinishfChild: function (msg) {
						this.finishedBtn = msg
						this.getStatus()
					},
					Nnmber: function (event) {

app/followup/v1/html/fangshi-detail-9.html

@@ -316,7 +316,7 @@
                <tr>
                    <td class="col-w300 c-t-center">评估医生签名</td>
                    <td>
                        <el-input :readonly="!editable" v-model="data2.life_style.signature_doctor_name" placeholder="" clearable></el-input>
                        <el-input :readonly="!editable" v-model="data2.signature_doctor_name" placeholder="" clearable></el-input>
                    </td>
                </tr>
        </table>

component/followup/fangshi-detail-6.js

@@ -1057,12 +1057,12 @@ Vue.component('fangshi-detail-6', {
        editBtn: function () {
            this.isEditBtn = !this.isEditBtn
            if (this.isEditBtn == true) {
                var btn = document.getElementsByClassName('button')[1]
                var btn = document.getElementsByClassName('button')[2]
                btn.innerHTML = '编辑'
                this.editable = false
                this.editData()
            } else if (this.isEditBtn == false) {
                var btn = document.getElementsByClassName('button')[1]
                var btn = document.getElementsByClassName('button')[2]
                btn.innerHTML = '保存'
                this.editable = true
            }