Merge branch 'dev' of liuwenbin/wlyy2.0 into dev

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

@@ -17,9 +17,13 @@ public interface MessageDao extends PagingAndSortingRepository<BaseMessageDO, St
    @Query("select m from BaseMessageDO m where m.platform=?1 and m.receiver=?2  and m.del=1 and m.msgTypeCode like ?3  order by m.readState desc")
    List<BaseMessageDO> messageList(Integer platform, String code,String msgTypeCode);
    @Query("select count(m.id) from BaseMessageDO m where m.platform=?1 and m.receiver=?2  and m.del=1 and m.msgTypeCode like ?3  and m.readState=1")
    @Query("select count(m.id) from BaseMessageDO m where m.platform=?1 and m.receiver=?2  and m.del=1 and m.msgTypeCode like ?3  and m.readState=0")
    Integer countMessage(Integer platform, String code,String msgTypeCode);
    BaseMessageDO findById(Integer id);
    @Modifying
    @Query("update BaseMessageDO t set t.readState = ?1 where t.id=?2 ")
    int updateStatusById(Integer readState,Integer id);
}

business/base-service/src/main/java/com/yihu/jw/message/service/MessageService.java

@@ -139,7 +139,8 @@ public class MessageService extends BaseJpaService<BaseMessageDO, MessageDao> {
                " AND b.platform = '"+platform+"' " +
                " AND b.receiver = '"+code+"' " +
                " AND b.del = 1 " +
                " AND b.read_state = "+readState;
                " AND b.read_state = "+readState+
                " AND b.msg_type_code like '%03%'";
        return jdbcTemplate.queryForList(sql);
    }
