From f12cb14446f9feeffb13134703f63a6ca72237c3 Mon Sep 17 00:00:00 2001 From: cfl Date: Tue, 12 Sep 2023 21:00:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BF=87=E7=A8=8B=E4=B8=ADbu?= =?UTF-8?q?g=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../talkonlineweb/controller/XljcArchiveController.java | 9 +++++++++ .../lyms/talkonlineweb/controller/XljcFormController.java | 11 +++++++++-- .../lyms/talkonlineweb/controller/XljcTraceController.java | 4 ++++ .../lyms/talkonlineweb/mapper/LymsXljcRecordMapper.java | 4 ++-- .../service/impl/LymsXljcRecordServiceImpl.java | 4 ++-- talkonlineweb/src/main/resources/application-dev.yml | 2 +- .../src/main/resources/mapper/LymsXljcRecordMapper.xml | 14 ++++++++++---- .../main/resources/mapper/LymsXljcRecordTraceMapper.xml | 1 + 8 files changed, 38 insertions(+), 11 deletions(-) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcArchiveController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcArchiveController.java index e0c6e61..603509b 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcArchiveController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcArchiveController.java @@ -58,6 +58,9 @@ public class XljcArchiveController { @TokenRequired public BaseResponse saveArchive(@RequestBody @Validated LymsXljcArchive archive,BindingResult result,@RequestHeader String authorization){ LymsUser curUser=lymsUserService.getUserByToken(authorization); + if(curUser.getDoctorId() == null){ + return BaseResponse.error("当前账号无法新建档案，请绑定医生"); + } //身份证号转小写 archive.setIdno(archive.getIdno().toLowerCase()); QueryWrapper query = new QueryWrapper<>(); @@ -91,6 +94,9 @@ public class XljcArchiveController { @TokenRequired public BaseResponse updateArchive(@RequestBody @Validated LymsXljcArchive archive,BindingResult result,@RequestHeader String authorization){ LymsUser curUser=lymsUserService.getUserByToken(authorization); + if(curUser.getDoctorId() == null){ + return BaseResponse.error("当前账号无法更新档案，请绑定医生"); + } //身份证号转小写 archive.setIdno(archive.getIdno().toLowerCase()); QueryWrapper query = new QueryWrapper<>(); @@ -139,6 +145,7 @@ public class XljcArchiveController { return BaseResponse.error("未查询到该身份证证号对应的档案，请先建立档案"); } lymsXljcArchive.setSexName(BeanUtils.tranferSexToText(lymsXljcArchive.getSex())); + lymsXljcArchive.setAge(DateUtil.getAge(DateUtil.parseYMD(lymsXljcArchive.getBirth()))); return BaseResponse.ok(lymsXljcArchive); } @@ -180,6 +187,7 @@ public class XljcArchiveController { Page archivePage = lymsXljcArchiveService.page(page,query.orderByDesc("bookbuil_date")); for(LymsXljcArchive archive : archivePage.getRecords() ){ archive.setSexName(BeanUtils.tranferSexToText(archive.getSex())); + archive.setAge(DateUtil.getAge(DateUtil.parseYMD(archive.getBirth()))); } return BaseResponse.ok(archivePage); } @@ -217,6 +225,7 @@ public class XljcArchiveController { LymsXljcArchive archive = LymsXljcArchiveList.get(i); archive.setSequence(i+1); archive.setSexName(BeanUtils.tranferSexToText(archive.getSex())); + archive.setAge(DateUtil.getAge(DateUtil.parseYMD(archive.getBirth()))); } Workbook result = ExcelExportUtil.exportExcel( new ExportParams("心理检测患者档案表", "档案列表"), diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcFormController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcFormController.java index 42b3a67..bd581a6 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcFormController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcFormController.java @@ -45,6 +45,9 @@ public class XljcFormController { @TokenRequired public BaseResponse saveExamineRecord(@RequestBody XljcExamineRequest xljcExamineRequest, @RequestHeader String authorization) { LymsUser curUser=lymsUserService.getUserByToken(authorization); + if(curUser.getDoctorId() == null){ + return BaseResponse.error("当前账号无法保存检测记录，请绑定医生"); + } lymsXljcRecordService.saveRecord(xljcExamineRequest,curUser); return BaseResponse.ok(); } @@ -100,7 +103,9 @@ public class XljcFormController { public BaseResponse examineRecordList(@RequestBody ExamineRecordListRequest recordListRequest, @RequestHeader String authorization, int current, int size){ //参数处理 LymsUser curUser=lymsUserService.getUserByToken(authorization); - recordListRequest.setExamineHid(curUser.getHid()); + if(curUser.getHid() != null){ + recordListRequest.setExamineHid(curUser.getHid()); + } if(StringUtil.isNotEmpty(recordListRequest.getExamineTimeEnd())){ recordListRequest.setExamineTimeEnd(recordListRequest.getExamineTimeEnd()+" 23:59:59"); } @@ -126,7 +131,9 @@ public class XljcFormController { @RequestHeader String authorization , HttpServletResponse response) throws Exception{ //参数处理 LymsUser curUser=lymsUserService.getUserByToken(authorization); - recordListRequest.setExamineHid(curUser.getHid()); + if(curUser.getHid() != null){ + recordListRequest.setExamineHid(curUser.getHid()); + } if(StringUtil.isNotEmpty(recordListRequest.getExamineTimeEnd())){ recordListRequest.setExamineTimeEnd(recordListRequest.getExamineTimeEnd()+" 23:59:59"); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcTraceController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcTraceController.java index 823591a..7e45e4c 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcTraceController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcTraceController.java @@ -47,6 +47,9 @@ public class XljcTraceController { @TokenRequired public BaseResponse traceSave(@RequestBody LymsXljcRecordTrace recordTrace, @RequestHeader String authorization){ LymsUser curUser=lymsUserService.getUserByToken(authorization); + if(curUser.getDoctorId() == null){ + return BaseResponse.error("当前账号无法保存追访详情，请绑定医生"); + } LymsXljcRecordTrace lymsXljcRecordTrace = lymsXljcRecordTraceService.getById(recordTrace.getId()); lymsXljcRecordTrace.setTraceTime(recordTrace.getTraceTime()); lymsXljcRecordTrace.setTracePerson(recordTrace.getTracePerson()); @@ -118,6 +121,7 @@ public class XljcTraceController { for(int i=0;i < xljcTraceRecords.size() ;i++){ XljcTraceRecord xljcTraceRecord = xljcTraceRecords.get(i); xljcTraceRecord.setSequence(i+1); + xljcTraceRecord.setAge(DateUtil.getAge(DateUtil.parseYMD(xljcTraceRecord.getBirth()))); xljcTraceRecord.setSexText(BeanUtils.tranferSexToText(xljcTraceRecord.getSex())); xljcTraceRecord.setNextExamineStatusText(TraceStatusEnum.getName(xljcTraceRecord.getNextExamineStatus())); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsXljcRecordMapper.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsXljcRecordMapper.java index 3274ca4..4303eae 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsXljcRecordMapper.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsXljcRecordMapper.java @@ -29,14 +29,14 @@ public interface LymsXljcRecordMapper extends BaseMapper { * @param recordListRequest * @return */ - Page selectHisExamineRecordPage(Page rowPage, @Param("recordListRequest") ExamineRecordListRequest recordListRequest); + Page selectHisExamineRecord(Page rowPage, @Param("recordListRequest") ExamineRecordListRequest recordListRequest); /** * 查询检测记录列表,用于导出 * @param recordListRequest * @return */ - List selectHisExamineRecordNoPage(@Param("recordListRequest") ExamineRecordListRequest recordListRequest); + List selectHisExamineRecord(@Param("recordListRequest") ExamineRecordListRequest recordListRequest); List countExamineRecordGroupByFormType(@Param("request") ExamineRecordListRequest recordListRequest); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsXljcRecordServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsXljcRecordServiceImpl.java index 91a80d2..ca8f2df 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsXljcRecordServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsXljcRecordServiceImpl.java @@ -199,12 +199,12 @@ public class LymsXljcRecordServiceImpl extends ServiceImpl selectHisExamineRecordPage(Page rowPage, ExamineRecordListRequest recordListRequest){ - return lymsXljcRecordMapper.selectHisExamineRecordPage(rowPage,recordListRequest); + return lymsXljcRecordMapper.selectHisExamineRecord(rowPage,recordListRequest); } @Override public List selectHisExamineRecordNoPage(ExamineRecordListRequest recordListRequest) { - return lymsXljcRecordMapper.selectHisExamineRecordNoPage(recordListRequest); + return lymsXljcRecordMapper.selectHisExamineRecord(recordListRequest); } @Override diff --git a/talkonlineweb/src/main/resources/application-dev.yml b/talkonlineweb/src/main/resources/application-dev.yml index b812b5e..4d058b2 100644 --- a/talkonlineweb/src/main/resources/application-dev.yml +++ b/talkonlineweb/src/main/resources/application-dev.yml @@ -53,4 +53,4 @@ patient: #微信公众号获取access_token(测试环境部署不要开启。会与线上环境冲突) getAccessToken: #on/off 会转义boolean - on_off: off \ No newline at end of file + on_off: on \ No newline at end of file diff --git a/talkonlineweb/src/main/resources/mapper/LymsXljcRecordMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsXljcRecordMapper.xml index 5b82054..484635e 100644 --- a/talkonlineweb/src/main/resources/mapper/LymsXljcRecordMapper.xml +++ b/talkonlineweb/src/main/resources/mapper/LymsXljcRecordMapper.xml @@ -44,7 +44,7 @@ - - +