筛查结果 筛查记录 选择项目

api/pagesB/screeningRecord/screeningRecord.js

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

api/pagesB/screeningResult/screeningResult.js

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

pages/medicalservice/medicalservice.vue

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

pagesB/SelectItem/SelectItem.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="app">
-		<view class="content">
+		<view class="content" v-for="(item,index) in prejectlist">
-			<view class="big">阿尔兹海默症筛查
+			<view class="big">{{item.projectName}}
 			</view>
-			<view class="servename" @tap="result(1)">
+			<view class="servename" @tap="result(item.projectId)">
 				查看筛查结果
 			</view>
 		</view>
-		<view class="content">
+<!-- 		<view class="content">
 			<view class="big">血小板筛查
 			</view>
 			<view class="servename" @tap="result(2)">
@@ -20,7 +20,7 @@
 			<view class="servename" @tap="result(3)">
 				查看筛查结果
 			</view>
-		</view>
+		</view> -->
 
 
 
@@ -28,18 +28,36 @@
 </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: {
+			resultstype(){
+			
+			},
 			// 查看筛查结果
 			result(item){
 					uni.navigateTo({
-						url: `/pagesB/screeningResult/screeningResult?toindex=${item}`
+						url: `/pagesB/screeningResult/screeningResult?projectId=${item}`
 					});
-				// console.log(item)
+				console.log(item)
 
 			}
 			// goapponint() {

pagesB/screeningRecord/screeningRecord.vue

@@ -22,19 +22,21 @@
     data() {
       return {
         screeningResultData:[],
-        registerId:""
+        registerId:"",
+		patientId:"",
       };
     },
     onLoad(e) {
+		// con
       if(e) {
-        this.registerId = e.registerId
+        this.patientId = e.registerId
       }
       this.getScreeningResultList()
     },
     methods:{
       //获取结果记录列表
       getScreeningResultList() {
-        screeningResultList(this.registerId).then(res => {
+        screeningResultList(this.patientId).then(res => {
           console.log(res);
           this.screeningResultData = res.data.rows
         })

pagesB/screeningResult/screeningResult.vue

@@ -150,9 +150,14 @@
 		},
 		onLoad(e) {
 			console.log(e);
-			this.type = e.type
+			// this.type = e.type
        if(e) {
-              this.registerId= e.registerId
+		   this.registerId=e.projectId
+		   // this.patientld=uni.getStorageSync('patientId);
+		   
+		   this.patientld=52;
+		   this.getLastScreeningResult()
+              // this.registerId= e.registerId
             }
 			if (e.screeningId) {
 				screeningResultDetail(e.screeningId).then(res => {
@@ -160,7 +165,9 @@
 					this.screeningResultData = res.data.data
 				})
 			} else {
-				this.getLastScreeningResult()
+				// this.patientld= uni.getStorageSync('patientld');
+				// this.patientld=52;
+				// this.getLastScreeningResult()
 			}
 		},
 		methods: {
@@ -209,7 +216,7 @@
 			},
 			// 获取最新的筛查结果
 			getLastScreeningResult() {
-				lastScreeningResult(this.registerId).then(res => {
+				lastScreeningResult(this.patientld,this.registerId).then(res => {
 					// console.log(res);
 					this.items.push(res.data.data.projectName)
 					this.screeningResultData = res.data.data
@@ -222,7 +229,7 @@
 			goToScreeningRecord() {
 				uni.navigateTo({
 					// url: `../screeningRecord/screeningRecord?registerId=${this.registerId}`
-					url: `/pagesB/screeningRecord/screeningRecord?registerId=${this.registerId}`
+					url: `/pagesB/screeningRecord/screeningRecord?registerId=${this.patientld}`
 				})
 			}
 		}