diff --git a/src/main/java/com/ccsens/carbasics/api/ExportController.java b/src/main/java/com/ccsens/carbasics/api/ExportController.java index f56dddf..bb505e1 100644 --- a/src/main/java/com/ccsens/carbasics/api/ExportController.java +++ b/src/main/java/com/ccsens/carbasics/api/ExportController.java @@ -48,9 +48,9 @@ public class ExportController { @ApiOperation(value = "导出最新急救信息(自用)", notes = "") @RequestMapping(value = "/exportFirstAid", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) - public void exportFirstAid(String startTime, HttpServletResponse response) throws Exception{ + public void exportFirstAid(String startTime,Byte type, HttpServletResponse response) throws Exception{ log.info("导出最新急救信息(自用):{}",startTime); - Workbook workbook = exportService.exportFirstAid(startTime); + Workbook workbook = exportService.exportFirstAid(startTime,type); log.info("导出最新急救信息(自用)结束:{}",workbook); String fileName = "医院急救信息汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx"; response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CharsetUtil.UTF_8)); diff --git a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java b/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java index 1817f3c..5050ed7 100644 --- a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java +++ b/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java @@ -127,7 +127,15 @@ public class QuestionnaireController { // 未添加时间条件 Workbook workbook = questionnaireService.export(export); log.info("导出问卷记录结束"); - String fileName = "山西省缺血性脑卒中数据汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx"; + String str = ""; + if (1L == export.getQid()) { + str = "2021年1-6月"; + }else if (3L == export.getQid()) { + str = "2021年7-11月"; + }else if (4L == export.getQid()) { + str = "2021年7-12月"; + } + String fileName = str+"山西省缺血性脑卒中数据汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx"; response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CharsetUtil.UTF_8)); workbook.write(response.getOutputStream()); } diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java index 65e414a..d60ac7d 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java @@ -60,6 +60,8 @@ public class AccountVo { private String positionCode; @ApiModelProperty("审核状态(0-未审核,1-审核通过,2-审核拒绝)") private Byte auditStatus; + @ApiModelProperty("数据来源(0-账户,1-问卷)") + private Byte dataFrom; public String getPhone() { return DesensitizedUtils.mobilePhone(phone); diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java index f45eb30..e143663 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java @@ -2,7 +2,6 @@ package com.ccsens.carbasics.bean.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javafx.geometry.Pos; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java index fed9969..432bd1d 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java @@ -3,7 +3,9 @@ package com.ccsens.carbasics.bean.vo.message; import com.ccsens.carbasics.util.Constant; import com.ccsens.util.message.BaseMessageDto; import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode(callSuper = true) @Data public class RemindMessageVo extends BaseMessageDto { private Data data; diff --git a/src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java b/src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java index 579170d..a9db7bc 100644 --- a/src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java +++ b/src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java @@ -76,7 +76,7 @@ public interface FirstAidDao extends FirstAidMapper { * 查询四家医院的病例列表 * @return 四家医院的病例列表 */ - List queryNeedHospital(@Param("startTime") Long startTime); + List queryNeedHospital(@Param("startTime") Long startTime,@Param("type") Byte type); /** * 质检员查看急救列表 diff --git a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java index ac2644e..13306c4 100644 --- a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java +++ b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java @@ -88,7 +88,7 @@ public class AccountManageService implements IAccountManageService { boolean flag = true; //1.校验字段是否都填写 Integer num = questionnaireDetailDao.countCodeNumber(detailId); - if (num < 22) { + if (num < 24) { flag = false; } String answer = questionnaireDetailDao.queryXGZL(detailId); diff --git a/src/main/java/com/ccsens/carbasics/service/ExportService.java b/src/main/java/com/ccsens/carbasics/service/ExportService.java index 57b0b88..e096a54 100644 --- a/src/main/java/com/ccsens/carbasics/service/ExportService.java +++ b/src/main/java/com/ccsens/carbasics/service/ExportService.java @@ -260,7 +260,7 @@ public class ExportService implements IExportService{ @Override - public Workbook exportFirstAid(String startTime) throws IOException, ParseException { + public Workbook exportFirstAid(String startTime,Byte type) throws IOException, ParseException { Workbook workbook = new XSSFWorkbook(); //空白格 PoiUtil.PoiUtilCell blank = new PoiUtil.PoiUtilCell(); @@ -285,7 +285,7 @@ public class ExportService implements IExportService{ Date parse = timeParam.parse(startTime); long time = parse.getTime(); - List hospitalData = firstAidDao.queryNeedHospital(time); + List hospitalData = firstAidDao.queryNeedHospital(time,type); if (CollectionUtil.isNotEmpty(hospitalData)) { for (FirstAidVo.NeedHospital hospitalDatum : hospitalData) { List data = new ArrayList<>(); diff --git a/src/main/java/com/ccsens/carbasics/service/IExportService.java b/src/main/java/com/ccsens/carbasics/service/IExportService.java index 07d0081..48b9801 100644 --- a/src/main/java/com/ccsens/carbasics/service/IExportService.java +++ b/src/main/java/com/ccsens/carbasics/service/IExportService.java @@ -24,5 +24,5 @@ public interface IExportService { * @param startTime 用户id * @return excel */ - Workbook exportFirstAid(String startTime) throws IOException, ParseException; + Workbook exportFirstAid(String startTime,Byte type) throws IOException, ParseException; } diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index b4f966a..a164ca2 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -114,14 +114,14 @@ public class QuestionnaireService implements IQuestionnaireService{ @Override public void saveQuestionnaire(QuestionnaireDto.SaveQuestionnaire param, Long userId) throws Exception { //redis判断是否已有 - Object o = redisUtil.get(param.getDetailId() + "" + userId); + Object o = redisUtil.get(param.getDetailId() + "" + userId + param.getCode()); log.info("redis保存问卷用户{},{}",param.getDetailId() + "" + userId,o); if (ObjectUtil.isNull(o)) { - redisUtil.set(param.getDetailId() + "" + userId,userId); + redisUtil.set(param.getDetailId() + "" + userId + param.getCode(),userId); //查询是否已经提交,已提交不能保存修改 QuestionnaireDetail questionnaireDetail = questionnaireDetailDao.selectByPrimaryKey(param.getDetailId()); if (Constant.SubmitStatus.submit.status == questionnaireDetail.getSubmitStatus()) { - redisUtil.del(param.getDetailId() + "" + userId); + redisUtil.del(param.getDetailId() + "" + userId + param.getCode()); throw new BaseException(DefaultCodeError.HOSPITAL_REPEAT_SUBMIT); } Long recordId = recordDao.queryIsExist(param.getDetailId(),param.getCode()); @@ -139,7 +139,7 @@ public class QuestionnaireService implements IQuestionnaireService{ record.setAnswer(param.getAnswer()); recordDao.insertSelective(record); } - redisUtil.del(param.getDetailId() + "" + userId); + redisUtil.del(param.getDetailId() + "" + userId + param.getCode()); } @@ -186,7 +186,8 @@ public class QuestionnaireService implements IQuestionnaireService{ List stringList = new ArrayList<>(); stringList.add("QXXWJ"); List qxxwj = codeDictionariesDao.query(stringList); - if (num <= qxxwj.size()) { + log.info("QXXWJ数量:{}",qxxwj.size()); + if (num < qxxwj.size()) { throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE); } String answer = questionnaireDetailDao.queryXGZL(param.getDetailId()); @@ -195,7 +196,7 @@ public class QuestionnaireService implements IQuestionnaireService{ sonCode.add("XGZL"); List xgzl = codeDictionariesDao.query(sonCode); Integer sonOfXGZLNum = questionnaireDetailDao.querySonOfXGZL(param.getDetailId()); - if (sonOfXGZLNum <= xgzl.size()) { + if (sonOfXGZLNum < xgzl.size()) { throw new BaseException(DefaultCodeError.XGZL_INCOMPLETE); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c3b11fb..5abf242 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test + active: prod + include: common, util-prod diff --git a/src/main/resources/mapper_dao/AccountManageDao.xml b/src/main/resources/mapper_dao/AccountManageDao.xml index c305d99..4b98983 100644 --- a/src/main/resources/mapper_dao/AccountManageDao.xml +++ b/src/main/resources/mapper_dao/AccountManageDao.xml @@ -13,7 +13,8 @@ department_code, position_name AS position, position_code, - audit_status + audit_status, + data_from FROM t_qcp_account_manage WHERE diff --git a/src/main/resources/mapper_dao/AreaDao.xml b/src/main/resources/mapper_dao/AreaDao.xml index 0973442..73209d1 100644 --- a/src/main/resources/mapper_dao/AreaDao.xml +++ b/src/main/resources/mapper_dao/AreaDao.xml @@ -3,37 +3,29 @@ - - + + - - - - - - + +