diff --git a/api/pagesB/SelectItem/SelectItem.js b/api/pagesB/SelectItem/SelectItem.js
new file mode 100644
index 0000000..c9d7f35
--- /dev/null
+++ b/api/pagesB/SelectItem/SelectItem.js
@@ -0,0 +1,8 @@
+import request from "../../request.js"
+// 获取项目
+export function projectTypedata(projectType) {
+ return request({
+ url: `/nurseApplet/screening/project/list?projectType=${projectType}`,
+ method: 'GET'
+ })
+}
\ No newline at end of file
diff --git a/api/pagesB/screeningRecord/screeningRecord.js b/api/pagesB/screeningRecord/screeningRecord.js
index b59145b..da29e1b 100644
--- a/api/pagesB/screeningRecord/screeningRecord.js
+++ b/api/pagesB/screeningRecord/screeningRecord.js
@@ -1,8 +1,8 @@
import request from "../../request.js"
// 获取筛查结果列表
-export function screeningResultList(patientId) {
+export function screeningResultList(patientId,pageNum,pageSize) {
return request({
- url: `/nurseApplet/screening/record/record?patientId=${patientId}`,
+ url: `/nurseApplet/screening/record/record?patientId=${patientId}&pageNum=${pageNum}&pageSize=${pageSize}`,
method: 'GET'
})
}
\ No newline at end of file
diff --git a/pagesB/SelectItem/SelectItem.vue b/pagesB/SelectItem/SelectItem.vue
index 964831d..27f55f5 100644
--- a/pagesB/SelectItem/SelectItem.vue
+++ b/pagesB/SelectItem/SelectItem.vue
@@ -55,7 +55,7 @@
// 查看筛查结果
result(item){
uni.navigateTo({
- url: `/pagesB/screeningResult/screeningResult?projectId=${item}`
+ url: `/pagesB/screeningResult/screeningResult?registerId=${item}`
});
console.log(item)
diff --git a/pagesB/screeningRecord/screeningRecord.vue b/pagesB/screeningRecord/screeningRecord.vue
index 69a255f..78fefc9 100644
--- a/pagesB/screeningRecord/screeningRecord.vue
+++ b/pagesB/screeningRecord/screeningRecord.vue
@@ -4,7 +4,7 @@
{{ item.screeningDate }}
- 筛查医院：{{ item.deptName }}
+ 筛查医院：{{ item.hospitalName }}
责任医生：{{ item.doctorName}}
@@ -24,26 +24,46 @@
screeningResultData:[],
registerId:"",
patientId:"",
+ pageNum:1,
+ pageSize:10,
+ total: 0,
+ // qure:{
+
+ // }
};
},
onLoad(e) {
// con
if(e) {
- this.patientId = e.registerId
+ this.registerId = e.registerId
}
this.getScreeningResultList()
},
methods:{
//获取结果记录列表
getScreeningResultList() {
- screeningResultList(this.patientId).then(res => {
+ screeningResultList(this.registerId,this.pageNum,this.pageSize).then(res => {
console.log(res);
- this.screeningResultData = res.data.rows
+ this.screeningResultData = res.rows
+ this.total=res.total
})
},
+ onReachBottom() { //下滑加载
+ if (this.screeningResultData.length >= this.total) {} else {
+ this.pageNum++;
+ screeningResultList(this.registerId,this.pageNum,this.pageSize).then(res => {
+ console.log(res);
+ res.rows.forEach(e => {
+ this.screeningResultData.push(e)
+ })
+ this.total=res.total
+ })
+ }
+ },
+ // 查看筛查结果
goToScreeningResult(item) {
uni.navigateTo({
- url:`../screeningResult/screeningResult?screeningId=${item.screeningId}®isterId=${this.registerId}&type=1`
+ url:`/pagesB/screeningResult/screeningResult?screeningId=${item.screeningId}®isterId=${this.registerId}&type=1`
})
}
}
diff --git a/pagesB/screeningResult/screeningResult.vue b/pagesB/screeningResult/screeningResult.vue
index 73fd16e..9abb003 100644
--- a/pagesB/screeningResult/screeningResult.vue
+++ b/pagesB/screeningResult/screeningResult.vue
@@ -9,11 +9,37 @@
筛查记录
+
+ {{screeningResultData.projectName}}
+
+
+
+ 查看报告
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -116,7 +142,7 @@
lastScreeningResult,
screeningResultDetail
} from '@/api/pagesB/screeningResult/screeningResult.js'
-
+import baseurl from '@/api/baseurl.js'
export default {
data() {
return {
@@ -145,32 +171,82 @@
fileImgSrc: '',
fileImgSrc1: '',
fileImgSrc2: '',
- registerId:""
+ registerId: "",
+ baseurl:'',
};
},
+ // onLoad(e) {
+ // console.log(e);
+ // // this.type = e.type
+ // if(e) {
+ // 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 => {
+ // this.items.push(res.data.data.projectName)
+ // this.screeningResultData = res.data.data
+ // })
+ // } else {
+
+ // // this.patientld= uni.getStorageSync('patientld');
+ // this.patientld=52;
+ // this.getLastScreeningResult()
+ // }
+ // },
+ onShow() {
+ this.baseurl=baseurl
+ console.log(baseurl)
+
+ },
onLoad(e) {
- console.log(e);
- // this.type = e.type
- if(e) {
- this.registerId=e.projectId
- // this.patientld=uni.getStorageSync('patientId);
-
- this.patientld=52;
- this.getLastScreeningResult()
- // this.registerId= e.registerId
- }
+ // console.log(e);
+ this.type = e.type
+ if (e) {
+ this.registerId = e.registerId
+ }
if (e.screeningId) {
screeningResultDetail(e.screeningId).then(res => {
- this.items.push(res.data.data.projectName)
- this.screeningResultData = res.data.data
+ this.items.push(res.data.projectName)
+ console.log(this.items, '111')
+ this.screeningResultData = res.data
+ console.log(this.screeningResultData, '000000')
})
} else {
+ this.patientld = 52;
// this.patientld= uni.getStorageSync('patientld');
- // this.patientld=52;
- // this.getLastScreeningResult()
+ this.getLastScreeningResult()
}
},
methods: {
+ lookpath() {
+ var that = this
+
+ var url = that.baseurl + `/nurseApplet/screening/record/fileview/${that.screeningResultData.screeningId}`
+ 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)
+ }
+ });
+ }
+ })
+ },
onClickItem(e) {
if (this.Inv != e.currentIndex) {
this.Inv = e.currentIndex;
@@ -179,6 +255,7 @@
}
},
isResult(inv) {
+ console.log(this.screeningResultData.projectRecordList, '555')
for (let item in this.screeningResultData.projectRecordList) {
if (this.screeningResultData.projectRecordList[item].projectName == (inv == 0 ? '糖尿病-眼底病变筛查' : (inv ==
1 ?
@@ -216,10 +293,11 @@
},
// 获取最新的筛查结果
getLastScreeningResult() {
- lastScreeningResult(this.patientld,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
+ this.items.push(res.data.projectName)
+ this.screeningResultData = res.data
this.isResult(this.Inv)
})
},
@@ -287,4 +365,4 @@
color: #393939;
border-bottom: 3px solid #4DC2A8;
}
-
+
\ No newline at end of file