From b8fcb3fd96a2313059433a7d05980660fe683350 Mon Sep 17 00:00:00 2001 From: zzc Date: Wed, 19 Mar 2025 11:32:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=AF=BC=E5=87=BA=20=E4=BF=AE=E6=94=B9=E7=AD=9B?= =?UTF-8?q?=E6=9F=A5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/web/ExternalController.java | 4 -- .../main/resources/TreamtmentPgTemplate.docx | Bin 0 -> 19579 bytes acupuncture-system/pom.xml | 2 +- .../service/impl/PmsTreatmentServiceImpl.java | 67 +++++++++++++++--- .../service/impl/ScreeningServiceImpl.java | 43 ++++++----- pom.xml | 2 +- 6 files changed, 85 insertions(+), 33 deletions(-) create mode 100644 acupuncture-admin/src/main/resources/TreamtmentPgTemplate.docx diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java index 4d18978b..67b944c5 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java @@ -25,13 +25,9 @@ import com.acupuncture.system.domain.vo.UmsDataSourceVo; import com.acupuncture.system.domain.vo.UplRtcfInfoVo; import com.acupuncture.system.persist.dao.UmsDataSourceDao; import com.acupuncture.system.service.ExternalService; -import com.mysql.cj.xdevapi.JsonArray; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import jdk.nashorn.internal.runtime.logging.Logger; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.apache.regexp.RE; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/acupuncture-admin/src/main/resources/TreamtmentPgTemplate.docx b/acupuncture-admin/src/main/resources/TreamtmentPgTemplate.docx new file mode 100644 index 0000000000000000000000000000000000000000..e370ede7b3109ca9af20d3faa730a1a6158ce1c5 GIT binary patch literal 19579 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 literal 0 HcmV?d00001 diff --git a/acupuncture-system/pom.xml b/acupuncture-system/pom.xml index ad62855a..72bd9a0e 100644 --- a/acupuncture-system/pom.xml +++ b/acupuncture-system/pom.xml @@ -80,7 +80,7 @@ com.deepoove poi-tl - 1.10.5 + 1.12.2 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 081f7e08..eded34cf 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 @@ -30,6 +30,8 @@ import com.acupuncture.system.persist.mapper.*; import com.acupuncture.system.service.PmsPatientService; import com.acupuncture.system.service.PmsTreatmentService; import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.data.*; +import com.deepoove.poi.data.style.BorderStyle; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -536,7 +538,13 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { if (CollectionUtil.isNotEmpty(pmsTreatmentRecords)) { Map recordMap = pmsTreatmentRecords.stream().collect(Collectors.toMap(PmsTreatmentRecord::getQuestionCode, Function.identity())); map.put("Clinical_diagnosis", recordMap.get("JBXX_ZYZD") == null ? "" : StrUtil.split(recordMap.get("JBXX_ZYZD").getAnswer(), UserConstants.ANSWER_JOIN_STRING).stream().collect(Collectors.joining(", "))); - map.put("PG_RTCF_TXLX", recordMap.get("PG_RTCF_TXLX") == null ? "" : recordMap.get("PG_RTCF_TXLX").getAnswer()); + String txlx = recordMap.get("PG_RTCF_TXLX") == null ? "" : recordMap.get("PG_RTCF_TXLX").getAnswer(); + if (StrUtil.isEmpty(txlx)) { + map.put("rtcf_flag", false); + }else { + map.put("rtcf_flag", true); + } + map.put("PG_RTCF_TXLX", txlx); map.put("PG_RTCF_STNL", recordMap.get("PG_RTCF_STNL") == null ? "" : recordMap.get("PG_RTCF_STNL").getAnswer()); map.put("PG_RTCF_JKPF", recordMap.get("PG_RTCF_JKPF") == null ? "" : recordMap.get("PG_RTCF_JKPF").getAnswer()); map.put("PG_RTCF_TZ", recordMap.get("PG_RTCF_TZ") == null ? "" : recordMap.get("PG_RTCF_TZ").getAnswer()); @@ -551,17 +559,56 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { map.put("PG_RTCF_BMI", recordMap.get("PG_RTCF_BMI") == null ? "" : recordMap.get("PG_RTCF_BMI").getAnswer()); map.put("PG_RTCF_PBF", recordMap.get("PG_RTCF_PBF") == null ? "" : recordMap.get("PG_RTCF_PBF").getAnswer()); map.put("PG_RTCF_NZZFSP", recordMap.get("PG_RTCF_NZZFSP") == null ? "" : recordMap.get("PG_RTCF_NZZFSP").getAnswer()); - map.put("PG_TZBS_ZYTZ", recordMap.get("PG_TZBS_ZYTZ") == null ? "" : recordMap.get("PG_TZBS_ZYTZ").getAnswer()); + + String tzbs = recordMap.get("PG_TZBS_ZYTZ") == null ? "" : recordMap.get("PG_TZBS_ZYTZ").getAnswer(); + if (StrUtil.isEmpty(tzbs)) { + map.put("bsjg_flag", false); + }else { + map.put("bsjg_flag", true); + } + map.put("PG_TZBS_ZYTZ", tzbs); map.put("PG_TZBS_JJTZ", recordMap.get("PG_TZBS_JJTZ") == null ? "" : StrUtil.split(recordMap.get("PG_TZBS_JJTZ").getAnswer(), UserConstants.ANSWER_JOIN_STRING).stream().collect(Collectors.joining(","))); - map.put("score1", recordMap.get("PG_TT_TAPS_DF") == null ? "" : recordMap.get("PG_TT_TAPS_DF").getAnswer()); - map.put("score2", recordMap.get("PG_TT_TRACE_DF") == null ? "" : recordMap.get("PG_TT_TRACE_DF").getAnswer()); - map.put("score3", recordMap.get("PG_TT_SRS22_DF") == null ? "" : recordMap.get("PG_TT_SRS22_DF").getAnswer()); - map.put("score4", recordMap.get("PG_SM_PHQ-9_DF") == null ? "" : recordMap.get("PG_SM_PHQ-9_DF").getAnswer()); - map.put("score5", recordMap.get("PG_SM_EPSW_DF") == null ? "" : recordMap.get("PG_SM_EPSW_DF").getAnswer()); - map.put("score6", recordMap.get("PG_SM_PSQI_DF") == null ? "" : recordMap.get("PG_SM_PSQI_DF").getAnswer()); - map.put("score7", recordMap.get("PG_JL_HAMD-24_DF") == null ? "" : recordMap.get("PG_JL_HAMD-24_DF").getAnswer()); - map.put("score8", recordMap.get("PG_JL_SAS_DF") == null ? "" : recordMap.get("PG_JL_SAS_DF").getAnswer()); + String score1 = recordMap.get("PG_TT_TAPS_DF") == null ? "" : recordMap.get("PG_TT_TAPS_DF").getAnswer(); + String score2 = recordMap.get("PG_TT_TRACE_DF") == null ? "" : recordMap.get("PG_TT_TRACE_DF").getAnswer(); + String score3 = recordMap.get("PG_TT_SRS22_DF") == null ? "" : recordMap.get("PG_TT_SRS22_DF").getAnswer(); + if (StrUtil.isEmpty(score1) && StrUtil.isEmpty(score2) && StrUtil.isEmpty(score3)) { + map.put("ttpg_flag", false); + }else { + map.put("ttpg_flag", true); + } + map.put("score1", score1); + map.put("score2", score2); + map.put("score3", score3); + String score4 = recordMap.get("PG_SM_PHQ-9_DF") == null ? "" : recordMap.get("PG_SM_PHQ-9_DF").getAnswer(); + String score5 = recordMap.get("PG_SM_EPSW_DF") == null ? "" : recordMap.get("PG_SM_EPSW_DF").getAnswer(); + String score6 = recordMap.get("PG_SM_PSQI_DF") == null ? "" : recordMap.get("PG_SM_PSQI_DF").getAnswer(); + + if (StrUtil.isEmpty(score4) && StrUtil.isEmpty(score5) && StrUtil.isEmpty(score6)) { + map.put("smpg_flag", false); + }else { + map.put("smpg_flag", true); + } + + map.put("table0", Tables.of(new String[][] { + new String[] { "00", "01" }, + new String[] { "10", "11" } + }).border(BorderStyle.DEFAULT).create()); + + + map.put("score4", score4); + map.put("score5", score5); + map.put("score6", score6); + + String score7 = recordMap.get("PG_JL_HAMD-24_DF") == null ? "" : recordMap.get("PG_JL_HAMD-24_DF").getAnswer(); + String score8 = recordMap.get("PG_JL_SAS_DF") == null ? "" : recordMap.get("PG_JL_SAS_DF").getAnswer(); + if (StrUtil.isEmpty(score7) && StrUtil.isEmpty(score8)) { + map.put("jlpg_flag", false); + }else { + map.put("jlpg_flag", true); + } + map.put("score7", score7); + map.put("score8", score8); } //渲染 template.render(map); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java index 7fd645ea..14a38b68 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java @@ -89,15 +89,22 @@ public class ScreeningServiceImpl implements IScreeningService { "性别", "出生日期", "年龄", -// "身份证", "联系方式", "身高", "体重", "BMI", "体重自评结论", - "失眠自评（SRSS）得分", - "可接受的治疗方式", - "可接受的治疗周期", + "上床睡觉", + "入睡时间", + "睡醒时间", + "起床时间", + "睡眠效率", + "疾病风险", + "疾病风险-其他", + "筛查结论", +// "失眠自评（SRSS）得分", +// "可接受的治疗方式", +// "可接受的治疗周期", "筛查时间", "组织" ); @@ -114,28 +121,30 @@ public class ScreeningServiceImpl implements IScreeningService { if (CollectionUtil.isNotEmpty(recordList)) { map = recordList.stream().collect(Collectors.toMap(ScrScreenVo.ScreeningDetailVo::getQuestionCode, Function.identity())); } - //筛查信息 - ScrScreenVo.ScreeningDetailVo record = map.get("SCWJ-ILLNESS"); - //筛查结果 - ScrScreenVo.ScreeningDetailVo result = map.get("SCWJ-RESULT"); + row += 1; excelWriter.writeCellValue(0, row, detailVos.get(i).getName() + ""); excelWriter.writeCellValue(1, row, map.get("SCWJ-SEX") == null ? "未知" : map.get("SCWJ-SEX").getAnswer()); -// excelWriter.writeCellValue(3, row, map.get("SCWJ-idCard") == null ? "" : map.get("SCWJ-idCard").getAnswer()); excelWriter.writeCellValue(2, row, map.get("SCWJ-BIRTH") == null ? "" : map.get("SCWJ-BIRTH").getAnswer()); excelWriter.writeCellValue(3, row, map.get("SCWJ-AGE") == null ? "" : map.get("SCWJ-AGE").getAnswer()); excelWriter.writeCellValue(4, row, map.get("SCWJ-PHONE") == null ? "" : map.get("SCWJ-PHONE").getAnswer()); - excelWriter.writeCellValue(5, row, map.get("SCWJ-HEIGHT") == null ? "" : map.get("SCWJ-HEIGHT").getAnswer()); excelWriter.writeCellValue(6, row, map.get("SCWJ-WEIGHT") == null ? "" : map.get("SCWJ-WEIGHT").getAnswer()); excelWriter.writeCellValue(7, row, map.get("SCWJ-BMI") == null ? "" : map.get("SCWJ-BMI").getAnswer()); excelWriter.writeCellValue(8, row, map.get("SCWJ-JL") == null ? "" : map.get("SCWJ-JL").getAnswer()); - excelWriter.writeCellValue(9, row, map.get("SCWJ-RESULT") == null ? "" : map.get("SCWJ-RESULT").getAnswer()); - excelWriter.writeCellValue(10, row, map.get("SCWJ-ZLFS") == null ? "" : map.get("SCWJ-ZLFS").getAnswer()); - excelWriter.writeCellValue(11, row, map.get("SCWJ-ZLZQ") == null ? "" : map.get("SCWJ-ZLZQ").getAnswer()); - - excelWriter.writeCellValue(12, row, DateUtil.format(detailVos.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss")); - excelWriter.writeCellValue(13, row, detailVos.get(i).getTenantName()); + excelWriter.writeCellValue(9, row, map.get("SCWJ-SCSJ") == null ? "" : map.get("SCWJ-SCSJ").getAnswer()); + excelWriter.writeCellValue(10, row, map.get("SCWJ-RSSJ") == null ? "" : map.get("SCWJ-RSSJ").getAnswer()); + excelWriter.writeCellValue(11, row, map.get("SCWJ-SXSJ") == null ? "" : map.get("SCWJ-SXSJ").getAnswer()); + excelWriter.writeCellValue(12, row, map.get("SCWJ-QCSJ") == null ? "" : map.get("SCWJ-QCSJ").getAnswer()); + excelWriter.writeCellValue(13, row, map.get("SCWJ-SMXL") == null ? "" : map.get("SCWJ-SMXL").getAnswer()); + excelWriter.writeCellValue(14, row, map.get("SCWJ-XBS") == null ? "" : map.get("SCWJ-XBS").getAnswer()); + excelWriter.writeCellValue(15, row, map.get("SCWJ-XBS-QT") == null ? "" : map.get("SCWJ-XBS-QT").getAnswer()); + excelWriter.writeCellValue(16, row, map.get("SCREEN-JL") == null ? "" : map.get("SCREEN-JL").getAnswer()); +// excelWriter.writeCellValue(17, row, map.get("SCWJ-RESULT") == null ? "" : map.get("SCWJ-RESULT").getAnswer()); +// excelWriter.writeCellValue(18, row, map.get("SCWJ-ZLFS") == null ? "" : map.get("SCWJ-ZLFS").getAnswer()); +// excelWriter.writeCellValue(19, row, map.get("SCWJ-ZLZQ") == null ? "" : map.get("SCWJ-ZLZQ").getAnswer()); + excelWriter.writeCellValue(17, row, DateUtil.format(detailVos.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + excelWriter.writeCellValue(18, row, detailVos.get(i).getTenantName()); // if (record == null || StrUtil.isEmpty(record.getAnswer())) { // excelWriter.writeCellValue(6, row, "否"); @@ -185,7 +194,7 @@ public class ScreeningServiceImpl implements IScreeningService { } } - String filename = StrUtil.format("筛查-{}.xlsx", DateUtil.date().toString("yyyyMMdd")); + String filename = StrUtil.format("Screen-{}.xlsx", DateUtil.date().toString("yyyyMMdd")); //response为HttpServletResponse对象 response.setContentType("application/vnd.ms-excel;charset=utf-8"); diff --git a/pom.xml b/pom.xml index a9cd8482..a574f28d 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ org.apache.poi poi-ooxml - 4.1.2 + 5.2.2