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 1ce110e..ca00340 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 @@ -20,6 +20,9 @@ public class MaternalDeliverModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.MaternalDeliverModel.getCid(); private String id; + /**新加字段***/ + //产次 + private Integer dueCount; //产妇id private String parentId; private String pid; @@ -153,6 +156,14 @@ public class MaternalDeliverModel extends BaseModel { */ private Integer isClose; + public Integer getDueCount() { + return dueCount; + } + + public void setDueCount(Integer dueCount) { + this.dueCount = dueCount; + } + public String getMatFollowId() { return matFollowId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 1cea818..bc408a1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -180,6 +180,7 @@ public class BabyCheckFacade { model.setNd(request.getNd()); model.setYgbmky(request.getYgbmky()); model.setYgeky(request.getYgeky()); + model.setYgbmkt(request.getYgbmkt()); model.setYgekt(request.getYgekt()); model.setYghxkt(request.getYghxkt()); model.setWlTong(request.getWlTong()); 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 4401547..ee3b7fc 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 @@ -3274,6 +3274,7 @@ public class ViewFacade { model.setYgeky(FunvCommonUtil.checkYiGan(checkModel.getYgeky())); model.setYgekt(FunvCommonUtil.checkYiGan(checkModel.getYgekt())); model.setYghxkt(FunvCommonUtil.checkYiGan(checkModel.getYghxkt())); + model.setYgbmkt(FunvCommonUtil.checkYiGan(checkModel.getYgbmkt())); model.setWlTong(UnitUtils.unitSplice(checkModel.getWlTong(), UnitConstants.UMOLL)); model.setWlXin(UnitUtils.unitSplice(checkModel.getWlXin(), UnitConstants.UMOLL)); @@ -3541,7 +3542,7 @@ public class ViewFacade { String qt = map.get("qt") == null ? "" : map.get("qt").toString(); if ("true".equals(qt)) { String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); - drugGllergic += " " + qtText + ","; + drugGllergic += " 其他:" + qtText + ","; } drugGllergic = FunvCommonUtil.spitd(drugGllergic); } 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 f3a6632..c0a6c8d 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 @@ -17,6 +17,10 @@ import java.util.Map; @Form public class MatDeliverAddRequest implements IBasicRequestConvert{ private String id; + + /**新加字段***/ + //产次 + private Integer dueCount; // private String pid; //产妇id @@ -89,6 +93,14 @@ public class MatDeliverAddRequest implements IBasicRequestConvert