更新

admin-ui/src/assets/styles/extend.scss

@@ -497,3 +497,14 @@
     padding-left: 5px;
   }
 }
+.visitList{
+  .item{
+    font-size: 14px;
+    padding: 5px;
+    cursor: pointer;
+    color: #606266;
+    &.active{
+      color: #1890ff;
+    }
+  }
+}

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

@@ -53,92 +53,118 @@
     </div>
     <!--就诊信息-->
     <div v-if="activeName == '就诊信息'">
-      <div class="bos">
-        <div class="lab">
-          <div class="bsg"></div>
-          <div class="tit">就诊信息</div>
-        </div>
-        <el-descriptions :column="3" border>
-          <el-descriptions-item label="患者类别">
-            <dict-tag :options="dict.type.pat_class" :value="visit.patClass"></dict-tag>
-          </el-descriptions-item>
-          <el-descriptions-item label="所在病区">{{ visit.wardName }}</el-descriptions-item>
-          <el-descriptions-item label="主治医生">{{ visit.physician }}</el-descriptions-item>
-          <el-descriptions-item label="主管护士">{{ visit.nurseCode }}</el-descriptions-item>
-          <el-descriptions-item label="在院状态">
-            <dict-tag :options="dict.type.hospital_status" :value="visit.hospitalStatus" />
-          </el-descriptions-item>
-          <el-descriptions-item label="入院次数">{{ visit.hospitalizedNumber }}</el-descriptions-item>
-          <el-descriptions-item label="住院号">{{ patient.blh }}</el-descriptions-item>
-          <el-descriptions-item label="出院方式">
-            <dict-tag :options="dict.type.discharge_method" :value="visit.dischargeMothod" />
-          </el-descriptions-item>
-          <el-descriptions-item label="入院时间">{{ visit.admissionTime }}</el-descriptions-item>
-          <el-descriptions-item label="出院时间">{{ visit.dischargeTime }}</el-descriptions-item>
-          <el-descriptions-item label="危重级别">{{ visit.level }}</el-descriptions-item>
-          <el-descriptions-item label="入区时间">{{ visit.entryTime }}</el-descriptions-item>
-          <el-descriptions-item label="出区时间">{{ visit.exitTime }}</el-descriptions-item>
-          <el-descriptions-item label="出区原因">{{ visit.reasonArea }}</el-descriptions-item>
-        </el-descriptions>
-      </div>
-      <div class="bos">
-        <div class="lab">
-          <div class="bsg"></div>
-          <div class="tit">就诊结果</div>
-        </div>
-        <el-table height="350px" :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>
-          <el-table-column label="诊断类型" align="center" prop="diagnosticType">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.diagnostic_type" :value="scope.row.diagnosticType" />
-            </template>
-          </el-table-column>
-          <el-table-column label="诊断类别" align="center" prop="diagnosticCategoryCode">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.diagnostic_category_code" :value="scope.row.diagnosticCategoryCode" />
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
+      <el-row>
+        <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 visitList" @click="visitClick(item, index)">
+                {{ item.department }}
+              </div>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="20" style="padding-left: 15px">
+          <div class="bos" v-if="visitList.length > 0">
+            <div class="lab">
+              <div class="bsg"></div>
+              <div class="tit">就诊信息</div>
+            </div>
+            <el-descriptions :column="3" border>
+              <el-descriptions-item label="患者类别">
+                <dict-tag :options="dict.type.pat_class" :value="visitList[visitCurrent].patClass"></dict-tag>
+              </el-descriptions-item>
+              <el-descriptions-item label="所在病区">{{ visitList[visitCurrent].wardName }}</el-descriptions-item>
+              <el-descriptions-item label="主治医生">{{ visitList[visitCurrent].physician }}</el-descriptions-item>
+              <el-descriptions-item label="主管护士">{{ visitList[visitCurrent].nurseCode }}</el-descriptions-item>
+              <el-descriptions-item label="在院状态">
+                <dict-tag :options="dict.type.hospital_status" :value="visitList[visitCurrent].hospitalStatus" />
+              </el-descriptions-item>
+              <el-descriptions-item label="入院次数">{{ visitList[visitCurrent].hospitalizedNumber }}</el-descriptions-item>
+              <el-descriptions-item label="住院号">{{ patient.blh }}</el-descriptions-item>
+              <el-descriptions-item label="出院方式">
+                <dict-tag :options="dict.type.discharge_method" :value="visitList[visitCurrent].dischargeMothod" />
+              </el-descriptions-item>
+              <el-descriptions-item label="入院时间">{{ visitList[visitCurrent].admissionTime }}</el-descriptions-item>
+              <el-descriptions-item label="出院时间">{{ visitList[visitCurrent].dischargeTime }}</el-descriptions-item>
+              <el-descriptions-item label="危重级别">{{ visitList[visitCurrent].level }}</el-descriptions-item>
+              <el-descriptions-item label="入区时间">{{ visitList[visitCurrent].entryTime }}</el-descriptions-item>
+              <el-descriptions-item label="出区时间">{{ visitList[visitCurrent].exitTime }}</el-descriptions-item>
+              <el-descriptions-item label="出区原因">{{ visitList[visitCurrent].reasonArea }}</el-descriptions-item>
+            </el-descriptions>
+          </div>
+          <div class="bos">
+            <div class="lab">
+              <div class="bsg"></div>
+              <div class="tit">就诊结果</div>
+            </div>
+            <el-table height="350px" :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>
+              <el-table-column label="诊断类型" align="center" prop="diagnosticType">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.diagnostic_type" :value="scope.row.diagnosticType" />
+                </template>
+              </el-table-column>
+              <el-table-column label="诊断类别" align="center" prop="diagnosticCategoryCode">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.diagnostic_category_code" :value="scope.row.diagnosticCategoryCode" />
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-col>
+      </el-row>
     </div>
     <!--检查项目-->
     <div v-if="activeName == '检查项目'">
