diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 17172bd..2a70088 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1008,13 +1008,19 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (StringUtils.isNotEmpty(range)) { String[] array = range.split("-"); double cz = getDiff(beforeWeight, weight); - if ((cz-Double.parseDouble(array[1])) >= add && cz/Double.parseDouble(array[1]) > prcent) + if (Double.parseDouble(array[0]) > cz) { - level = 1; + if ((Double.parseDouble(array[0])-Math.abs(cz))*prcent < 1) + { + level = -1; + } } - else if ((Double.parseDouble(array[0])-cz) >= add && Double.parseDouble(array[0])/cz > prcent) + else if (Double.parseDouble(array[1]) < cz) { - level = -1; + if ((cz-Double.parseDouble(array[1]))*prcent > 1) + { + level = 1; + } } } return level; @@ -1036,7 +1042,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient double cz = getDiff(beforeWeight, weight); if (Double.parseDouble(array[0]) > cz) { - if ((Double.parseDouble(array[0])-cz)*prcent < 1) + if ((Double.parseDouble(array[0])-Math.abs(cz))*prcent < 1) { level = -1; }