重点关注居民

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/sign/SignFamilyService.java

@@ -277,7 +277,7 @@ public class SignFamilyService extends BaseJpaService<SignFamily,Long> {
            if(!StringUtils.isEmpty(doctor)){
                //1.4.2更新重点关注列表,取消关注
                updateTrackPatient(signFamily.getPatient(),signFamily.getDoctor());
                updateTrackPatient(signFamily.getPatient(),signFamily.getDoctor(),signFamily.getDoctorHealth(),doctor,doctorHealth);
                signFamily.setDoctor(doctor);
                signFamily.setDoctorName(doctorName);
@@ -285,7 +285,7 @@ public class SignFamilyService extends BaseJpaService<SignFamily,Long> {
            if(!StringUtils.isEmpty(doctorHealth)){
                //1.4.2更新重点关注列表,取消关注
                updateTrackPatient(signFamily.getPatient(),signFamily.getDoctorHealth());
                updateTrackPatient(signFamily.getPatient(),signFamily.getDoctorHealth(),signFamily.getDoctor(),doctor,doctorHealth);
                signFamily.setDoctorHealth(doctorHealth);
                signFamily.setDoctorHealthName(doctorHealthName);
@@ -447,11 +447,58 @@ public class SignFamilyService extends BaseJpaService<SignFamily,Long> {
        return list ;
    }
    public void updateTrackPatient(String patient,String oldDoctor){
        TrackPatient trackPatient = trackPatientDao.findByDoctorCodeAndPatientCode(oldDoctor,patient);
        if(trackPatient!=null){
            trackPatient.setDel("0");
            trackPatientDao.save(trackPatient);
    /**
     * 设置取消关注
     * @param patient
     * @param oldDoctor 患者签约旧的要取消关注的医生
     * @param oldDoctor2 患者旧的签约的另一个医生
     * @param newDoctor 患者新签约的全科医生
     * @param newHDoctor 患者新签约的健康管理师
     */
    public void updateTrackPatient(String patient,String oldDoctor,String oldDoctor2,String newDoctor,String newHDoctor){
        //是否需要修改
        boolean flag = false;
        if(StringUtils.isBlank(oldDoctor)){
            return ;
        }
        //1.两个都修改
        if(StringUtils.isNotBlank(newDoctor)&&StringUtils.isNotBlank(newHDoctor)){
            if((!oldDoctor.equals(newDoctor))&&(!oldDoctor.equals(newHDoctor))){
                flag = true;
            }
            //只改全科
        }else if(StringUtils.isNotBlank(newDoctor)&&StringUtils.isBlank(newHDoctor)){
            if(!oldDoctor.equals(newDoctor)){
                if(StringUtils.isBlank(oldDoctor2)){
                    flag = true;
                }else{
                    if(!oldDoctor.equals(oldDoctor2)){
                        flag = true;
                    }
                }
            }
            //只改健管
        }else if(StringUtils.isBlank(newDoctor)&&StringUtils.isNotBlank(newHDoctor)){
            if(!oldDoctor.equals(newHDoctor)){
                if(StringUtils.isBlank(oldDoctor2)){
                    flag = true;
                }else{
                    if(!oldDoctor.equals(oldDoctor2)){
                        flag = true;
                    }
                }
            }
        }else{
            return ;
        }
        if(flag){
            TrackPatient trackPatient = trackPatientDao.findByDoctorCodeAndPatientCode(oldDoctor,patient);
            if(trackPatient!=null){
                trackPatient.setDel("0");
                trackPatientDao.save(trackPatient);
            }
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -856,7 +856,7 @@ public class DoctorInfoService extends BaseService {
        String oldDoctorHealthName = signFamily.getDoctorHealthName();
        //1.4.2更新重点关注列表,取消关注
        familyContractService.updateTrackPatient(patient,signFamily.getDoctorHealth());
        familyContractService.updateTrackPatient(patient,signFamily.getDoctorHealth(),signFamily.getDoctor(),null,newDoctorCode);
        //修改签约中的健康管理师
        signFamily.setDoctorHealth(newD.getCode());
@@ -1013,7 +1013,7 @@ public class DoctorInfoService extends BaseService {
        Doctor newD = doctorDao.findByCode(newDoctorCode);
        //1.4.2更新重点关注列表,取消关注
        familyContractService.updateTrackPatient(patient,signFamily.getDoctorHealth());
        familyContractService.updateTrackPatient(patient,signFamily.getDoctorHealth(),signFamily.getDoctor(),null,newDoctorCode);
        //修改签约中的健康管理师
        signFamily.setDoctorHealth(newD.getCode());
@@ -1239,7 +1239,7 @@ public class DoctorInfoService extends BaseService {
        String oldDoctorName = signFamily.getDoctorName();
        //1.4.2更新重点关注列表,取消关注
        familyContractService.updateTrackPatient(patient,signFamily.getDoctor());
        familyContractService.updateTrackPatient(patient,signFamily.getDoctor(),signFamily.getDoctorHealth(),newDoctorCode,null);
        //修改签约中的全科医生
        signFamily.setDoctor(newD.getCode());

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

@@ -2279,6 +2279,9 @@ public class FamilyContractService extends BaseService {
        SignFamily signFamily = signFamilyDao.findByjiatingPatientYes(patient);
        String oldDoctor = signFamily.getDoctor();
        String oldHdoctor = signFamily.getDoctorHealth();
        if (signFamily == null) {
            result.put("status", -1);
            result.put("msg", "居民不存在家庭签约");
@@ -2377,7 +2380,7 @@ public class FamilyContractService extends BaseService {
            }
            //1.4.2更新重点关注列表,取消关注
            updateTrackPatient(patient,signFamily.getDoctorHealth());
            updateTrackPatient(patient,oldHdoctor,oldDoctor,doctor,healthDoctor);
            signFamily.setDoctorHealth(docHealth.getCode());
            signFamily.setDoctorHealthName(docHealth.getName());
@@ -2431,7 +2434,7 @@ public class FamilyContractService extends BaseService {
            }
            //1.4.2更新重点关注列表,取消关注
            updateTrackPatient(patient,signFamily.getDoctor());
            updateTrackPatient(patient,oldDoctor,oldHdoctor,doctor,healthDoctor);
            signFamily.setDoctor(docQk.getCode());
            signFamily.setDoctorName(docQk.getName());
@@ -4325,11 +4328,58 @@ public class FamilyContractService extends BaseService {
        return rs;
    }
    public void updateTrackPatient(String patient,String oldDoctor){
        TrackPatient trackPatient = trackPatientDao.findByDoctorCodeAndPatientCode(oldDoctor,patient);
        if(trackPatient!=null){
            trackPatient.setDel("0");
            trackPatientDao.save(trackPatient);
    /**
     * 设置取消关注
     * @param patient
     * @param oldDoctor 患者签约旧的要取消关注的医生
     * @param oldDoctor2 患者旧的签约的另一个医生
     * @param newDoctor 患者新签约的全科医生
     * @param newHDoctor 患者新签约的健康管理师
     */
    public void updateTrackPatient(String patient,String oldDoctor,String oldDoctor2,String newDoctor,String newHDoctor){
        //是否需要修改
        boolean flag = false;
        if(StringUtils.isBlank(oldDoctor)){
            return ;
        }
        //1.两个都修改
        if(StringUtils.isNotBlank(newDoctor)&&StringUtils.isNotBlank(newHDoctor)){
            if((!oldDoctor.equals(newDoctor))&&(!oldDoctor.equals(newHDoctor))){
                flag = true;
            }
        //只改全科
        }else if(StringUtils.isNotBlank(newDoctor)&&StringUtils.isBlank(newHDoctor)){
            if(!oldDoctor.equals(newDoctor)){
                if(StringUtils.isBlank(oldDoctor2)){
                    flag = true;
                }else{
                    if(!oldDoctor.equals(oldDoctor2)){
                        flag = true;
                    }
                }
            }
        //只改健管
        }else if(StringUtils.isBlank(newDoctor)&&StringUtils.isNotBlank(newHDoctor)){
            if(!oldDoctor.equals(newHDoctor)){
                if(StringUtils.isBlank(oldDoctor2)){
                    flag = true;
                }else{
                    if(!oldDoctor.equals(oldDoctor2)){
                        flag = true;
                    }
                }
            }
        }else{
            return ;
        }
       if(flag){
            TrackPatient trackPatient = trackPatientDao.findByDoctorCodeAndPatientCode(oldDoctor,patient);
            if(trackPatient!=null){
                trackPatient.setDel("0");
                trackPatientDao.save(trackPatient);
            }
        }
    }
}