liquanyu / talkonline

Download as
Browse Code »

Commit f12cb14446f9feeffb13134703f63a6ca72237c3

Authored by cfl
1 parent b7815f2cd5
Exists in dev

测试过程中bug修改

Showing 8 changed files with 38 additions and 11 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcArchiveController.java View file @ f12cb14
... ... @@ -58,6 +58,9 @@
58 58 @TokenRequired
59 59 public BaseResponse saveArchive(@RequestBody @Validated LymsXljcArchive archive,BindingResult result,@RequestHeader String authorization){
60 60 LymsUser curUser=lymsUserService.getUserByToken(authorization);
  61 + if(curUser.getDoctorId() == null){
  62 + return BaseResponse.error("当前账号无法新建档案，请绑定医生");
  63 + }
61 64 //身份证号转小写
62 65 archive.setIdno(archive.getIdno().toLowerCase());
63 66 QueryWrapper<LymsXljcArchive> query = new QueryWrapper<>();
... ... @@ -91,6 +94,9 @@
91 94 @TokenRequired
92 95 public BaseResponse updateArchive(@RequestBody @Validated LymsXljcArchive archive,BindingResult result,@RequestHeader String authorization){
93 96 LymsUser curUser=lymsUserService.getUserByToken(authorization);
  97 + if(curUser.getDoctorId() == null){
  98 + return BaseResponse.error("当前账号无法更新档案，请绑定医生");
  99 + }
94 100 //身份证号转小写
95 101 archive.setIdno(archive.getIdno().toLowerCase());
96 102 QueryWrapper<LymsXljcArchive> query = new QueryWrapper<>();
... ... @@ -139,6 +145,7 @@
139 145 return BaseResponse.error("未查询到该身份证证号对应的档案，请先建立档案");
140 146 }
141 147 lymsXljcArchive.setSexName(BeanUtils.tranferSexToText(lymsXljcArchive.getSex()));
  148 + lymsXljcArchive.setAge(DateUtil.getAge(DateUtil.parseYMD(lymsXljcArchive.getBirth())));
142 149 return BaseResponse.ok(lymsXljcArchive);
143 150 }
144 151  
... ... @@ -180,6 +187,7 @@
180 187 Page<LymsXljcArchive> archivePage = lymsXljcArchiveService.page(page,query.orderByDesc("bookbuil_date"));
181 188 for(LymsXljcArchive archive : archivePage.getRecords() ){
182 189 archive.setSexName(BeanUtils.tranferSexToText(archive.getSex()));
  190 + archive.setAge(DateUtil.getAge(DateUtil.parseYMD(archive.getBirth())));
183 191 }
184 192 return BaseResponse.ok(archivePage);
185 193 }
... ... @@ -217,6 +225,7 @@
217 225 LymsXljcArchive archive = LymsXljcArchiveList.get(i);
218 226 archive.setSequence(i+1);
219 227 archive.setSexName(BeanUtils.tranferSexToText(archive.getSex()));
  228 + archive.setAge(DateUtil.getAge(DateUtil.parseYMD(archive.getBirth())));
