From a2d315bd92b775740b64d75fe7a16ed98c9f1884 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, 12 Mar 2025 11:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9A=AE=E8=AF=95=20=E8=BE=93=E6=B6=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InfusionRecord/component/api.js           |   0
 .../InfusionRecord/component/prescription.vue | 222 ++++++++++++++++
 .../clinicManagement/InfusionRecord/index.vue | 245 ++++++++++++++++++
 .../clinicManagement/skinRecord/index.vue     |  94 ++++---
 .../outpatienRecords/index.vue                |   1 +
 5 files changed, 520 insertions(+), 42 deletions(-)
 create mode 100644 openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/component/api.js
 create mode 100644 openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/component/prescription.vue
 create mode 100644 openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/index.vue

diff --git a/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/component/api.js b/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/component/api.js
new file mode 100644
index 00000000..e69de29b
diff --git a/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/component/prescription.vue b/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/component/prescription.vue
new file mode 100644
index 00000000..b618c393
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/component/prescription.vue
@@ -0,0 +1,222 @@
+<template>
+  <div class="prescription">
+    <div class="prescription-header">
+        <el-row class="row-spacing">
+            <el-button type="primary" plain icon="Printer" @click="printPrescription">打印处方</el-button>
+		    <el-button type="primary" icon="Printer" plain @click="printInfusionRecordPrescription">打印输液处方</el-button>
+        </el-row>
+        <el-row class="row-spacing">
+            <el-col :span="6">
+                <span>门诊号</span>
+                <span class="fixed-width">12345689789123456</span>
+            </el-col>
+            <el-col :span="6">
+                <span>姓名</span>
+                <span class="fixed-width">小红</span>
+            </el-col>
+            <el-col :span="4">
+                <span>性别</span>
+                <span style="display: inline-block;width: 80px;margin-left: 10px;border-bottom: 1px solid black;text-align: center;">男</span>
+            </el-col>
+            <el-col :span="7">
+                <span>年龄</span>
+                <span class="fixed-width">25岁10月10天</span>
+            </el-col>
+        </el-row>
+        <el-row class="row-spacing">
+            <el-col :span="6">
+                <span>处方号</span>
+                <span class="fixed-width">12345689789123456</span>
+            </el-col>
+            <el-col :span="6">
+                <span>医生</span>
+                <span class="fixed-width">张三</span>
+            </el-col>
+            <el-col :span="4">
+                <span>类型</span>
+                <span style="display: inline-block;width: 80px;margin-left: 10px;border-bottom: 1px solid black;text-align: center;">自自费费</span>
+            </el-col>
+            <el-col :span="7">
+                <span>登记时间</span>
+                <span class="fixed-width">2025年1月1日 11:11:11</span>
+            </el-col>
+        </el-row>
+        <el-row class="row-spacing">
+            <el-col :span="6">
+                <span>病人ID</span>
+                <span class="fixed-width">12345683456</span>
+            </el-col>
+            <el-col :span="6">
+                <span>状态</span>
+                <span class="fixed-width" style="color: salmon;">门诊就诊|不分发药|已审核</span>
+            </el-col>
+        </el-row>
+    </div>
+    <div style="margin-top: 15px;">
+      <el-tabs type="border-card">
+        <el-tab-pane label="西药处方">
+            <el-table :data="xiyaoList" border style="width: 100%;height: 58vh" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column prop="name" label="分组" width="60" />
+                <el-table-column prop="idCard" label="药品" width="180" />
+                <el-table-column prop="description" label="规格" width="160" />
+                <el-table-column prop="patientBusNo" label="用药途径" width="80" />
+                <el-table-column prop="encounterBusNo" label="用药频次" width="80" />
+                <el-table-column prop="phone" label="单次剂量" width="80" />
+                <el-table-column prop="genderEnum_enumText" label="剂量单位" width="80" />
+                <el-table-column prop="phone" label="用药天数" width="60" />
+                <el-table-column prop="encounterTime" label="总量" width="40" />
+                <el-table-column prop="encounterTime" label="单位" width="40" />
+                <el-table-column prop="subjectStatusEnum_enumText" label="单价（元）" width="100" />
+                <el-table-column prop="organizationName" label="组数" width="60" />
+                <el-table-column prop="doctorName" label="主嘱" width="40" />
+                <el-table-column prop="doctorName" label="用法说明" width="180" />
+                <el-table-column prop="doctorName" label="皮试" width="40" />
+                <el-table-column prop="doctorName" label="皮试状态" width="60" />
+                <el-table-column prop="doctorName" label="皮试结果" width="60" />
+                <el-table-column prop="doctorName" label="是否计价" width="60" />
+		    </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="中药处方">
+            <p style="color: blue;font-size: 17px;margin-top: 0;font-weight: bold;">中药方付数:1&nbsp;&nbsp;&nbsp;用法:</p>
+            <el-table :data="zhongyaoList" border style="width: 100%;height: 58vh" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column prop="idCard" label="药品" width="180" />
+                <el-table-column prop="encounterTime" label="单位" width="60" />
+                <el-table-column prop="encounterTime" label="数量" width="60" />
+                <el-table-column prop="subjectStatusEnum_enumText" label="单价" width="100" />
+                <el-table-column prop="organizationName" label="煎用方法" width="140" />
+                <el-table-column prop="doctorName" label="用药频次" width="160" />
+                <el-table-column prop="doctorName" label="规格" width="180" />
+                <el-table-column prop="doctorName" label="是否计价" width="80" />
+		    </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="辅助检查">
+            <el-table :data="fuzhuList" border style="width: 100%;height: 65vh" @selection-change="handleSelectionChange">
+                <el-table-column  type="selection" width="80" align="center">
+                    <template #header>
+                        <span>是否执行</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="idCard" label="检验检查" width="160" />
+                <el-table-column prop="encounterTime" label="说明" width="180" />
+                <el-table-column prop="encounterTime" label="部位" width="60" />
+                <el-table-column prop="subjectStatusEnum_enumText" label="单位" width="60" />
+                <el-table-column prop="organizationName" label="数量" width="60" />
+                <el-table-column prop="doctorName" label="单价" width="60" />
+                <el-table-column prop="doctorName" label="执行科室" width="140" />
+                <el-table-column prop="doctorName" label="执行时间" width="140" />
+                <el-table-column prop="doctorName" label="执行医生" width="100" />
+                <el-table-column prop="doctorName" label="皮试" width="60" />
+                <el-table-column prop="doctorName" label="皮试状态" width="80" />
+                <el-table-column prop="doctorName" label="皮试结果" width="80" />
+                <el-table-column label="操作" align="center" width="90" fixed="right" >
+                    <template #default="scope">
+                            <el-button link type="primary" icon="Edit" @click="handlePrescription(scope.row)" v-hasPermi="['system:menu:edit']">打印样本号</el-button>
+                    </template>
+			    </el-table-column>
+                <el-table-column prop="doctorName" label="是否计价" width="80" />
+		    </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="治疗与手术记录">
+            <el-table :data="shoushuList" border style="width: 100%;height: 58vh" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column prop="idCard" label="手术治疗" width="180" />
+                <el-table-column prop="encounterTime" label="疗程项目" width="180" />
+                <el-table-column prop="encounterTime" label="数量" width="60" />
+                <el-table-column prop="subjectStatusEnum_enumText" label="单位" width="60" />
+                <el-table-column prop="organizationName" label="单价" width="80" />
+                <el-table-column prop="doctorName" label="治疗次数" width="100" />
+                <el-table-column prop="doctorName" label="用法说明" width="180" />
+                <el-table-column prop="doctorName" label="是否理疗" width="120" />
+                <el-table-column prop="doctorName" label="执行科室" width="120" />
+		    </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="耗材处方">
+            <div style="align-items: center;">
+                <span style="color: blue;">耗材药房：</span>
+                <el-select v-model="value" placeholder="请选择">
+                    <el-option
+                    v-for="item in hcyaofangList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>&nbsp;
+                <el-button type="primary" plain @click="handleSelectionChange">更改耗材药房</el-button>
+            </div>
+            <br>
+            <el-table :data="haocaiList" border style="width: 100%;height: 58vh;" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column prop="idCard" label="医用耗材" width="180" />
+                <el-table-column prop="encounterTime" label="单位" width="60" />
+                <el-table-column prop="encounterTime" label="数量" width="60" />
+                <el-table-column prop="subjectStatusEnum_enumText" label="单价" width="100" />
+		    </el-table>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div></div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+// import { listOutpatienRecords, listDoctorNames } from "./component/api"
+
+const xiyaoList = ref([]);
+const zhongyaoList = ref([]);
+const fuzhuList = ref([]);
+const shoushuList = ref([]);
+const haocaiList = ref([]);
+const hcyaofangList = ref([]);
+
+const { proxy } = getCurrentInstance();
+
+const data = reactive({
+	form: {},
+	queryParams: {
+		pageNo: 1,
+		pageSize: 10,
+		doctorName: undefined,
+		searchKey: undefined,
+		phone: undefined,
+		patientid: undefined
+	},
+});
+const { queryParams } = toRefs(data);
+
+function handleSelectionChange(selection) {
+//   ids.value = selection.map(item => item.dictId);
+//   single.value = selection.length != 1;
+//   multiple.value = !selection.length;
+}
+//打印输液处方
+function printInfusionRecordPrescription() {
+
+}
+//打印处方
+function printPrescription() {
+
+}
+
+</script>
+
+<style>
+.prescription-header{
+    font-size: 15px;
+    margin-top: -20px;
+    /* background-color: #813030; */
+}
+.fixed-width {
+  display: inline-block;
+  width: 190px;
+  margin-left: 10px;
+  border-bottom: 1px solid black;
+  text-align: center;
+}
+.row-spacing {
+  margin-bottom: 20px; /* 设置每行的底部间距 */
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/index.vue b/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/index.vue
new file mode 100644
index 00000000..4ea7694c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/index.vue
@@ -0,0 +1,245 @@
+<template>
+    <div class="app-container1">
+
+		<div class="left">
+			<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+           		<el-form-item label="入院日期" prop="patientname">
+            		<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>
+		   		<el-form-item label="" prop="phone">
+		      		<el-input v-model="queryParams.phone"  placeholder="门诊号/病人/ID" clearable style="width: 180px"
+		         		@keyup.enter="handleQuery" />
+		   		</el-form-item>
+		   		<el-form-item>
+		      		<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+		      		<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+		   		</el-form-item>
+			</el-form>
+
+			<el-table :data="patientList" border style="width: 100%" highlight-current-row @current-change="handleCurrentChange" >
+				<el-table-column label="操作" align="center" width="90" fixed="right">
+					<template #default="scope">
+							<el-button link type="primary" icon="Edit" @click="handlePrescription(scope.row)" v-hasPermi="['system:menu:edit']">处方</el-button>
+					</template>
+				</el-table-column>
+				<el-table-column prop="busNo" label="处方号" width="160" />
+				<el-table-column prop="name" label="病人" width="120" />
+				<el-table-column prop="genderEnum" label="开方时间" width="140" />
+				<el-table-column prop="status" label="状态" width="140" />
+				<el-table-column prop="doctorName" label="开方医生" width="140" />
+		  </el-table>
+		  <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" style="margin-left: 15px;" />
+		</div>
+
+		<div class="right">
+			<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+           		<el-form-item label="医嘱执行时间" prop="patientname">
+            		<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>
+		   		<el-form-item>
+		      		<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+		      		<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+			 	 	<el-button icon="Refresh" @click="resetQuery">打印输液卡</el-button>
+		   		</el-form-item>
+			</el-form>
+			<el-row :gutter="20" style="display: flex; flex-wrap: wrap;" v-if="medicineData.length > 0">
+    			<el-col v-for="(item, index) in medicineData" :key="index" style="flex: 0 0 auto;"  >
+					<el-card style="width: 480px;margin-top: 15px;">
+						<template #header>
+							<div class="card-header">
+								<span>1组<br>克林霉素磷酸酯注射液 4ml:0.6g(按C18H33ClN2O5S计) 静滴 1.00克/次 1.00支qd1天</span>
+							</div>
+						</template>
+						<div style="margin-top: -3%;border-bottom: 1px dashed #F0F0F0; ">
+							<div style="display: flex;">
+								<p>病人 男 25岁10月10天</p>
+								<p>
+									<span span style="margin-left: 15px;border-left: 1px solid #DEDEDE;"></span>
+									<span style="margin-left: 15px;">床号：</span>
+									<span>123456</span>
+								</p>
+								<p>
+									<span span style="margin-left: 15px;border-left: 1px solid #DEDEDE;"></span>
+									<span style="margin-left: 15px;">频次：</span>
+									<span>qd</span>
+								</p>
+							</div>
+							<p style="margin-top: 0;">
+								<span style="color: black;">门诊号：</span>{{ item.name }}
+								<span style="margin-left: 20px;">
+									<el-date-picker style="width: 180px;" v-model="item.time" type="datetime" placeholder="时间选择" :default-time="defaultTime"/>
+								</span>
+							</p>
+						</div>
+						
+						<div style="text-align: center;">
+							<div style="border-bottom: 1px solid #CFCFCF;margin-top: 10px;padding-bottom: 5px;">
+								药品规格<div style="height: 10px;"></div>用法&nbsp;&nbsp;&nbsp;计量&nbsp;&nbsp;&nbsp;速度&nbsp;&nbsp;&nbsp;数量
+							</div>
+							<div style="margin-top: 10px;">{{ item.age }}</div>
+						</div><br>
+						<div style="line-height: 15px;align-items: center;">
+							<span>
+								备注:
+							</span>
+							<span>
+								<el-input v-model="item.notes" clearable style="width: 210px;"/>
+							</span>
+							<span style="margin-left: 30px;color: red;">
+								{{ item.nurse }}
+							</span>
+						</div>
+						
+						<template #footer="scope">
+							<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">确认</el-button>
+							<el-button link type="primary" icon="View" @click="handleSee(scope.row)" v-hasPermi="['system:menu:add']">打印</el-button>
+						</template>
+					</el-card>
+    			</el-col>
+			</el-row>
+		</div>
+		<div>
+			<el-dialog title="处方信息" v-model="showPrescription" width="60vw" :before-close="handleClose">
+				<prescriptioncard></prescriptioncard>
+			</el-dialog>
+		</div>
+        
+    </div>
+</template>
+
+<script  setup name="InfusionRecord">
+import { ref, computed } from 'vue';
+import prescriptioncard from './component/prescription.vue'
+
+const showSearch = ref(true);
+const showPrescription = ref(false);
+const total = ref(1);
+const currentRow = ref(null);
+// const notes = ref('');
+// const time = ref('');
+const dateRange = ref([]);
+const patientList = ref([
+  {
+    "busNo": "PX20250308001",
+    "name": "张三",
+    "genderEnum": "2025-03-08 10:30",
+    "status": "待审核",
+    "doctorName": "李医生"
+  },
+  {
+    "busNo": "PX20250308002",
+    "name": "李四",
+    "genderEnum": "2025-03-08 11:15",
+    "status": "已审核",
+    "doctorName": "王医生"
+  }
+]);
+const medicineData = ref([
+  {
+    idCard: '1组克林霉素磷酸酯注射液 4ml:0.6g(按C18H33ClN2O5S计) 静滴 1.00克/次 1.00支qd1天', // 药品信息
+    busNo: '黄诗韧  男  25岁10月10天',             // 患者信息
+    name: 'M2503040009100252',              // 门诊号
+    genderEnum: '12341',              // 床号（假设 1 表示男，2 表示女）
+    maritalStatusEnum: 'qd',       // 频次（假设 3 表示每天三次）
+    nationalityCode: '2025-03-01 10:00', // 时间
+    age: '克林霉素磷酸酯注射液4ml:0.6g(按C18H33ClN2O5S计) 静滴 1.00克 1.00支克林霉素磷酸酯注射液4ml:0.6g(按C18H33ClN2O5S计) 静滴 1.00克 1.00支', // 药品规格(用法，计量，速度，数量)
+    phone: '备注信息',             // 备注
+    address: '会诊医院A',
+	nurse:'李护士'
+  },
+  {
+    idCard: '1组克林霉素磷酸酯注射液 4ml:0.6g(按C18H33ClN2O5S计) 静滴 1.00克/次 1.00支qd1天', // 药品信息
+    busNo: '黄诗韧  男  25岁10月10天',             // 患者信息
+    name: 'M2503040009100252',              // 门诊号
+    genderEnum: '12341',              // 床号（假设 1 表示男，2 表示女）
+    maritalStatusEnum: 'qd',       // 频次（假设 3 表示每天三次）
+    nationalityCode: '2025-03-01 10:00', // 时间
+    age: '克林霉素磷酸酯注射液4ml:0.6g(按C18H33ClN2O5S计) 静滴 1.00克 1.00支', // 药品规格(用法，计量，速度，数量)
+    phone: '备注信息',             // 备注
+    address: '会诊医院A',
+	nurse:'李护士'
+  },
+  {
+    idCard: '1组克林霉素磷酸酯注射液 4ml:0.6g(按C18H33ClN2O5S计) 静滴 1.00克/次 1.00支qd1天', // 药品信息
+    busNo: '黄诗韧  男  25岁10月10天',             // 患者信息
+    name: 'M2503040009100252',              // 门诊号
+    genderEnum: '12341',              // 床号（假设 1 表示男，2 表示女）
+    maritalStatusEnum: 'qd',       // 频次（假设 3 表示每天三次）
+    nationalityCode: '2025-03-01 10:00', // 时间
+    age: '克林霉素磷酸酯注射液4ml:0.6g(按C18H33ClN2O5S计) 静滴 1.00克 1.00支', // 药品规格(用法，计量，速度，数量)
+    phone: '备注信息',             // 备注
+    address: '会诊医院A',
+	nurse:'李护士'
+  }
+]);
+
+const { proxy } = getCurrentInstance();
+
+const data = reactive({
+  form: {},
+  queryParams: {
+	pageNum: 1,
+    pageSize: 10,
+    patientname: undefined,
+    patientid: undefined
+  },
+});
+const { queryParams } = toRefs(data);
+
+/** 查询门诊输液列表 */
+// function getList() {
+//   listJobLog(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+//     jobLogList.value = response.rows;
+//     total.value = response.total;
+//     loading.value = false;
+//   });
+// }
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+function handlePrescription(row){
+	showPrescription.value = true;
+}
+
+function handleRowClick(row){
+	console.log("handleRowClick",row);
+	
+}
+function handleCurrentChange(row) {
+      currentRow.value = row; // 更新当前选中行的数据
+      console.log("当前选中行的数据：", currentRow.value);
+	  medicineData.value = [];
+    }
+
+// getList();
+
+</script>
+
+<style scoped>
+.app-container1 {
+	padding: 20px;
+  	display: flex;
+}
+.left {
+	/* background-color: #f3f1f19f; */
+  	width: 27%;
+}
+.right {
+	margin-left: 5%;
+  	width: 72%;
+}
+.el-table__row--current {
+  background-color: cyan !important; /* 青色背景 */
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue b/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue
index 17166359..48959ae2 100644
--- a/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue
@@ -1,29 +1,29 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-		   <el-form-item label="门诊号" prop="patientname">
-		      <el-input v-model="queryParams.patientname"  placeholder="身份证号/病人ID/门诊号/姓名" clearable style="width: 210px"
+		   <el-form-item label="门诊号" prop="encounterBusNo">
+		      <el-input v-model="queryParams.encounterBusNo"  placeholder="请输入门诊号" clearable style="width: 210px"
 		         @keyup.enter="handleQuery" />
 		   </el-form-item>
-		   <el-form-item label="处方号" prop="phone">
-		      <el-input v-model="queryParams.phone"  placeholder="请输入联系方式" clearable style="width: 200px"
+		   <el-form-item label="处方号" prop="prescriptionNo">
+		      <el-input v-model="queryParams.prescriptionNo"  placeholder="请输入处方号" clearable style="width: 200px"
 		         @keyup.enter="handleQuery" />
 		   </el-form-item>
-           <el-form-item label="病人ID" prop="phone">
-		      <el-input v-model="queryParams.phone"  placeholder="请输入联系方式" clearable style="width: 200px"
+           <el-form-item label="病人ID" prop="patientBusNo">
+		      <el-input v-model="queryParams.patientBusNo"  placeholder="请输入病人ID" clearable style="width: 200px"
 		         @keyup.enter="handleQuery" />
 		   </el-form-item>
            <el-form-item label="电话" prop="phone">
-		      <el-input v-model="queryParams.phone"  placeholder="请输入联系方式" clearable style="width: 200px"
+		      <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>
-		   <el-form-item label="状态" prop="patientid">
-				<el-select v-model="queryParams.bloodAbo" placeholder="请选择医生" clearable   @keyup.enter="handleQuery" style="width: 160px">
-					<el-option v-for="item in bloodtypeaboList"
+		   <el-form-item label="皮试项目状态" prop="status">
+				<el-select v-model="queryParams.status" placeholder="请选择状态" clearable   @keyup.enter="handleQuery" style="width: 160px">
+					<el-option v-for="item in statusList"
 					:key="item.value" :label="item.info" :value="item.value" />
 				</el-select>
 		   </el-form-item>
@@ -33,25 +33,10 @@
 		   </el-form-item>
 		</el-form>
 
-		<el-row :gutter="10" class="mb8">
-		   <el-col :span="1.5">
-		      <!-- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:menu:add']">确认项目</el-button> -->
-		   </el-col>
-		   <el-col :span="1.5">
-		      <el-button type="success" plain icon="EditPen" @click="handleUpdate" v-hasPermi="['system:menu:add']">修改</el-button>
-		   </el-col>
-		   <el-col :span="1.5">
-		      <!-- <el-button type="danger" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:menu:add']">取消修改</el-button> -->
-		   </el-col>
-		   <el-col :span="1.5">
-		      <!-- <el-button type="warning" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:menu:add']">保存</el-button> -->
-		   </el-col>
-		   <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
-
         <el-table :data="skinRecordList" border style="width: 100%">
 		    <el-table-column prop="prescriptionNo" label="处方号" width="150" />
 		    <el-table-column prop="encounterBusNo" label="门诊号" width="150" />
+		    <el-table-column prop="patientBusNo" label="病人ID" width="150" />
 			<el-table-column prop="patientName" label="病人" width="120" />
 			<el-table-column prop="medicationInformation" label="药品信息" width="150" />
 			<el-table-column prop="medicationDetail" label="药品" width="160" />
@@ -60,15 +45,23 @@
 			<el-table-column prop="clinicalStatusEnum_enumText" label="皮试结果" width="120" />
 			<el-table-column prop="performerId_dictText" label="执行护士" width="130" />
 			<el-table-column prop="performerCheckId_dictText" label="核对护士" width="130" />
-		    <el-table-column prop="occurrenceStartTime" label="开始时间" width="180" />
-			<el-table-column prop="occurrenceEndTime" label="结束时间" width="180" />
-			<el-table-column prop="organizationName" label="开单医生" width="180" />
+		    <el-table-column prop="occurrenceStartTime" key="occurrenceStartTime" label="开始时间" width="180" >
+				<template #default="scope">
+                <span>{{ parseTime(scope.row.occurrenceStartTime) }}</span>
+              </template>
+			</el-table-column>
+			<el-table-column prop="occurrenceEndTime" key="occurrenceEndTime" label="结束时间" width="180">
+				<template #default="scope">
+                <span>{{ parseTime(scope.row.occurrenceEndTime) }}</span>
+              </template>
+			</el-table-column>
+			<el-table-column prop="doctorId_dictText" label="开单医生" width="180" />
 			<el-table-column prop="medicationStatusEnum" label="发药状态" width="180" />
 			<el-table-column prop="note" label="备注" width="180" />
             <el-table-column label="操作" align="center" width="210" fixed="right" class-name="small-padding fixed-width">
 			   <template #default="scope">
-			      <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>
-			      <el-button link type="primary" icon="EditPen" @click="sign(scope.row)" v-hasPermi="['system:menu:add']">签名</el-button>
+			      <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" :disabled="!!scope.row.performerCheckId_dictText">修改</el-button>
+			      <el-button link type="primary" icon="EditPen" @click="sign(scope.row)" :disabled="!!scope.row.performerCheckId_dictText">签名</el-button>
 			      <!-- <el-button link type="primary" icon="Finished" @click="submitForm(scope.row)" v-hasPermi="['system:menu:add']">保存</el-button> -->
 			   </template>
 			</el-table-column>
@@ -184,7 +177,7 @@
 
 <script  setup name="skinRecord">
 import { ref, computed } from 'vue';
-import { ElMessage } from 'element-plus'
+import { ElMessage,ElMessageBox  } from 'element-plus'
 
 import { listSkinRecord,listStatus,listSkinResult,updateNurseSign,updateSkinTestRecord } from './component/api'; 
 
@@ -205,8 +198,11 @@ const data = reactive({
   queryParams: {
 	pageNo: 1,
     pageSize: 10,
-    patientname: undefined,
-    patientid: undefined
+    encounterBusNo: undefined,
+    prescriptionNo: undefined,
+    patientBusNo: undefined,
+    phone: undefined,
+    status: undefined
   },
 });
 const { queryParams,form } = toRefs(data);
@@ -233,7 +229,7 @@ function reset() {
 
 /** 查询门诊皮试列表 */
 function getList() {
-  listSkinRecord(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+  listSkinRecord(queryParams.value).then(response => {
 	console.log("1234",response);
     skinRecordList.value = response.data.records;
     total.value = response.data.total;
@@ -241,18 +237,22 @@ function getList() {
   listStatus().then(response => {
 	statusList.value = response.data
   });
-  listSkinResult().then(response => {
+  listSkinResult().then(response => {6
 	skinResultList.value = response.data
   });
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
+	queryParams.value.beginTime = dateRange.value[0];
+	queryParams.value.endTime = dateRange.value[1];
   queryParams.value.pageNo = 1;
+  console.log("123",queryParams.value,typeof queryParams.value.beginTime)
   getList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
+	dateRange.value = [];
   proxy.resetForm("queryRef");
   handleQuery();
 }
@@ -262,16 +262,22 @@ function cancel() {
   reset();
 }
 function handleUpdate(row) {
+	reset();
 	open.value = true;
 	form.value = row;
 }
 function sign(row){
 	console.log("564564",row);
+	proxy.$modal.confirm('签字后无法修改信息').then(() => {
 	updateNurseSign(row).then(response => {
-          proxy.$modal.msgSuccess("签名成功");
-          open.value = false;
-          getList();
-        });
+		proxy.$modal.msgSuccess("签名成功");
+		open.value = false;
+		getList();
+	}).catch(error => {
+		// 处理签名失败的逻辑
+		proxy.$modal.msgError("签名失败：" + error.message);
+	});
+	}).catch(() => {});
 }
 
 function saveForm() {
@@ -294,6 +300,7 @@ function saveForm() {
 		// 	console.log(skinRecordList.value[index]);
 		// }
 		console.log("564564",form.value);
+		// return;
 		updateSkinTestRecord(form.value).then(response => {
           proxy.$modal.msgSuccess("更新成功");
           open.value = false;
@@ -317,4 +324,7 @@ function submitForm() {
 
 getList();
 
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue
index f9f7f5cc..82454511 100644
--- a/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue
+++ b/openhis-ui-vue3/src/views/patientManagement/outpatienRecords/index.vue
@@ -101,6 +101,7 @@ function handleQuery() {
 }
 /** 重置按钮操作 */
 function resetQuery() {
+	dateRange.value = [];
 	proxy.resetForm("queryRef");
 	handleQuery();
 }