更新

app/common/common.scss

@@ -427,7 +427,10 @@
 			padding-top: 10px;
 			color: $font-c;
 			text {
-				padding-right: 15px;
+				padding-left: 15px;
+				&:first-child {
+					padding-left: 0px;
+				}
 			}
 			.state {
 				float: right;

app/pages/detection/doctor/list.vue

@@ -26,8 +26,7 @@
 					<view class="time">{{ item.reportCompleteTime }}</view>
 				</view>
 			</view>
-			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
-			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
+			<u-empty v-if="list.length == 0"></u-empty>
 		</view>
 		<u-calendar :show="calendar" monthNum="120" mode="range" :maxDate="util.getDate()" minDate="2020-01-01"
 			@confirm="confirm" @close="close()" :closeOnClickOverlay="true"></u-calendar>
@@ -59,7 +58,7 @@
 		},
 		onLoad(e) {
 			console.log(e);
-			this.setDefTime()
+			//this.setDefTime()
 			this.patId = e.patId
 			this.patientName = e.patientName
 			this.cardId = e.cardId
@@ -101,11 +100,7 @@
 					url: '/work/request/patid/' + this.patId,
 					data:this.param,
 					success: (res) => {
-						this.list = res.data.rows
-						this.loadMore = false
-						//暂时没有分页
-						// this.loadMore = res.data.pages > this.param.pageNum ? true : false;
-						// this.list.push(...res.data.rows);
+						this.list = res.data.data;
 					}
 				});
 			},

app/pages/detection/doctor/selectUser.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="main">
-		<view style="padding: 15px 0;">
+		<view style="padding: 15px 0">
 			<u-search placeholder="患者姓名" v-model="param.patientName" bgColor="white" :showAction="false" @search="refresh()" @clear="(param.patientName = ''), refresh()"></u-search>
 		</view>
 		<view class="list">
-			<view class="item" v-for="(item, index) in list" :key="index" @click="go('/pages/detection/doctor/list?cardId='+item.cardId+'&patId=' + item.patId+'&patientName='+ item.name)">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="go('/pages/detection/doctor/list?cardId=' + item.cardId + '&patId=' + item.patId + '&patientName=' + item.name)">
 				<view class="title omit">
 					<text>{{ item.name }}</text>
-						<text class="check">({{ item.cardId }})</text>
+					<text class="check">({{ item.cardId }})</text>
 				</view>
 			</view>
 			<u-empty v-if="list.length == 0" text="暂无患者"></u-empty>