-      <div class="bos" v-if="obrList.length > 0">
-        <div class="lab">
-          <div class="bsg"></div>
-          <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>
-      </div>
-      <div class="bos">
-        <div class="lab">
-          <div class="bsg"></div>
-          <div class="tit">检查项目</div>
-        </div>
-        <el-table height="350px" :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>
-          <el-table-column label="项目结果信息" align="center" prop="projectInfo"></el-table-column>
-          <el-table-column label="单位代码" align="center" prop="unitCode"></el-table-column>
-          <el-table-column label="单位名称" align="center" prop="result"></el-table-column>
-          <el-table-column label="参值范围" align="center" prop="result"></el-table-column>
-          <el-table-column label="高低标志" align="center" prop="sign"></el-table-column>
-          <el-table-column label="微生物观察分类" align="center" prop="obsClassification"></el-table-column>
-          <el-table-column label="检验方法" align="center" prop="testMethod"></el-table-column>
-        </el-table>
-      </div>
+      <el-row>
+        <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>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="20" style="padding-left: 15px">
+          <div class="bos" v-if="obrList.length > 0">
+            <div class="lab">
+              <div class="bsg"></div>
+              <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>
+          </div>
+          <div class="bos">
+            <div class="lab">
+              <div class="bsg"></div>
+              <div class="tit">检查项目</div>
+            </div>
+            <el-table height="350px" :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>
+              <el-table-column label="项目结果信息" align="center" prop="projectInfo"></el-table-column>
+              <el-table-column label="单位代码" align="center" prop="unitCode"></el-table-column>
+              <el-table-column label="单位名称" align="center" prop="result"></el-table-column>
+              <el-table-column label="参值范围" align="center" prop="result"></el-table-column>
+              <el-table-column label="高低标志" align="center" prop="sign"></el-table-column>
+              <el-table-column label="微生物观察分类" align="center" prop="obsClassification"></el-table-column>
+              <el-table-column label="检验方法" align="center" prop="testMethod"></el-table-column>
+            </el-table>
+          </div>
+        </el-col>
+      </el-row>
     </div>
   </div>
 </template>
