From af3cb649883d1bfaa9abf9d647304fbcc21553cd Mon Sep 17 00:00:00 2001
From: liuhongrui <liuhr@ccbjb.com.cn>
Date: Wed, 5 Mar 2025 13:07:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?ServiceRequest=E8=A1=A8=20=E6=96=B0?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=A0=B8=E5=AF=B9=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/openhis/workflow/domain/ServiceRequest.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
index c7029161..c1fd203e 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
@@ -82,6 +82,9 @@ public class ServiceRequest extends HisBaseEntity {
     /** 执行人 */
     private Long performerId;
 
+    /** 核对人 */
+    private Long performerCheckId;
+
     /** 执行位置 */
     private Long locationId;
 

From 64f23e3d63baf5e54e1d2780f272116a73c1de5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E8=8F=B2?= <12704587+yvwen@user.noreply.gitee.com>
Date: Wed, 5 Mar 2025 13:26:36 +0800
Subject: [PATCH 2/2] .

---
 .../src/views/patientManagement/outpatienRecords/index.vue  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue
index c1267df7..fc13a7d6 100644
--- a/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue
+++ b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue
@@ -9,7 +9,7 @@
 				<el-input v-model="queryParams.phone" placeholder="请输入联系方式" clearable style="width: 200px"
 					@keyup.enter="handleQuery" />
 			</el-form-item>
-			<el-form-item label="病人名称" prop="patientname">
+			<el-form-item label="起始时间">
 				<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
 					start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 			</el-form-item>
@@ -41,7 +41,7 @@
 			<el-table-column prop="workCompany" label="会诊医生工作单位" width="180" />
 			<el-table-column prop="organizationName" label="协同服务" width="180" /> -->
 		</el-table>
-		<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+		<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo"
 			v-model:limit="queryParams.pageSize" @pagination="getList" />
 	</div>
 </template>
@@ -93,7 +93,7 @@ function getList() {
 /** 搜索按钮操作 */
 function handleQuery() {
 	console.log("123",queryParams.value)
-	queryParams.value.pageNum = 1;
+	queryParams.value.pageNo = 1;
 	getList();
 }
 /** 重置按钮操作 */