liquanyu / talkonline

Download as
Browse Code »

Commit b7815f2cd56af4c8585fee5f47dba352cfa8990f

Authored by cfl
1 parent 51387a1664
Exists in dev

测试过程中bug修改

Showing 6 changed files with 16 additions and 4 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java View file @ b7815f2
... ... @@ -144,6 +144,8 @@
144 144 LymsUser curUser=lymsUserService.getUserByToken(authorization);
145 145 user.setCreatedby(curUser.getUid());
146 146 user.setCreatedtime(new Date());
  147 + user.setUpdatedby(curUser.getUid());
  148 + user.setUpdatedTime(new Date());
147 149 if(user.getUid()==null){
148 150 user.setPasswd(DigestUtils.md5DigestAsHex("123456".getBytes()));
149 151 }else{
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcArchiveController.java View file @ b7815f2
... ... @@ -135,9 +135,10 @@
135 135 query.eq("idno",idno);
136 136 query.eq("hid",curUser.getHid());
137 137 LymsXljcArchive lymsXljcArchive = lymsXljcArchiveService.getOne(query);
138   - if(lymsXljcArchive != null){
139   - lymsXljcArchive.setSexName(BeanUtils.tranferSexToText(lymsXljcArchive.getSex()));
  138 + if(lymsXljcArchive == null){
  139 + return BaseResponse.error("未查询到该身份证证号对应的档案，请先建立档案");
140 140 }
  141 + lymsXljcArchive.setSexName(BeanUtils.tranferSexToText(lymsXljcArchive.getSex()));
141 142 return BaseResponse.ok(lymsXljcArchive);
142 143 }
143 144  
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcFormController.java View file @ b7815f2
... ... @@ -79,6 +79,9 @@
79 79 record.setArchId(archId);
80 80 record.setExamineHid(curUser.getHid());
81 81 List<HisExamineRecord> hisExamineRecords = lymsXljcRecordService.queryHisExamineRecords(record);
  82 + for(HisExamineRecord hisExamineRecord : hisExamineRecords){
  83 + hisExamineRecord.setFormType(hisExamineRecord.getFormType()+"类量表");
  84 + }
82 85  
83 86 return BaseResponse.ok(hisExamineRecords);
84 87 }
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcPatientController.java View file @ b7815f2
... ... @@ -25,7 +25,7 @@
25 25 private LymsXljcRecordService lymsXljcRecordService;
26 26  
27 27 /**
28   - * 检测记录列表
  28 + * 检测患者列表
29 29 * @param patientRequest
30 30 * @param authorization
31 31 * @param current
talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/UserroleInfo.java View file @ b7815f2
... ... @@ -135,6 +135,12 @@
135 135 @TableField(value = "rname")
136 136 private String rname;
137 137  
  138 + /**
  139 + * 角色名称
  140 + */
  141 + @TableField(value = "doctor_id")
  142 + private Integer doctorId;
  143 +
138 144 @TableField(exist = false)
139 145 private static final long serialVersionUID = 1L;
140 146  
talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml View file @ b7815f2
... ... @@ -34,7 +34,7 @@
34 34 a.sex,
35 35 trace.next_examine_date as nextExamineDate,
36 36 trace.next_examine_status as nextExamineStatus,
37   - trace.trace_time as traceTime,
  37 + trace.trace_time as traceDate,
38 38 DATEDIFF((case when next_examine_status = 0 then now() else trace_time end),
39 39 next_examine_date) as overDays,
40 40 trace.result