redis

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -1250,13 +1250,21 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
                         }
                     }
                 }
-                result.put("zu", isEmpty(zuDept) ? 0 : zuDept.size());
-                int xz = vaccineInfoMapper.countByXz(condition);
-                int js = vaccineInfoMapper.countByJs(condition);
+
+                result.put("zu", isEmpty(zuDept) ? 0 : zuDept.size()); // 组
+                int czrk = vaccineInfoMapper.countCzrk(condition); // 常住人口
+                result.put("czrk", czrk);
+
+                int xz = vaccineInfoMapper.countByXz(condition); // 新增
+                int js = vaccineInfoMapper.countByJs(condition);// 减少
                 result.put("xz", xz);
                 result.put("js", js);
-                result.put("czrk", vaccineInfoMapper.countCzrk(condition));
-//            redisService.setCacheObject(packRedisKey("single:" + deptId), result, 1L, TimeUnit.DAYS);
+
+                condition.setRyrl(null); // 查全部
+                int zrs = vaccineInfoMapper.countCzrk(condition);
+                String bfb = NumberUtils.percent(czrk, zrs);
+                result.put("bfb", bfb);
+                result.put("zrs", zrs);
                 setIntoRedis(packRedisKey("single:" + deptId), result);
                 QIANSHANSHI_SINGEL = result;
             });
@@ -1639,7 +1647,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
     }
 
     private String packRedisKey(String deptId){
-        return STS_CZRK_ + ":" + deptId + ":" + DateUtils.getDate();
+        return STS_CZRK_ + deptId + ":" + DateUtils.getDate();
     }
 
     private void setIntoRedis(String key, Object result){