220 229 }
221 230 Workbook result = ExcelExportUtil.exportExcel(
222 231 new ExportParams("心理检测患者档案表", "档案列表"),
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcFormController.java View file @ f12cb14
... ... @@ -45,6 +45,9 @@
45 45 @TokenRequired
46 46 public BaseResponse saveExamineRecord(@RequestBody XljcExamineRequest xljcExamineRequest, @RequestHeader String authorization) {
47 47 LymsUser curUser=lymsUserService.getUserByToken(authorization);
  48 + if(curUser.getDoctorId() == null){
  49 + return BaseResponse.error("当前账号无法保存检测记录，请绑定医生");
  50 + }
48 51 lymsXljcRecordService.saveRecord(xljcExamineRequest,curUser);
49 52 return BaseResponse.ok();
50 53 }
... ... @@ -100,7 +103,9 @@
100 103 public BaseResponse examineRecordList(@RequestBody ExamineRecordListRequest recordListRequest, @RequestHeader String authorization, int current, int size){
101 104 //参数处理
102 105 LymsUser curUser=lymsUserService.getUserByToken(authorization);
103   - recordListRequest.setExamineHid(curUser.getHid());
  106 + if(curUser.getHid() != null){
  107 + recordListRequest.setExamineHid(curUser.getHid());
  108 + }
104 109 if(StringUtil.isNotEmpty(recordListRequest.getExamineTimeEnd())){
105 110 recordListRequest.setExamineTimeEnd(recordListRequest.getExamineTimeEnd()+" 23:59:59");
106 111 }
... ... @@ -126,7 +131,9 @@
126 131 @RequestHeader String authorization , HttpServletResponse response) throws Exception{
127 132 //参数处理
128 133 LymsUser curUser=lymsUserService.getUserByToken(authorization);
129   - recordListRequest.setExamineHid(curUser.getHid());
  134 + if(curUser.getHid() != null){
  135 + recordListRequest.setExamineHid(curUser.getHid());
  136 + }
130 137 if(StringUtil.isNotEmpty(recordListRequest.getExamineTimeEnd())){
131 138 recordListRequest.setExamineTimeEnd(recordListRequest.getExamineTimeEnd()+" 23:59:59");
132 139 }
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcTraceController.java View file @ f12cb14
... ... @@ -47,6 +47,9 @@
47 47 @TokenRequired
48 48 public BaseResponse traceSave(@RequestBody LymsXljcRecordTrace recordTrace, @RequestHeader String authorization){
49 49 LymsUser curUser=lymsUserService.getUserByToken(authorization);
  50 + if(curUser.getDoctorId() == null){
  51 + return BaseResponse.error("当前账号无法保存追访详情，请绑定医生");
  52 + }
50 53 LymsXljcRecordTrace lymsXljcRecordTrace = lymsXljcRecordTraceService.getById(recordTrace.getId());
51 54 lymsXljcRecordTrace.setTraceTime(recordTrace.getTraceTime());
52 55 lymsXljcRecordTrace.setTracePerson(recordTrace.getTracePerson());
... ... @@ -118,6 +121,7 @@
118 121 for(int i=0;i < xljcTraceRecords.size() ;i++){
119 122 XljcTraceRecord xljcTraceRecord = xljcTraceRecords.get(i);
120 123 xljcTraceRecord.setSequence(i+1);
  124 + xljcTraceRecord.setAge(DateUtil.getAge(DateUtil.parseYMD(xljcTraceRecord.getBirth())));
121 125 xljcTraceRecord.setSexText(BeanUtils.tranferSexToText(xljcTraceRecord.getSex()));
122 126 xljcTraceRecord.setNextExamineStatusText(TraceStatusEnum.getName(xljcTraceRecord.getNextExamineStatus()));
123 127 }
talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsXljcRecordMapper.java View file @ f12cb14
... ... @@ -29,14 +29,14 @@
29 29 * @param recordListRequest
30 30 * @return
31 31 */
32   - Page<HisExamineRecord> selectHisExamineRecordPage(Page<HisExamineRecord> rowPage, @Param("recordListRequest") ExamineRecordListRequest recordListRequest);
  32 + Page<HisExamineRecord> selectHisExamineRecord(Page<HisExamineRecord> rowPage, @Param("recordListRequest") ExamineRecordListRequest recordListRequest);
33 33  
34 34 /**
35 35 * 查询检测记录列表,用于导出
36 36 * @param recordListRequest
37 37 * @return
38 38 */
39   - List<HisExamineRecord> selectHisExamineRecordNoPage(@Param("recordListRequest") ExamineRecordListRequest recordListRequest);
  39 + List<HisExamineRecord> selectHisExamineRecord(@Param("recordListRequest") ExamineRecordListRequest recordListRequest);
40 40  
41 41 List<ExamineRecordCount> countExamineRecordGroupByFormType(@Param("request") ExamineRecordListRequest recordListRequest);
42 42  
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsXljcRecordServiceImpl.java View file @ f12cb14
... ... @@ -199,12 +199,12 @@
199 199  
200 200 @Override
201 201 public Page<HisExamineRecord> selectHisExamineRecordPage(Page<HisExamineRecord> rowPage, ExamineRecordListRequest recordListRequest){
202   - return lymsXljcRecordMapper.selectHisExamineRecordPage(rowPage,recordListRequest);
  202 + return lymsXljcRecordMapper.selectHisExamineRecord(rowPage,recordListRequest);
203 203 }
204 204  
205 205 @Override
206 206 public List<HisExamineRecord> selectHisExamineRecordNoPage(ExamineRecordListRequest recordListRequest) {
207   - return lymsXljcRecordMapper.selectHisExamineRecordNoPage(recordListRequest);
  207 + return lymsXljcRecordMapper.selectHisExamineRecord(recordListRequest);
208 208 }
209 209  
210 210 @Override
talkonlineweb/src/main/resources/application-dev.yml View file @ f12cb14
... ... @@ -53,5 +53,5 @@
53 53 #微信公众号获取access_token(测试环境部署不要开启。会与线上环境冲突)
54 54 getAccessToken:
55 55 #on/off 会转义boolean
56   - on_off: off
  56 + on_off: on
talkonlineweb/src/main/resources/mapper/LymsXljcRecordMapper.xml View file @ f12cb14
... ... @@ -44,7 +44,7 @@
44 44  
45 45 </select>
46 46  
47   - <select id="selectHisExamineRecordPage" parameterType="com.lyms.talkonlineweb.request.ExamineRecordListRequest"
  47 + <select id="selectHisExamineRecord" parameterType="com.lyms.talkonlineweb.request.ExamineRecordListRequest"
48 48 resultType="com.lyms.talkonlineweb.result.HisExamineRecord">
49 49 select
50 50 r.id as rid,
... ... @@ -56,6 +56,7 @@
56 56 a.tel,
57 57 a.age,
58 58 a.sex,
  59 + a.birth,
59 60 DATE_FORMAT(r.examine_time,'%Y/%m/%d') as examineTime,
60 61 r.examine_doctor as examineDoctor,
61 62 d.dname as examineDoctorName
62 63  
... ... @@ -66,10 +67,12 @@
66 67 lyms_doctor d
67 68 where
68 69 a.id = r.arch_id
69   - and r.examine_hid = #{recordListRequest.examineHid}
70 70 and r.examine_doctor = d.did
71 71 and r.form_code = f.form_code
72 72 and r.form_version = f.form_version
  73 + <if test="recordListRequest.examineHid != null ">
  74 + and r.examine_hid = #{recordListRequest.examineHid}
  75 + </if>
73 76 <if test="recordListRequest.examineTimeStart != null and recordListRequest.examineTimeStart != '' ">
74 77 and r.examine_time > #{recordListRequest.examineTimeStart}
75 78 </if>
... ... @@ -92,7 +95,7 @@
92 95 order by r.examine_time desc
93 96  
94 97 </select>
95   -
  98 +<!--
96 99 <select id="selectHisExamineRecordNoPage" parameterType="com.lyms.talkonlineweb.request.ExamineRecordListRequest"
97 100 resultType="com.lyms.talkonlineweb.result.HisExamineRecord">
98 101 select
... ... @@ -119,6 +122,9 @@
119 122 and r.examine_doctor = d.did
120 123 and r.form_code = f.form_code
121 124 and r.form_version = f.form_version
  125 + <if test="recordListRequest.examineHid != null ">
  126 + and r.examine_hid = #{recordListRequest.examineHid}
  127 + </if>
122 128 <if test="recordListRequest.examineTimeStart != null and recordListRequest.examineTimeStart != '' ">
123 129 and r.examine_time > #{recordListRequest.examineTimeStart}
124 130 </if>
... ... @@ -140,7 +146,7 @@
140 146  
141 147 order by r.examine_time desc
142 148  
143   - </select>
  149 + </select>-->
144 150  
145 151 <select id="countExamineRecordGroupByFormType" parameterType="com.lyms.talkonlineweb.request.ExamineRecordListRequest"
146 152 resultType="com.lyms.talkonlineweb.result.ExamineRecordCount">
talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml View file @ f12cb14
... ... @@ -32,6 +32,7 @@
32 32 a.tel,
33 33 a.age,
34 34 a.sex,
  35 + a.birth,
35 36 trace.next_examine_date as nextExamineDate,
36 37 trace.next_examine_status as nextExamineStatus,
37 38 trace.trace_time as traceDate,