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 55bac89..1dfe4ef 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 @@ -162,6 +162,22 @@ public class MaternalDeliverModel { } + public Baby(BabyModel babyModel){ + setAsphyxiaM(babyModel.getAsphyxiaM()); + if (null != babyModel.getSex()) { + setBabyGender(babyModel.getSex()+""); + } + setApgarScore(babyModel.getApgarScore()); + setBabyHealthy(babyModel.getBabyHealthy()); + setBabyWeight((Integer.valueOf(babyModel.getBabyWeight())*1000)+""); + setBabyHeight(babyModel.getBabyHeight()); + setDeformity(babyModel.getMalformation()); + setPregnancyOut(babyModel.getPregnancyOut()); + setContactM(babyModel.getContactM()); + setContactStartM(babyModel.getContactStartM()); + setEarlySuck(babyModel.getEarlySuck()); + } + public String getApgarScore() { return apgarScore; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 3dc40aa..2af2c04 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -106,8 +106,14 @@ public class MatDeliverFacade { List babyModels = babyService.queryBabyWithQuery(babyModelQuery); if (CollectionUtils.isEmpty(babyModels)) { handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1); + }else{ + List babies=new ArrayList<>(); + for(BabyModel babyModel:babyModels){ + MaternalDeliverModel.Baby baby1 = new MaternalDeliverModel.Baby(babyModel); + babies.add(baby1); + } + maternalDeliverModel.setBaby(babies); } -// maternalDeliverModel.setBaby(babyModels); } List list1 = autoMatchFacade.matchOrgId(userId); if (CollectionUtils.isNotEmpty(list1)) {