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

src/main/java/com/yihu/wlyy/job/SignJob.java

@@ -393,7 +393,7 @@ public class SignJob implements Job {
                    List<JSONObject> jsonObjects = new ArrayList<JSONObject>();
                    JSONArray redisValues = new JSONArray(jsonString);
                    for (Object obj : redisValues) {
                        JSONObject redisValue = new JSONObject(obj);
                        JSONObject redisValue = (JSONObject)(obj);
                        if(!redisValue.has("signType")){
                            continue;
                        }
@@ -401,12 +401,12 @@ public class SignJob implements Job {
                        if ("1".equals(redisValue.get("signType").toString())) {
                            continue;
                        }
                        String disease = redisValue.get("disease").toString();
                        if (Integer.valueOf(disease).equals("1")) {
                        String disease =  redisValue.getString("disease");
                        if ("1".equals(disease)) {
                            jsonObjects.add(redisValue);
                            hasGXY = true;//设置有高血压
                        }
                        if (Integer.valueOf(disease).equals("2")) {
                        if ("2".equals(disease)) {
                            jsonObjects.add(redisValue);
                            hasTNB = true;//设置有糖尿病
                        }
@@ -416,8 +416,10 @@ public class SignJob implements Job {
                    }
                    if (hasGXY && hasTNB) {
                        group = "100";//有高血压又有糖尿病
                    } else {
                        group = Integer.valueOf(jsonObjects.get(0).get("disease").toString()) + 3 + "";//4高血压，5糖尿病
                    } else if(hasGXY){
                        group = 4 + "";//4高血压，5糖尿病
                    }else if(hasTNB){
                        group = 5 + "";//4高血压，5糖尿病
                    }
                    if (cityGroupMap.containsKey(Constant.city)) {
                        Map<String, Long> groupMapTemp = cityGroupMap.get(Constant.city);