--

business/base-service/src/main/java/com/yihu/jw/hospital/message/dao/SystemMessageDao.java

@@ -28,10 +28,10 @@ public interface SystemMessageDao extends PagingAndSortingRepository<SystemMessa
    List<SystemMessageDO> queryByRelationCodeAndTypeIn(String relationCode,String[] type);
    //获取资质申请审核有效的未结束已发送的消息
    @Query("select a from SystemMessageDO a where a.type in ('401','408') and a.del='1' and a.over='1' and relationCode = ?1  ")
    @Query("select a from SystemMessageDO a where a.type in ('401','408') and a.del='1' and a.over='1' and a.relationCode = ?1  ")
    List<SystemMessageDO> findMessageByRelationCode(String relationCode);
    @Modifying
    @Query("delete from SystemMessageDO a   where a.receiver = ?1 and a.relationCode = ?2 and a.type =?3")
    @Query("delete from SystemMessageDO a  where a.receiver = ?1 and a.relationCode = ?2 and a.type =?3")
    int orderMessageDelByType(String doctor, String orderId,String type);
}

common/common-entity/src/main/java/com/yihu/jw/entity/care/sign/CapacityAssessmentSocialAbilityDo.java

@@ -22,7 +22,7 @@ public class CapacityAssessmentSocialAbilityDo extends UuidIdentityEntityWithCre
    private String  communicateScore;  //沟通交流得分 总分3分
    private String  socialSkillsScore;    //社交能力得分
    private String  visionScore;   //视力功能得分
    private Integer hearingScore;  //听力能力得分
    private String  hearingScore;  //听力能力得分
    private String  totalScore;    // 精神状态与社会交流能力总分 上述得分和 总分22
    private String  abilityGrade;  //能力等级:0能力完好(22);1轻度受损(15-21);2中度受损(7-14);3重度受损(≤6)
@@ -98,11 +98,11 @@ public class CapacityAssessmentSocialAbilityDo extends UuidIdentityEntityWithCre
        this.visionScore = visionScore;
    }
    public Integer getHearingScore() {
    public String getHearingScore() {
        return hearingScore;
    }
    public void setHearingScore(Integer hearingScore) {
    public void setHearingScore(String hearingScore) {
        this.hearingScore = hearingScore;
    }