更新

admin-ui/src/views/work/visit/detail.vue

@@ -97,7 +97,7 @@
               <div class="bsg"></div>
               <div class="tit">就诊结果</div>
             </div>
-            <el-table height="350px" :data="dgList">
+            <el-table height="calc(100vh - 570px)" :data="dgList">
               <el-table-column label="诊断名称" align="center" prop="diagnosticName"></el-table-column>
               <el-table-column label="诊断代码" align="center" prop="diagnosticCode"></el-table-column>
               <el-table-column label="诊断时间" align="center" prop="diagnosisTime"></el-table-column>
@@ -122,8 +122,8 @@
         <el-col :span="4">
           <div class="bos" style="height: calc(100vh - 240px)">
             <div class="visitList">
-              <div class="item" :class="{ active: visitCurrent == index }" v-for="(item, index) in obrList" @click="visitClick(item, index)">
-                {{ item.department }}
+              <div class="item" :class="{ active: obrCurrent == index }" v-for="(item, index) in obrList" @click="obrClick(item, index)">
+                {{ item.medTechProName }}
               </div>
             </div>
           </div>
@@ -135,14 +135,14 @@
               <div class="tit">详细检测报告</div>
             </div>
             <el-descriptions :column="3" border>
-              <el-descriptions-item label="医技项目名称">{{ obrList[current].medTechProName }}</el-descriptions-item>
-              <el-descriptions-item label="报告完成时间">{{ obrList[current].reportCompleteTime }}</el-descriptions-item>
-              <el-descriptions-item label="危机标志">{{ obrList[current].signs }}</el-descriptions-item>
-              <el-descriptions-item label="样本收到日期">{{ obrList[current].sampleReceivedDate }}</el-descriptions-item>
-              <el-descriptions-item label="检查部位或样本">{{ obrList[current].checkpoint }}</el-descriptions-item>
-              <el-descriptions-item label="执行科室名称">{{ obrList[current].executeDepartmentName }}</el-descriptions-item>
-              <el-descriptions-item label="审核医生">{{ obrList[current].reviewDoctorName }}</el-descriptions-item>
-              <el-descriptions-item label="报告单日期">{{ obrList[current].reportDate }}</el-descriptions-item>
+              <el-descriptions-item label="医技项目名称">{{ obrList[obrCurrent].medTechProName }}</el-descriptions-item>
+              <el-descriptions-item label="报告完成时间">{{ obrList[obrCurrent].reportCompleteTime }}</el-descriptions-item>
+              <el-descriptions-item label="危机标志">{{ obrList[obrCurrent].signs }}</el-descriptions-item>
+              <el-descriptions-item label="样本收到日期">{{ obrList[obrCurrent].sampleReceivedDate }}</el-descriptions-item>
+              <el-descriptions-item label="检查部位或样本">{{ obrList[obrCurrent].checkpoint }}</el-descriptions-item>
+              <el-descriptions-item label="执行科室名称">{{ obrList[obrCurrent].executeDepartmentName }}</el-descriptions-item>
+              <el-descriptions-item label="审核医生">{{ obrList[obrCurrent].reviewDoctorName }}</el-descriptions-item>
+              <el-descriptions-item label="报告单日期">{{ obrList[obrCurrent].reportDate }}</el-descriptions-item>
             </el-descriptions>
           </div>
           <div class="bos">
@@ -150,7 +150,7 @@
               <div class="bsg"></div>
               <div class="tit">检查项目</div>
             </div>
-            <el-table height="350px" :data="obxList">
+            <el-table height="400px" :data="obxList">
               <el-table-column label="医技观察项目" align="center" prop="mecTechObsProject"></el-table-column>
               <el-table-column label="医技项目名称" align="center" prop="mecTechObsName"></el-table-column>
               <el-table-column label="观察值" align="center" prop="obsProjectDetail"></el-table-column>
