diff --git a/src/main/java/com/ccsens/yanyuan/bean/dto/TraineeDto.java b/src/main/java/com/ccsens/yanyuan/bean/dto/TraineeDto.java index 5a73832..ae621d3 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/dto/TraineeDto.java +++ b/src/main/java/com/ccsens/yanyuan/bean/dto/TraineeDto.java @@ -118,7 +118,7 @@ public class TraineeDto { private String abstinencePeriod; @ApiModelProperty("饮酒种类") private String drinkType; - @ApiModelProperty("是否喝茶 0 不 2 是 不喝 3 喝 继续中") + @ApiModelProperty("是否喝茶 0:否 1:曾经是 2:是") private Byte isTea; @ApiModelProperty("已不喝茶时长") private String quitTea; @@ -214,7 +214,7 @@ public class TraineeDto { private String abstinencePeriod; @ApiModelProperty("饮酒种类") private String drinkType; - @ApiModelProperty("是否喝茶 0 不 2 是 不喝 3 喝 继续中") + @ApiModelProperty("是否喝茶0:否 1:曾经是 2:是") private Byte isTea; @ApiModelProperty("已不喝茶时长") private String quitTea; diff --git a/src/main/java/com/ccsens/yanyuan/bean/dto/ZaritDto.java b/src/main/java/com/ccsens/yanyuan/bean/dto/ZaritDto.java index 7ead1f9..193793e 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/dto/ZaritDto.java +++ b/src/main/java/com/ccsens/yanyuan/bean/dto/ZaritDto.java @@ -38,7 +38,7 @@ public class ZaritDto { } @Data - @ApiModel("添加负担量表-入参") + @ApiModel("计算负担量表分数-入参") public static class Id { @ApiModelProperty("照顾者负担量表id") private Long careId; diff --git a/src/main/java/com/ccsens/yanyuan/bean/vo/ZaritVo.java b/src/main/java/com/ccsens/yanyuan/bean/vo/ZaritVo.java index 3a1c209..e7d34cb 100644 --- a/src/main/java/com/ccsens/yanyuan/bean/vo/ZaritVo.java +++ b/src/main/java/com/ccsens/yanyuan/bean/vo/ZaritVo.java @@ -13,7 +13,7 @@ public class ZaritVo { @ApiModel("zarit信息列表-返参") public static class ZaritInfo{ @ApiModelProperty("照顾者负担量表id") - private Long id; + private String id; @ApiModelProperty("用户ID") private Long keyUserId; @ApiModelProperty("填写人userId") @@ -32,8 +32,10 @@ public class ZaritVo { private String carePeriod; @ApiModelProperty("关系") private String careRelation; - @ApiModelProperty("照顾得分") + @ApiModelProperty("分数计算情况") private String zaritState; + @ApiModelProperty("分数") + private String zaritPoint; } @Data @ApiModel("zarit分数计算-返参") diff --git a/src/main/java/com/ccsens/yanyuan/service/ZaritService.java b/src/main/java/com/ccsens/yanyuan/service/ZaritService.java index 757c0e9..fe4febe 100644 --- a/src/main/java/com/ccsens/yanyuan/service/ZaritService.java +++ b/src/main/java/com/ccsens/yanyuan/service/ZaritService.java @@ -7,12 +7,11 @@ import cn.hutool.core.util.ObjectUtil; import com.ccsens.util.exception.BaseException; import com.ccsens.yanyuan.bean.dto.MedicineDto; import com.ccsens.yanyuan.bean.dto.ZaritDto; -import com.ccsens.yanyuan.bean.po.Care; -import com.ccsens.yanyuan.bean.po.CareExample; -import com.ccsens.yanyuan.bean.po.UserFamily; +import com.ccsens.yanyuan.bean.po.*; import com.ccsens.yanyuan.bean.vo.ZaritVo; import com.ccsens.yanyuan.persist.dao.CareDao; import com.ccsens.yanyuan.persist.dao.FamilyDao; +import com.ccsens.yanyuan.persist.mapper.UserMapper; import com.ccsens.yanyuan.util.YanYuanCodeError; import com.ccsens.yanyuan.util.YanYuanConstant; import lombok.extern.slf4j.Slf4j; @@ -39,6 +38,8 @@ public class ZaritService implements IZaritService{ private FamilyDao familyDao; @Resource private Snowflake snowflake; + @Resource + private UserMapper userMapper; @Override public List queryList(ZaritDto.QueryZarit param, Long userId) { @@ -58,6 +59,16 @@ public class ZaritService implements IZaritService{ @Override public Long addZarit(ZaritDto.AddZarit param, Long userId) { + // 检查使用者是否存在 + UserExample userExample = new UserExample(); + userExample.createCriteria().andKeyIdEqualTo(param.getProjectId()); + userExample.setOrderByClause("key_id limit 1"); + List users = userMapper.selectByExample(userExample); + if (CollectionUtil.isEmpty(users)) { + log.info("没有找到用户信息:{}", param.getProjectId()); + throw new BaseException(YanYuanCodeError.PARAM_ERROR); + } + Care care = new Care(); BeanUtil.copyProperties(param,care); care.setId(UUID.randomUUID().toString()); @@ -65,6 +76,7 @@ public class ZaritService implements IZaritService{ care.setKeyUserId(param.getProjectId()); care.setRecordUserId(userId); care.setZaritState(YanYuanConstant.Zarit.STATE_CREATE); + care.setUserId(users.get(0).getId()); careDao.insertSelective(care); return care.getKeyId(); } diff --git a/src/main/resources/mapper_dao/MentalTestDao.xml b/src/main/resources/mapper_dao/MentalTestDao.xml index 72a8e55..9d37036 100644 --- a/src/main/resources/mapper_dao/MentalTestDao.xml +++ b/src/main/resources/mapper_dao/MentalTestDao.xml @@ -20,7 +20,7 @@ count(*) FROM u_user u - LEFT JOIN u_mental_test t ON u.id = t.user_id AND t.test_at >= #{date} and t.finish_status = 0 + LEFT JOIN u_mental_test t ON u.id = t.user_id AND t.test_at <= #{date} and t.finish_status = 0 where u.use_level = 1 and u.rec_status = 0 and t.id is null