From fd3599ebb0d00e5142b83950a931e4c9d7e88a53 Mon Sep 17 00:00:00 2001
From: "Zhang.YC" <zhangyc@ccbjb.com.cn>
Date: Mon, 31 Mar 2025 11:02:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E6=94=B6=E8=B4=B9=E9=80=80?=
 =?UTF-8?q?=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutpatientRefundController.java           |   2 +-
 .../dto/EncounterPatientPaymentDto.java       |   1 +
 .../src/views/charge/cliniccharge/index.vue   | 194 ++++++++++++------
 .../src/views/charge/clinicrefund/index.vue   | 187 +++++++++++++----
 4 files changed, 273 insertions(+), 111 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
index 7dffbffd..198f001e 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
@@ -79,7 +79,7 @@ public class OutpatientRefundController {
      * @return 操作结果
      */
     @PostMapping(value = "/refund-payment")
-    public R<?> refundPayment(@RequestParam List<Long> paymentIdList) {
+    public R<?> refundPayment(@RequestBody List<Long> paymentIdList) {
         return R.ok(outpatientRefundAppService.refundPayment(paymentIdList));
     }
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java
index 8c5f4ccd..cb468bf7 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java
@@ -54,6 +54,7 @@ public class EncounterPatientPaymentDto {
     /** 支付位置 */
     @Dict(dictTable = "adm_location", dictText = "name", dictCode = "id")
     private Long locationId;
+    private String locationId_dictText;
 
     /** 到期时间 */
     private Date expirationDate;
diff --git a/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue b/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
index a354f92b..0b1281c4 100644
--- a/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
+++ b/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
@@ -3,71 +3,130 @@
     style="display: flex; justify-content: space-between"
     class="app-container"
   >
-    <div style="width: 30%">
-      <el-table
-        ref="patientListRef"
-        height="700"
-        :data="patientList"
-        row-key="encounterId"
-        @cell-click="clickRow"
-        highlight-current
-        width=""
-      >
-        <el-table-column label="病历号" align="center" prop="patientBusNo" />
-        <el-table-column label="姓名" align="center" prop="patientName" />
-        <el-table-column label="时间" align="center" prop="startTime">
-          <template #default="scope">
-            {{ formatDate(scope.row.startTime) }}
+    <el-card style="width: 34%">
+      <template #header>
+        <span style="vertical-align: middle">患者列表</span>
+      </template>
+      <div style="width: 100%">
+        <el-input
+          v-model="queryParams.patientName"
+          placeholder="请输入患者名"
+          clearable
+          style="width: 49%; margin-bottom: 10px; margin-right: 10px"
+          @keyup.enter="handleQuery"
+        >
+          <template #append>
+            <el-button icon="Search" @click="handleQuery" />
           </template>
-        </el-table-column>
-        <el-table-column
-          label="收费状态"
-          align="center"
-          prop="statusEnum_enumText"
+        </el-input>
+        <el-select
+          style="width: 49%; margin-bottom: 10px"
+          placeholder="收费状态"
+        >
+        </el-select>
+        <el-date-picker
+          v-model="value1"
+          type="daterange"
+          range-separator="~"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 100%; margin-bottom: 10px"
         />
-      </el-table>
-    </div>
+        <el-table
+          ref="patientListRef"
+          height="620"
+          :data="patientList"
+          row-key="encounterId"
+          @cell-click="clickRow"
+          highlight-current
+        >
+          <el-table-column label="病历号" align="center" prop="patientBusNo" />
+          <el-table-column label="姓名" align="center" prop="patientName" />
+          <el-table-column label="时间" align="center" prop="startTime">
+            <template #default="scope">
+              {{ formatDate(scope.row.startTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="收费状态"
+            align="center"
+            prop="statusEnum_enumText"
+          />
+        </el-table>
+      </div>
+    </el-card>
     <div style="width: 65%">
-      <div></div>
-      <el-button type="primary" @click="addEmr()" :disabled="buttonDisabled"
-        >确认收费</el-button
-      >
-      <el-button
-        type="primary"
-        @click="payToSelt()"
-        style="margin-left: 20px"
-        :disabled="buttonDisabled"
-        >医保转自费</el-button
-      >
-      <el-button
-        type="primary"
-        @click="patToMedicalInsurance()"
-        style="margin-left: 20px"
-        :disabled="buttonDisabled"
-        >自费转医保</el-button
-      >
-      <el-table
-        ref="chargeListRef"
-        height="400"
-        :data="chargeList"
-        row-key="encounterId"
-        @cell-click="clickRow"
-        v-loading="chargeLoading"
-        width=""
-      >
-        <el-table-column
-          label="收费项目"
-          align="center"
-          prop="contextEnum_enumText"
-        />
-        <el-table-column
-          label="收费状态"
-          align="center"
-          prop="statusEnum_enumText"
-        />
-        <el-table-column label="总价" align="center" prop="totalPrice" />
-        <el-table-column label="处方号" align="center" prop="prescriptionNo" />
-      </el-table>
+      <el-card style="margin-bottom: 20px">
+        <template #header>
+          <span style="vertical-align: middle">基本信息</span>
+        </template>
+        <el-descriptions :column="4">
+          <el-descriptions-item label="姓名:">{{
+            patientInfo.patientName
+          }}</el-descriptions-item>
+          <el-descriptions-item label="性别:">{{
+            patientInfo.genderEnum_enumText
+          }}</el-descriptions-item>
+          <el-descriptions-item label="年龄:">{{
+            patientInfo.age
+          }}</el-descriptions-item>
+          <el-descriptions-item label="合同类型:">{{
+            patientInfo.categoryEnum_enumText
+          }}</el-descriptions-item>
+          <el-descriptions-item label="身份证号:">{{
+            patientInfo.idCard
+          }}</el-descriptions-item>
+          <!-- <el-descriptions-item label="手机号">{{ patientInfo.name }}</el-descriptions-item>
+          <el-descriptions-item label="出生日期">{{ patientInfo.name }}</el-descriptions-item> -->
+        </el-descriptions>
+      </el-card>
+      <el-card style="min-width: 1100px">
+        <template #header>
+          <span style="vertical-align: middle">收费项目</span>
+        </template>
+        <el-button type="primary" @click="addEmr()" :disabled="buttonDisabled"
+          >确认收费</el-button
+        >
+        <el-button
+          type="primary"
+          @click="payToSelt()"
+          style="margin-left: 20px"
+          :disabled="buttonDisabled"
+          >医保转自费</el-button
+        >
+        <el-button
+          type="primary"
+          @click="patToMedicalInsurance()"
+          style="margin-left: 20px"
+          :disabled="buttonDisabled"
+          >自费转医保</el-button
+        >
+        <el-table
+          ref="chargeListRef"
+          height="500"
+          :data="chargeList"
+          row-key="encounterId"
+          v-loading="chargeLoading"
+          width=""
+        >
+          <el-table-column
+            label="收费项目"
+            align="center"
+            prop="contextEnum_enumText"
+          />
+          <el-table-column
+            label="收费状态"
+            align="center"
+            prop="statusEnum_enumText"
+          />
+          <el-table-column label="总价" align="center" prop="totalPrice" />
+          <el-table-column
+            label="处方号"
+            align="center"
+            prop="prescriptionNo"
+          />
+        </el-table>
+      </el-card>
     </div>
   </div>
 </template>
@@ -92,6 +151,7 @@ const patientList = ref([]);
 const chargeList = ref([]);
 const chargeLoading = ref(false);
 const encounterId = ref("");
+const patientInfo = ref({});
 getPatientList();
 /**
  * 患者列表
@@ -106,6 +166,7 @@ function getPatientList() {
  * 点击患者列表行 获取处方列表
  */
 function clickRow(row) {
+  patientInfo.value = row;
   chargeLoading.value = true;
   encounterId.value = row.encounterId;
   getChargeList(row.encounterId).then((res) => {
@@ -139,7 +200,10 @@ function patToMedicalInsurance() {
 }
 </script>
 <style scoped>
-::v-deep .el-table__row:hover > td {
-  background-color: #cde5ff !important; /* 设置为透明或其他你想要的颜色 */
-}
+/* ::v-deep .el-table__row:hover > td {
+  background-color: #cde5ff !important; 
+} */
+/* ::v-deep .el-card__body {
+	padding: 0 !important;
+} */
 </style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue b/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
index fa6b39d3..ed7163bb 100644
--- a/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
+++ b/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
@@ -3,57 +3,139 @@
     style="display: flex; justify-content: space-between"
     class="app-container"
   >
-    <div style="width: 30%">
-      <el-table
-        ref="patientListRef"
-        height="800"
-        :data="patientList"
-        row-key="encounterId"
-        @cell-click="clickRow"
-        highlight-current
-        width=""
-      >
-        <el-table-column label="病历号" align="center" prop="patientBusNo" />
-        <el-table-column label="姓名" align="center" prop="patientName" />
-        <el-table-column label="时间" align="center" prop="startTime">
-          <template #default="scope">
-            {{ formatDate(scope.row.startTime) }}
+    <el-card style="width: 34%">
+      <template #header>
+        <span style="vertical-align: middle">患者列表</span>
+      </template>
+      <div style="width: 100%">
+        <el-input
+          v-model="queryParams.patientName"
+          placeholder="请输入患者名"
+          clearable
+          style="width: 49%; margin-bottom: 10px; margin-right: 10px"
+          @keyup.enter="handleQuery"
+        >
+          <template #append>
+            <el-button icon="Search" @click="handleQuery" />
           </template>
-        </el-table-column>
-        <!-- <el-table-column
+        </el-input>
+        <el-select
+          style="width: 49%; margin-bottom: 10px"
+          placeholder="收费状态"
+        >
+        </el-select>
+        <el-date-picker
+          v-model="value1"
+          type="daterange"
+          range-separator="~"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 100%; margin-bottom: 10px"
+        />
+        <el-table
+          ref="patientListRef"
+          height="630"
+          :data="patientList"
+          row-key="encounterId"
+          @cell-click="clickRow"
+          highlight-current
+          width=""
+        >
+          <el-table-column label="病历号" align="center" prop="patientBusNo" />
+          <el-table-column label="姓名" align="center" prop="patientName" />
+          <el-table-column label="时间" align="center" prop="startTime">
+            <template #default="scope">
+              {{ formatDate(scope.row.startTime) }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column
           label="收费状态"
           align="center"
           prop="statusEnum_enumText"
         /> -->
-      </el-table>
-    </div>
+        </el-table>
+      </div>
+    </el-card>
     <div style="width: 65%">
-      <div></div>
-      <el-button type="primary" @click="addEmr()" :disabled="buttonDisabled"
-        >确认收费</el-button
-      >
-      <el-table
-        ref="chargeListRef"
-        height="400"
-        :data="chargeList"
-        row-key="encounterId"
-        @cell-click="clickRow"
-        v-loading="chargeLoading"
-        width=""
-      >
-        <el-table-column
-          label="收费项目"
-          align="center"
-          prop="contextEnum_enumText"
-        />
-        <el-table-column
-          label="收费状态"
-          align="center"
-          prop="statusEnum_enumText"
-        />
-        <el-table-column label="总价" align="center" prop="totalPrice" />
-        <el-table-column label="处方号" align="center" prop="prescriptionNo" />
-      </el-table>
+      <el-card style="margin-bottom: 20px">
+        <template #header>
+          <span style="vertical-align: middle">基本信息</span>
+        </template>
+        <el-descriptions :column="4">
+          <el-descriptions-item label="就诊号:">
+            {{ patientInfo.encounterId }}
+          </el-descriptions-item>
+          <el-descriptions-item label="姓名:">
+            {{ patientInfo.patientName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="性别:">
+            {{ patientInfo.genderEnum_enumText }}
+          </el-descriptions-item>
+          <el-descriptions-item label="年龄:">
+            {{ patientInfo.age }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同类型:">
+            {{ patientInfo.categoryEnum_enumText }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算时间:">
+            {{ patientInfo.billDate }}
+          </el-descriptions-item>
+          <el-descriptions-item label="账单总额:">
+            {{ patientInfo.totalAmount }}
+          </el-descriptions-item>
+          <el-descriptions-item label="医保支付:">
+            {{ patientInfo.insurancePrice }}
+          </el-descriptions-item>
+          <el-descriptions-item label="自费金额:">
+            {{ patientInfo.selfPrice }}
+          </el-descriptions-item>
+          <el-descriptions-item label="支付方式:">
+            {{ patientInfo.typeCode_dictText }}
+          </el-descriptions-item>
+          <el-descriptions-item label="发票号:">
+            {{ patientInfo.idCard }}
+          </el-descriptions-item>
+          <!-- <el-descriptions-item label="手机号">{{ patientInfo.name }}</el-descriptions-item>
+          <el-descriptions-item label="出生日期">{{ patientInfo.name }}</el-descriptions-item> -->
+        </el-descriptions>
+      </el-card>
+      <el-card>
+        <template #header>
+          <span style="vertical-align: middle">退费单据</span>
+        </template>
+        <el-button
+          type="primary"
+          @click="handleRefund()"
+          :disabled="buttonDisabled"
+          >确认退费</el-button
+        >
+        <el-table
+          ref="chargeListRef"
+          height="475"
+          :data="chargeList"
+          row-key="encounterId"
+          @cell-click="clickRow"
+          v-loading="chargeLoading"
+          width=""
+        >
+          <el-table-column label="单据号" align="center" prop="paymentNo" />
+          <el-table-column
+            label="付款总额"
+            align="center"
+            prop="displayAmount"
+          />
+          <el-table-column
+            label="处方号"
+            align="center"
+            prop="prescriptionNo"
+          />
+          <el-table-column
+            label="开单科室"
+            align="center"
+            prop="locationId_dictText"
+          />
+        </el-table>
+      </el-card>
     </div>
   </div>
 </template>
@@ -68,6 +150,7 @@ const queryParams = ref({
 });
 
 const patientList = ref([]);
+const patientInfo = ref({});
 const chargeList = ref([]);
 const chargeLoading = ref(false);
 const encounterId = ref("");
@@ -85,6 +168,7 @@ function getPatientList() {
  * 点击患者列表行 获取处方列表
  */
 function clickRow(row) {
+  patientInfo.value = row;
   chargeLoading.value = true;
   encounterId.value = row.encounterId;
   getRefundList(row.encounterId).then((res) => {
@@ -94,6 +178,19 @@ function clickRow(row) {
     }, 100);
   });
 }
+
+function handleRefund() {
+  refund(
+    chargeList.value.map((item) => {
+      item.id;
+    })
+  ).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess("操作成功");
+    }
+    getPatientList();
+  });
+}
 </script>
 <style scoped>
 ::v-deep .el-table__row:hover > td {