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

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

@@ -144,11 +144,8 @@ public class PatientDiseaseService extends BaseService {
                }
            } else {
                JSONArray redisValues = new JSONArray();
                // 重新分组
                if (!changeGroupInfo(patient, new ArrayList<String>())) {
                    throw new Exception("set group falied");
                }
                List<PatientDisease> ssDisease = patientDiseaseDao.findByPatientSsDisease(patient);
                List<String> disList = new ArrayList<>();
                if (ssDisease != null && ssDisease.size() > 0) {
                    for (PatientDisease pd : ssDisease) {
                        JSONObject redisValue = new JSONObject();
@@ -157,9 +154,14 @@ public class PatientDiseaseService extends BaseService {
                        redisValue.put("del", pd.getDel());
                        redisValue.put("signType", pd.getSignType());
                        redisValues.put(redisValue);
                        disList.add(pd.getDisease());
                    }
                }
                redisTemplate.opsForValue().set("disease:" + patient, redisValues.toString());
                // 重新分组
                if (!changeGroupInfo(patient, disList)) {
                    throw new Exception("set group falied");
                }
            }
            return true;