Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/message/MessageDao.java

@@ -38,10 +38,10 @@ public interface MessageDao extends PagingAndSortingRepository<Message, Long>, J
    List<Message> findUnreadSign(String sender, String receiver, String signStatus);
    @Query(" from Message a where a.read = 1 and over ='1' and a.sender = ?1 and a.receiver=?2 and a.signStatus='1'")
    Message findByPatient(String patient,String doctor);
    List<Message> findByPatient(String patient,String doctor);
    @Query(" from Message a where a.read = 1 and over ='1' and a.sender = ?1 and a.receiver=?2 ")
    Message findByPatientRenew(String patient,String doctor);
    List<Message> findByPatientRenew(String patient,String doctor);
    @Query("select a from Message a where a.receiver = ?1 and a.sender=?2 and a.tzType=?3 order by a.createTime desc")
    List<Message> getHealthIndexMessageByPatient(String doctor,String patient,String type,Pageable pageRequest);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -648,7 +648,6 @@ public class FamilyContractService extends BaseService {
        } else if (doc.getLevel() == 3) {
            sf = signFamilyDao.findByDoctorHealthPatient(doctor, patient);
        }
        Message message = messageDao.findByPatient(patient, doctor);
        if (sf.getStatus() != 0 && sf.getStatus() != 2) {
            return -2;
        }
@@ -657,10 +656,16 @@ public class FamilyContractService extends BaseService {
        } else {
            return -2;
        }
        //修改信息为无效
        if (message != null) {
            message.setRead(0);
            message.setOver("0");
        //结束与医生所有消息
        List<Message> messages = messageDao.findByPatient(patient, doctor);
        if(messages!=null&&messages.size()>0){
            for(Message message:messages){
                //修改信息为无效
                if (message != null) {
                    message.setRead(0);
                    message.setOver("0");
                }
            }
        }
        return 200;
    }
@@ -688,12 +693,20 @@ public class FamilyContractService extends BaseService {
            sf.setStatus(-1);
        }
        Message message = messageDao.findByPatientRenew(patient, doctor);
        //修改信息为无效
        if (message != null) {
            message.setRead(0);
            message.setOver("0");
        //结束与医生所有消息
        List<Message> messages = messageDao.findByPatientRenew(patient, doctor);
        if(messages!=null&messages.size()>0){
            for(Message message:messages){
                //修改信息为无效
                if (message != null) {
                    message.setRead(0);
                    message.setOver("0");
                    messageDao.save(message);
                }
            }
        }
        return 200;
    }