修改药物使用相关接口

src/main/java/com/ccsens/yanyuan/bean/vo/FamilyVo.java

@@ -1,5 +1,8 @@
 package com.ccsens.yanyuan.bean.vo;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.ccsens.util.DesensitizedUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,6 +49,19 @@ public class FamilyVo {
         private String educateLevel;
         @ApiModelProperty("审核状态(0未审核 1审核通过 2审核未通过)")
         private String auditStatus;
+        @ApiModelProperty("关系(0:本人 1:创建者 2:家属 3:医生)")
+        private Byte relationType;
+        @ApiModelProperty("头像")
+        private String avatarUrl;
+        @ApiModelProperty("手机号")
+        private String phone;
+
+        public String getPhone() {
+            if (StrUtil.isNotBlank(phone)) {
+                return DesensitizedUtils.fixedPhone(phone);
+            }
+            return phone;
+        }
     }
 
     @Data

src/main/java/com/ccsens/yanyuan/bean/vo/MedicineVo.java

@@ -18,9 +18,12 @@ public class MedicineVo {
         private String id;
         @ApiModelProperty("是否测评")
         private String isTest;
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty("测试时间")
         private Date testAt;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @ApiModelProperty("添加时间")
+        private Date createAt;
         @ApiModelProperty("Mmse得分")
         private String mmseScore;
         @ApiModelProperty("moca得分")

src/main/java/com/ccsens/yanyuan/service/MedicineService.java

@@ -50,6 +50,7 @@ public class MedicineService implements IMedicineService {
         followUp.setAdlScore(param.getAdiScore());
         followUp.setStatus((byte)1);
         followUp.setRecordUserId(userId);
+        followUp.setTestAt(param.getTestAt());
         followUpDao.insertSelective(followUp);
         return CodeError.SUCCESS;
     }

src/main/resources/mapper_dao/FamilyDao.xml

@@ -26,10 +26,14 @@
             f.age,
             f.job_title,
             f.educate_level,
-            r.audit_status
+            r.audit_status,
+            r.relation_type,
+            u.avatar_url,
+            u.phone
         FROM
             u_user_relation AS r
         LEFT JOIN u_user_family AS f ON r.user_id = f.user_id
+        LEFT JOIN tall3.t_sys_user AS u ON u.id= f.user_id AND u.rec_status = 0
         WHERE
             r.rec_status = 0
         AND r.relation_type = 2

src/main/resources/mapper_dao/FollowUpDao.xml

@@ -22,7 +22,8 @@
             fifth_medicine,
             sixth_medicine,
             sev_name,
-            sev_medicine
+            sev_medicine,
+            create_at
         FROM
             u_follow_up
         WHERE