Merge remote-tracking branch 'origin/dev' into dev

api/pagesB/SelectItem/SelectItem.js

@@ -1,11 +1,12 @@
 import request from "../../request.js"
 // 获取项目
-export function projectTypedata(patientId) {
+export function getAppointProject(patientId,identity) {
 	return request({
-		url: `/nurseApplet/screening/project/list?patientId=${patientId}`,
+		url: `/nurseApplet/screening/project/getAppointProject?patientId=${patientId}&identity=${identity}`,
 		method: 'GET',
 		header: {
-			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
+			region: uni.getStorageSync('region'),
 		},
 	})
 }

api/pagesB/screeningRecord/screeningRecord.js

@@ -1,11 +1,13 @@
 import request from "../../request.js"
 // 获取筛查结果列表
-export function screeningResultList(patientId,pageNum,pageSize) {
+export function screeningResultList(patientId,identity,pageNum,pageSize) {
 	return request({
-		url: `/nurseApplet/screening/record/record?patientId=${patientId}&pageNum=${pageNum}&pageSize=${pageSize}`,
+		url: `/nurseApplet/screening/record/record?patientId=${patientId}&identity=${identity}&pageNum=${pageNum}&pageSize=${pageSize}`,
 		method: 'GET',
 		header: {
-			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
+			region: uni.getStorageSync('region'),
+			
 		},
 	})
 }

api/pagesB/screeningResult/screeningResult.js

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

pagesB/SelectItem/SelectItem.vue

@@ -16,7 +16,7 @@
 
 <script>
 	import {
-		projectTypedata
+		getAppointProject
 	} from '@/api/pagesB/SelectItem/SelectItem.js'
 	export default {
 		data() {
@@ -25,7 +25,7 @@
 			};
 		},
 		onShow() {
-			projectTypedata(uni.getStorageSync('userinfo').id).then(res => {
+			getAppointProject(uni.getStorageSync('userinfo').id,uni.getStorageSync('userinfo').cardNo).then(res => {
 				this.prejectlist = res.data
 			})
 		},

pagesB/screeningRecord/screeningRecord.vue

@@ -39,7 +39,7 @@
 		methods: {
 			//获取结果记录列表
 			getScreeningResultList() {
-				screeningResultList(this.registerId, this.pageNum, this.pageSize).then(res => {
+				screeningResultList(this.registerId,uni.getStorageSync('userinfo').cardNo,this.pageNum, this.pageSize).then(res => {
 					this.screeningResultData = res.rows
 					this.total = res.total
 				})
@@ -54,7 +54,7 @@
 		onReachBottom() { //下滑加载
 			if (this.screeningResultData.length >= this.total) {} else {
 				this.pageNum++;
-				screeningResultList(this.registerId, this.pageNum, this.pageSize).then(res => {
+				screeningResultList(this.registerId,uni.getStorageSync('userinfo').cardNo, this.pageNum, this.pageSize).then(res => {
 					res.rows.forEach(e => {
 						this.screeningResultData.push(e)
 					})

pagesB/screeningResult/screeningResult.vue

@@ -168,6 +168,9 @@
 				uni.downloadFile({
 					url: url,
 					responseType: 'blob',
+					 header: {
+					 	region: uni.getStorageSync('region'),
+					 },
 					success: function(resp) {
 						var filePath = resp.tempFilePath;
 						uni.openDocument({
@@ -220,7 +223,7 @@
 			},
 			// 获取最新的筛查结果
 			getLastScreeningResult() {
-				lastScreeningResult(this.patientld, this.projectId).then(res => {
+				lastScreeningResult(uni.getStorageSync('userinfo').cardNo, this.projectId).then(res => {
 					if (res.code == 200 && res.data.projectName) {
 						this.items.push(res.data.projectName)
 					}
@@ -233,7 +236,6 @@
 			},
 			goToScreeningRecord() {
 				uni.navigateTo({
-					// url: `../screeningRecord/screeningRecord?registerId=${this.registerId}`
 					url: `/pagesB/screeningRecord/screeningRecord?registerId=${this.patientld}`
 				})
 			}

pagesC/Screeningdetails/Screeningdetails.vue

@@ -11,11 +11,11 @@
 			</view>
 			<view class="item">
 				筛查机构：
-				<span>{{screeningResultData.hospitalName}}</span>
+				<span v-if="screeningResultData.hospitalName">{{screeningResultData.hospitalName}}</span>
 			</view>
 			<view class="item">
 				筛查医生：
-				<span>{{screeningResultData.doctorName}}</span>
+				<span v-if="screeningResultData.doctorName">{{screeningResultData.doctorName}}</span>
 			</view>
 			<view class="itemend">
 				筛查结果:
@@ -74,14 +74,14 @@
 			return {
 				screeningResultData: {},
 				projectId: '',
-				patientld: '',
+				identity: '',
 				userinfo: {},
 				baseurl: '',
 			};
 		},
 		onLoad(e) {
 			this.userinfo = uni.getStorageSync('userinfo');
-			this.patientld = this.userinfo.id;
+			this.identity = this.userinfo.cardNo;
 			this.projectId = e.projectId
 			this.getLastScreeningResult()
 			console.log(e)
@@ -92,7 +92,7 @@
 		methods: {
 			// 获取最新的筛查结果
 			getLastScreeningResult() {
-				lastScreeningResult(this.patientld, this.projectId).then(res => {
+				lastScreeningResult(this.identity, this.projectId).then(res => {
 					this.screeningResultData = res.data
 				})
 			},

pagesC/Screeningrecords/Screeningrecords.vue

@@ -18,7 +18,7 @@
 
 <script>
 	import {
-		projectTypedata
+		getAppointProject
 	} from '@/api/pagesB/SelectItem/SelectItem.js'
 	export default {
 		data() {
@@ -30,7 +30,8 @@
 		onShow() {
 			this.userinfo=uni.getStorageSync('userinfo');
 			var patientId=this.userinfo.id
-			projectTypedata(patientId).then(res=>{
+			var identity=this.userinfo.cardNo
+			getAppointProject(patientId,identity).then(res=>{
 				this.prejectlist=res.data