筛查记录

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>
@@ -54,8 +54,9 @@
 			},
 			// 查看筛查结果
 			result(item){
+				console.log(item)
 					uni.navigateTo({
-						url: `/pagesB/screeningResult/screeningResult?registerId=${item}`
+						url: `/pagesB/screeningResult/screeningResult?projectId=${item.projectId}`
 					});
 				console.log(item)
 

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>

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"
@@ -204,10 +204,11 @@ import baseurl from '@/api/baseurl.js'
 
 		},
 		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 => {
@@ -226,7 +227,7 @@ import baseurl from '@/api/baseurl.js'
 			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,7 +294,8 @@ 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)