筛查结果 筛查记录

api/pagesB/screeningRecord/screeningRecord.js

@@ -0,0 +1,8 @@
+import request from "../../request.js"
+// 获取筛查结果列表
+export function screeningResultList(registerId) {
+	return request({
+		url: `/screening/record?registerId=${registerId}`,
+		method: 'GET'
+	})
+}

api/pagesB/screeningResult/screeningResult.js

@@ -1,13 +1,15 @@
 import request from "../../request.js"
 // 获取最新的筛查结果
 export function lastScreeningResult(registerId) {
-	return request.get({
+	return request({
-		url: `/screening/last/${registerId}`
+		url: `/screening/last/${registerId}`,
+		method: 'GET'
 	})
 }
 // 获取筛查结果详情
 export function screeningResultDetail(screeningId) {
-	return request.get({
+	return request({
-		url: `/screening/detail/${screeningId}`
+		url: `/screening/detail/${screeningId}`,
+		method: 'GET'
 	})
 }

pages.json

@@ -3,18 +3,19 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	{
+		"path": "pages/startup/startup",
+		"style": {
+			"navigationStyle": "custom",
+			"enablePullDownRefresh": false
+		}
+	},
 		{
 			"path": "pages/medicalservice/medicalservice",
 			"style": {
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-		}, {
-			"path": "pages/startup/startup",
-			"style": {
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": false
-			}
 		}, {
 			"path": "pages/myinformation/myinformation",
 			"style": {
@@ -345,6 +346,23 @@
                     "enablePullDownRefresh": false
                 }
 
+                }
+                ,{
+                    "path" : "screeningRecord/screeningRecord",
+                    "style" :
+                {
+                    "navigationBarTitleText": "筛查记录",
+                    "enablePullDownRefresh": false
+                }
+
+                },{
+                    "path" : "SelectItem/SelectItem",
+                    "style" :
+                {
+                    "navigationBarTitleText": "选择项目",
+                    "enablePullDownRefresh": false
+                }
+
                 }
             ]
 	}, {

pages/medicalservice/medicalservice.vue

@@ -112,9 +112,13 @@
 			},
 			// 筛查结果
 			result(){
-				uni.navigateTo({
+			uni.navigateTo({
-					url: '/pagesB/screeningResult/screeningResult'
+				url: '/pagesB/SelectItem/SelectItem'
-				})
+			})
+
+				// uni.navigateTo({
+				// 	url: '/pagesB/screeningResult/screeningResult'
+				// })
 
 
 			},

pagesB/SelectItem/SelectItem.vue

@@ -0,0 +1,89 @@
+<template>
+	<view class="app">
+		<view class="content">
+			<view class="big">阿尔兹海默症筛查
+			</view>
+			<view class="servename" @tap="result(1)">
+				查看筛查结果
+			</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>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+
+		methods: {
+			// 查看筛查结果
+			result(item){
+					uni.navigateTo({
+						url: `/pagesB/screeningResult/screeningResult?toindex=${item}`
+					});
+				// console.log(item)
+				
+			}
+			// goapponint() {
+			// 	uni.navigateTo({
+			// 		url: '/pagesC/Screeningdetails/Screeningdetails'
+			// 	});
+			// },
+		},
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		height: 100vh;
+		background-color: #F7F5F5;
+		padding: 30rpx 0 0 0;
+		overflow: scroll;
+
+		.content {
+			position: relative;
+			width: 95%;
+			height: 183rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 5rpx;
+			margin: 15rpx auto;
+
+			.servename {
+				padding: 0 50rpx 0 50rpx;
+				font-size: 28rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #868585;
+				line-height: 38rpx;
+			}
+
+			.big {
+				padding: 35rpx 50rpx 30rpx 50rpx;
+				font-size: 32rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 500;
+				color: #000000;
+				line-height: 38rpx;
+			}
+		}
+	}
+</style>

pagesB/screeningRecord/screeningRecord.vue

@@ -0,0 +1,64 @@
+<template>
+  <view class="screeningRecord">
+    <view class="screeningRecordItem" v-for="(item,index) in screeningResultData" :key="index">
+      <!-- <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.deptName }}</view>
+      <view>责任医生：{{ item.doctorName}}</view>
+      <view style="border-bottom: 1px solid #EDEDED;margin: 10px 0;"></view>
+      <view style="color: #346CF2;text-align: center;font-size: 30rpx;" @click="goToScreeningResult(item)">
+        <span>查看筛查结果</span>
+      </view>
+    </view>
+    
+  </view>
+</template>
+
+<script>
+  // import { screeningResultList } from "@/service/api/jsApi.js"
+  import { screeningResultList } from '@/api/pagesB/screeningRecord/screeningRecord.js'
+  export default {
+    data() {
+      return {
+        screeningResultData:[],
+        registerId:""
+      };
+    },
+    onLoad(e) {
+      if(e) {
+        this.registerId = e.registerId
+      }
+      this.getScreeningResultList()
+    },
+    methods:{
+      //获取结果记录列表
+      getScreeningResultList() {
+        screeningResultList(this.registerId).then(res => {
+          console.log(res);
+          this.screeningResultData = res.data.rows
+        })
+      },
+      goToScreeningResult(item) {
+        uni.navigateTo({
+          url:`../screeningResult/screeningResult?screeningId=${item.screeningId}&registerId=${this.registerId}&type=1`
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .screeningRecord {
+    width: 94%;
+    margin: 10px auto;
+
+    .screeningRecordItem {
+      margin-top: 10px;
+      padding: 10px 20px;
+      background-color: #fff;
+      line-height: 30px;
+      border-radius: 10px;
+    }
+  }
+</style>

pagesB/screeningResult/screeningResult.vue

@@ -149,7 +149,7 @@
 			};
 		},
 		onLoad(e) {
-			// console.log(e);
+			console.log(e);
 			this.type = e.type
        if(e) {
               this.registerId= e.registerId
@@ -221,7 +221,8 @@
 			},
 			goToScreeningRecord() {
 				uni.navigateTo({
-					url: `../screeningRecord/screeningRecord?registerId=${this.registerId}`
+					// url: `../screeningRecord/screeningRecord?registerId=${this.registerId}`
+					url: `/pagesB/screeningRecord/screeningRecord?registerId=${this.registerId}`
 				})
 			}
 		}