登录添加头像

eitc-patient-base/src/main/java/com/eitc/patient/domain/AppUser.java

@@ -29,7 +29,7 @@ public class AppUser extends EitcBaseEntity {
     private String password;
 
     @TableField(value = "identification_card")
-    @ApiModelProperty(value = "手机号码", name = "identificationCard")
+    @ApiModelProperty(value = "身份证号", name = "identificationCard")
     private String identificationCard;
 
     @TableField(value = "avatar")

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/AppUserServiceImpl.java

@@ -205,7 +205,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         payload.put("id", appUser.getId());
         payload.put("phoneNumber", appUser.getPhoneNumber());
         payload.put("identificationCard", appUser.getIdentificationCard());
-
+        payload.put("avatar", appUser.getAvatar());
         String secretKey = PatientBaseUtil.getSecretKey(appUser.getId());
         //生成JWt的令牌
         String token = JWTUtil.getToken(payload, secretKey);
@@ -224,6 +224,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         Map<String, String> payload = new HashMap<>();
         payload.put("id", userId);
         payload.put("phoneNumber", user.getPhonenumber());
+        payload.put("avatar", user.getAvatar());
         String secretKey = PatientBaseUtil.getSecretKey(userId);
         //生成JWt的令牌
         String token = JWTUtil.getToken(payload, secretKey);

eitc-patient-base/src/main/resources/mapper/patient/PatientFollowUpMapper.xml

@@ -130,19 +130,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from (select * from erm_patient_follow_up where is_del = 0 group by patient_appointment_id) epfu
         left join erm_patient_appointment epa on epfu.patient_appointment_id = epa.id
         left join erm_patient ep on epa.appointment_person_id = ep.id
-        <where>
-            and epa.is_del = 0 and ep.is_del = 0
+        where epa.is_del = 0 and ep.is_del = 0
             <if test="patientName != null and patientName != ''"> and ep.patient_name like concat('%', #{patientName}, '%')</if>
             <if test="followUpStatus != null and followUpStatus != ''"> and epfu.follow_up_status = #{followUpStatus}</if>
             <if test="followUpUser != null and followUpUser != ''"> and epfu.follow_up_user like concat('%', #{followUpUser}, '%')</if>
-
             <if test="followUpStartTime != null and followUpStartTime != ''"><!-- 开始时间检索 -->
                 and date_format(epfu.follow_up_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{followUpStartTime},'%Y-%m-%d %H:%i:%S')
             </if>
             <if test="followUpEndTime != null and followUpEndTime != ''"><!-- 结束时间检索 -->
                 and date_format(epfu.follow_up_time,'%Y-%m-%d %H:%i:%S') &lt;= date_format(#{followUpEndTime},'%Y-%m-%d %H:%i:%S')
             </if>
-        </where>
         ORDER BY epa.appointment_start_time DESC
     </select>
 </mapper>