@@ -20,9 +20,9 @@ export default {
 	data() {
 		return {
 			list: [],
-			param:{
-				pageNum:1,
-				pageSize:20,
+			param: {
+				pageNum: 1,
+				pageSize: 20
 			},
 			loadMore: true
 		};
@@ -35,20 +35,14 @@ export default {
 	},
 	methods: {
 		getData() {
+			this.param.userId = this.getUser().userId;
 			this.http.request({
-				url: '/system/user/deptTree',
+				url: '/work/visit/patientCard',
+				data: this.param,
 				success: (res) => {
-					console.log(res);
-					this.param.departmentName = res.data.data[0].label
-					this.http.request({
-						url: '/work/visit/patientCard',
-						data: this.param,
-						success: (res) => {
-							this.loadMore = res.data.pages > this.param.pageNum ? true : false;
-							res.data.rows.forEach((item) => {
-								this.list.push(item);
-							});
-						}
+					this.loadMore = res.data.pages > this.param.pageNum ? true : false;
+					res.data.rows.forEach((item) => {
+						this.list.push(item);
 					});
 				}
 			});
@@ -62,8 +56,7 @@ export default {
 			this.param.pageNum = 1;
 			this.list = [];
 			this.getData();
-		},
-		
+		}
 	},
 	//上拉加载
 	onReachBottom() {

app/pages/follow/doctor/add.vue

@@ -5,12 +5,8 @@
 				<view class="lable">所属科室</view>
 				<input :value="user.dept.deptName || '无科室'" disabled />
 			</view>
-			<view class="form_group" v-if="item.type == 0">
-				<view class="lable">提醒标题</view>
-				<input v-model="item.templateName" placeholder="请输入提醒标题" />
-			</view>
-			<view class="form_group" v-if="item.type == 1">
-				<view class="lable">随访模板</view>
+			<view class="form_group">
+				<view class="lable">选择模板</view>
 				<picker :range="templateList" range-key="title" @change="picker">
 					<input placeholder="请选择" v-model="item.templateName" :disabled="true" />
 					<view class="icon more">&#xe62b;</view>
@@ -22,11 +18,7 @@
 					<input placeholder="请选择" :value="item.patientList.length > 0 ? '已选择：' + item.patientList.length + '人' : ''" :disabled="true" />
 					<view class="icon more">&#xe62b;</view>
 				</picker>
-				<input :value="item.patientName" v-else />
-			</view>
-			<view class="form_group" v-if="item.type == 0">
-				<view class="lable">提醒内容</view>
-				<textarea v-model="item.op" placeholder="请输入提醒内容"></textarea>
+				<input :value="item.patientName" v-else :disabled="true" />
 			</view>
 		</view>
 		<button class="btn" @click="add()">确认</button>
@@ -72,6 +64,7 @@ export default {
 		getTemplateList() {
 			this.http.request({
 				url: '/work/record/template/list',
+				data: { type: this.item.type },
 				success: (res) => {
 					this.templateList = res.data.data;
 				}

app/pages/follow/doctor/index.vue

@@ -27,6 +27,27 @@
 				<text>新增</text>
 			</button>
 		</view>
+		<u-popup :show="show" round="15" mode="center" :closeable="true" :customStyle="{ width: '95%' }" @close="show = false">
+			<view class="popup">
+				<view class="mtt">{{ item.templateName }}</view>
+				<view class="item">
+					<text class="tt">科室名称</text>
+					<text class="la">{{ user.dept.deptName || '无科室' }}</text>
+				</view>
+				<view class="item">
+					<text class="tt">医生姓名</text>
+					<text class="la">{{ item.createBy }}</text>
+				</view>
+				<view class="item">
+					<text class="tt">复诊内容</text>
+					<text class="la">{{ item.op }}</text>
+				</view>
+				<view class="item">
+					<text class="tt">提醒日期</text>
+					<text class="la">{{ item.createTime }}</text>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -34,9 +55,12 @@
 export default {
 	data() {
 		return {
+			user: this.getUser(),
 			list: [],
-			param: { pageNum: 1, pageSize: 10, orderByColumn: 'k.id', isAsc: 'desc' },
-			loadMore: true
+			param: { pageNum: 1, pageSize: 10 },
+			loadMore: true,
+			show: false,
+			item: {}
 		};
 	},
 	onLoad(e) {
@@ -82,6 +106,15 @@ export default {
 			});
 		},
 		detail(item) {
+			if (this.param.type == 0) {
+				this.show = true;
+				this.http.request({
+					url: '/work/record/detail/' + item.id,
+					success: (res) => {
+						this.item = res.data.data;
+					}
+				});
+			}
 			if (this.param.type == 1) {
 				uni.navigateTo({ url: '/pages/follow/detail?id=' + item.id });
 			}

app/pages/visit/doctor/list.vue

@@ -60,7 +60,6 @@
 		},
 		onLoad(e) {
 			console.log(e);
-			this.setDefTime()
 			this.param.cardId = e.cardId
 			this.param.patientName = e.patientName
 			this.getData();

app/pages/visit/doctor/selectUser.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="main">
-		<view style="padding: 15px 0;">
+		<view style="padding: 15px 0">
 			<u-search placeholder="患者姓名" v-model="param.patientName" bgColor="white" :showAction="false" @search="refresh()" @clear="(param.patientName = ''), refresh()"></u-search>
 		</view>
 		<view class="list">
-			<view class="item" v-for="(item, index) in list" :key="index" @click="go('/pages/visit/doctor/list?cardId=' + item.cardId+'&patientName='+ item.name)">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="go('/pages/visit/doctor/list?cardId=' + item.cardId + '&patientName=' + item.name)">
 				<view class="title omit">
 					<text>{{ item.name }}</text>
-						<text class="check">({{ item.cardId }})</text>
+					<text class="check">({{ item.cardId }})</text>
 				</view>
 			</view>
 			<u-empty v-if="list.length == 0" text="暂无患者"></u-empty>
@@ -20,9 +20,9 @@ export default {
 	data() {
 		return {
 			list: [],
-			param:{
-				pageNum:1,
-				pageSize:20,
+			param: {
+				pageNum: 1,
+				pageSize: 20
 			},
 			loadMore: true
 		};
@@ -35,20 +35,14 @@ export default {
 	},
 	methods: {
 		getData() {
+			this.param.userId = this.getUser().userId;
 			this.http.request({
-				url: '/system/user/deptTree',
+				url: '/work/visit/patientCard',
+				data: this.param,
 				success: (res) => {
-					console.log(res);
-					this.param.departmentName = res.data.data[0].label
-					this.http.request({
-						url: '/work/visit/patientCard',
-						data: this.param,
-						success: (res) => {
-							this.loadMore = res.data.pages > this.param.pageNum ? true : false;
-							res.data.rows.forEach((item) => {
-								this.list.push(item);
-							});
-						}
+					this.loadMore = res.data.pages > this.param.pageNum ? true : false;
+					res.data.rows.forEach((item) => {
+						this.list.push(item);
 					});
 				}
 			});

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/vo/VisitVoList.java

@@ -15,6 +15,10 @@ public class VisitVoList {
     @ApiModelProperty(value = "患者ID")
     private Long patId;
 
+    @ApiModelProperty(value = "就诊卡号")
+    private String cardId;
+
+
     @ApiModelProperty(value = "患者姓名")
     private String name;