diff --git a/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/index.vue b/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/index.vue
index 6a874374..6dc01003 100644
--- a/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicManagement/InfusionRecord/index.vue
@@ -1,6 +1,5 @@
 <template>
-    <div class="app-container1">
-
+    <div class="app-container">
 		<div class="left">
 			<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
            		<el-form-item label="入院日期" prop="patientname">
@@ -44,77 +43,38 @@
 			 	 	<el-button icon="Refresh" @click="resetQuery">打印输液卡</el-button>
 		   		</el-form-item>
 			</el-form>
-			<el-table :data="outpatienRecordsList" border style="width: 100%">
-			<el-table-column prop="name" label="院注次数" width="180" />
-			<el-table-column prop="idCard" label="已确认次数" width="180" />
-			<el-table-column prop="description" label="开立时间" width="180" />
-			<el-table-column prop="patientBusNo" label="开单医生" width="180" />
-			<el-table-column prop="encounterBusNo" label="科别" width="180" />
-			<el-table-column prop="genderEnum_enumText" label="性别" width="80" />
-			<el-table-column prop="phone" label="医嘱" width="160" />
-			<el-table-column prop="encounterTime" label="组" width="180" />
-			<el-table-column prop="subjectStatusEnum_enumText" label="频次" width="120" />
-			<el-table-column prop="organizationName" label="每次量" width="180" />
-			<el-table-column prop="doctorName" label="用法" width="180" />
-			<!-- <el-table-column prop="address" label="会诊医院" width="180" />
-			<el-table-column prop="workCompany" label="会诊医生工作单位" width="180" />
-			<el-table-column prop="organizationName" label="协同服务" width="180" /> -->
-		</el-table>
-			<!-- <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>
+				<p style="margin: 0px 0px 10px 0px;">院注医嘱</p>
+			<el-table :data="outpatienRecordsList" border style="width: 100%;height: 300px;">
+				<el-table-column prop="name" label="院注次数" width="180" />
+				<el-table-column prop="idCard" label="已确认次数" width="180" />
+				<el-table-column prop="description" label="开立时间" width="180" />
+				<el-table-column prop="patientBusNo" label="开单医生" width="180" />
+				<el-table-column prop="encounterBusNo" label="科别" width="180" />
+				<el-table-column prop="genderEnum_enumText" label="性别" width="80" />
+				<el-table-column prop="phone" label="医嘱" width="160" />
+				<el-table-column prop="encounterTime" label="组" width="180" />
+				<el-table-column prop="subjectStatusEnum_enumText" label="频次" width="120" />
+				<el-table-column prop="organizationName" label="每次量" width="180" />
+				<el-table-column prop="doctorName" label="用法" width="180" />
+			</el-table>
+			</div>
+			<div>
+				<p style="margin: 13px 0px 10px 0px;">院注执行历史</p>
+				<el-table :data="outpatienRecordsList" border style="width: 100%;max-height: 250px;">
+					<el-table-column prop="name" label="院注次数" width="180" />
+					<el-table-column prop="idCard" label="已确认次数" width="180" />
+					<el-table-column prop="description" label="开立时间" width="180" />
+					<el-table-column prop="patientBusNo" label="开单医生" width="180" />
+					<el-table-column prop="encounterBusNo" label="科别" width="180" />
+					<el-table-column prop="genderEnum_enumText" label="性别" width="80" />
+					<el-table-column prop="phone" label="医嘱" width="160" />
+					<el-table-column prop="encounterTime" label="组" width="180" />
+					<el-table-column prop="subjectStatusEnum_enumText" label="频次" width="120" />
+					<el-table-column prop="organizationName" label="每次量" width="180" />
+					<el-table-column prop="doctorName" label="用法" width="180" />
+				</el-table>
+			</div>
 		</div>
 		<div>
 			<el-dialog title="处方信息" v-model="showPrescription" width="60vw" :before-close="handleClose">
@@ -243,12 +203,10 @@ function handleCurrentChange(row) {
 </script>
 
 <style scoped>
-.app-container1 {
-	padding: 20px;
+.app-container {
   	display: flex;
 }
 .left {
-	/* background-color: #f3f1f19f; */
   	width: 27%;
 }
 .right {
diff --git a/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue b/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue
index 7cb3755d..4de86ffc 100644
--- a/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicManagement/skinRecord/index.vue
@@ -38,11 +38,24 @@
 		    <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 label="发药状态" width="180">
+				<template #default="scope">
+					<span :class="getStatusColor(scope.row.medicationStatusEnum_enumText)">
+					{{ scope.row.medicationStatusEnum_enumText }}
+					</span>
+				</template>
+			</el-table-column>
 			<el-table-column prop="medicationInformation" label="药品信息" width="150" />
 			<el-table-column prop="medicationDetail" label="药品" width="160" />
 			<el-table-column prop="medicationLotNumber" label="药品批号" width="160" />
 			<el-table-column prop="verificationStatusEnum_enumText" label="状态" width="80" />
-			<el-table-column prop="clinicalStatusEnum_enumText" label="皮试结果" width="120" />
+			<el-table-column prop="clinicalStatusEnum_enumText" label="皮试结果" width="120" >
+				<template #default="scope">
+					<span :class="getClinicalStatus(scope.row.clinicalStatusEnum_enumText)">
+					{{ scope.row.clinicalStatusEnum_enumText }}
+					</span>
+				</template>
+			</el-table-column>
 			<el-table-column prop="performerId_dictText" label="执行护士" width="130" />
 			<el-table-column prop="performerCheckId_dictText" label="核对护士" width="130" />
 		    <el-table-column prop="occurrenceStartTime" key="occurrenceStartTime" label="开始时间" width="180" >
@@ -56,14 +69,13 @@
               </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)" 
-				  :disabled="!!scope.row.performerCheckId_dictText">修改</el-button>
+				  :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>
+				  :disabled="!!scope.row.performerCheckId_dictText || scope.row.medicationStatusEnum_enumText == '未完成'">签名</el-button>
 			      <!-- <el-button link type="primary" icon="Finished" @click="submitForm(scope.row)" v-hasPermi="['system:menu:add']">保存</el-button> -->
 			   </template>
 			</el-table-column>
@@ -192,6 +204,14 @@ const statusList = ref([]);
 
 const open = ref(false);
 
+const getStatusColor = (status) => {
+  return status !== '已完成' ? 'status-red' : '';
+};
+
+const getClinicalStatus = (status) => {
+  return status === '阳性' ? 'status-red' : '';
+};
+
 
 const { proxy } = getCurrentInstance();
 
@@ -264,9 +284,18 @@ function cancel() {
   reset();
 }
 function handleUpdate(row) {
-	reset();
-	open.value = true;
-	form.value = row;
+	if (row.medicationStatusEnum_enumText === '已完成') {
+    // 如果状态是“已完成”，允许编辑
+    reset();
+    open.value = true;
+    form.value = row;
+  } else {
+    // 如果状态不是“已完成”，提示用户
+	ElMessageBox.alert('请先领药', '提示', {
+      type: 'error',
+      center: true // 确保对话框居中
+    });
+  }
 }
 function sign(row){
 	console.log("564564",row);
@@ -329,4 +358,7 @@ getList();
 </script>
 
 <style scoped>
+.status-red {
+  color: red; /* 设置字体颜色为红色 */
+}
 </style>
\ No newline at end of file