diff --git a/pagesB/SelectItem/SelectItem.vue b/pagesB/SelectItem/SelectItem.vue
index 9a0a309..c4b9f4f 100644
--- a/pagesB/SelectItem/SelectItem.vue
+++ b/pagesB/SelectItem/SelectItem.vue
@@ -7,23 +7,6 @@
 				查看筛查结果
 			</view>
 		</view>
-<!-- 		<view class="content">
-			<view class="big">血小板筛查
-			</view>
-			<view class="servename" @tap="result(2)">
-				查看筛查结果
-			</view>
-		</view>
-		<view class="content">
-			<view class="big">糖尿病-眼底病变筛查
-			</view>
-			<view class="servename" @tap="result(3)">
-				查看筛查结果
-			</view>
-		</view> -->
-
-
-
 	</view>
 </template>
 
diff --git a/pagesB/screeningResult/screeningResult.vue b/pagesB/screeningResult/screeningResult.vue
index adf7c37..dd4de26 100644
--- a/pagesB/screeningResult/screeningResult.vue
+++ b/pagesB/screeningResult/screeningResult.vue
@@ -46,45 +46,9 @@
 						<view v-else style="margin: 10px auto; ">
 							<u-empty text="暂无照片" mode="data"></u-empty>
 						</view>
-						<!-- <view style="text-align: center;">
-						<view v-if="screeningResultData.attachment && screeningResultData.attachment != '找不到指定文件!'">
-							<view style="display: flex;justify-content: space-around;">
-								<view style="width: 49%;" @click="xxbClick(screeningResultData.attachment)">
-									<image style="width: 100%;height: 100px;"
-										:src="'data:image/jpeg;base64' + screeningResultData.attachment"></image>
-								</view>
-								<view style="width: 49%;" @click="picClick1(screeningResultData.attachmentTwo)">
-									<image style="width: 100%;height: 100px;"
-										:src="'data:image/jpeg;base64' + screeningResultData.attachmentTwo"></image>
-								</view>
-							</view>
-						</view>
-						<view v-else style="margin: 10px auto; ">
-							<u-empty text="暂无照片" mode="data"></u-empty>
-						</view> -->
 					</view>
 				</view>
 
-				<!-- <view v-show="Inv == 0">
-          <view style="text-align: center;">
-            <view
-              v-if="screeningResultData.projectRecordList[0].attachment && screeningResultData.projectRecordList[0].attachment != '找不到指定文件!'">
-              <view style="display: flex;justify-content: space-around;">
-                <view style="width: 49%;" @click="xxbClick(screeningResultData.projectRecordList[0].attachment)">
-                  <image style="width: 100%;height: 100px;"
-                    :src="'data:image/jpeg;base64' + screeningResultData.projectRecordList[0].attachment"></image>
-                </view>
-                <view style="width: 49%;" @click="picClick1(screeningResultData.projectRecordList[0].attachmentTwo)">
-                  <image style="width: 100%;height: 100px;"
-                    :src="'data:image/jpeg;base64' + screeningResultData.projectRecordList[0].attachmentTwo"></image>
-                </view>
-              </view>
-            </view>
-            <view v-else style="margin: 10px auto; ">
-              <u-empty text="暂无照片" mode="data"></u-empty>
-            </view>
-          </view>
-        </view> -->
 				<view v-show="Inv == 1">
 					<view>
 						<view
diff --git a/pagesC/Screeningdetails/Screeningdetails.vue b/pagesC/Screeningdetails/Screeningdetails.vue
index aae2821..e9b796c 100644
--- a/pagesC/Screeningdetails/Screeningdetails.vue
+++ b/pagesC/Screeningdetails/Screeningdetails.vue
@@ -3,30 +3,52 @@
 		<view class="content">
 			<view class="item">
 				筛查项目：
-				<span>眼底筛查</span>
+				<span>{{screeningResultData.projectName}}</span>
 			</view>
 			<view class="item">
 				筛查时间：
-				<span>2023-14-14 13:13:13</span>
+				<span>{{ screeningResultData.screeningDate ? screeningResultData.screeningDate : '无' }}</span>
 			</view>
 			<view class="item">
 				筛查机构：
-				<span>河口社区卫生服务中心</span>
-			</view>
-			<view class="item">
-				筛查项目：
-				<span>眼底筛查</span>
+				<span>{{screeningResultData.hospitalName}}</span>
 			</view>
+
 			<view class="item">
 				筛查医生：
-				<span>张三</span>
+				<span>{{screeningResultData.doctorName}}</span>
 			</view>
 			<view class="itemend">
 				筛查结果:
 
 			</view>
 			<view class="image">
