ccsens_zhengzhichuan
/
acupuncture
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改报告单

newMaster
zzc 4 months ago
parent
b8fcb3fd96
commit
ac89ac3a95
7 changed files with 76 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java
  2. 4
      acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/WxQrCodeDao.java
  3. 158
      acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java
  4. 2
      acupuncture-system/src/main/java/com/acupuncture/system/service/impl/WxQrCodeServiceImpl.java
  5. 4
      acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml
  6. 9
      acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml
  7. 5
      acupuncture-system/src/main/resources/mapper/dao/WxQrCodeDao.xml

2
acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/WxQrCodeController.java
View File

@ -72,7 +72,7 @@ public class WxQrCodeController {
if (dto.getPageNum() > 0) { if (dto.getPageNum() > 0) {
PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); 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 = "查询客户端筛查二维码") @ApiOperation(value = "查询客户端筛查二维码")

4
acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/WxQrCodeDao.java
View File

@ -24,7 +24,9 @@ public interface WxQrCodeDao {
*/ */
List<AmsWxQrCodeVo.ScreenResult> selectScreen(@Param("hospitalId") Long hospitalId); List<AmsWxQrCodeVo.ScreenResult> selectScreen(@Param("hospitalId") Long hospitalId);
List<AmsWxQrCodeVo.ScreenResult> selectScreenList(@Param("hospitalIdList") List<Long> hospitalIdList); List<AmsWxQrCodeVo.ScreenResult> selectScreenList(@Param("hospitalIdList") List<Long> hospitalIdList,
@Param("userId") Long userId,
@Param("tenantId") Long tenantId);
@DataSource(DataSourceType.MASTER) @DataSource(DataSourceType.MASTER)
List<AmsWxQrCodeVo.ScreenResult> adminSelectScreenList(@Param("hospitalIdList") List<Long> hospitalIdList); List<AmsWxQrCodeVo.ScreenResult> adminSelectScreenList(@Param("hospitalIdList") List<Long> hospitalIdList);

158
acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java
View File

@ -85,26 +85,24 @@ public class ScreeningServiceImpl implements IScreeningService {
public void export(HttpServletResponse response, ScreeningDto.Query param) { public void export(HttpServletResponse response, ScreeningDto.Query param) {
ExcelWriter excelWriter = ExcelUtil.getWriter(); ExcelWriter excelWriter = ExcelUtil.getWriter();
List<String> headerList = CollectionUtil.newArrayList( List<String> headerList = CollectionUtil.newArrayList(
"单位",
"姓名", "姓名",
"性别", "性别",
"出生日期", "出生日期",
"年龄", "年龄",
"联系方式", "联系方式",
"身高", "身高（cm）",
"体重", "体重（kg）",
"BMI", "BMI",
"体重自评结论", "体重自评结论",
"上床睡觉", "上床睡觉",
"入睡时间", "入睡时间",
"睡醒时间", "睡醒时间",
"起床时间", "起床时间",
"睡眠效率", "睡眠效率（%）",
"疾病风险", "疾病风险",
"疾病风险-其他", "疾病风险-其他",
"筛查结论", "筛查结论",
// "失眠自评（SRSS）得分",
// "可接受的治疗方式",
// "可接受的治疗周期",
"筛查时间", "筛查时间",
"组织" "组织"
); );
@ -123,28 +121,29 @@ public class ScreeningServiceImpl implements IScreeningService {
} }
row += 1; row += 1;
excelWriter.writeCellValue(0, row, detailVos.get(i).getName() + ""); excelWriter.writeCellValue(0, row, map.get("SCWJ-DW") == null ? "" : map.get("SCWJ-DW").getAnswer());
excelWriter.writeCellValue(1, row, map.get("SCWJ-SEX") == null ? "未知" : map.get("SCWJ-SEX").getAnswer()); excelWriter.writeCellValue(1, row, detailVos.get(i).getName() + "");
excelWriter.writeCellValue(2, row, map.get("SCWJ-BIRTH") == null ? "" : map.get("SCWJ-BIRTH").getAnswer()); excelWriter.writeCellValue(2, row, map.get("SCWJ-SEX") == null ? "未知" : map.get("SCWJ-SEX").getAnswer());
excelWriter.writeCellValue(3, row, map.get("SCWJ-AGE") == null ? "" : map.get("SCWJ-AGE").getAnswer()); excelWriter.writeCellValue(3, row, map.get("SCWJ-BIRTH") == null ? "" : map.get("SCWJ-BIRTH").getAnswer());
excelWriter.writeCellValue(4, row, map.get("SCWJ-PHONE") == null ? "" : map.get("SCWJ-PHONE").getAnswer()); excelWriter.writeCellValue(4, row, map.get("SCWJ-AGE") == null ? "" : map.get("SCWJ-AGE").getAnswer());
excelWriter.writeCellValue(5, row, map.get("SCWJ-HEIGHT") == null ? "" : map.get("SCWJ-HEIGHT").getAnswer()); excelWriter.writeCellValue(5, row, map.get("SCWJ-PHONE") == null ? "" : map.get("SCWJ-PHONE").getAnswer());
excelWriter.writeCellValue(6, row, map.get("SCWJ-WEIGHT") == null ? "" : map.get("SCWJ-WEIGHT").getAnswer()); excelWriter.writeCellValue(6, row, map.get("SCWJ-HEIGHT") == null ? "" : map.get("SCWJ-HEIGHT").getAnswer());
excelWriter.writeCellValue(7, row, map.get("SCWJ-BMI") == null ? "" : map.get("SCWJ-BMI").getAnswer()); excelWriter.writeCellValue(7, row, map.get("SCWJ-WEIGHT") == null ? "" : map.get("SCWJ-WEIGHT").getAnswer());
excelWriter.writeCellValue(8, row, map.get("SCWJ-JL") == null ? "" : map.get("SCWJ-JL").getAnswer()); excelWriter.writeCellValue(8, row, map.get("SCWJ-BMI") == null ? "" : map.get("SCWJ-BMI").getAnswer());
excelWriter.writeCellValue(9, row, map.get("SCWJ-SCSJ") == null ? "" : map.get("SCWJ-SCSJ").getAnswer()); excelWriter.writeCellValue(9, row, map.get("SCWJ-JL") == null ? "" : map.get("SCWJ-JL").getAnswer());
excelWriter.writeCellValue(10, row, map.get("SCWJ-RSSJ") == null ? "" : map.get("SCWJ-RSSJ").getAnswer()); excelWriter.writeCellValue(10,row, map.get("SCWJ-SCSJ") == null ? "" : map.get("SCWJ-SCSJ").getAnswer());
excelWriter.writeCellValue(11, row, map.get("SCWJ-SXSJ") == null ? "" : map.get("SCWJ-SXSJ").getAnswer()); excelWriter.writeCellValue(11, row, map.get("SCWJ-RSSJ") == null ? "" : map.get("SCWJ-RSSJ").getAnswer());
excelWriter.writeCellValue(12, row, map.get("SCWJ-QCSJ") == null ? "" : map.get("SCWJ-QCSJ").getAnswer()); excelWriter.writeCellValue(12, row, map.get("SCWJ-SXSJ") == null ? "" : map.get("SCWJ-SXSJ").getAnswer());
excelWriter.writeCellValue(13, row, map.get("SCWJ-SMXL") == null ? "" : map.get("SCWJ-SMXL").getAnswer()); excelWriter.writeCellValue(13, row, map.get("SCWJ-QCSJ") == null ? "" : map.get("SCWJ-QCSJ").getAnswer());
excelWriter.writeCellValue(14, row, map.get("SCWJ-XBS") == null ? "" : map.get("SCWJ-XBS").getAnswer()); excelWriter.writeCellValue(14, row, map.get("SCWJ-SMXL") == null ? "" : map.get("SCWJ-SMXL").getAnswer());
excelWriter.writeCellValue(15, row, map.get("SCWJ-XBS-QT") == null ? "" : map.get("SCWJ-XBS-QT").getAnswer()); excelWriter.writeCellValue(15, row, map.get("SCWJ-XBS") == null ? "" : map.get("SCWJ-XBS").getAnswer());
excelWriter.writeCellValue(16, row, map.get("SCREEN-JL") == null ? "" : map.get("SCREEN-JL").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(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(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(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, DateUtil.format(detailVos.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
excelWriter.writeCellValue(18, row, detailVos.get(i).getTenantName()); excelWriter.writeCellValue(19, row, detailVos.get(i).getTenantName());
// if (record == null || StrUtil.isEmpty(record.getAnswer())) { // if (record == null || StrUtil.isEmpty(record.getAnswer())) {
// excelWriter.writeCellValue(6, row, "否"); // excelWriter.writeCellValue(6, row, "否");
@ -219,25 +218,26 @@ public class ScreeningServiceImpl implements IScreeningService {
public void adminExport(HttpServletResponse response, ScreeningDto.Query param) { public void adminExport(HttpServletResponse response, ScreeningDto.Query param) {
ExcelWriter excelWriter = ExcelUtil.getWriter(); ExcelWriter excelWriter = ExcelUtil.getWriter();
List<String> headerList = CollectionUtil.newArrayList( List<String> headerList = CollectionUtil.newArrayList(
"单位",
"姓名", "姓名",
"性别", "性别",
"年龄",
"身份证",
"出生日期", "出生日期",
"手机号", "年龄",
"有高血压,>=140/90mmHg", "联系方式",
"血脂异常,或不清楚", "身高（cm）",
"有糖尿病", "体重（kg）",
"心跳不规则", "BMI",
"吸烟", "体重自评结论",
"明显超重或肥胖", "上床睡觉",
"缺乏运动", "入睡时间",
"有卒中家族史", "睡醒时间",
"有既往脑卒中病史", "起床时间",
"有既往短暂脑缺血病史", "睡眠效率（%）",
"筛查结果", "疾病风险",
"数据来源", "疾病风险-其他",
"科室名称"); "筛查结论",
"筛查时间",
"组织");
excelWriter.writeHeadRow(headerList); excelWriter.writeHeadRow(headerList);
PageInfo<ScrScreenVo.Result> page = adminQueryDetailByPage(param, -1, -1); PageInfo<ScrScreenVo.Result> page = adminQueryDetailByPage(param, -1, -1);
@ -251,62 +251,30 @@ public class ScreeningServiceImpl implements IScreeningService {
if (CollectionUtil.isNotEmpty(recordList)) { if (CollectionUtil.isNotEmpty(recordList)) {
map = recordList.stream().collect(Collectors.toMap(ScrScreenVo.ScreeningDetailVo::getQuestionCode, Function.identity())); 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; row += 1;
excelWriter.writeCellValue(0, row, detailVos.get(i).getName() + ""); excelWriter.writeCellValue(0, row, map.get("SCWJ-DW") == null ? "" : map.get("SCWJ-DW").getAnswer());
excelWriter.writeCellValue(1, row, map.get("SCWJ-SEX") == null ? "未知" : map.get("SCWJ-SEX").getAnswer()); excelWriter.writeCellValue(1, row, detailVos.get(i).getName() + "");
excelWriter.writeCellValue(2, row, map.get("SCWJ-AGE") == null ? "" : map.get("SCWJ-AGE").getAnswer()); excelWriter.writeCellValue(2, 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(3, row, map.get("SCWJ-BIRTH") == null ? "" : map.get("SCWJ-BIRTH").getAnswer());
excelWriter.writeCellValue(4, 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(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());
if (record == null || StrUtil.isEmpty(record.getAnswer())) { excelWriter.writeCellValue(7, row, map.get("SCWJ-WEIGHT") == null ? "" : map.get("SCWJ-WEIGHT").getAnswer());
excelWriter.writeCellValue(6, row, "否"); excelWriter.writeCellValue(8, row, map.get("SCWJ-BMI") == null ? "" : map.get("SCWJ-BMI").getAnswer());
excelWriter.writeCellValue(7, row, "否"); excelWriter.writeCellValue(9, row, map.get("SCWJ-JL") == null ? "" : map.get("SCWJ-JL").getAnswer());
excelWriter.writeCellValue(8, row, "否"); excelWriter.writeCellValue(10,row, map.get("SCWJ-SCSJ") == null ? "" : map.get("SCWJ-SCSJ").getAnswer());
excelWriter.writeCellValue(9, row, "否"); excelWriter.writeCellValue(11, row, map.get("SCWJ-RSSJ") == null ? "" : map.get("SCWJ-RSSJ").getAnswer());
excelWriter.writeCellValue(10, row, "否"); excelWriter.writeCellValue(12, row, map.get("SCWJ-SXSJ") == null ? "" : map.get("SCWJ-SXSJ").getAnswer());
excelWriter.writeCellValue(11, row, "否"); excelWriter.writeCellValue(13, row, map.get("SCWJ-QCSJ") == null ? "" : map.get("SCWJ-QCSJ").getAnswer());
excelWriter.writeCellValue(12, row, "否"); excelWriter.writeCellValue(14, row, map.get("SCWJ-SMXL") == null ? "" : map.get("SCWJ-SMXL").getAnswer());
excelWriter.writeCellValue(13, row, "否"); excelWriter.writeCellValue(15, row, map.get("SCWJ-XBS") == null ? "" : map.get("SCWJ-XBS").getAnswer());
excelWriter.writeCellValue(14, row, "否"); excelWriter.writeCellValue(16, row, map.get("SCWJ-XBS-QT") == null ? "" : map.get("SCWJ-XBS-QT").getAnswer());
excelWriter.writeCellValue(15, row, "否"); excelWriter.writeCellValue(17, row, map.get("SCREEN-JL") == null ? "" : map.get("SCREEN-JL").getAnswer());
} else { // excelWriter.writeCellValue(17, row, map.get("SCWJ-RESULT") == null ? "" : map.get("SCWJ-RESULT").getAnswer());
String answer = record.getAnswer(); // excelWriter.writeCellValue(18, row, map.get("SCWJ-ZLFS") == null ? "" : map.get("SCWJ-ZLFS").getAnswer());
String[] split = answer.split(","); // excelWriter.writeCellValue(19, row, map.get("SCWJ-ZLZQ") == null ? "" : map.get("SCWJ-ZLZQ").getAnswer());
excelWriter.writeCellValue(6, row, Arrays.asList(split).contains("01") ? "是" : "否"); excelWriter.writeCellValue(18, row, DateUtil.format(detailVos.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
excelWriter.writeCellValue(7, row, Arrays.asList(split).contains("02") ? "是" : "否"); excelWriter.writeCellValue(19, row, detailVos.get(i).getTenantName());
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());
} }
} }
} }

2
acupuncture-system/src/main/java/com/acupuncture/system/service/impl/WxQrCodeServiceImpl.java
View File

@ -203,7 +203,7 @@ public class WxQrCodeServiceImpl implements WxQrCodeService {
@Override @Override
public List<AmsWxQrCodeVo.ScreenResult> queryList(Long hospitalId) { public List<AmsWxQrCodeVo.ScreenResult> 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 @Override

4
acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml
View File

@ -130,10 +130,10 @@
<if test="param.tenantId != null"> <if test="param.tenantId != null">
and r.tenant_id = #{param.tenantId} and r.tenant_id = #{param.tenantId}
</if> </if>
<if test="param.startTime != null and param.startTime != ''"> <if test="param.startTime != null">
and r.create_time &gt;= #{param.startTime} and r.create_time &gt;= #{param.startTime}
</if> </if>
<if test="param.endTime != null and param.endTime != ''"> <if test="param.endTime != null">
and r.create_time &lt;= #{param.endTime} and r.create_time &lt;= #{param.endTime}
</if> </if>
<if test="param.startAge != null and param.endAge != ''"> <if test="param.startAge != null and param.endAge != ''">

9
acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml
View File

@ -4,14 +4,7 @@
<select id="queryById" resultType="com.acupuncture.system.domain.po.DmsTenant"> <select id="queryById" resultType="com.acupuncture.system.domain.po.DmsTenant">
select id, select id,
tenant_id as tenantId, name
user_name as userName,
password,
nick_name as nickName,
email,
phonenumber,
sex,
status
from dms_tenant from dms_tenant
where id = #{id} where id = #{id}
</select> </select>

5
acupuncture-system/src/main/resources/mapper/dao/WxQrCodeDao.xml
View File

@ -94,6 +94,11 @@ and del_flag = 0
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="userId != null and userId != 1">
<if test="tenantId != null">
AND c.tenant_id = #{tenantId}
</if>
</if>
</where> </where>
GROUP BY c.id GROUP BY c.id
order by c.create_time desc order by c.create_time desc

Write Preview
Loading…
Cancel
Save