From b5f4f2b3ac8145b7dd9abcd797fe06ab9ba24258 Mon Sep 17 00:00:00 2001 From: zzc Date: Mon, 17 Mar 2025 23:20:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/screenQrCodeTemplate.docx | Bin 0 -> 12225 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 acupuncture-admin/src/main/resources/screenQrCodeTemplate.docx diff --git a/acupuncture-admin/src/main/resources/screenQrCodeTemplate.docx b/acupuncture-admin/src/main/resources/screenQrCodeTemplate.docx new file mode 100644 index 0000000000000000000000000000000000000000..b45eb624f2170a1e95010408b5817c30e9620fce GIT binary patch literal 12225 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 aI*^c+1pPI?zccO;02A-;(-QTstN#aT)x4en literal 0 HcmV?d00001 From 3430ed4598f3a96c0936ad54d658b8ae2daecc29 Mon Sep 17 00:00:00 2001 From: zzc Date: Mon, 17 Mar 2025 23:24:31 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=9B=E6=9F=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/dao/ScreeningDetailDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml b/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml index e7ec883f..1ebbbfac 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml @@ -90,10 +90,10 @@ and r.tenant_id = #{param.tenantId} - + and r.create_time >= #{param.startTime} - + and r.create_time <= #{param.endTime} From 79b27f284498ed49d9fcbed1103beef52f63a608 Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 18 Mar 2025 00:04:04 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=8A=E7=96=97?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E8=AF=84=E4=BC=B0=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PmsTreatmentServiceImpl.java | 45 +++++++++++++++---- 1 file changed, 37 insertions(+), 8 deletions(-) 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 9af11510..d4bf726f 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 @@ -12,6 +12,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.pinyin.PinyinUtil; import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; +import com.acupuncture.common.constant.UserConstants; import com.acupuncture.common.core.redis.RedisCache; import com.acupuncture.common.exception.base.BaseException; import com.acupuncture.common.utils.AsposeUtils; @@ -25,10 +26,7 @@ import com.acupuncture.system.domain.vo.PmsPatientVo; import com.acupuncture.system.domain.vo.PmsTreatmentVo; import com.acupuncture.system.persist.dao.FmsFollowupDao; import com.acupuncture.system.persist.dao.PmsTreatmentDao; -import com.acupuncture.system.persist.mapper.FmsPatientQueueRelationMapper; -import com.acupuncture.system.persist.mapper.PmsPatientMapper; -import com.acupuncture.system.persist.mapper.PmsTreatmentMapper; -import com.acupuncture.system.persist.mapper.PmsTreatmentRecordMapper; +import com.acupuncture.system.persist.mapper.*; import com.acupuncture.system.service.PmsPatientService; import com.acupuncture.system.service.PmsTreatmentService; import com.deepoove.poi.XWPFTemplate; @@ -72,6 +70,8 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { private FmsFollowupDao fmsFollowupDao; @Resource private RedisCache redisCache; + @Resource + private DmsTenantMapper dmsTenantMapper; @Value("${file.TreamentTemplate}") private String treamentTemplate; @Value("${file.pgTemplate}") @@ -117,6 +117,8 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { FmsPatientQueueRelation patientQueueRelation = BeanUtil.copyProperties(dto, FmsPatientQueueRelation.class); patientQueueRelation.setId(IdUtil.getSnowflakeNextId()); patientQueueRelation.setDelFlag((byte) 0); + patientQueueRelation.setPinyinFull(PinyinUtil.getPinyin(pmsTreatment.getName(), "")); + patientQueueRelation.setPinyinSimple(PinyinUtil.getFirstLetter(pmsTreatment.getName(), "")); patientQueueRelation.setIdCard(dto.getIdCard()); patientQueueRelation.setIdCardType(dto.getIdCardType().byteValue()); patientQueueRelation.setCreateBy(SecurityUtils.getUsername()); @@ -129,6 +131,8 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { FmsPatientQueueRelation patientQueueRelation = BeanUtil.copyProperties(dto, FmsPatientQueueRelation.class); patientQueueRelation.setId(IdUtil.getSnowflakeNextId()); patientQueueRelation.setDelFlag((byte) 0); + patientQueueRelation.setPinyinFull(PinyinUtil.getPinyin(pmsTreatment.getName(), "")); + patientQueueRelation.setPinyinSimple(PinyinUtil.getFirstLetter(pmsTreatment.getName(), "")); patientQueueRelation.setCreateBy(SecurityUtils.getUsername()); patientQueueRelation.setTenantId(SecurityUtils.getTenantId()); patientQueueRelation.setIdCard(dto.getIdCard()); @@ -462,7 +466,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { writer.writeCellValue(13, row, treatmentVOList.get(i).getDoctor()); writer.writeCellValue(14, row, treatmentVOList.get(i).getCreateBy()); } - String filename = StrUtil.format("患者档案-{}.xlsx", DateUtil.date().toString("yyyyMMdd")); + String filename = StrUtil.format("HZDA-{}.xlsx", DateUtil.date().toString("yyyyMMdd")); //response为HttpServletResponse对象 response.setContentType("application/vnd.ms-excel;charset=utf-8"); @@ -493,6 +497,9 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { pmsTreatmentRecordExample.createCriteria().andTreatmentIdEqualTo(dto.getTreatmentId()).andDelFlagEqualTo((byte) 0); List pmsTreatmentRecords = pmsTreatmentRecordMapper.selectByExample(pmsTreatmentRecordExample); + //查询租户 + DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(pmsTreatment.getTenantId()); + String pdfName = pmsTreatment.getName() + "_" + pmsTreatment.getVisitNumber(); String wordPath = profilePath + File.separator + pdfName + ".docx"; String pdfPath = profilePath + File.separator + pdfName + ".pdf"; @@ -501,17 +508,39 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { Map map = new HashMap<>(); map.put("name", pmsTreatment.getName()); map.put("sex", pmsTreatment.getGender() == 0 ? "男" : "女"); - map.put("age", pmsTreatment.getAge()); + map.put("age", pmsTreatment.getAge() + " 岁"); map.put("phone", pmsTreatment.getPhone()); map.put("visitNum", pmsTreatment.getVisitNumber()); - map.put("visitTime", DateUtil.format(pmsTreatment.getVisitTime(), "yyyy-MM-dd HH:mm:ss")); + map.put("visitTime", DateUtil.format(pmsTreatment.getVisitTime(), "yyyy-MM-dd")); map.put("doctor", pmsTreatment.getDoctor()); map.put("createBy", pmsTreatment.getCreateBy()); map.put("createTime", DateUtil.format(pmsTreatment.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); map.put("status", pmsTreatment.getStatus() == 0 ? "未完成" : "已完成"); - + map.put("report_date", DateUtil.format(new Date(), "yyyy-MM-dd")); + if (dmsTenant != null) { + map.put("h_name", dmsTenant.getName()); + } 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()); + 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()); + map.put("PG_RTCF_QZTZ", recordMap.get("PG_RTCF_QZTZ") == null ? "" : recordMap.get("PG_RTCF_QZTZ").getAnswer()); + map.put("PG_RTCF_JRL", recordMap.get("PG_RTCF_JRL") == null ? "" : recordMap.get("PG_RTCF_JRL").getAnswer()); + map.put("PG_RTCF_TBW", recordMap.get("PG_RTCF_TBW") == null ? "" : recordMap.get("PG_RTCF_TBW").getAnswer()); + map.put("PG_RTCF_DBZ", recordMap.get("PG_RTCF_DBZ") == null ? "" : recordMap.get("PG_RTCF_DBZ").getAnswer()); + map.put("PG_RTCF_GZ", recordMap.get("PG_RTCF_GZ") == null ? "" : recordMap.get("PG_RTCF_GZ").getAnswer()); + map.put("PG_RTCF_GGJ", recordMap.get("PG_RTCF_GGJ") == null ? "" : recordMap.get("PG_RTCF_GGJ").getAnswer()); + map.put("PG_RTCF_ZF", recordMap.get("PG_RTCF_ZF") == null ? "" : recordMap.get("PG_RTCF_ZF").getAnswer()); + map.put("PG_RTCF_WHR", recordMap.get("PG_RTCF_WHR") == null ? "" : recordMap.get("PG_RTCF_WHR").getAnswer()); + 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()); + 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()); From deecd8a81ba2fc5ce9b0fadeb6655606de0c2d65 Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 18 Mar 2025 00:11:20 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=8A=E7=96=97?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=E9=98=9F?= =?UTF-8?q?=E5=88=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PmsTreatmentServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 d4bf726f..a5e1c1ec 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 @@ -271,15 +271,15 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { willSavedRecord.setCreateBy(SecurityUtils.getUsername()); willSavedFirstAidRecordList.add(willSavedRecord); - //处理随访队列 - //删除队列 - //如有患者档案信息，则需要判断患者是否有随访队列，如果有，则需要删除(先删除后新增) - FmsPatientQueueRelationExample fmsPatientQueueRelationExample = new FmsPatientQueueRelationExample(); - fmsPatientQueueRelationExample.createCriteria().andPatientIdEqualTo(pmsTreatment.getPatientId()).andDelFlagEqualTo((byte) 0); - FmsPatientQueueRelation fmsPatientQueueRelation = new FmsPatientQueueRelation(); - fmsPatientQueueRelation.setDelFlag((byte) 1); - fmsPatientQueueRelationMapper.updateByExampleSelective(fmsPatientQueueRelation, fmsPatientQueueRelationExample); if ("SFDL".equals(codeAndAnswer.getQuestionCode())) { + //处理随访队列 + //删除队列 + //如有患者档案信息，则需要判断患者是否有随访队列，如果有，则需要删除(先删除后新增) + FmsPatientQueueRelationExample fmsPatientQueueRelationExample = new FmsPatientQueueRelationExample(); + fmsPatientQueueRelationExample.createCriteria().andPatientIdEqualTo(pmsTreatment.getPatientId()).andDelFlagEqualTo((byte) 0); + FmsPatientQueueRelation fmsPatientQueueRelation = new FmsPatientQueueRelation(); + fmsPatientQueueRelation.setDelFlag((byte) 1); + fmsPatientQueueRelationMapper.updateByExampleSelective(fmsPatientQueueRelation, fmsPatientQueueRelationExample); //新增随访队列 if (CollectionUtil.isNotEmpty(codeAndAnswer.getAnswer())) { List answer = codeAndAnswer.getAnswer(); From 49399dc00428af47ee424b30637aed66c2adbc3b Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 18 Mar 2025 00:36:50 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=82=A3=E8=80=85=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=AF=BC=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()); From 6a7afc62b6657c8a03b500ace5d583c0294fefe7 Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 18 Mar 2025 01:02:27 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E8=AF=8A=E7=96=97=E6=A1=A3=E6=A1=88=E3=80=81=E6=82=A3=E8=80=85?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/web/ScreeningController.java | 1 - .../system/domain/vo/PmsTreatmentVo.java | 2 + .../service/impl/PmsPatientServiceImpl.java | 2 + .../service/impl/PmsTreatmentServiceImpl.java | 30 +++++++++- .../resources/mapper/dao/PmsTreatmentDao.xml | 57 ++++++++++--------- 5 files changed, 62 insertions(+), 30 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java index 8f0e268f..7fdcf95b 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java @@ -161,7 +161,6 @@ public class ScreeningController { screeningService.exportRzScreen(response, param.getParam()); } - // @Anonymous // @ApiOperation(value = "导出筛查记录", notes = "") // @RequestMapping(value = "/export", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) 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 8287394c..dc32bdc0 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 @@ -70,6 +70,8 @@ public class PmsTreatmentVo { private String name; + private String tenantName; + private String pinyinFull; private String pinyinSimple; 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 9e48157e..06a526c9 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 @@ -257,6 +257,8 @@ public class PmsPatientServiceImpl implements PmsPatientService { writer.writeCellValue(7, row, "港澳居民来往内地通行证"); break; case 3: + writer.writeCellValue(7, row, "台湾居民来往大陆通行证"); + case 4: writer.writeCellValue(7, row, "其他"); } } 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 742e0358..76d701be 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 @@ -585,17 +585,39 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { Map map = new HashMap<>(); map.put("name", treatmentRecordVO.getName()); map.put("sex", treatmentRecordVO.getGender() == 0 ? "男" : "女"); - map.put("age", treatmentRecordVO.getAge()); + map.put("age", treatmentRecordVO.getAge() + " 岁"); map.put("phone", treatmentRecordVO.getPhone()); map.put("visitNum", treatmentRecordVO.getVisitNumber()); - map.put("visitTime", DateUtil.format(treatmentRecordVO.getVisitTime(), "yyyy-MM-dd HH:mm:ss")); + map.put("visitTime", DateUtil.format(treatmentRecordVO.getVisitTime(), "yyyy-MM-dd")); map.put("doctor", treatmentRecordVO.getDoctor()); map.put("createBy", treatmentRecordVO.getCreateBy()); map.put("createTime", DateUtil.format(treatmentRecordVO.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); map.put("status", treatmentRecordVO.getStatus() == 0 ? "未完成" : "已完成"); - + map.put("report_date", DateUtil.format(new Date(), "yyyy-MM-dd")); + if (treatmentRecordVO != null) { + map.put("h_name", treatmentRecordVO.getTenantName()); + } 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()); + 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()); + map.put("PG_RTCF_QZTZ", recordMap.get("PG_RTCF_QZTZ") == null ? "" : recordMap.get("PG_RTCF_QZTZ").getAnswer()); + map.put("PG_RTCF_JRL", recordMap.get("PG_RTCF_JRL") == null ? "" : recordMap.get("PG_RTCF_JRL").getAnswer()); + map.put("PG_RTCF_TBW", recordMap.get("PG_RTCF_TBW") == null ? "" : recordMap.get("PG_RTCF_TBW").getAnswer()); + map.put("PG_RTCF_DBZ", recordMap.get("PG_RTCF_DBZ") == null ? "" : recordMap.get("PG_RTCF_DBZ").getAnswer()); + map.put("PG_RTCF_GZ", recordMap.get("PG_RTCF_GZ") == null ? "" : recordMap.get("PG_RTCF_GZ").getAnswer()); + map.put("PG_RTCF_GGJ", recordMap.get("PG_RTCF_GGJ") == null ? "" : recordMap.get("PG_RTCF_GGJ").getAnswer()); + map.put("PG_RTCF_ZF", recordMap.get("PG_RTCF_ZF") == null ? "" : recordMap.get("PG_RTCF_ZF").getAnswer()); + map.put("PG_RTCF_WHR", recordMap.get("PG_RTCF_WHR") == null ? "" : recordMap.get("PG_RTCF_WHR").getAnswer()); + 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()); + 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()); @@ -735,6 +757,8 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService { writer.writeCellValue(7, row, "港澳居民来往内地通行证"); break; case 3: + writer.writeCellValue(7, row, "台湾居民来往大陆通行证"); + case 4: writer.writeCellValue(7, row, "其他"); } } diff --git a/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml b/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml index c88a27d1..3ce02773 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml @@ -141,32 +141,35 @@ @@ -207,7 +210,9 @@ create_by as createBy, create_time as createTime from pms_treatment_record - where treatment_id = #{treatmentId} + where + del_flag = 0 + treatment_id = #{treatmentId} and question_code in From 949fa4d4df5418673fc5c4fcbe6683268caa04ef Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 18 Mar 2025 01:25:48 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=AF=8A=E7=96=97=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BB=E8=A6=81=E8=AF=8A=E6=96=AD=5F?= =?UTF-8?q?=E5=85=B6=E4=BB=96=EF=BC=8C=20=E5=AF=BC=E5=87=BA=E8=AF=8A?= =?UTF-8?q?=E7=96=97=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 From 0cd8743d92f9fe11614d4b1cfa232c49ceb39888 Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 18 Mar 2025 03:18:03 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acupuncture/web/task/TaskController.java | 2 +- .../src/main/resources/application-prod.yml | 71 +++++++++++++++++++ .../web/service/WebDmsLoginService.java | 2 +- .../system/persist/dao/ExternalDao.java | 4 +- .../service/impl/ExternalServiceImpl.java | 12 +++- 5 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 acupuncture-admin/src/main/resources/application-prod.yml diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java index ae352a71..76f20bed 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java @@ -66,7 +66,7 @@ public class TaskController { @ApiOperation("定时任务添加随访工单") @PostMapping("/task") - @Scheduled(fixedRate = 10000) + @Scheduled(cron = "0 0 0 * * ?") @Anonymous public void task() { // TODO 生成工单第一次生成之后2周的，往后只生成之后一周。第一次随访时间： （ 患者的出院时间 - 7 + 轮次时间） 到 （患者的出院时间 + 7 + 轮次时间 ） diff --git a/acupuncture-admin/src/main/resources/application-prod.yml b/acupuncture-admin/src/main/resources/application-prod.yml new file mode 100644 index 00000000..1f416db3 --- /dev/null +++ b/acupuncture-admin/src/main/resources/application-prod.yml @@ -0,0 +1,71 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://192.168.0.192:3306/acupuncture?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + username: root + password: csylcx18aA + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: jdbc:mysql://localhost:3306/acupuncture_yfyy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: po3OynBO[M3579p6L7)o + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: acupuncture + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + +file: + PatientTemplate: /home/acupuncture/server/profile/PatientTemplate.xlsx + TreamentTemplate: /home/acupuncture/server/profile/TreamentTemplate.xlsx + wxQrCodeTemplate: /home/acupuncture/server/profile/wxQrCodeTemplate.docx + screenQrCodeTemplate: /home/acupuncture/server/profile/screenQrCodeTemplate.docx + hbTemplate: /home/acupuncture/server/profile/screenHbQrCodeTemplate.docx + screenPath: http://test.tall.wiki/acupuncture/web-admin/screening/H5?hospitalId=hosId&hospitalName=hosName¢erId=cId + pgTemplate: /home/acupuncture/server/profile/TreamtmentPgTemplate.docx + jmrsUrl: /home/acupuncture/server/profile/uploads/jmrsTemplate.docx diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java index 9f65dacb..f5a40b40 100644 --- a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java +++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java @@ -62,7 +62,7 @@ public class WebDmsLoginService public String login(String username, String password, String code, String uuid) { // 验证码校验 -// validateCaptcha(username, code, uuid); + validateCaptcha(username, code, uuid); // 登录前置校验 loginPreCheck(username, password); // 用户验证 diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java index 772e2dc7..abc338f4 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java @@ -5,6 +5,8 @@ import com.acupuncture.system.domain.vo.DmsLoginUserVo; import com.acupuncture.system.domain.vo.ExternalVo; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Author zzc * @Package com.acupuncture.system.persist.dao @@ -13,5 +15,5 @@ import org.apache.ibatis.annotations.Param; */ public interface ExternalDao { - ExternalVo.Result select(@Param("query") ExternalDto.Query query); + List select(@Param("query") ExternalDto.Query query); } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java index 9def122e..21c7a869 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java @@ -44,7 +44,11 @@ public class ExternalServiceImpl implements ExternalService { ExternalDto.Query query = new ExternalDto.Query(); query.setFrom(from); query.setMemberid(memberid); - return externalDao.select(query); + List select = externalDao.select(query); + if (CollectionUtil.isNotEmpty(select)) { + return select.get(0); + } + return new ExternalVo.Result(); } @Override @@ -139,6 +143,12 @@ public class ExternalServiceImpl implements ExternalService { uplRtcfInfos.setBmiMax(rtcfInfoDto.getBMIMax()); uplRtcfInfos.setBmiMin(rtcfInfoDto.getBMIMin()); + UplRtcfInfoExample uplRtcfInfoExample = new UplRtcfInfoExample(); + uplRtcfInfoExample.createCriteria().andUuidEqualTo(rtcfInfoDto.getUUID()).andMemberidEqualTo(rtcfInfoDto.getMemberid()).andDelFlagEqualTo((byte) 0); + UplRtcfInfo uplRtcfInfo = new UplRtcfInfo(); + uplRtcfInfo.setDelFlag((byte) 1); + uplRtcfInfoMapper.updateByExampleSelective(uplRtcfInfo, uplRtcfInfoExample); + int insert = uplRtcfInfoMapper.insert(uplRtcfInfos); if (insert > 0) { redisCache.set("rtcfInfo:" + uplRtcfInfos.getMemberid(), uplRtcfInfos.getUuid());