diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java index 817a0fe..afa8fe5 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java @@ -5,7 +5,17 @@ package com.lyms.platform.common.enums; */ public enum BloodSugarEnums { - A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后"), D(4, "午餐前"), E(5, "午餐后"), F(6, "晚餐前"), G(7, "晚餐后"), I(9, "睡前") ,H(8, "夜间"); + A(1, "空腹"), C(3, "早餐后"), D(4, "午餐前"), E(5, "午餐后"), F(6, "晚餐前"), G(7, "晚餐后"),H(8, "0点"); + + +// A(1, "空腹"), +// +// C(3, "早餐后"), +// D(4, "午餐前"), +// E(5, "午餐后"), +// F(6, "晚餐前"), +// G(7, "晚餐后"), +// H(8, "0点"); BloodSugarEnums(Integer id, String name) { this.id = id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java index 9f306d5..c4f81ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java @@ -71,10 +71,10 @@ public class RemoteFacade { if (type == BloodSugarEnums.A.getId()) { min = 3.3D; max = 5.6D; - } else if (type == BloodSugarEnums.B.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { + } else if (type == BloodSugarEnums.A.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { min = 3.3D; max = 5.8D; - } else if (type == BloodSugarEnums.I.getId()) { + } else if (type == BloodSugarEnums.H.getId()) { min = 6.1D; max = 7.8D; } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index bfbd54e..55cd028 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -189,9 +189,9 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga private String getBloodSugarStatus(Integer type, String bloodSugar) { if (type == BloodSugarEnums.A.getId()) { return Double.parseDouble(bloodSugar) > 5.6D ? "高血糖" : Double.parseDouble(bloodSugar) < 3.3D ? "低血糖" : "正常"; - } else if (type == BloodSugarEnums.B.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { + } else if (type == BloodSugarEnums.A.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { return Double.parseDouble(bloodSugar) > 5.8D ? "高血糖" : Double.parseDouble(bloodSugar) < 3.3D ? "低血糖" : "正常"; - } else if (type == BloodSugarEnums.I.getId()) { + } else if (type == BloodSugarEnums.H.getId()) { return Double.parseDouble(bloodSugar) > 7.8D ? "高血糖" : Double.parseDouble(bloodSugar) < 6.1D ? "低血糖" : "正常"; } else { return Double.parseDouble(bloodSugar) > 6.7D ? "高血糖" : Double.parseDouble(bloodSugar) < 4.4D ? "低血糖" : "正常"; @@ -211,10 +211,10 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga if (type == BloodSugarEnums.A.getId()) { minAxis = Arrays.asList(3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3); maxAxis = Arrays.asList(5.6, 5.6, 5.6, 5.6, 5.6, 5.6, 5.6); - } else if (type == BloodSugarEnums.B.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { + } else if (type == BloodSugarEnums.A.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { minAxis = Arrays.asList(3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3); maxAxis = Arrays.asList(5.8, 5.8, 5.8, 5.8, 5.8, 5.8, 5.8); - } else if (type == BloodSugarEnums.I.getId()) { + } else if (type == BloodSugarEnums.H.getId()) { minAxis = Arrays.asList(6.1, 6.1, 6.1, 6.1, 6.1, 6.1, 6.1); maxAxis = Arrays.asList(7.8, 7.8, 7.8, 7.8, 7.8, 7.8, 7.8); } else { @@ -373,7 +373,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga if(CollectionUtils.isEmpty(bloodSugars)) { - RespBuilder.buildSuccess("restList", restList); + return RespBuilder.buildSuccess("restList", restList); } Set dayCountSet = new HashSet<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index 64dcd1e..0ce9f19 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -227,10 +227,10 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I private String getBloodSugarStatus(Integer type, String bloodSugar) { if (type == BloodSugarEnums.A.getId()) { return Double.parseDouble(bloodSugar) > 5.6D ? "高血糖" : Double.parseDouble(bloodSugar) < 3.3D ? "低血糖" : "正常"; - } else if (type == BloodSugarEnums.B.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { + } else if (type == BloodSugarEnums.A.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { return Double.parseDouble(bloodSugar) > 5.8D ? "高血糖" : Double.parseDouble(bloodSugar) < 3.3D ? "低血糖" : "正常"; - } else if (type == BloodSugarEnums.I.getId()) { - return Double.parseDouble(bloodSugar) > 7.8D ? "高血糖" : Double.parseDouble(bloodSugar) < 6.1D ? "低血糖" : "正常"; +// } else if (type == BloodSugarEnums.A.getId()) { +// return Double.parseDouble(bloodSugar) > 7.8D ? "高血糖" : Double.parseDouble(bloodSugar) < 6.1D ? "低血糖" : "正常"; } else { return Double.parseDouble(bloodSugar) > 6.7D ? "高血糖" : Double.parseDouble(bloodSugar) < 4.4D ? "低血糖" : "正常"; } @@ -248,10 +248,10 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I if (type == BloodSugarEnums.A.getId()) { minAxis = Arrays.asList(3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3); maxAxis = Arrays.asList(5.6, 5.6, 5.6, 5.6, 5.6, 5.6, 5.6); - } else if (type == BloodSugarEnums.B.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { + } else if (type == BloodSugarEnums.A.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { minAxis = Arrays.asList(3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3); maxAxis = Arrays.asList(5.8, 5.8, 5.8, 5.8, 5.8, 5.8, 5.8); - } else if (type == BloodSugarEnums.I.getId()) { + } else if (type == BloodSugarEnums.H.getId()) { minAxis = Arrays.asList(6.1, 6.1, 6.1, 6.1, 6.1, 6.1, 6.1); maxAxis = Arrays.asList(7.8, 7.8, 7.8, 7.8, 7.8, 7.8, 7.8); } else {