diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 9b45c2c..3088841 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -17,6 +17,15 @@ import java.util.Map; public class AntenatalExaminationModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid(); + List mHighRiskReason; + + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } /** 处理意见 */ private Map> treatmentOpinion2; 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 c940317..b3cf84c 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 @@ -1965,6 +1965,7 @@ public class ViewFacade { map.put("diagnosis", diagnosis); map.put("treatmentOpinion", data.getTreatmentOpinion()); map.put("guide", data.getGuide()); + map.put("mHighRiskReason", mongoUtil.findPlatValueList(data.getmHighRiskReason())); /** 优惠券编号 */ map.put("couponCode", couponService.findByUsedId(id)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 97644b3..9201f35 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -15,6 +15,15 @@ import java.util.Map; */ @Form public class AntExAddRequest implements IBasicRequestConvert { + List mHighRiskReason; + + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } /** 处理意见 */ private Map> treatmentOpinion2; private List treatmentOpinion2Types; @@ -298,6 +307,7 @@ public class AntExAddRequest implements IBasicRequestConvert { + List mHighRiskReason; + + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } + private Map> treatmentOpinion2; private List treatmentOpinion2Types; /** 胎动 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 1bf55ae..37b4004 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -123,6 +123,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } } } + StringBuilder refractometer = new StringBuilder(); if(StringUtils.isNotEmpty(babyEyeCheck.getR1())) { refractometer.append("R:S( ").append(babyEyeCheck.getR1()).append( " )"); @@ -149,9 +150,36 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } refractometer.append("L:DC( ").append(babyEyeCheck.getL2()).append( " )"); } - map.put("refractometer", refractometer.toString()); + StringBuilder refraction = new StringBuilder(); + if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionR1())) { + refraction.append("R:S( ").append(babyEyeCheck.getRefractionR1()).append( " )"); + } + if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionR2())) { + if(refraction.length() != 0) { + refraction.append(" "); + } + refraction.append("R:DC( ").append(babyEyeCheck.getRefractionR2()).append( " )"); + } + boolean flag2 = false; + if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionL1())) { + if(refraction.length() != 0) { + refraction.append(", "); + flag2 = true; + } + refraction.append("L:S( ").append(babyEyeCheck.getRefractionL1()).append( " ) "); + } + if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionL2())) { + if(!flag2) { + if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionR1()) || StringUtils.isNotEmpty(babyEyeCheck.getRefractionR2())) { + refraction.append(", "); + } + } + refraction.append("L:DC( ").append(babyEyeCheck.getRefractionL2()).append( " )"); + } + map.put("refraction", refraction.toString()); + map.put("riskFactorId", riskFactorNames); map.put("checkMonthId", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); map.put("checkMonth", babyEyeCheck.getCheckMonthId());