From 949fa4d4df5418673fc5c4fcbe6683268caa04ef Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 18 Mar 2025 01:25:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E7=96=97=E6=A1=A3=E6=A1=88=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=BB=E8=A6=81=E8=AF=8A=E6=96=AD=5F=E5=85=B6?= =?UTF-8?q?=E4=BB=96=EF=BC=8C=20=E5=AF=BC=E5=87=BA=E8=AF=8A=E7=96=97?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/vo/PmsTreatmentVo.java | 2 + .../service/impl/PmsTreatmentServiceImpl.java | 41 +++++++++++-------- .../resources/mapper/dao/PmsTreatmentDao.xml | 2 +- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java index dc32bdc0..342fdc49 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java @@ -55,6 +55,8 @@ public class PmsTreatmentVo { private String tenantName; + private String zyzdQt; + @Data public static class QueueVo{ private Long queueId; 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 76d701be..081f7e08 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 @@ -201,12 +201,22 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { List commonFollowupQueue = redisCache.getCacheList("common_followup_queue"); for (PmsTreatmentVo.TreatmentVO treatmentVO : query) { PmsTreatmentRecordExample pmsTreatmentRecordExample = new PmsTreatmentRecordExample(); - pmsTreatmentRecordExample.createCriteria().andDelFlagEqualTo((byte) 0).andQuestionCodeEqualTo("JBXX_ZYZD").andTreatmentIdEqualTo(treatmentVO.getId()); + pmsTreatmentRecordExample.createCriteria().andDelFlagEqualTo((byte) 0).andQuestionCodeIn(CollectionUtil.newArrayList("JBXX_ZYZD", "JBXX_ZYZD_QT")).andTreatmentIdEqualTo(treatmentVO.getId()); List pmsTreatmentRecords = pmsTreatmentRecordMapper.selectByExample(pmsTreatmentRecordExample); if (CollectionUtil.isNotEmpty(pmsTreatmentRecords)) { - String answer = pmsTreatmentRecords.get(0).getAnswer(); - if (StrUtil.isNotEmpty(answer)) { - treatmentVO.setDiagnosisName(answer.replace("!@#", ",")); + for (PmsTreatmentRecord pmsTreatmentRecord : pmsTreatmentRecords) { + if ("JBXX_ZYZD".equals(pmsTreatmentRecord.getQuestionCode())) { + String answer = pmsTreatmentRecord.getAnswer(); + if (StrUtil.isNotEmpty(answer)) { + treatmentVO.setDiagnosisName(answer.replace("!@#", ",")); + } + } + if ("JBXX_ZYZD_QT".equals(pmsTreatmentRecord.getQuestionCode())) { + String answer = pmsTreatmentRecord.getAnswer(); + if (StrUtil.isNotEmpty(answer)) { + treatmentVO.setZyzdQt(answer.replace("!@#", ",")); + } + } } } List queueVos = fmsFollowupDao.queryQueueListByPatientId(treatmentVO.getPatientId()); @@ -461,12 +471,14 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { } } writer.writeCellValue(8, row, treatmentVOList.get(i).getIdCard()); - writer.writeCellValue(9, row, treatmentVOList.get(i).getVisitType() == 0 ? "门诊" : "住院"); - 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()); + writer.writeCellValue(9, row, treatmentVOList.get(i).getDiagnosisName()); + writer.writeCellValue(10, row, treatmentVOList.get(i).getZyzdQt()); + writer.writeCellValue(11, row, treatmentVOList.get(i).getVisitType() == 0 ? "门诊" : "住院"); + writer.writeCellValue(12, row, treatmentVOList.get(i).getVisitNumber()); + writer.writeCellValue(13, row, DateUtil.format(treatmentVOList.get(i).getVisitTime(), "yyyy-MM-dd HH:mm:ss")); + writer.writeCellValue(14, row, DateUtil.format(treatmentVOList.get(i).getDischargeTime(), "yyyy-MM-dd HH:mm:ss")); + writer.writeCellValue(15, row, treatmentVOList.get(i).getDoctor()); + writer.writeCellValue(16, row, treatmentVOList.get(i).getCreateBy()); } String filename = StrUtil.format("HZDA-{}.xlsx", DateUtil.date().toString("yyyyMMdd")); @@ -478,8 +490,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { try { out = response.getOutputStream(); writer.flush(out); - } catch ( - IOException e) { + } catch (IOException e) { e.printStackTrace(); } finally { // 关闭writer，释放内存 @@ -676,8 +687,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { addTreatment(dto); } catch (Exception e) { e.printStackTrace(); - throw new BaseException(StrUtil.format("导入诊疗信息错误：sheet:{},row:{}, {}", - sheetIndex + 1, rowIndex + 1, ExceptionUtil.getExceptionMessage(e))); + throw new BaseException(StrUtil.format("导入诊疗信息错误：sheet:{},row:{}, {}", sheetIndex + 1, rowIndex + 1, ExceptionUtil.getExceptionMessage(e))); } }); } @@ -780,8 +790,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { try { out = response.getOutputStream(); writer.flush(out); - } catch ( - IOException e) { + } catch (IOException e) { e.printStackTrace(); } finally { // 关闭writer，释放内存 diff --git a/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml b/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml index 3ce02773..cd848231 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml @@ -212,7 +212,7 @@ from pms_treatment_record where del_flag = 0 - treatment_id = #{treatmentId} + and treatment_id = #{treatmentId} and question_code in