Merge remote-tracking branch 'origin/dev' into dev

api/pagesC/testreport/index.js

@@ -24,14 +24,19 @@ var request = function(config) {
 		})
 	})
 }
-//获取dy报告list
+//获取东营报告list
+//  东营驿站记录接口：http://218.58.213.15:8009/fd/sh05/record/{identity}
+// 东营获取驿站报告接口：http://218.58.213.15:8009/fd/sh05/report/view/{reportId}
 export function dyrecord(identity) {
 	return request({
-		url: `http://8.131.93.145:54098/fd/sh05/record/${identity}`,
+		url: `http://218.58.213.15:8009/fd/sh05/record/${identity}`,
 		method: 'get',
 	})
 }
-//获取dz报告list
+//获取德州报告list
+
+// 德州驿站记录接口： http: //112.6.122.71:8009/fd/sh05/record/{identity}
+// 德州获取驿站报告接口： http: //112.6.122.71:8009/fd/sh05/report/view/{reportId}
 export function dzrecord(identity) {
 	return request({
 		url: `http://112.6.122.71:8009/fd/sh05/record/${identity}`,

api/socketurl.js

@@ -0,0 +1,9 @@
+var socketurl = "ws://8.131.93.145:54010/webSocket/";
+var dzsocketurl = "ws://112.6.122.71:8009/fd/webSocket/"; // SN码设备德州
+var dysocketurl = "ws://218.58.213.15:8009/fd/webSocket/"; // SN码设备东营
+
+export {
+	socketurl,
+	dzsocketurl,
+	dysocketurl
+}

pages/homepage/homepage.vue

@@ -3,24 +3,11 @@
 		<view class="content">
 			<image src="/static/pageC/homepage.png" mode=""></image>
 			<view class="loginmount" @tap="city">
-				<!-- <image src="/static/pageC/TAB.png" mode=""></image> -->
 				<image src="../../static/pages/address.png" mode=""></image>
-				<text v-if="address">
+				<text>
-					{{address}}
+					{{address?address:'请选择城市'}}
-				</text>
-				<text v-else>
-					请选择城市
 				</text>
 			</view>
-			<!-- 			<view class="address" @tap="city">
-				<image src="../../static/pages/address.png" mode=""></image>
-				<text v-if="address">
-					{{address}}
-				</text>
-				<text v-else>
-					请选择城市
-				</text>
-			</view> -->
 		</view>
 		<view class="contentcenter">
 			<view class="home" @tap="goonline">
@@ -93,7 +80,6 @@
 	export default {
 		data() {
 			return {
-				patientName: '',
 				userinfo: null,
 				infotitle: null,
 				region: '',
@@ -102,40 +88,23 @@
 				openid: '',
 			}
 		},
-		onLoad() {
+		onLoad() {},
-
-			// this.login()
-		},
 		onShow() {
 			this.userinfo = uni.getStorageSync('userinfo')
 			this.address = uni.getStorageSync('location')
 			this.openid = uni.getStorageSync('openid');
-			if (this.address == '德州市') {
-				uni.setStorageSync("region", 1)
-			} else if (this.address == '东营市') {
-				uni.setStorageSync("region", 2)
-			} else if (this.address == '济南市') {
-				uni.setStorageSync("region", 3)
-			}
 			this.region = uni.getStorageSync('region')
 			if (this.userinfo && this.region != 3) {
-				this.patientName = this.userinfo.patientName
 				checkSignApply(this.userinfo.cardNo).then(res => {
 					if (res.data) {
 						this.checkSign = res.data.code
 						this.infotitle = res.data.info
 					}
-					// if (res.data.code == 0) {
-					// 	this.checkSign = true
-					// } else {
-					// 	this.checkSign = false
-					// }
 				})
-			} else {
+			} else {}
-				this.patientName = ''
-			}
 		},
 		methods: {
+			//跳转选择地址
 			city() {
 				uni.navigateTo({
 					url: '/pages/location/location'
@@ -171,8 +140,6 @@
 					if (this.region == 3) {
 						this.family()
 					} else {
-						console.log(this.userinfo, '0900')
-
 						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({

pages/location/location.vue

@@ -31,7 +31,6 @@
 					</view>
 					<view class="city_item" @click="getAddressCon('3')">
 						<text>济南市</text>
-
 					</view>
 				</view>
 			</view>
@@ -75,16 +74,15 @@
 				uni.setStorageSync('location', this.showFont)
 				this.isShowFont = false
 				this.address = uni.getStorageSync('location')
-				// console.log('fontClick',this.address);
 			},
 			getAddressCon(value) {
 				if (value == '1') {
 					uni.setStorageSync('location', '德州市')
 					uni.setStorageSync("region", 1)
 					this.address = '德州市'
-				uni.navigateBack({
+					uni.navigateBack({
-					delta: 1
+						delta: 1
-				})
+					})
 				} else if (value == '2') {
 					uni.setStorageSync('location', '东营市')
 					uni.setStorageSync("region", 2)

pages/login/login.vue

@@ -31,11 +31,7 @@
 			};
 		},
 		onShow() {
-			if (uni.getStorageSync('location') && uni.getStorageSync('region')) {
+			if (uni.getStorageSync('location') && uni.getStorageSync('region')) {} else {
-
-				let location = uni.getStorageSync('location')
-				let region = uni.getStorageSync('region')
-			} else {
 				this.getAddress()
 			}
 			this.phonecode = undefined

pagesB/createnewconsultation/createnewconsultation.vue

@@ -97,7 +97,8 @@
 				附件材料上传
 			</view>
 			<u-upload ref="uUpload" :max-count='9' :action="uoloadaction" :auto-upload="false" upload-text=' '
-				@on-choose-complete='onchoosecomplete' @on-success='onsuccess' @on-uploaded='onuploaded'></u-upload>
+				@on-choose-complete='onchoosecomplete' @on-uploaded='onuploaded'></u-upload>
+			<!-- @on-success='onsuccess' -->
 			<view class="textarea">
 				<view class="">
 					最多支持9个文件；
@@ -155,7 +156,7 @@
 				imglistlength: null,
 				address: '请选择所属地区', //页面所属区域
 				formdata: {
-					address:'', //页面所属区域
+					address: '', //页面所属区域
 					patientId: '',
 					patientName: '',
 					cardNo: '',
@@ -176,24 +177,22 @@
 		},
 		onLoad(options) {
 			this.uoloadaction = baseurl + '/nurseApplet/consultationInfo/uploadConsultationFile'
-
+			this.formdata = uni.getStorageSync('userinfo')
+			this.formdata.address = ''
+			this.formdata.fileUrls = []
+			this.infolist()
+			this.areaInfo();
 		},
 		onShow() {
-			this.areaInfo();
 			let that = this
-			that.formdata = uni.getStorageSync('userinfo')
-			this.formdata.address=''
-			this.infolist()
 			uni.$on('doctordata', function(data) {
 				let item = JSON.parse(data.data)
 				that.formdata.doctorName = item.personName
 				that.formdata.doctorId = item.id
-				console.log(that.formdata.doctorName, '45632')
 				uni.$off('doctordata')
 			})
 		},
 		methods: {
-
 			updata() {
 				this.formdata.doctorName = this.doctorName
 				this.formdata.doctorId = this.doctorId
@@ -206,74 +205,68 @@
 			onchoosecomplete(lists, name) {
 				this.imglistlength = lists.length
 			},
-			onsuccess(data, index, lists, name) {
+			// onsuccess(data, index, lists, name) {
-				if (data.code == 200) {
+			// 	if (data.code == 200) {
-					this.formdata.fileUrls.push(data.fileUrl)
+			// 		this.formdata.fileUrls.push(data.fileUrl)
-				}
+			// 	}
-			},
+			// },
-			onuploaded() {
+			onuploaded(lists, name) {
+				this.formdata.fileUrls = []
+				lists.forEach(e => {
+					this.formdata.fileUrls.push(e.response.fileUrl)
+				})
 				this.info();
 			},
 			info() {
-				this.$delete(this.formdata,'id')
+				this.$delete(this.formdata, 'id')
-				console.log(this.formdata.address,'774')
-				
 				this.formdata.consultationType = 'IMAGE_TEXT_CONSULTATION'
 				if (!this.formdata.address) {
 					this.$refs.uToast.show({
 						title: '请选择地址',
 						type: 'error',
 						duration: '1500',
-						// url:'/pages/homepage/homepage'
 					})
 				} else if (!this.formdata.patientName) {
 					this.$refs.uToast.show({
 						title: '请选择姓名',
 						type: 'error',
 						duration: '1500',
-
 					})
 				} else if (!this.formdata.cardNo) {
 					this.$refs.uToast.show({
 						title: '请选择身份证号',
 						type: 'error',
 						duration: '1500',
-
 					})
 				} else if (!this.formdata.phone) {
 					this.$refs.uToast.show({
 						title: '请选择手机号',
 						type: 'error',
 						duration: '1500',
-
 					})
 				} else if (!this.formdata.doctorName) {
 					this.$refs.uToast.show({
 						title: '请选择医生',
 						type: 'error',
 						duration: '1500',
-
 					})
 				} else if (!this.formdata.problemDescription) {
 					this.$refs.uToast.show({
 						title: '请输入问题简述',
 						type: 'error',
 						duration: '1500',
-
 					})
 				} else if (!this.formdata.situationDescription) {
 					this.$refs.uToast.show({
 						title: '请输入患者个体说明',
 						type: 'error',
 						duration: '1500',
-
 					})
 				} else if (!this.formdata.medicalRecord) {
 					this.$refs.uToast.show({
 						title: '请输入既往疾病史',
 						type: 'error',
 						duration: '1500',
-
 					})
 				} else {
 					consultationInfo(this.formdata).then(res => {
@@ -293,7 +286,6 @@
 						}
 					})
 				}
-
 			},
 			// 显示三级地址联动
 			showPicker() {
@@ -325,26 +317,21 @@
 			infolist() {
 				detail(this.formdata.cardNo).then(res => {
 					var status = '1'
-					if(res.code==200){
+					if (res.code == 200) {
 						getHospitalPersonInfo(res.data.dutyDoctorNo, status).then(res => {
 							this.doctorName = res.data.personName
 							this.doctorId = res.data.id
 							this.doctorlist = res.data
-						
 						})
-					}else if (res.code==500){
+					} else if (res.code == 500) {
 						this.$refs.uToast.show({
 							title: res.msg,
 							type: 'error',
 							duration: '1500',
-							
 						})
 					}
-					
-
 				})
 			},
-
 			gochoosedoctor() {
 				console.log(this.doctorlist, '44444')
 				// detail(this.formdata.cardNo).then(res => {

pagesC/addHeartRate/addHeartRate.vue

@@ -31,6 +31,10 @@
 	import {
 		savehr
 	} from '@/api/examinationapi/add.js'
+	import {
+		dzsocketurl,
+		dysocketurl
+	} from '@/api/socketurl.js'
 	export default {
 		data() {
 			return {

pagesC/addPressure/addPressure.vue

@@ -52,6 +52,10 @@
 	import {
 		bound,
 	} from '@/api/examinationapi/add.js'
+	import {
+		dzsocketurl,
+		dysocketurl
+	} from '@/api/socketurl.js'
 	export default {
 		data() {
 			return {

pagesC/addsugar/addsugar.vue

@@ -48,6 +48,10 @@
 	import {
 		bound,
 	} from '@/api/examinationapi/add.js'
+	import {
+		dzsocketurl,
+		dysocketurl
+	} from '@/api/socketurl.js'
 	export default {
 		data() {
 			return {

pagesC/seekadvicefrom/seekadvicefrom.vue

@@ -83,12 +83,15 @@
 		markRead
 	} from '@/api/pagesC/seekadvicefrom/seekadvicefrom.js';
 	import baseurl from '@/api/baseurl.js'
+	import {
+		socketurl
+	} from '@/api/socketurl.js'
 	export default {
 		data() {
 			return {
 				baseurl: '',
 				title: '',
-				SOCKETURL: 'ws://8.131.93.145:54010/webSocket/',
+				SOCKETURL: '',
 				socketOpen: false,
 				sendInfo: {},
 				currentItem: '',
@@ -157,7 +160,7 @@
 			this.currentItem = JSON.parse(options.item)
 			this.title = this.currentItem.doctorName //导航栏标题
 			this.userName = this.currentItem.patientName
-			this.SOCKETURL = this.SOCKETURL + this.currentItem.patientId
+			this.SOCKETURL = socketurl + this.currentItem.patientId
 			this.getPageHistory()
 			this.scoket()
 		},
@@ -466,7 +469,7 @@
 						that.newsList.push({
 							senderName: that.currentItem.doctorName,
 							content: JSON.parse(res.data).message,
-							messageType: JSON.parse(res.data).message
+							messageType: JSON.parse(res.data).messageType
 						})
 						setTimeout(() => {
 							let query = uni.createSelectorQuery().in(this);

pagesC/testreport/testreport.vue

@@ -34,14 +34,14 @@
 		onLoad() {
 			this.region = uni.getStorageSync('region')
 			if (this.region == 1) {
-				dzrecord('370785199502153071').then(res => {
+				dzrecord(uni.getStorageSync('userinfo').cardNo).then(res => {
 					res.data.forEach(e => {
 						e.existReport = Number(e.existReport)
 					})
 					this.list = res.data
 				})
 			} else if (this.region == 2) {
-				dyrecord('370785199502153071').then(res => {
+				dyrecord(uni.getStorageSync('userinfo').cardNo).then(res => {
 					res.data.forEach(e => {
 						e.existReport = Number(e.existReport)
 					})
@@ -50,8 +50,8 @@
 			}
 		},
 		methods: {
-			// 东营获取驿站报告接口：http://218.58.213.15:8009/fd/sh05/report/view/{reportId}
+			// 东营获取驿站报告接口：http://218.58.213.15:8009/fd/sh05/report/download/{reportId}
-			// 德州获取驿站报告接口：http://112.6.122.71:8009/fd/sh05/report/view/{reportId}
+			// 德州获取驿站报告接口：http://112.6.122.71:8009/fd/sh05/report/download/{reportId}
 			lookReport(item) {
 				if (this.region == 1) {
 					uni.downloadFile({
@@ -72,7 +72,7 @@
 					});
 				} else if (this.region == 2) {
 					uni.downloadFile({
-						url: `http://8.131.93.145:54098/fd/sh05/report/download/${item.reportId}`,
+						url: `http://218.58.213.15:8009/fd/sh05/report/download/${item.reportId}`,
 						success: function(res) {
 							console.log(res)
 							var filePath = res.tempFilePath;