@@ -149,9 +175,10 @@ export default {
   data() {
     return {
       current: 0,
+      visitCurrent: 0,
       activeName: '患者信息',
       patient: {}, //患者详细信息
-      visit: {}, //住院信息
+      visitList: [], //患者住院信息列表
       nkList: [], //亲属列表
       dgList: [], //诊断记录
       obrList: [], //检测结果列表
@@ -164,41 +191,48 @@ export default {
   },
   mounted() {
     this.getPatient();
-    this.getVisit();
+    this.getNkList();
   },
   methods: {
     handleClick(tab, event) {
       if (tab.name == '就诊信息') {
-        this.getNkList();
-        this.getDgList();
+        this.visitCurrent = 0;
+        this.getVisitList();
       }
       if (tab.name == '检查项目') {
         this.getObrList();
         this.getObxList();
       }
     },
+    visitClick(item, index) {
+      this.visitCurrent = index;
+      this.getDgList(item.id);
+    },
     //患者信息
     getPatient() {
       this.get({ url: '/work/patient/detail/' + this.param.patId }).then((response) => {
         this.patient = response.data;
       });
     },
-    //住院信息
-    getVisit() {
-      this.get({ url: '/work/visit/detail/' + this.param.id }).then((response) => {
-        this.visit = response.data;
-      });
-    },
     /** 查询亲属表 */
     getNkList() {
       this.get({ url: '/work/nk/list', data: { patId: this.param.patId } }).then((response) => {
         this.nkList = response.data;
       });
     },
-    /** 查询诊断记录表 */
-    getDgList() {
-      this.get({ url: '/work/diagnosis/list', data: this.queryParams }).then((response) => {
-        this.dgList = response.rows;
+    //住院信息列表
+    getVisitList() {
+      this.get({ url: '/work/visit/list', data: { patId: this.param.patId } }).then((response) => {
+        this.visitList = response.data;
+        if (this.visitList.length > 0) {
+          this.getDgList(this.visitList[0].id);
+        }
+      });
+    },
+    /** 住院诊断列表 */
+    getDgList(visitId) {
+      this.get({ url: '/work/diagnosis/list', data: { visitId: visitId } }).then((response) => {
+        this.dgList = response.data;
       });
     },
     /** 查询诊断记录表 */

app/pages/visit/doctor/detail.vue

@@ -4,7 +4,6 @@
 			<view class="nameBox">
 				<view class="name">{{patientName}}</view>
 			</view>
-			<view class="cardNum">{{cardId}}</view>
 			<view class="list">
 				<view class="item" v-for="(item, index) in item">
 					<view class="topTitle">{{ titleType(item.diagnosticType) }}</view>

app/pages/visit/doctor/list.vue

@@ -2,18 +2,15 @@
 	<view class="main">
 		<view class="top">
 			<view class="nameBox">
-				<view class="name">{{param.patientName}}</view>
-				<text class="icon arrow" style="margin-left: 10px;">&#xeb73;</text>
+				<view class="name">{{ param.patientName }}</view>
+				<text class="icon arrow" style="margin-left: 10px">&#xeb73;</text>
 				<view class="change" @click="go('/pages/visit/doctor/selectUser')">切换就诊人</view>
 			</view>
-			<view class="cardNum">{{param.cardId}}</view>
-			<view style="display: flex;text-align: center;margin: 5px;padding: 13px;font-size: 13px;"
-				@click="calendar = true">
+			<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">
@@ -29,199 +26,181 @@
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
 			<u-empty v-if="!loadMore && 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: [{
-					label: '就诊记录'
-				}, ],
-				startTime: null,
-				endTime: null,
-				list: [],
-				param: {
-					// pageNum: 1,
-					// pageSize: 10,
-					cardId:null,
-					patientName:null,
-				},
-				loadMore: true,
-				calendar: false,
-				user:{},
-			}
+export default {
+	data() {
+		return {
+			userList: [],
+			current: 0,
+			time: null,
+			tab: [{ label: '就诊记录' }],
+			startTime: null,
+			endTime: null,
+			list: [],
+			param: {
+				pageNum: 1,
+				pageSize: 10,
+				cardId: null,
+				orderByColumn: 'id',
+				isAsc: 'desc'
+			},
+			loadMore: true,
+			calendar: false,
+			user: {}
+		};
+	},
+	onLoad(e) {
+		this.param.patId = e.patId;
+		this.param.patientName = e.patientName;
+		this.getData();
+	},
+	methods: {
+		groupChange(n) {
+			uni.showModal({
+				title: '提示',
+				content: '确定切换就诊人',
+				success: (res) => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/app/user/bind/change/' + n.id,
+							success: (res) => {
+								this.param.patientName = n.patientName;
+								this.param.cardId = n.cardId;
+								this.closePopup();
+								this.refresh();
+							}
+						});
+					}
+				}
+			});
+		},
+		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();
 		},
-		onLoad(e) {
+		close() {
+			this.calendar = false;
+		},
+		getData() {
+			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);
+				}
+			});
+		},
+		click(e) {
+			this.current = e.index;
+			this.param.type = e.dictValue;
+			this.refresh();
+		},
+		selectTime(e) {
 			console.log(e);
-			this.param.cardId = e.cardId
-			this.param.patientName = e.patientName
-			this.getData();
 		},