-				<view class="imageitem">
+				<view style="text-align: center;">
+					<view class="" v-if="screeningResultData.fileType=='docx'||screeningResultData.fileType=='doc'">
+						<view class="btn" @click="lookpath" v-if="screeningResultData.attachment">
+							查看报告
+						</view>
+					</view>
+					<view class="" v-else>
+						<view v-if="screeningResultData.attachment && screeningResultData.attachment != '找不到指定文件!'">
+							<view style="display: flex;justify-content: space-around;">
+								<view style="width: 49%;" @click="xxbClick(screeningResultData.attachment)">
+									<image style="width: 100%;height: 100px;"
+										:src="'data:image/jpeg;base64' + screeningResultData.attachment"></image>
+								</view>
+								<view style="width: 49%;" @click="picClick1(screeningResultData.attachmentTwo)">
+									<image style="width: 100%;height: 100px;"
+										:src="'data:image/jpeg;base64' + screeningResultData.attachmentTwo"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view v-else style="margin: 10px auto; ">
+						<u-empty text="暂无照片" mode="data"></u-empty>
+					</view>
+				</view>
+			</view>
+			<!-- <view class="imageitem">
 					<image src="../../static/pagesB/Behave.png" mode=""></image>
 				</view>
 				<view class="imageitem">
@@ -34,29 +56,82 @@
 				</view>
 				<view class="imageitem">
 					<image src="../../static/pagesB/Behave.png" mode=""></image>
+				</view> -->
+				<view class="item">
+					诊断结果：
+					<span>{{screeningResultData.diagnosticResult}}</span>
 				</view>
-			</view>
-			<view class="item">
-				诊断结果：
-				<span>诊断结果内容</span>
-			</view>
-			<view class="item">
-				健康处方：
-			</view>
-			<view class="word">
-				处方内容内容处方处内容方内处方容容内处 方内容处方容处方处内容方内处方容容内处 方容处方内容
-			</view>
 		</view>
+	
+
+	</view>
 	</view>
 </template>
 
 <script>
+	import {
+		lastScreeningResult,
+		screeningResultDetail
+	} from '@/api/pagesB/screeningResult/screeningResult.js'
+	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
-			return {};
+			return {
+				screeningResultData: {},
+				projectId: '',
+				patientld: '',
+				userinfo: {},
+				baseurl: '',
+			};
+		},
+		onLoad(e) {
+			this.userinfo = uni.getStorageSync('userinfo');
+			this.patientld = this.userinfo.id;
+			this.projectId = e.projectId
+			this.getLastScreeningResult()
+			console.log(e)
+
+		},
+		onShow() {
+			this.baseurl = baseurl
+
+
 		},
 
 		methods: {
+			// 获取最新的筛查结果
+			getLastScreeningResult() {
+		
+				lastScreeningResult(this.patientld, this.projectId).then(res => {
+					this.screeningResultData = res.data
+			
+				})
+			},
+			// 查看报告
+			lookpath() {
+				var that = this
+				var url = that.baseurl +
+					`/nurseApplet/screening/record/fileview?filePath=${that.screeningResultData.attachment}`
+				// console.log(url, '1')
+				uni.downloadFile({
+					url: url,
+					responseType: 'blob',
+					success: function(resp) {
+						var filePath = resp.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							fileType: that.screeningResultData.fileType.toLowerCase(),
+							showMenu: true,
+							success: function(respp) {
+								console.log(respp)
+							},
+							fail(err) {
+								console.log(err)
+							}
+						});
+					}
+				})
+			},
 			goapponint() {
 				uni.navigateTo({
 					url: '/pagesC/Screeningdetails/Screeningdetails'
@@ -112,8 +187,8 @@
 			}
 
 			.image {
-				display: flex;
-				justify-content: space-around;
+				// display: flex;
+				// justify-content: space-around;
 				padding-top: 20rpx;
 			}
 
@@ -138,4 +213,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pagesC/Screeningrecords/Screeningrecords.vue b/pagesC/Screeningrecords/Screeningrecords.vue
index f5b9767..6d997b4 100644
--- a/pagesC/Screeningrecords/Screeningrecords.vue
+++ b/pagesC/Screeningrecords/Screeningrecords.vue
@@ -1,6 +1,16 @@
 <template>
 	<view class="app">
-		<view class="content">
+		<view class="content" v-for="(item,index) in prejectlist">
+			<view class="big">{{item.projectName}}
+			</view>
+			<view class="servename">
+				{{item.createTime}}
+			</view>
+			<view class="appoint" @tap="goapponint(item)">
+				详情
+			</view>
+		</view>
+		<!-- <view class="content">
 			<view class="big">眼底筛查
 
 			</view>
@@ -10,33 +20,38 @@
 			<view class="appoint" @tap="goapponint">
 				详情
 			</view>
-		</view>
-		<view class="content">
-			<view class="big">眼底筛查
-
-			</view>
-			<view class="servename">
-				2023-12-12 12:12:12
-			</view>
-			<view class="appoint" @tap="goapponint">
-				详情
-			</view>
-		</view>
+		</view> -->
 
 
 	</view>
 </template>
 
 <script>
+	import {
+		projectTypedata
+	} from '@/api/pagesB/SelectItem/SelectItem.js'
 	export default {
 		data() {
-			return {};
+			return {
+				prejectlist:{},
+			};
+		},
+		onShow() {
+			var projectType=1
+			projectTypedata(projectType).then(res=>{
+				this.prejectlist=res.data
+				console.log(res)
+
+			})
+			// this.resultstype();
 		},
 
+
 		methods: {
-			goapponint() {
+			goapponint(item) {
+				console.log(item)
 				uni.navigateTo({
-					url: '/pagesC/Screeningdetails/Screeningdetails'
+					url: `/pagesC/Screeningdetails/Screeningdetails?projectId=${item.projectId}`
 				});
 			},
 		},