疾病更新分组BUG修改

src/main/java/com/yihu/wlyy/service/app/disease/PatientDiseaseService.java

@@ -196,6 +196,20 @@ public class PatientDiseaseService extends BaseService {
                    ncdGroup.setGroup("2");
                    groupInfoDao.save(ncdGroup);
                    DoctorPatientGroupInfo ncdJgGroup = new DoctorPatientGroupInfo();
                    ncdJgGroup.setDoctor(jjSign.getDoctorHealth());
                    ncdJgGroup.setPatient(patient);
                    ncdJgGroup.setSignType("2");
                    ncdJgGroup.setCzrq(new Date());
                    ncdJgGroup.setStatus(1);
                    ncdJgGroup.setPname(jjSign.getName());
                    ncdJgGroup.setQyrq(jjSign.getApplyDate());
                    ncdJgGroup.setDqrq(jjSign.getEnd());
                    ncdJgGroup.setGroup("2");
                    groupInfoDao.save(ncdJgGroup);
                }
            }
            if (ssSign != null) {
@@ -213,10 +227,26 @@ public class PatientDiseaseService extends BaseService {
                    ncdGroup.setGroup("2");
                    groupInfoDao.save(ncdGroup);
                    DoctorPatientGroupInfo ncdJgGroup = new DoctorPatientGroupInfo();
                    ncdJgGroup.setDoctor(ssSign.getDoctorHealth());
                    ncdJgGroup.setPatient(patient);
                    ncdJgGroup.setSignType("1");
                    ncdJgGroup.setCzrq(new Date());
                    ncdJgGroup.setStatus(1);
                    ncdJgGroup.setPname(ssSign.getName());
                    ncdJgGroup.setQyrq(ssSign.getApplyDate());
                    ncdJgGroup.setDqrq(ssSign.getEnd());
                    ncdJgGroup.setGroup("2");
                    groupInfoDao.save(ncdJgGroup);
                }
            }
            groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctor() : ssSign.getDoctor(), patient, "1", 0);
            groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctor() : ssSign.getDoctor(), patient, "3", 0);
            groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctorHealth() : ssSign.getDoctorHealth(), patient, "1", 0);
            groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctorHealth() : ssSign.getDoctorHealth(), patient, "3", 0);
        } else {
            boolean isSixFive = false;
            String birth = p.getIdcard().substring(6, 14);
@@ -250,6 +280,20 @@ public class PatientDiseaseService extends BaseService {
                        ncdGroup.setGroup("3");
                        groupInfoDao.save(ncdGroup);
                        DoctorPatientGroupInfo ncdJgGroup = new DoctorPatientGroupInfo();
                        ncdJgGroup.setDoctor(jjSign.getDoctorHealth());
                        ncdJgGroup.setPatient(patient);
                        ncdJgGroup.setSignType("2");
                        ncdJgGroup.setCzrq(new Date());
                        ncdJgGroup.setStatus(1);
                        ncdJgGroup.setPname(jjSign.getName());
                        ncdJgGroup.setQyrq(jjSign.getApplyDate());
                        ncdJgGroup.setDqrq(jjSign.getEnd());
                        ncdJgGroup.setGroup("3");
                        groupInfoDao.save(ncdJgGroup);
                    }
                }
                if (ssSign != null) {
@@ -267,10 +311,26 @@ public class PatientDiseaseService extends BaseService {
                        ncdGroup.setGroup("3");
                        groupInfoDao.save(ncdGroup);
                        DoctorPatientGroupInfo ncdJgGroup = new DoctorPatientGroupInfo();
                        ncdJgGroup.setDoctor(ssSign.getDoctorHealth());
                        ncdJgGroup.setPatient(patient);
                        ncdJgGroup.setSignType("1");
                        ncdJgGroup.setCzrq(new Date());
                        ncdJgGroup.setStatus(1);
                        ncdJgGroup.setPname(ssSign.getName());
                        ncdJgGroup.setQyrq(ssSign.getApplyDate());
                        ncdJgGroup.setDqrq(ssSign.getEnd());
                        ncdJgGroup.setGroup("3");
                        groupInfoDao.save(ncdJgGroup);
                    }
                }
                groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctor() : ssSign.getDoctor(), patient, "1", 0);
                groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctor() : ssSign.getDoctor(), patient, "2", 0);
                groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctorHealth() : ssSign.getDoctorHealth(), patient, "1", 0);
                groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctorHealth() : ssSign.getDoctorHealth(), patient, "2", 0);
            } else {
                // 普通分组
                if (jjSign != null) {
@@ -288,6 +348,20 @@ public class PatientDiseaseService extends BaseService {
                        ncdGroup.setGroup("1");
                        groupInfoDao.save(ncdGroup);
                        DoctorPatientGroupInfo ncdJgGroup = new DoctorPatientGroupInfo();
                        ncdJgGroup.setDoctor(jjSign.getDoctorHealth());
                        ncdJgGroup.setPatient(patient);
                        ncdJgGroup.setSignType("2");
                        ncdJgGroup.setCzrq(new Date());
                        ncdJgGroup.setStatus(1);
                        ncdJgGroup.setPname(jjSign.getName());
                        ncdJgGroup.setQyrq(jjSign.getApplyDate());
                        ncdJgGroup.setDqrq(jjSign.getEnd());
                        ncdJgGroup.setGroup("1");
                        groupInfoDao.save(ncdJgGroup);
                    }
                }
                if (ssSign != null) {
@@ -305,10 +379,26 @@ public class PatientDiseaseService extends BaseService {
                        ncdGroup.setGroup("1");
                        groupInfoDao.save(ncdGroup);
                        DoctorPatientGroupInfo ncdJgGroup = new DoctorPatientGroupInfo();
                        ncdJgGroup.setDoctor(ssSign.getDoctorHealth());
                        ncdJgGroup.setPatient(patient);
                        ncdJgGroup.setSignType("1");
                        ncdJgGroup.setCzrq(new Date());
                        ncdJgGroup.setStatus(1);
                        ncdJgGroup.setPname(ssSign.getName());
                        ncdJgGroup.setQyrq(ssSign.getApplyDate());
                        ncdJgGroup.setDqrq(ssSign.getEnd());
                        ncdJgGroup.setGroup("1");
                        groupInfoDao.save(ncdJgGroup);
                    }
                }
                groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctor() : ssSign.getDoctor(), patient, "2", 0);
                groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctor() : ssSign.getDoctor(), patient, "3", 0);
                groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctorHealth() : ssSign.getDoctorHealth(), patient, "2", 0);
                groupInfoDao.updateDoctorPatientGroup(jjSign != null ? jjSign.getDoctorHealth() : ssSign.getDoctorHealth(), patient, "3", 0);
            }
        }