|
@@ -40,7 +40,7 @@ public class ScaleCalculate {
|
|
for (Map<String, Object> row : rowList) {
|
|
for (Map<String, Object> row : rowList) {
|
|
List<Map<String, Object>> detailsList = (List<Map<String, Object>>) row.get("details");
|
|
List<Map<String, Object>> detailsList = (List<Map<String, Object>>) row.get("details");
|
|
for (Map<String, Object> details : detailsList) {
|
|
for (Map<String, Object> details : detailsList) {
|
|
- if (Integer.valueOf(details.get("select").toString()) == 1) {
|
|
|
|
|
|
+ if (details.get("select") != null && Integer.valueOf(details.get("select").toString()) == 1) {
|
|
i += 1;
|
|
i += 1;
|
|
if (!selectList.contains(row)) {
|
|
if (!selectList.contains(row)) {
|
|
selectList.add(row);
|
|
selectList.add(row);
|
|
@@ -230,7 +230,7 @@ public class ScaleCalculate {
|
|
JSONObject valueResult = new JSONObject();
|
|
JSONObject valueResult = new JSONObject();
|
|
JSONObject nameResult = new JSONObject();
|
|
JSONObject nameResult = new JSONObject();
|
|
valueResult.put("name", "GFR值");
|
|
valueResult.put("name", "GFR值");
|
|
- valueResult.put("text", new DecimalFormat("#.00").format(eGFR3) + " " + unit);
|
|
|
|
|
|
+ valueResult.put("text", new DecimalFormat("0.00").format(eGFR3) + " " + unit);
|
|
nameResult.put("name", "评估结论");
|
|
nameResult.put("name", "评估结论");
|
|
nameResult.put("text", text);
|
|
nameResult.put("text", text);
|
|
// scaleCalcResult.put("text", text);
|
|
// scaleCalcResult.put("text", text);
|