-		methods: {
-			groupChange(n) {
-				uni.showModal({
-					title: '提示',
-					content: '确定切换就诊人',
-					success: (res) => {
-						if (res.confirm) {
-							this.http.request({
-								url: '/app/user/bind/change/' + n.id,
-								success: (res) => {
-									this.param.patientName = n.patientName
-									this.param.cardId = n.cardId
-									this.closePopup()
-									this.refresh()
-								}
-							});
-						}
-					}
-				});
-			},
-			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() {
-				console.log(this.param.cardId);
-				this.http.request({
-					url: '/work/visit/list?cardId=' + this.param.cardId,
-					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);
-					}
-				});
-			},
-			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.loadMore = true;
+			this.param.pageNum = 1;
+			this.list = [];
+			this.getData();
+		}
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNum++;
+			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;
+
+			.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/visit/doctor/selectUser.vue

@@ -4,10 +4,9 @@
 			<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?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>

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/DiagnosisController.java

@@ -36,10 +36,9 @@ public class DiagnosisController extends BaseController {
 
     @ApiOperation(value = "获取诊断列表")
     @GetMapping("/list")
-    public TableDataInfo list(Diagnosis diagnosis){
-        startPage();
+    public AjaxResult list(Diagnosis diagnosis){
         List<Diagnosis> list = dgService.selectList(diagnosis);
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
     @ApiOperation(value = "根据id查询")

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/VisitController.java

@@ -45,10 +45,9 @@ public class VisitController extends BaseController {
     @ApiOperation(value = "获取住院信息列表")
     @PreAuthorize("@ss.hasPermi('work:visit:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Visit visit){
-        startPage();
+    public AjaxResult list(Visit visit){
         List<Visit> list = visitService.selectList(visit);
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
     @ApiOperation(value = "根据id查询住院信息")

ruoyi-admin/src/main/resources/mapper/work/VisitMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  AND (v.dept_id = #{deptId} OR v.dept_id IN (SELECT s.dept_id FROM sys_dept s WHERE s.parent_id in (SELECT s.dept_id FROM sys_dept s WHERE find_in_set( #{deptId}, parent_id ))))
             </if>
         </where>
+        order by v.id desc
     </select>