|
|
@ -1456,7 +1456,7 @@ public class StatisticsService extends BaseService {
|
|
|
|
|
|
Map<String, Object> manbing = new HashMap<>();
|
|
|
manbing.put("code", "2");
|
|
|
manbing.put("name", "慢病人群");
|
|
|
manbing.put("name", "慢病人群65岁以下");
|
|
|
manbing.put("amount", Double.valueOf("0.0"));
|
|
|
resultList.add(manbing);
|
|
|
|
|
|
@ -1479,10 +1479,16 @@ public class StatisticsService extends BaseService {
|
|
|
resultList.add(tnb);
|
|
|
|
|
|
Map<String, Object> tnbGxy = new HashMap<>();
|
|
|
tnbGxy.put("code", "100");
|
|
|
tnbGxy.put("name", "高血压+糖尿病");
|
|
|
tnbGxy.put("code", "6");
|
|
|
tnbGxy.put("name", "高血压和糖尿病");
|
|
|
tnbGxy.put("amount", Double.valueOf("0.0"));
|
|
|
resultList.add(tnb);
|
|
|
|
|
|
Map<String, Object> mn65LowGxy = new HashMap<>();
|
|
|
mn65LowGxy.put("code", "7");
|
|
|
mn65LowGxy.put("name", "慢病人群65岁以上");
|
|
|
mn65LowGxy.put("amount", Double.valueOf("0.0"));
|
|
|
resultList.add(mn65LowGxy);
|
|
|
} else if (index.equals(AGE)) {
|
|
|
Map<String, Object> map1 = new HashMap<>();
|
|
|
map1.put("code", "1");
|
|
|
@ -1591,7 +1597,7 @@ public class StatisticsService extends BaseService {
|
|
|
if (index.equals(GROUP)) {
|
|
|
// 分组指标总数算法
|
|
|
String code = map.get("code") != null ? String.valueOf(map.get("code")) : "";
|
|
|
if (code.equals("1") || code.equals("2") || code.equals("3")) {
|
|
|
if (code.equals("1") || code.equals("2") || code.equals("7") || code.equals("3")) {
|
|
|
total += (long) map.get("amount");
|
|
|
}
|
|
|
} else if (index.equals("16")) {
|
