From 408ca425bfaab634dc33948ce9a477acb411b1f5 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Fri, 13 Oct 2023 10:17:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesB/SelectItem/SelectItem.vue           | 11 ++++++-----
 pagesB/screeningRecord/screeningRecord.vue |  3 ++-
 pagesB/screeningResult/screeningResult.vue | 18 ++++++++++--------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pagesB/SelectItem/SelectItem.vue b/pagesB/SelectItem/SelectItem.vue
index 27f55f5..4bbebb5 100644
--- a/pagesB/SelectItem/SelectItem.vue
+++ b/pagesB/SelectItem/SelectItem.vue
@@ -3,7 +3,7 @@
 		<view class="content" v-for="(item,index) in prejectlist">
 			<view class="big">{{item.projectName}}
 			</view>
-			<view class="servename" @tap="result(item.projectId)">
+			<view class="servename" @tap="result(item)">
 				查看筛查结果
 			</view>
 		</view>
@@ -33,7 +33,7 @@
 	} from '@/api/pagesB/SelectItem/SelectItem.js'
 	export default {
 		data() {
-			
+
 			return {
 				prejectlist:{},
 			};
@@ -43,19 +43,20 @@
 			projectTypedata(projectType).then(res=>{
 				this.prejectlist=res.data
 				console.log(res)
-				
+
 			})
 			// this.resultstype();
 		},
 
 		methods: {
 			resultstype(){
-			
+
 			},
 			// 查看筛查结果
 			result(item){
+				console.log(item)
 					uni.navigateTo({
-						url: `/pagesB/screeningResult/screeningResult?registerId=${item}`
+						url: `/pagesB/screeningResult/screeningResult?projectId=${item.projectId}`
 					});
 				console.log(item)
 
diff --git a/pagesB/screeningRecord/screeningRecord.vue b/pagesB/screeningRecord/screeningRecord.vue
index 78fefc9..4ce98e3 100644
--- a/pagesB/screeningRecord/screeningRecord.vue
+++ b/pagesB/screeningRecord/screeningRecord.vue
@@ -4,6 +4,7 @@
       <!-- <view>筛查日期：{{ item.screeningDate }}</view> -->
       <view style="font-size: 16px;font-weight: 900;">{{ item.screeningDate }}</view>
       <view style="border-bottom: 1px solid #EDEDED;margin: 8px 0;"></view>
+	  <view>筛查项目：{{ item.projectName }}</view>
       <view>筛查医院：{{ item.hospitalName }}</view>
       <view>责任医生：{{ item.doctorName}}</view>
       <view style="border-bottom: 1px solid #EDEDED;margin: 10px 0;"></view>
@@ -28,7 +29,7 @@
 		pageSize:10,
 		total: 0,
 		// qure:{
-			
+
 		// }
       };
     },
diff --git a/pagesB/screeningResult/screeningResult.vue b/pagesB/screeningResult/screeningResult.vue
index 9abb003..847dd1c 100644
--- a/pagesB/screeningResult/screeningResult.vue
+++ b/pagesB/screeningResult/screeningResult.vue
@@ -9,7 +9,7 @@
 			<view style="color: #2968F1;" @click="goToScreeningRecord" v-show="type != '1'">筛查记录</view>
 		</view>
 		<view class="tabbarCon">
-			<view style="text-align: center;color: #26A888;">
+			<view style="text-align: center;color: #26A888;" v-if="screeningResultData.projectName">
 				{{screeningResultData.projectName}}
 			</view>
 			<uni-segmented-control :current="Inv" :values="items" @clickItem="onClickItem" styleType="text"
@@ -201,13 +201,14 @@ import baseurl from '@/api/baseurl.js'
 		onShow() {
 			this.baseurl=baseurl
 			console.log(baseurl)
-			
+
 		},
 		onLoad(e) {
-			// console.log(e);
+			console.log(e);
 			this.type = e.type
 			if (e) {
 				this.registerId = e.registerId
+				this.projectId = e.projectId
 			}
 			if (e.screeningId) {
 				screeningResultDetail(e.screeningId).then(res => {
@@ -225,8 +226,8 @@ import baseurl from '@/api/baseurl.js'
 		methods: {
 			lookpath() {
 				var that = this
-				
-				var url = that.baseurl + `/nurseApplet/screening/record/fileview/${that.screeningResultData.screeningId}`
+
+				var url = that.baseurl + `/nurseApplet/screening/record/fileview/${that.screeningResultData.attachment}`
 				console.log(url,'1')
 				uni.downloadFile({
 					url: url,
@@ -293,8 +294,9 @@ import baseurl from '@/api/baseurl.js'
 			},
 			// 获取最新的筛查结果
 			getLastScreeningResult() {
-				lastScreeningResult(this.patientld, this.registerId).then(res => {
-				
+				console.log(this.registerId,'999')
+				lastScreeningResult(this.patientld,this.projectId).then(res => {
+
 					// console.log(res);
 					this.items.push(res.data.projectName)
 					this.screeningResultData = res.data
@@ -365,4 +367,4 @@ import baseurl from '@/api/baseurl.js'
 		color: #393939;
 		border-bottom: 3px solid #4DC2A8;
 	}
-</style>
\ No newline at end of file
+</style>