@@ -176,6 +176,7 @@ export default {
     return {
       current: 0,
       visitCurrent: 0,
+      obrCurrent: 0,
       activeName: '患者信息',
       patient: {}, //患者详细信息
       visitList: [], //患者住院信息列表
@@ -200,14 +201,18 @@ export default {
         this.getVisitList();
       }
       if (tab.name == '检查项目') {
+        this.obrCurrent = 0;
         this.getObrList();
-        this.getObxList();
       }
     },
     visitClick(item, index) {
       this.visitCurrent = index;
       this.getDgList(item.id);
     },
+    obrClick(item, index) {
+      this.obrCurrent = index;
+      this.getObxList(item.id);
+    },
     //患者信息
     getPatient() {
       this.get({ url: '/work/patient/detail/' + this.param.patId }).then((response) => {
@@ -239,11 +244,14 @@ export default {
     getObrList() {
       this.get({ url: '/work/request/patid/' + this.param.patId }).then((response) => {
         this.obrList = response.data;
+        if (this.obrList.length > 0) {
+          this.getObxList(this.obrList[0].id);
+        }
       });
     },
     /** 查询诊断记录表 */
-    getObxList() {
-      this.get({ url: '/work/result/patid/' + this.param.patId }).then((response) => {
+    getObxList(obrId) {
+      this.get({ url: '/work/result/getResults/' + obrId }).then((response) => {
         this.obxList = response.data;
       });
     }

app/pages/detection/doctor/list.vue

@@ -2,18 +2,16 @@
 	<view class="main">
 		<view class="top">
 			<view class="nameBox">
-				<view class="name">{{patientName}}</view>
-				<text class="icon arrow" style="margin-left: 10px;">&#xeb73;</text>
+				<view class="name">{{ patientName }}</view>
+				<text class="icon arrow" style="margin-left: 10px">&#xeb73;</text>
 				<view class="change" @click="go('/pages/detection/doctor/selectUser')">切换就诊人</view>
 			</view>
-			<view class="cardNum">{{cardId}}</view>
-			<view style="display: flex;text-align: center;margin: 5px;padding: 13px;font-size: 13px;"
-				@click="calendar = true">
+			<view class="cardNum">{{ cardId }}</view>
+			<view style="display: flex; text-align: center; margin: 5px; padding: 13px; font-size: 13px" @click="calendar = true">
 				<input placeholder="点击选择时间" :disabled="true" v-model="startTime" type="select" />
 				<view>至</view>
 				<input placeholder="点击选择时间" :disabled="true" v-model="endTime" type="select" />
 			</view>
-
 		</view>
 
 		<view class="tab">
@@ -28,176 +26,173 @@
 			</view>
 			<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>
+		<u-calendar :show="calendar" monthNum="120" mode="range" :maxDate="util.getDate()" minDate="2020-01-01" @confirm="confirm" @close="close()" :closeOnClickOverlay="true"></u-calendar>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				userList: [],
-				current: 0,
-				time: null,
-				tab: [{
+export default {
+	data() {
+		return {
+			userList: [],
+			current: 0,
+			time: null,
+			tab: [
+				{
 					label: '就诊记录'
-				}, ],
-				startTime: null,
-				endTime: null,
-				list: [],
-				param: {
-				
-				},
-				loadMore: true,
-				calendar: false,
-				user:{},
-				patId:null,
-				patientName:null,
-			}
+				}
+			],
+			startTime: null,
+			endTime: null,
+			list: [],
+			param: {},
+			calendar: false,
+			user: {},
+			patId: null,
+			patientName: null
+		};
+	},
+	onLoad(e) {
+		console.log(e);
+		//this.setDefTime()
+		this.patId = e.patId;
+		this.patientName = e.patientName;
+		this.cardId = e.cardId;
+		this.getData();
+	},
+	methods: {
+		setDefTime() {
+			const today = new Date();
+			const todayYear = today.getFullYear();
+			const todayMonth = today.getMonth() + 1 < 10 ? '0' + (today.getMonth() + 1) : today.getMonth() + 1;
+			const todayDay = today.getDate() < 10 ? '0' + today.getDate() : today.getDate();
+			this.param.endTime = todayYear + todayMonth + todayDay;
+			this.endTime = todayYear + '-' + todayMonth + '-' + todayDay;
+
+			let beforeTime = new Date(today.getTime() - 24 * 60 * 60 * 1000 * 30);
+			//一个月前
+			let beforeTimeYear = beforeTime.getFullYear();
+			let beforeTimeMonth = beforeTime.getMonth() + 1;
+			let beforeTimeDay = beforeTime.getDate();
+			beforeTimeMonth = beforeTimeMonth < 10 ? '0' + beforeTimeMonth : beforeTimeMonth;
+			beforeTimeDay = beforeTimeDay < 10 ? '0' + beforeTimeDay : beforeTimeDay;
+			this.param.startTime = beforeTimeYear + beforeTimeMonth + beforeTimeDay;
+			this.startTime = beforeTimeYear + '-' + beforeTimeMonth + '-' + beforeTimeDay;
+		},
+		confirm(e) {
+			this.calendar = false;
+			this.param.startTime = e[0].replace(/-/g, '');
+			this.param.endTime = e[e.length - 1].replace(/-/g, '');
+			this.startTime = e[0];
+			this.endTime = e[e.length - 1];
+			this.refresh();
+		},
+		close() {
+			this.calendar = false;
 		},
-		onLoad(e) {
+		getData() {
+			this.http.request({
+				url: '/work/request/patid/' + this.patId,
+				data: this.param,
+				success: (res) => {
+					this.list = res.data.data;
+				}
+			});
+		},
+		click(e) {
+			this.current = e.index;
+			this.param.type = e.dictValue;
+			this.refresh();
+		},
+		selectTime(e) {
 			console.log(e);
-			//this.setDefTime()
-			this.patId = e.patId
-			this.patientName = e.patientName
-			this.cardId = e.cardId
-			this.getData();
 		},
-		methods: {
-			setDefTime() {
-				const today = new Date();
-				const todayYear = today.getFullYear()
-				const todayMonth = (today.getMonth() + 1) < 10 ? "0" + (today.getMonth() + 1) : (today.getMonth() + 1)
-				const todayDay = today.getDate() < 10 ? "0" + today.getDate() : today.getDate()
-				this.param.endTime = todayYear + todayMonth + todayDay
-				this.endTime = todayYear + '-' + todayMonth + '-' + todayDay
-
-				let beforeTime = new Date(today.getTime() - 24 * 60 * 60 * 1000 * 30);
-				//一个月前
-				let beforeTimeYear = beforeTime.getFullYear();
-				let beforeTimeMonth = beforeTime.getMonth() + 1;
-				let beforeTimeDay = beforeTime.getDate();
-				beforeTimeMonth = beforeTimeMonth < 10 ? "0" + beforeTimeMonth : beforeTimeMonth;
-				beforeTimeDay = beforeTimeDay < 10 ? "0" + beforeTimeDay : beforeTimeDay;
-				this.param.startTime = beforeTimeYear + beforeTimeMonth + beforeTimeDay
-				this.startTime = beforeTimeYear + "-" + beforeTimeMonth + "-" + beforeTimeDay
-
-			},
-			confirm(e) {
-				this.calendar = false;
-				this.param.startTime = e[0].replace(/-/g, '');;
-				this.param.endTime = e[e.length - 1].replace(/-/g, '');;
-				this.startTime = e[0]
-				this.endTime = e[e.length - 1]
-				this.refresh();
-			},
-			close() {
-				this.calendar = false;
-			},
-			getData() {
-				this.http.request({
-					url: '/work/request/patid/' + this.patId,
-					data:this.param,
-					success: (res) => {
-						this.list = res.data.data;
-					}
-				});
-			},
-			click(e) {
-				this.current = e.index;
-				this.param.type = e.dictValue;
-				this.refresh();
-			},
-			selectTime(e) {
-				console.log(e);
-			},
-			go(url) {
-				uni.navigateTo({
-					url: url
-				});
-			},
-			//刷新数据
-			refresh() {
-				this.loadMore = true;
-				// this.param.pageNum = 1;
-				this.list = [];
-				this.getData();
-			}
+		go(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+		//刷新数据
+		refresh() {
+			this.list = [];
+			this.getData();
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-	.top {
-		padding: 15px;
-		background-color: white;
-		border-radius: 8px;
-
-		.nameBox {
-			display: flex;
-			align-items: center;
+.top {
+	padding: 15px;
+	background-color: white;
+	border-radius: 8px;
 
-			.name {
-				font-weight: bold;
-				font-size: 16px;
-			}
+	.nameBox {
+		display: flex;
+		align-items: center;
 
-			.change {
-				color: royalblue;
-				margin-left: 20px;
-			}
+		.name {
+			font-weight: bold;
+			font-size: 16px;
 		}
 
-		.cardNum {
-			padding-top: 10px;
-			font-size: 14px;
+		.change {
+			color: royalblue;
+			margin-left: 20px;
 		}
 	}
 
-	.content {
-		padding: 15px;
-		background-color: white;
-		border-radius: 8px;
-
-		.list {
-			.item {
-				overflow: hidden;
-				padding: 13px 0;
-				border-bottom: 1px solid $line;
-				margin-bottom: 10px;
-
-				.title {
-					font-size: 18px;
-					font-weight: bold;
-				}
+	.cardNum {
+		padding-top: 10px;
+		font-size: 14px;
+	}
+}
+
+.content {
+	padding: 15px;
+	background-color: white;
+	border-radius: 8px;
+
+	.list {
+		.item {
+			overflow: hidden;
+			padding: 13px 0;
+			border-bottom: 1px solid $line;
+			margin-bottom: 10px;
+			&:last-child {
+				border: 0px;
+			}
+			.title {
+				font-size: 18px;
+				font-weight: bold;
+			}
 
-				.time {
-					font-size: 14px;
-					padding-top: 15px;
-					color: $font-c;
-				}
+			.time {
+				font-size: 14px;
+				padding-top: 15px;
+				color: $font-c;
 			}
 		}
 	}
+}
 
-	.userChangeTitle {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 48px;
-		font-weight: bold;
-	}
+.userChangeTitle {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 48px;
+	font-weight: bold;
+}
 
-	.userChangeItem {
-		width: 100%;
+.userChangeItem {
+	width: 100%;
 
-		.userChangeItemName {
-			padding: 5px 10px;
-		}
+	.userChangeItemName {
+		padding: 5px 10px;
+	}
 
-		.userChangeCartNo {
-			padding: 5px 10px;
-		}
+	.userChangeCartNo {
+		padding: 5px 10px;
 	}
-</style>
+}
+</style>

app/pages/detection/doctor/selectUser.vue

@@ -7,7 +7,6 @@
 			<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>
 				</view>
 			</view>
 			<u-empty v-if="list.length == 0" text="暂无患者"></u-empty>

app/pages/visit/doctor/detail.vue

@@ -37,8 +37,7 @@
 				url: '/work/diagnosis/list?visitId=' + e.id,
 				loading: 'true',
 				success: (res) => {
-					console.log(res);
-					this.item = res.data.rows
+					this.item = res.data.data;
 				}
 			});
 		},

app/pages/visit/doctor/list.vue

@@ -23,8 +23,7 @@
 					<view class="time">{{ item.admissionTime }}</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>
 	</view>
@@ -42,13 +41,8 @@ export default {
 			endTime: null,
 			list: [],
 			param: {
-				pageNum: 1,
-				pageSize: 10,
-				cardId: null,
-				orderByColumn: 'id',
-				isAsc: 'desc'
+				cardId: null
 			},
-			loadMore: true,
 			calendar: false,
 			user: {}
 		};
@@ -93,10 +87,8 @@ export default {
 			this.http.request({
 				url: '/work/visit/list',
 				data: this.param,
-				loading: 'false',
 				success: (res) => {
-					this.loadMore = res.data.pages > this.param.pageNum ? true : false;
-					this.list.push(...res.data.rows);
+					this.list = res.data.data;
 				}
 			});
 		},
@@ -169,7 +161,9 @@ export default {
 			padding: 13px 0;
 			border-bottom: 1px solid $line;
 			margin-bottom: 10px;
-
+			&:last-child {
+				border: 0px;
+			}
 			.title {
 				font-size: 18px;
 				font-weight: bold;