diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index b5aed44..eaf70db 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -205,12 +205,21 @@ public final class StringUtils { if (StringUtils.isNotEmpty(repalceStr)) { String date = DateUtil.getyyyy_MM_dd(birth); - return repalceStr.replace("{{姓名}}",name).replace("{{出生日期}}",date); + return repalceStr.replace("{{姓名}}",name).replace("{{出生日期}}", date); } return repalceStr; } + public static String unitHandle(String value,String unit) + { + if (org.apache.commons.lang.StringUtils.isNotEmpty(value)) + { + return value+ unit; + } + return ""; + } + // public static void main(String[] arg) { // System.out.print(encryPhone("18382670036")); // } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index adc1c9b..dbe3fc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -1776,8 +1776,8 @@ public class PremaritalCheckupFacade { } } - checkupResult.setMenarcheAge(result.getMenarcheAge()+UnitConstants.SUI); - checkupResult.setMenstrualCycle(result.getMenstrualCycle()+UnitConstants.DAY); + checkupResult.setMenarcheAge(UnitHandle(result.getMenarcheAge(),UnitConstants.SUI)); + checkupResult.setMenstrualCycle(UnitHandle(result.getMenstrualCycle(),UnitConstants.DAY)); checkupResult.setMenstrualAmount(result.getMenstrualAmount()); checkupResult.setLastMenses(result.getLastMenses()); String menorrhalgia= ""; @@ -1904,9 +1904,9 @@ public class PremaritalCheckupFacade { } checkupResult.setTeShuTiTai(teShuTiTai); - checkupResult.setHeight(result.getHeight()+UnitConstants.CM); - checkupResult.setWeight(result.getWeight()+UnitConstants.KG); - checkupResult.setBp(result.getBp()+UnitConstants.MMHG); + checkupResult.setHeight(UnitHandle(result.getHeight(),UnitConstants.CM)); + checkupResult.setWeight(UnitHandle(result.getWeight(),UnitConstants.KG)); + checkupResult.setBp(UnitHandle(result.getBp(),UnitConstants.MMHG)); String piFu = ""; if (result.getPiFu() != null && result.getPiFu() == 1) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 9fa6b01..1c82a8f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1726,17 +1726,17 @@ public class ViewFacade { model.setPee(checkModel.getPee()); model.setExcrement(checkModel.getExcrement()); model.setSleep(checkModel.getSleep()); - model.setActivity(checkModel.getActivity() + UnitConstants.HD); - model.setVitaminD(checkModel.getVitaminD()+ UnitConstants.WSSD); + model.setActivity(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getActivity() , UnitConstants.HD)); + model.setVitaminD(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getVitaminD(), UnitConstants.WSSD)); model.setAssistFood(checkModel.getAssistFood()); model.setHomeMeasure(checkModel.getHomeMeasure()); model.setMorbidity(checkModel.getMorbidity()); - model.setTemperature(checkModel.getTemperature()+ UnitConstants.WENDU); - model.setHeight(checkModel.getHeight()+UnitConstants.CM); - model.setWeight(checkModel.getWeight()+UnitConstants.KG); - model.setHead(checkModel.getHead()+UnitConstants.CM); + model.setTemperature(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getTemperature(), UnitConstants.WENDU)); + model.setHeight(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getHeight(),UnitConstants.CM)); + model.setWeight(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getWeight(),UnitConstants.KG)); + model.setHead(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getHead(),UnitConstants.CM)); model.setHeightWeight(checkModel.getHeightWeight()); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getGrowthEvaluate())) { @@ -1820,9 +1820,9 @@ public class ViewFacade { model.setBonez(checkModel.getBonez()); model.setHipJoint(checkModel.getHipJoint()); - model.setHemoglobin(checkModel.getHemoglobin()+UnitConstants.GL); - model.setWhiteCell(checkModel.getWhiteCell()+UnitConstants.TEN_LKG); - model.setPlatelet(checkModel.getPlatelet()+UnitConstants.TEN_LKG); + model.setHemoglobin(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getHemoglobin(),UnitConstants.GL)); + model.setWhiteCell(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getWhiteCell(),UnitConstants.TEN_LKG)); + model.setPlatelet(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getPlatelet(),UnitConstants.TEN_LKG)); model.setOtherBlood(checkModel.getOtherBlood()); model.setUrineProtein(checkModel.getUrineProtein()); model.setUrineSugar(checkModel.getUrineSugar()); @@ -1931,7 +1931,7 @@ public class ViewFacade { model.setDrugGllergic(drugGllergic); - model.setChestw(checkModel.getChestw()+UnitConstants.CM); + model.setChestw(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getChestw(),UnitConstants.CM)); model.setWeightEvaluate(checkModel.getWeightEvaluate()); model.setHeadEvaluate(checkModel.getHeadEvaluate()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 347a3db..2730aa0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -11,6 +11,7 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.UnitConstants; import com.lyms.platform.pojo.BabyModel; +import org.mortbay.util.StringUtil; import java.util.Date; import java.util.List; @@ -537,10 +538,10 @@ public class BabyPageResult implements IBasicResultConvert map = JsonUtil.getMap(destModel.getApgarScore());