From 9c4d113e598d0b9dd7e51e7f20c5337213baccec Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Fri, 29 Dec 2017 12:17:43 +0800 Subject: [PATCH] bbbbbb --- .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 3255d72..e7fabd4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -694,7 +694,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (Map tireDatum : tireData) { fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")); heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : tireDatum.get("heartRate").toString().replaceAll("\\.0", ""); - fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")); + fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? fetalPresentation.length() < 0 ? "--" : fetalPresentation + "/--": fetalPresentation.length() > 0 ? + fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")); } } catch (Exception e) { fetalPosition = "--"; -- 1.8.3.1