diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 6cd6c7e..9bd267e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -216,10 +216,17 @@ public class MaternalDeliverModel extends BaseModel { private List status; /** + *分娩地点类别代码 + */ + private String fmddlb; + /** + *分娩地点类型代码 + */ + private String fmddlx; + /** *本次是否属于高危妊娠 */ private String gwrs; - /** *妊娠风险评估分级代码 */ @@ -228,14 +235,7 @@ public class MaternalDeliverModel extends BaseModel { *孕次 */ private String cfyc; - /** - *分娩地点类别代码 - */ - private String fmddlb; - /** - *分娩地点类型代码 - */ - private String fmddlx; + public String getFmddlb() { return fmddlb; @@ -801,11 +801,15 @@ public class MaternalDeliverModel extends BaseModel { private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他 private String otherInfo; - //儿童出生序列号 - private String babySeq; - //胎次 该新生儿在本次分娩中出生的次序 + /** + * 胎次 该新生儿在本次分娩中出生的次序 + */ private String cftc; /** + * 儿童出生序列号 + */ + private String babySeq; + /** * 新生儿姓名 */ private String xsexm; 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 d75840a..762b816 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 @@ -4417,6 +4417,10 @@ public class ViewFacade { babyMap.put("cjfy", temp.getCjfy()); babyMap.put("zl", temp.getZl()); + babyMap.put("cftc", temp.getCftc()); + babyMap.put("babySeq", temp.getBabySeq()); + babyMap.put("xsexm", temp.getXsexm()); + babyList.add(babyMap); } } @@ -4437,6 +4441,12 @@ public class ViewFacade { /** 优惠券编号 */ map.put("couponCode", couponService.findByUsedId(id)); + map.put("fmddlb",data.getFmddlb()); + map.put("fmddlx",data.getFmddlx()); + map.put("gwrs",data.getGwrs()); + map.put("rsfxdm",data.getRsfxdm()); + map.put("cfyc",data.getCfyc()); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index 0a17f61..819526f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -445,6 +445,68 @@ public class MatDeliverAddRequest implements IBasicRequestConvert