From ac89ac3a954a4000e6af6ca9907ab43f81bc5987 Mon Sep 17 00:00:00 2001 From: zzc Date: Wed, 19 Mar 2025 20:42:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=91=8A=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/web/WxQrCodeController.java | 2 +- .../system/persist/dao/WxQrCodeDao.java | 4 +- .../service/impl/ScreeningServiceImpl.java | 158 +++++++----------- .../service/impl/WxQrCodeServiceImpl.java | 2 +- .../mapper/dao/ScreeningDetailDao.xml | 4 +- .../main/resources/mapper/dao/SysPowerDao.xml | 9 +- .../main/resources/mapper/dao/WxQrCodeDao.xml | 5 + 7 files changed, 76 insertions(+), 108 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java index 76450cb7..f2d2dc90 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java @@ -72,7 +72,7 @@ public class WxQrCodeController { if (dto.getPageNum() > 0) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); } - return JsonResponse.ok(new PageInfo<>(wxQrCodeService.queryList(dto.getParam().getTenantId()))); + return JsonResponse.ok(new PageInfo<>(wxQrCodeService.adminQueryList(dto.getParam().getTenantId()))); } @ApiOperation(value = "查询客户端筛查二维码") diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/WxQrCodeDao.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/WxQrCodeDao.java index b60cfc7b..a6192b03 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/WxQrCodeDao.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/WxQrCodeDao.java @@ -24,7 +24,9 @@ public interface WxQrCodeDao { */ List selectScreen(@Param("hospitalId") Long hospitalId); - List selectScreenList(@Param("hospitalIdList") List hospitalIdList); + List selectScreenList(@Param("hospitalIdList") List hospitalIdList, + @Param("userId") Long userId, + @Param("tenantId") Long tenantId); @DataSource(DataSourceType.MASTER) List adminSelectScreenList(@Param("hospitalIdList") List hospitalIdList); 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 14a38b68..32a44833 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 @@ -85,26 +85,24 @@ public class ScreeningServiceImpl implements IScreeningService { public void export(HttpServletResponse response, ScreeningDto.Query param) { ExcelWriter excelWriter = ExcelUtil.getWriter(); List headerList = CollectionUtil.newArrayList( + "单位", "姓名", "性别", "出生日期", "年龄", "联系方式", - "身高", - "体重", + "身高（cm）", + "体重（kg）", "BMI", "体重自评结论", "上床睡觉", "入睡时间", "睡醒时间", "起床时间", - "睡眠效率", + "睡眠效率（%）", "疾病风险", "疾病风险-其他", "筛查结论", -// "失眠自评（SRSS）得分", -// "可接受的治疗方式", -// "可接受的治疗周期", "筛查时间", "组织" ); @@ -123,28 +121,29 @@ public class ScreeningServiceImpl implements IScreeningService { } 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(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-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(0, row, map.get("SCWJ-DW") == null ? "" : map.get("SCWJ-DW").getAnswer()); + excelWriter.writeCellValue(1, row, detailVos.get(i).getName() + ""); + excelWriter.writeCellValue(2, row, map.get("SCWJ-SEX") == null ? "未知" : map.get("SCWJ-SEX").getAnswer()); + excelWriter.writeCellValue(3, row, map.get("SCWJ-BIRTH") == null ? "" : map.get("SCWJ-BIRTH").getAnswer()); + excelWriter.writeCellValue(4, row, map.get("SCWJ-AGE") == null ? "" : map.get("SCWJ-AGE").getAnswer()); + excelWriter.writeCellValue(5, row, map.get("SCWJ-PHONE") == null ? "" : map.get("SCWJ-PHONE").getAnswer()); + excelWriter.writeCellValue(6, row, map.get("SCWJ-HEIGHT") == null ? "" : map.get("SCWJ-HEIGHT").getAnswer()); + excelWriter.writeCellValue(7, row, map.get("SCWJ-WEIGHT") == null ? "" : map.get("SCWJ-WEIGHT").getAnswer()); + excelWriter.writeCellValue(8, row, map.get("SCWJ-BMI") == null ? "" : map.get("SCWJ-BMI").getAnswer()); + excelWriter.writeCellValue(9, row, map.get("SCWJ-JL") == null ? "" : map.get("SCWJ-JL").getAnswer()); + excelWriter.writeCellValue(10,row, map.get("SCWJ-SCSJ") == null ? "" : map.get("SCWJ-SCSJ").getAnswer()); + excelWriter.writeCellValue(11, row, map.get("SCWJ-RSSJ") == null ? "" : map.get("SCWJ-RSSJ").getAnswer()); + excelWriter.writeCellValue(12, row, map.get("SCWJ-SXSJ") == null ? "" : map.get("SCWJ-SXSJ").getAnswer()); + excelWriter.writeCellValue(13, row, map.get("SCWJ-QCSJ") == null ? "" : map.get("SCWJ-QCSJ").getAnswer()); + excelWriter.writeCellValue(14, row, map.get("SCWJ-SMXL") == null ? "" : map.get("SCWJ-SMXL").getAnswer()); + excelWriter.writeCellValue(15, row, map.get("SCWJ-XBS") == null ? "" : map.get("SCWJ-XBS").getAnswer()); + excelWriter.writeCellValue(16, row, map.get("SCWJ-XBS-QT") == null ? "" : map.get("SCWJ-XBS-QT").getAnswer()); + excelWriter.writeCellValue(17, 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()); + excelWriter.writeCellValue(18, row, DateUtil.format(detailVos.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + excelWriter.writeCellValue(19, row, detailVos.get(i).getTenantName()); // if (record == null || StrUtil.isEmpty(record.getAnswer())) { // excelWriter.writeCellValue(6, row, "否"); @@ -219,25 +218,26 @@ public class ScreeningServiceImpl implements IScreeningService { public void adminExport(HttpServletResponse response, ScreeningDto.Query param) { ExcelWriter excelWriter = ExcelUtil.getWriter(); List headerList = CollectionUtil.newArrayList( + "单位", "姓名", "性别", - "年龄", - "身份证", "出生日期", - "手机号", - "有高血压,>=140/90mmHg", - "血脂异常,或不清楚", - "有糖尿病", - "心跳不规则", - "吸烟", - "明显超重或肥胖", - "缺乏运动", - "有卒中家族史", - "有既往脑卒中病史", - "有既往短暂脑缺血病史", - "筛查结果", - "数据来源", - "科室名称"); + "年龄", + "联系方式", + "身高（cm）", + "体重（kg）", + "BMI", + "体重自评结论", + "上床睡觉", + "入睡时间", + "睡醒时间", + "起床时间", + "睡眠效率（%）", + "疾病风险", + "疾病风险-其他", + "筛查结论", + "筛查时间", + "组织"); excelWriter.writeHeadRow(headerList); PageInfo page = adminQueryDetailByPage(param, -1, -1); @@ -251,62 +251,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(2, row, map.get("SCWJ-AGE") == null ? "" : map.get("SCWJ-AGE").getAnswer()); - excelWriter.writeCellValue(3, row, map.get("SCWJ-idCard") == null ? "" : map.get("SCWJ-idCard").getAnswer()); - excelWriter.writeCellValue(4, row, map.get("SCWJ-BIRTH") == null ? "" : map.get("SCWJ-BIRTH").getAnswer()); + excelWriter.writeCellValue(0, row, map.get("SCWJ-DW") == null ? "" : map.get("SCWJ-DW").getAnswer()); + excelWriter.writeCellValue(1, row, detailVos.get(i).getName() + ""); + excelWriter.writeCellValue(2, row, map.get("SCWJ-SEX") == null ? "未知" : map.get("SCWJ-SEX").getAnswer()); + excelWriter.writeCellValue(3, row, map.get("SCWJ-BIRTH") == null ? "" : map.get("SCWJ-BIRTH").getAnswer()); + excelWriter.writeCellValue(4, row, map.get("SCWJ-AGE") == null ? "" : map.get("SCWJ-AGE").getAnswer()); excelWriter.writeCellValue(5, row, map.get("SCWJ-PHONE") == null ? "" : map.get("SCWJ-PHONE").getAnswer()); - - if (record == null || StrUtil.isEmpty(record.getAnswer())) { - excelWriter.writeCellValue(6, row, "否"); - excelWriter.writeCellValue(7, row, "否"); - excelWriter.writeCellValue(8, row, "否"); - excelWriter.writeCellValue(9, row, "否"); - excelWriter.writeCellValue(10, row, "否"); - excelWriter.writeCellValue(11, row, "否"); - excelWriter.writeCellValue(12, row, "否"); - excelWriter.writeCellValue(13, row, "否"); - excelWriter.writeCellValue(14, row, "否"); - excelWriter.writeCellValue(15, row, "否"); - } else { - String answer = record.getAnswer(); - String[] split = answer.split(","); - excelWriter.writeCellValue(6, row, Arrays.asList(split).contains("01") ? "是" : "否"); - excelWriter.writeCellValue(7, row, Arrays.asList(split).contains("02") ? "是" : "否"); - excelWriter.writeCellValue(8, row, Arrays.asList(split).contains("03") ? "是" : "否"); - excelWriter.writeCellValue(9, row, Arrays.asList(split).contains("04") ? "是" : "否"); - excelWriter.writeCellValue(10, row, Arrays.asList(split).contains("05") ? "是" : "否"); - excelWriter.writeCellValue(11, row, Arrays.asList(split).contains("06") ? "是" : "否"); - excelWriter.writeCellValue(12, row, Arrays.asList(split).contains("07") ? "是" : "否"); - excelWriter.writeCellValue(13, row, Arrays.asList(split).contains("08") ? "是" : "否"); - excelWriter.writeCellValue(14, row, Arrays.asList(split).contains("09") ? "是" : "否"); - excelWriter.writeCellValue(15, row, Arrays.asList(split).contains("10") ? "是" : "否"); - } - String str = ""; - if (map.get("SCWJ-RESULT") != null && StrUtil.isNotEmpty(map.get("SCWJ-RESULT").getAnswer())) { - String answer1 = map.get("SCWJ-RESULT").getAnswer(); - if ("0".equals(answer1)) { - str = "正常"; - } - if ("1".equals(answer1)) { - str = "低危"; - } - if ("2".equals(answer1)) { - str = "中危"; - } - if ("3".equals(answer1)) { - str = "高危"; - } - } - excelWriter.writeCellValue(16, row, str); - excelWriter.writeCellValue(17, row, map.get("SCWJ-SQMC") == null ? "" : map.get("SCWJ-SQMC").getAnswer()); - excelWriter.writeCellValue(18, row, map.get("SCWJ-DEPT") == null ? "" : map.get("SCWJ-DEPT").getAnswer()); + excelWriter.writeCellValue(6, row, map.get("SCWJ-HEIGHT") == null ? "" : map.get("SCWJ-HEIGHT").getAnswer()); + excelWriter.writeCellValue(7, row, map.get("SCWJ-WEIGHT") == null ? "" : map.get("SCWJ-WEIGHT").getAnswer()); + excelWriter.writeCellValue(8, row, map.get("SCWJ-BMI") == null ? "" : map.get("SCWJ-BMI").getAnswer()); + excelWriter.writeCellValue(9, row, map.get("SCWJ-JL") == null ? "" : map.get("SCWJ-JL").getAnswer()); + excelWriter.writeCellValue(10,row, map.get("SCWJ-SCSJ") == null ? "" : map.get("SCWJ-SCSJ").getAnswer()); + excelWriter.writeCellValue(11, row, map.get("SCWJ-RSSJ") == null ? "" : map.get("SCWJ-RSSJ").getAnswer()); + excelWriter.writeCellValue(12, row, map.get("SCWJ-SXSJ") == null ? "" : map.get("SCWJ-SXSJ").getAnswer()); + excelWriter.writeCellValue(13, row, map.get("SCWJ-QCSJ") == null ? "" : map.get("SCWJ-QCSJ").getAnswer()); + excelWriter.writeCellValue(14, row, map.get("SCWJ-SMXL") == null ? "" : map.get("SCWJ-SMXL").getAnswer()); + excelWriter.writeCellValue(15, row, map.get("SCWJ-XBS") == null ? "" : map.get("SCWJ-XBS").getAnswer()); + excelWriter.writeCellValue(16, row, map.get("SCWJ-XBS-QT") == null ? "" : map.get("SCWJ-XBS-QT").getAnswer()); + excelWriter.writeCellValue(17, 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(18, row, DateUtil.format(detailVos.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + excelWriter.writeCellValue(19, row, detailVos.get(i).getTenantName()); } } } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/WxQrCodeServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/WxQrCodeServiceImpl.java index f5129c91..165ce2fe 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/WxQrCodeServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/WxQrCodeServiceImpl.java @@ -203,7 +203,7 @@ public class WxQrCodeServiceImpl implements WxQrCodeService { @Override public List queryList(Long hospitalId) { - return wxQrCodeDao.selectScreenList(hospitalId == null ? null : CollectionUtil.newArrayList(hospitalId)); + return wxQrCodeDao.selectScreenList(hospitalId == null ? null : CollectionUtil.newArrayList(hospitalId), SecurityUtils.getUserId(), SecurityUtils.getTenantId()); } @Override diff --git a/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml b/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml index 1ebbbfac..ef479da3 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml @@ -130,10 +130,10 @@ and r.tenant_id = #{param.tenantId} - + and r.create_time >= #{param.startTime} - + and r.create_time <= #{param.endTime} diff --git a/acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml b/acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml index 4154f3eb..ef0da034 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml @@ -4,14 +4,7 @@ diff --git a/acupuncture-system/src/main/resources/mapper/dao/WxQrCodeDao.xml b/acupuncture-system/src/main/resources/mapper/dao/WxQrCodeDao.xml index 90c0985b..accdb6e0 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/WxQrCodeDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/WxQrCodeDao.xml @@ -94,6 +94,11 @@ and del_flag = 0 #{id} + + + AND c.tenant_id = #{tenantId} + + GROUP BY c.id order by c.create_time desc