@@ -155,9 +156,10 @@ public class MessageService extends BaseJpaService<BaseMessageDO, MessageDao> {
                "  GROUP BY " +
                "   m.sender, " +
                "   m.sender_name " ;
        Integer count  = jdbcTemplate.queryForObject(sql,Integer.class);
        List<Map<String, Object>> list  = jdbcTemplate.queryForList(sql);
        Integer count = list.size();
        if(count<=(originalPageSize-2)){
            return page-1;
            return page;
        }else{
            Integer s = (count-(originalPageSize-2))/originalPageSize;
            Integer y = (count-(originalPageSize-2))%originalPageSize;
@@ -173,4 +175,12 @@ public class MessageService extends BaseJpaService<BaseMessageDO, MessageDao> {
        return messageDao.findById(id);
    }
    public void updateStatusById(Integer readState,Integer id) throws Exception{
        int i = messageDao.updateStatusById(readState,id);
        if(i<0){
            throw new Exception("update data failur !");
        }
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/dao/myFamily/PatientFamilyMemberDao.java

@@ -38,4 +38,6 @@ public interface PatientFamilyMemberDao extends PagingAndSortingRepository<BaseP
    @Modifying
    @Query("update BasePatientFamilyMemberDO m set m.del = ?1 where m.id=?2 ")
    int updateDelById(Integer del,String id);
    BasePatientFamilyMemberDO findByPatientAndFamilyMemberAndDel(String patient,String familyMember,Integer del);
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/myFamily/MyFamilyEndpoint.java

@@ -131,9 +131,11 @@ public class MyFamilyEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "status", value = "3、通过，4、拒绝", required = true)
            @RequestParam(value = "status",required = true) Integer status,
            @ApiParam(name = "isAuthorize", value = "0:未授权,1:已授权", required = true)
            @RequestParam(value = "isAuthorize",required = true) Integer isAuthorize) throws Exception {
            @RequestParam(value = "isAuthorize",required = true) Integer isAuthorize,
            @ApiParam(name = "messageId", value = "messageId", required = true)
            @RequestParam(value = "messageId",required = true) Integer messageId) throws Exception {
        try{
            return success(myFamilyService.confirmApply(patientApplyLogId,status,isAuthorize));
            return success(myFamilyService.confirmApply(patientApplyLogId,status,isAuthorize,messageId));
        }catch (Exception e){
            e.printStackTrace();
            return failed(e.getMessage());

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/message/MyMessageService.java

@@ -3,6 +3,7 @@ package com.yihu.jw.patient.service.message;
import com.yihu.jw.message.service.MessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@@ -18,4 +19,10 @@ public class MyMessageService {
    public List<Map<String,Object>> messageList(String code,Integer page,Integer pageSize){//1微信端/患者端，2医生APP端
        return messageService.messageList(1,code,page,pageSize);
    }
    @Transactional(rollbackFor = Exception.class)
    public void updateStatusById(Integer readState,Integer id) throws Exception{
        messageService.updateStatusById(readState,id);
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/MyFamilyService.java

@@ -137,9 +137,10 @@ public class MyFamilyService {
            messageDO.setSenderPhoto(patientDO.getPhoto());
            messageDO.setTitle("家人绑定");
            messageDO.setMsgDigest("");
            messageDO.setMsgContent("");
            String msgContent = familyPatient.getName()+",您好！"+patientDO.getName()+"向您发起添加家人申请，添加成功后，对方可使用您的账号，为您处理各类健康服务。";
            messageDO.setMsgContent(msgContent);
            messageDO.setMsgTypeCode("010801");
            messageDO.setMsgTypeName("");
            messageDO.setMsgTypeName("系统消息-添加家人申请");
            messageDO.setPlatform(platform);
            messageDO.setReadState(0);
            messageDO.setReadonly(0);
@@ -242,7 +243,7 @@ public class MyFamilyService {
     * @param status 1、添加家人（默认），2、邀请登录，3、通过，4、拒绝
     */
    @Transactional(rollbackFor = Exception.class)
    public Map<String,Object> confirmApply(Integer patientApplyLogId,Integer status,Integer isAuthorize)throws Exception{
    public Map<String,Object> confirmApply(Integer patientApplyLogId,Integer status,Integer isAuthorize,Integer messageId)throws Exception{
        Map<String,Object> map = new HashedMap();
        PatientApplyLog patientApplyLog = patientApplyLogService.findById(patientApplyLogId);
        BasePatientDO apply = patientService.findByIdAndDel(patientApplyLog.getCreateUser());
@@ -253,23 +254,27 @@ public class MyFamilyService {
        patientApplyLog.setStatus(status);
        patientApplyLog.setConfirmTime(new Date());
        patientApplyLogService.save(patientApplyLog);
        if(status==3){
            BasePatientFamilyMemberDO patientFamilyMember = new BasePatientFamilyMemberDO();
            patientFamilyMember.setPatient(patientApplyLog.getCreateUser());
            patientFamilyMember.setFamilyMember(patientApplyLog.getFamilyMemberCode());
            patientFamilyMember.setFamilyRelation(patientApplyLog.getFamilyBindRole());
            patientFamilyMember.setIsAuthorize(0);
            patientFamilyMember.setDel(1);
            patientFamilyMemberService.save(patientFamilyMember);
            BasePatientFamilyMemberDO patientFamilyMember2 = new BasePatientFamilyMemberDO();
            patientFamilyMember2.setPatient(patientApplyLog.getFamilyMemberCode());
            patientFamilyMember2.setFamilyMember(patientApplyLog.getCreateUser());
            BasePatientDO createUser = patientService.findByIdAndDel(patientApplyLog.getCreateUser());
            patientFamilyMember2.setFamilyRelation(familyRelationTrans(patientApplyLog.getFamilyBindRole(),createUser.getSex()));
            patientFamilyMember2.setIsAuthorize(isAuthorize);
            patientFamilyMember2.setDel(1);
            patientFamilyMemberService.save(patientFamilyMember2);
        if(status==3||status==4){
            BasePatientFamilyMemberDO patientFamilyMemberDO = patientFamilyMemberService.findByPatientAndFamilyMemberAndDel(patientApplyLog.getCreateUser(),patientApplyLog.getFamilyMemberCode());
            if(status==3&&patientFamilyMemberDO==null){
                BasePatientFamilyMemberDO patientFamilyMember = new BasePatientFamilyMemberDO();
                patientFamilyMember.setPatient(patientApplyLog.getCreateUser());
                patientFamilyMember.setFamilyMember(patientApplyLog.getFamilyMemberCode());
                patientFamilyMember.setFamilyRelation(patientApplyLog.getFamilyBindRole());
                patientFamilyMember.setIsAuthorize(0);
                patientFamilyMember.setDel(1);
                patientFamilyMemberService.save(patientFamilyMember);
                BasePatientFamilyMemberDO patientFamilyMember2 = new BasePatientFamilyMemberDO();
                patientFamilyMember2.setPatient(patientApplyLog.getFamilyMemberCode());
                patientFamilyMember2.setFamilyMember(patientApplyLog.getFamilyMemberName());
                BasePatientDO createUser = patientService.findByIdAndDel(patientApplyLog.getCreateUser());
                patientFamilyMember2.setFamilyRelation(familyRelationTrans(patientApplyLog.getFamilyBindRole(),createUser.getSex()));
                patientFamilyMember2.setIsAuthorize(isAuthorize);
                patientFamilyMember2.setDel(1);
                patientFamilyMemberService.save(patientFamilyMember2);
            }
            messageService.updateStatusById(1,messageId);
        }
        return map;
    }
@@ -509,7 +514,7 @@ public class MyFamilyService {
            BasePatientDO patientDO = patientService.findByIdAndDel(patient);//被绑定人
            BasePatientDO createPatient = patientService.findByIdAndDel(createUser);//绑定人
            Integer converRole = familyRelationTrans(bindRole,createPatient.getSex());//转换后的角色
            map.put("messageId",Integer.valueOf(one.get("id")+""));
            map.put("patientApplyLogId",relationData);
            map.put("patientPhoto",patientDO.getPhoto());
            map.put("applyPatientPhoto",createPatient.getPhoto());

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/PatientFamilyMemberService.java

@@ -60,4 +60,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
        return patientFamilyMemberDao.updateAuthorizeById(isAuthorize,id);
    }
    public BasePatientFamilyMemberDO findByPatientAndFamilyMemberAndDel(String patient,String familyMember){
        return patientFamilyMemberDao.findByPatientAndFamilyMemberAndDel(patient,familyMember,1);
    }
}