1115修改提交

101captain

2021-11-15 fd8b23735d350a1a85bbce654df145c60c5f4033

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java

@@ -48,7 +48,7 @@
                    continue;
                }
                if(count%16==2){
                    conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd"))+" "+"当日隔离情况："+userAnswers.getAnswerContent()+"℃"+"\n");
                    conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd"))+" "+"当日隔离情况："+userAnswers.getAnswerContent()+"\n");
                    conditions.append("————————"+"\n");
                    count++;
                    continue;
@@ -203,8 +203,18 @@
                String answer = sb.toString();
                userData.add(answer.substring(0, answer.length() - 1));
            }
            for(List<Object> result:resultList){
                if(result.get(4).equals(userData.get(4))){
                    String condition=result.get(result.size()-1)+userData.get(userData.size()-1).toString();
                    result.set(result.size()-1,condition);
                    userData.set(userData.size()-1,null);
                    break;
                }
            }
            if(userData.get(userData.size()-1)!=null){
            resultList.add(userData);
        }
        }
        return resultList;
    }
}