From 49399dc00428af47ee424b30637aed66c2adbc3b Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 18 Mar 2025 00:36:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E6=A1=A3=E6=A1=88=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/PmsPatientServiceImpl.java | 4 ++++ .../system/service/impl/PmsTreatmentServiceImpl.java | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java index ed996850..9e48157e 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java @@ -136,6 +136,8 @@ public class PmsPatientServiceImpl implements PmsPatientService { writer.writeCellValue(7, row, "港澳居民来往内地通行证"); break; case 3: + writer.writeCellValue(7, row, "台湾居民来往大陆通行证"); + case 4: writer.writeCellValue(7, row, "其他"); } } @@ -154,6 +156,8 @@ public class PmsPatientServiceImpl implements PmsPatientService { } } writer.writeCellValue(10, row, patientList.get(i).getCurrentIllnessHistory()); + writer.writeCellValue(11, row, patientList.get(i).getCurrentIllnessHistoryQt()); + writer.writeCellValue(12, row, patientList.get(i).getTenantName()); } String filename = StrUtil.format("患者档案-{}.xlsx", DateUtil.date().toString("yyyyMMdd")); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java index a5e1c1ec..742e0358 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java @@ -455,13 +455,15 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { writer.writeCellValue(7, row, "港澳居民来往内地通行证"); break; case 3: + writer.writeCellValue(7, row, "台湾居民来往大陆通行证"); + case 4: writer.writeCellValue(7, row, "其他"); } } writer.writeCellValue(8, row, treatmentVOList.get(i).getIdCard()); writer.writeCellValue(9, row, treatmentVOList.get(i).getVisitType() == 0 ? "门诊" : "住院"); - writer.writeCellValue(9, row, treatmentVOList.get(i).getVisitNumber()); - writer.writeCellValue(10, row, DateUtil.format(treatmentVOList.get(i).getVisitTime(), "yyyy-MM-dd HH:mm:ss")); + writer.writeCellValue(10, row, treatmentVOList.get(i).getVisitNumber()); + writer.writeCellValue(11, row, DateUtil.format(treatmentVOList.get(i).getVisitTime(), "yyyy-MM-dd HH:mm:ss")); writer.writeCellValue(12, row, DateUtil.format(treatmentVOList.get(i).getDischargeTime(), "yyyy-MM-dd HH:mm:ss")); writer.writeCellValue(13, row, treatmentVOList.get(i).getDoctor()); writer.writeCellValue(14, row, treatmentVOList.get(i).getCreateBy());