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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsAllService.java

@@ -635,8 +635,8 @@ public class StatisticsAllService extends BaseService {
            for (int i = 0; i < resultList.size(); i++) {
                Map<String, Object> map = resultList.get(i);
                map.put("amount", map.get("amount") != null ? Long.valueOf(map.get("amount").toString()) : 0L);
                map.put("signTaskNum",signTaskNum);//目标量
                map.put("signRegulationNum",signRegulationNum);//调控量
                map.put("signTaskNum", signTaskNum);//目标量
                map.put("signRegulationNum", signRegulationNum);//调控量
                if (!low_level.equals("1")) {
                    String code = map.get("code").toString();
@@ -1283,11 +1283,30 @@ public class StatisticsAllService extends BaseService {
            }
            if (!index.equals("8")) {
                DecimalFormat df = new DecimalFormat("0.0000");
                for (Map<String, Object> map : resultList) {
                    double rateG = (total > 0 ? ((long) map.get("amount")) * 1.0000 / total * 100 : 0);
                    map.put("rate", df.format(rateG));
                    map.put("rateString", map.get("amount") + "/" + total);
                if (index.equals("36")) {
                    //如果是查询36的指标 那么除数是签约总数
                    String redisData="";
                    Integer num=0;
                    try {
                        redisData = redisTemplate.opsForValue().get("quota:1:" + level + ":" + area + ":" + getQuotaTimeStamp());
                        JSONObject jo=new JSONObject(redisData);
                        num=jo.getInt("num");
                    } catch (Exception e) {
                    }
                    DecimalFormat df = new DecimalFormat("0.0000");
                    for (Map<String, Object> map : resultList) {
                        double rateG = (total > 0 ? ((long) map.get("amount")) * 1.0000 / num * 100 : 0);
                        map.put("rate", df.format(rateG));
                        map.put("rateString", map.get("amount") + "/" + num);
                    }
                } else {
                    DecimalFormat df = new DecimalFormat("0.0000");
                    for (Map<String, Object> map : resultList) {
                        double rateG = (total > 0 ? ((long) map.get("amount")) * 1.0000 / total * 100 : 0);
                        map.put("rate", df.format(rateG));
                        map.put("rateString", map.get("amount") + "/" + total);
                    }
                }
            }
            if (index.equals("6") && resultList.size() > 0) {
@@ -2630,8 +2649,8 @@ public class StatisticsAllService extends BaseService {
            DecimalFormat df = new DecimalFormat("0.0000");
            for (Map<String, Object> map : resultList) {
                map.put("amount", map.get("amount") != null ? Long.valueOf(map.get("amount").toString()) : 0L);
                map.put("signTaskNum",signTaskNum);//目标量
                map.put("signRegulationNum",signRegulationNum);//调控量
                map.put("signTaskNum", signTaskNum);//目标量
                map.put("signRegulationNum", signRegulationNum);//调控量
                if (!low_level.equals("1")) {
                    PopulationBase peopleNum = getPopulationBase(map.get("code").toString(), year);
                    if (peopleNum != null) {
@@ -2833,14 +2852,14 @@ public class StatisticsAllService extends BaseService {
    }
    @Transactional
    public int cleanDoctorScore(){
    public int cleanDoctorScore() {
        List<Evaluate> evaluates = evaluateDao.findByScoreZero();
        if(evaluates!=null&&evaluates.size()>0){
            for(Evaluate eva : evaluates){
                List<EvaluateScore> scores =  evaluateScoreDao.findByConsultAndDoctor(eva.getConsult(),eva.getDoctor());
                if(scores!=null&&scores.size()>0){
        if (evaluates != null && evaluates.size() > 0) {
            for (Evaluate eva : evaluates) {
                List<EvaluateScore> scores = evaluateScoreDao.findByConsultAndDoctor(eva.getConsult(), eva.getDoctor());
                if (scores != null && scores.size() > 0) {
                    EvaluateScore score = scores.get(0);
                    if(score!=null){
                    if (score != null) {
                        eva.setScore(score.getScore().intValue());
                        evaluateDao.save(eva);
                    }