From b7815f2cd56af4c8585fee5f47dba352cfa8990f Mon Sep 17 00:00:00 2001 From: cfl Date: Tue, 12 Sep 2023 09:03:44 +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 --- .../main/java/com/lyms/talkonlineweb/controller/UserContoller.java | 2 ++ .../com/lyms/talkonlineweb/controller/XljcArchiveController.java | 5 +++-- .../java/com/lyms/talkonlineweb/controller/XljcFormController.java | 3 +++ .../com/lyms/talkonlineweb/controller/XljcPatientController.java | 2 +- .../src/main/java/com/lyms/talkonlineweb/domain/UserroleInfo.java | 6 ++++++ .../src/main/resources/mapper/LymsXljcRecordTraceMapper.xml | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java index c2eed32..085b20d 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java @@ -144,6 +144,8 @@ public class UserContoller { LymsUser curUser=lymsUserService.getUserByToken(authorization); user.setCreatedby(curUser.getUid()); user.setCreatedtime(new Date()); + user.setUpdatedby(curUser.getUid()); + user.setUpdatedTime(new Date()); if(user.getUid()==null){ user.setPasswd(DigestUtils.md5DigestAsHex("123456".getBytes())); }else{ 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 32ba271..e0c6e61 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcArchiveController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcArchiveController.java @@ -135,9 +135,10 @@ public class XljcArchiveController { query.eq("idno",idno); query.eq("hid",curUser.getHid()); LymsXljcArchive lymsXljcArchive = lymsXljcArchiveService.getOne(query); - if(lymsXljcArchive != null){ - lymsXljcArchive.setSexName(BeanUtils.tranferSexToText(lymsXljcArchive.getSex())); + if(lymsXljcArchive == null){ + return BaseResponse.error("未查询到该身份证证号对应的档案，请先建立档案"); } + lymsXljcArchive.setSexName(BeanUtils.tranferSexToText(lymsXljcArchive.getSex())); return BaseResponse.ok(lymsXljcArchive); } 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 342b440..42b3a67 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcFormController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcFormController.java @@ -79,6 +79,9 @@ public class XljcFormController { record.setArchId(archId); record.setExamineHid(curUser.getHid()); List hisExamineRecords = lymsXljcRecordService.queryHisExamineRecords(record); + for(HisExamineRecord hisExamineRecord : hisExamineRecords){ + hisExamineRecord.setFormType(hisExamineRecord.getFormType()+"类量表"); + } return BaseResponse.ok(hisExamineRecords); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcPatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcPatientController.java index bd633ce..8acb190 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcPatientController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/XljcPatientController.java @@ -25,7 +25,7 @@ public class XljcPatientController { private LymsXljcRecordService lymsXljcRecordService; /** - * 检测记录列表 + * 检测患者列表 * @param patientRequest * @param authorization * @param current diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/UserroleInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/UserroleInfo.java index 34da4b2..835f228 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/UserroleInfo.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/UserroleInfo.java @@ -135,6 +135,12 @@ public class UserroleInfo implements Serializable { @TableField(value = "rname") private String rname; + /** + * 角色名称 + */ + @TableField(value = "doctor_id") + private Integer doctorId; + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml index 9c2effa..a9efdf5 100644 --- a/talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml +++ b/talkonlineweb/src/main/resources/mapper/LymsXljcRecordTraceMapper.xml @@ -34,7 +34,7 @@ a.sex, trace.next_examine_date as nextExamineDate, trace.next_examine_status as nextExamineStatus, - trace.trace_time as traceTime, + trace.trace_time as traceDate, DATEDIFF((case when next_examine_status = 0 then now() else trace_time end), next_examine_date) as overDays, trace.result -- 1.8.3.1