diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java index 3dc617b..06c862f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java @@ -7,7 +7,6 @@ import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.PredictedStatisticsRequest; import com.lyms.platform.operate.web.request.PredictedStatisticsSumRequest; import com.lyms.platform.operate.web.result.PredictedStatisticsQueryModel; @@ -21,6 +20,7 @@ import com.lyms.platform.query.PatientsQuery; import net.sf.json.JSONArray; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -94,6 +94,7 @@ public class PredictedStatisticsFacade { predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getRiskFactorId())); predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId())); predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus())); + predictedStatisticsQueryModel.setRiskScore(StringUtils.isEmpty(patients.getRiskScore()) ? null : patients.getRiskScore().toString()); predictedStatisticsQueryModelList.add(predictedStatisticsQueryModel); } } @@ -151,9 +152,9 @@ public class PredictedStatisticsFacade { private static String getGestationalWeeks(Date date, int type, Integer dueStatus) { if (type == 3) { - if (dueStatus!=null&&dueStatus == 0 ) { + if (dueStatus != null && dueStatus == 0) { return "已分娩"; - } else if (dueStatus!=null&&dueStatus == 1) { + } else if (dueStatus != null && dueStatus == 1) { return "终止妊娠"; } else { return "已分娩"; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java index 88c18a7..fe25578 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java @@ -33,7 +33,7 @@ public class PredictedStatisticsQueryModel { * @createTime 2016年11月29日 17时05分 * @discription 高危评分 */ - private Integer riskScore; + private String riskScore; /** * @auther HuJiaqi * @createTime 2016年11月29日 17时06分 @@ -106,11 +106,11 @@ public class PredictedStatisticsQueryModel { this.dueDate = dueDate; } - public Integer getRiskScore() { + public String getRiskScore() { return riskScore; } - public void setRiskScore(Integer riskScore) { + public void setRiskScore(String riskScore) { this.riskScore = riskScore; }