diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 2cc0d19..a6841a1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -17,6 +17,16 @@ import java.util.List; public class BabyModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.BabyModel.getCid(); + // 母亲高危因素 + List mHighRiskReason; + + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } private String id; //来源id diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 5c422ac..86f7b07 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -631,6 +631,7 @@ public class BabyBookbuildingFacade { } BabyModel model = getBabyModel(request,true); + model.setmHighRiskReason(request.getmHighRiskReason()); model.setPid(babyPersonId); model.setOperator(userId); if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) { @@ -655,6 +656,8 @@ public class BabyBookbuildingFacade { // String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName(); model = babyBookbuildingService.addBabyBookbuilding(model); + + if (model == null || model.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); br.setErrormsg("保存失败"); @@ -1208,6 +1211,8 @@ public class BabyBookbuildingFacade { */ private BabyBuildResult getBabyBuildResult(BabyModel model) { BabyBuildResult result = new BabyBuildResult(); + result.setmHighRiskReason(model.getmHighRiskReason()); + result.setId(model.getId()); result.setPid(model.getPid()); //母亲信息 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 f22a075..c940317 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 @@ -2773,6 +2773,7 @@ public class ViewFacade { BabyModel model = models.get(0); result = result.convertToResult(model); + result.setmHighRiskReason(mongoUtil.findNameList(model.getmHighRiskReason())); String homeAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 4032d8c..d4f2e92 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -14,6 +14,17 @@ import java.util.Map; public class BabyBookbuildingAddRequest { /***********母亲基本信息***********/ + // 母亲高危因素 + List mHighRiskReason; + + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } + //建档Id private String id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index 48107d4..b1905dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -7,6 +7,17 @@ import java.util.Map; * Created by lqy on 2016/6/17. */ public class BabyBuildResult { + // 母亲高危因素 + List mHighRiskReason; + + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } + /***********母亲基本信息***********/ //建档Id 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 a66a7e5..e0bff88 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 @@ -12,6 +12,7 @@ import com.lyms.platform.operate.web.utils.UnitConstants; import com.lyms.platform.pojo.BabyModel; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -19,6 +20,17 @@ import java.util.Map; */ public class BabyPageResult implements IBasicResultConvert { + // 母亲高危因素 + List> mHighRiskReason; + + public List> getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List> mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } + //建档Id private String id; @@ -497,7 +509,7 @@ public class BabyPageResult implements IBasicResultConvert list = destModel.getmHighRiskReason(); setId(destModel.getId()); setPid(destModel.getPid()); setBabyName(destModel.getName());