From 85214ad636a7413b87c557bf9563f248208d58e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 15 Mar 2024 16:33:19 +0800
Subject: [PATCH] xg

---
 api/pagesB/mysigning/index.js                 |  8 ++++
 pages/homepage/homepage.vue                   |  2 +-
 .../createnewconsultation.vue                 | 37 +++++----------
 pagesB/mysigning/mysigning.vue                | 47 +++++++++++++++----
 pagesC/seekadvicefrom/seekadvicefrom.vue      |  4 ++
 5 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/api/pagesB/mysigning/index.js b/api/pagesB/mysigning/index.js
index 352a12c..5084d9e 100644
--- a/api/pagesB/mysigning/index.js
+++ b/api/pagesB/mysigning/index.js
@@ -9,4 +9,12 @@ export function rescindapplysave(data) {
 			region: uni.getStorageSync('region'),
 		}
 	})
+}
+// 新增问诊
+export function consultationInfo(data) {
+	return request({
+		url: `/nurseApplet/consultationInfo/add`,
+		method: 'post',
+		data: data
+	})
 }
\ No newline at end of file
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 7e34d85..13b4bf4 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -6,7 +6,7 @@
 				<image v-else-if="countyName=='东营经济开发区'" :src="baseurl+ '/profile/weChatPicture/dyjjmainPage.png'" />
 				<image v-else-if="countyName=='东营区'" :src="baseurl+ '/profile/weChatPicture/dyqmainPage.png'" mode="" />
 				<image v-else-if="countyName=='广饶县'" :src="baseurl+ '/profile/weChatPicture/grgmainPage.png'" mode="" />
-				<image v-else-if="countyName=='河口区'" :src="baseurl+ '/profile/weChatPicture/hkgmainPage.png'" mode="" />
+				<image v-else-if="countyName=='河口区'" :src="baseurl+ '/profile/weChatPicture/hkmainPage.png'" mode="" />
 				<image v-else-if="countyName=='垦利区'" :src="baseurl+ '/profile/weChatPicture/klgmainPage.png'" mode="" />
 				<image v-else-if="countyName=='利津县'" :src="baseurl+ '/profile/weChatPicture/ljgmainPage.png'" mode="" />
 				<image v-else :src="baseurl+ '/profile/weChatPicture/dysmainPage.png'" mode="" />
diff --git a/pagesB/createnewconsultation/createnewconsultation.vue b/pagesB/createnewconsultation/createnewconsultation.vue
index f188704..178a851 100644
--- a/pagesB/createnewconsultation/createnewconsultation.vue
+++ b/pagesB/createnewconsultation/createnewconsultation.vue
@@ -12,7 +12,7 @@
 				现住址所在区
 			</view>
 			<view class="input" @tap='showPicker'>
-		<!-- 		<view class="inputtext"
+				<!-- 		<view class="inputtext"
 					:style="address=='请选择所属地区'?'font-size:22rpx;font-weight: 400;color: #8E8E8E !important;':''">
 					{{address}}
 				</view> -->
@@ -141,11 +141,9 @@
 		consultationInfo,
 		detail,
 	} from '@/api/pagesB/createnewconsultation/createnewconsultation.js'
-
 	import {
 		getHospitalPersonInfo
 	} from '@/api/pagesC/contractsigningprotocol/index.js'
-	// import consultationplatformVueHtml from '../consultationplatform/consultationplatform.vue.html';
 	export default {
 		components: {
 			"m-city": gkcity
@@ -222,7 +220,7 @@
 			},
 			info() {
 				this.$delete(this.formdata, 'id')
-				this.formdata.patientId=uni.getStorageSync("patientId")
+				this.formdata.patientId = uni.getStorageSync("patientId")
 				this.formdata.consultationType = 'IMAGE_TEXT_CONSULTATION'
 				if (!this.formdata.address) {
 					this.$refs.uToast.show({
@@ -320,16 +318,16 @@
 			},
 			infolist() {
 				detail(this.formdata.cardNo).then(res => {
-					if(res.data.provinceName && res.data.cityName && res.data.countyName &&res.data.townName){
-						this.address=res.data.provinceName+res.data.cityName+res.data.countyName+res.data.townName
-						this.formdata.address=this.address
-					}else if(res.data.provinceName && res.data.cityName && res.data.countyName){
-						this.address=res.data.provinceName+res.data.cityName+res.data.countyName
-						this.formdata.address=this.address
+					if (res.data.provinceName && res.data.cityName && res.data.countyName && res.data.townName) {
+						this.address = res.data.provinceName + res.data.cityName + res.data.countyName + res.data
+							.townName
+						this.formdata.address = this.address
+					} else if (res.data.provinceName && res.data.cityName && res.data.countyName) {
+						this.address = res.data.provinceName + res.data.cityName + res.data.countyName
+						this.formdata.address = this.address
 					}
-					var status = '1'
 					if (res.code == 200) {
-						getHospitalPersonInfo(res.data.dutyDoctorNo, status).then(res => {
+						getHospitalPersonInfo(res.data.dutyDoctorNo, '1').then(res => {
 							this.doctorName = res.data.personName
 							this.doctorId = res.data.id
 							this.doctorlist = res.data
@@ -344,22 +342,9 @@
 				})
 			},
 			gochoosedoctor() {
-				console.log(this.doctorlist, '44444')
-				// detail(this.formdata.cardNo).then(res => {
-				// 	var status = '1'
-				// 	getHospitalPersonInfo(res.data.dutyDoctorNo, status).then(res => {
-				// 		console.log(res, '55')
-				// 		this.doctorlist = res.data
-
 				uni.navigateTo({
 					url: `/pagesC/choosedoctor/choosedoctor?item=${JSON.stringify(this.doctorlist)}`
 				})
-				// })
-
-				// })
-
-
-
 			},
 		}
 	}
@@ -367,4 +352,4 @@
 
 <style lang="scss">
 	@import './createnewconsultation.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue
index fcbe641..e24722a 100644
--- a/pagesB/mysigning/mysigning.vue
+++ b/pagesB/mysigning/mysigning.vue
@@ -35,7 +35,7 @@
 			</view>
 		</view>
 		<view class="item">
-			年限：{{list.signTime?list.signTime:''}}-{{list.signDeadline?list.signDeadline:''}}
+			年限：{{list.signTime?list.signTime:''}} 至 {{list.signDeadline?list.signDeadline:''}}
 		</view>
 		<view class="item">
 			机构：
@@ -114,6 +114,10 @@
 
 <script>
 	import {
+		getHospitalPersonInfo
+	} from '@/api/pagesC/contractsigningprotocol/index.js'
+	import {
+		consultationInfo,
 		rescindapplysave
 	} from '@/api/pagesB/mysigning/index.js'
 	import {
@@ -143,6 +147,16 @@
 						label: '其他'
 					},
 				],
+				formdata: {
+					address: '',
+					patientId: '',
+					patientName: '',
+					cardNo: '',
+					phone: '',
+					doctorId: '',
+					doctorName: '',
+					consultationType: 'ONLINE_CONSULTATION',
+				},
 			};
 		},
 		methods: {
@@ -159,7 +173,7 @@
 								url: "/pages/homepage/homepage"
 							})
 						}, 2000)
-					}else{
+					} else {
 						this.$refs.uToast.show({
 							title: res.msg,
 							type: 'error',
@@ -178,6 +192,10 @@
 						this.list.rescindReason = null
 						this.list.crowdsName = this.list.crowdsName.split(',')
 						this.list.packagesName = this.list.packagesName.split(',')
+						getHospitalPersonInfo(res.data.dutyDoctorNo, '1').then(resp => {
+							this.formdata.doctorName = resp.data.personName
+							this.formdata.doctorId = resp.data.id
+						})
 					}
 				})
 			},
@@ -201,12 +219,19 @@
 			},
 			//咨询
 			goseekadvicefrom() {
-				uni.navigateTo({
-					url: `/pagesB/imagetextConsultation/imagetextConsultation`
+				consultationInfo(this.formdata).then(res => {
+					if (res.code == 200) {
+						uni.navigateTo({
+							url: `/pagesC/seekadvicefrom/seekadvicefrom?item=${JSON.stringify(res.data)}`
+						})
+					} else if (res.code == 500) {
+						this.$refs.uToast.show({
+							title: res.msg,
+							type: 'error',
+							duration: '1500',
+						})
+					}
 				})
-				// uni.navigateTo({
-				// 	url: `/pagesC/seekadvicefrom/seekadvicefrom?item=${JSON.stringify(this.list)}`
-				// })
 			},
 			maskshowtwoconfirm(e) {
 				this.list.rescindType = e[0].value
@@ -214,6 +239,12 @@
 			},
 		},
 		onLoad(options) {
+			this.formdata.address = uni.getStorageSync('userinfo').address
+			this.formdata.patientId = uni.getStorageSync("patientId")
+			this.formdata.consultationType = 'ONLINE_CONSULTATION'
+			this.formdata.patientName = uni.getStorageSync('userinfo').patientName
+			this.formdata.cardNo = uni.getStorageSync('userinfo').cardNo
+			this.formdata.phone = uni.getStorageSync('userinfo').phone
 			this.detailinfo();
 		}
 	}
@@ -221,4 +252,4 @@
 
 <style lang="scss">
 	@import './mysigning.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/pagesC/seekadvicefrom/seekadvicefrom.vue b/pagesC/seekadvicefrom/seekadvicefrom.vue
index 927839b..90c5172 100644
--- a/pagesC/seekadvicefrom/seekadvicefrom.vue
+++ b/pagesC/seekadvicefrom/seekadvicefrom.vue
@@ -96,6 +96,9 @@
 	import {
 		socketurl
 	} from '@/api/socketurl.js'
+	import {
+		mapMutations
+	} from "vuex";
 	export default {
 		data() {
 			return {
@@ -188,6 +191,7 @@
 			// })
 		},
 		methods: {
+			...mapMutations(['scoket']),
 			messagescoket() {
 				const that = this
 				// this.SOCKETURL = socketurl + this.currentItem.patientId