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 a86d88a..7691105 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 @@ -978,7 +978,7 @@ public class MatDeliverFacade { personModel.setCardNo(babyModel.getMcertNo()); personModel.setName(babyModel.getName()); personModel.setCreated(new Date()); - babyModel.setPid(personService.addPerson(personModel).getId()); + //判断妊娠结局是活产才添加数据 if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { @@ -1008,10 +1008,7 @@ public class MatDeliverFacade { { personModel.setYn(YnEnums.NO.getId()); } - - - - + babyModel.setPid(personService.addPerson(personModel).getId()); babyIds.add(babyService.addOneBaby(babyModel).getId()); baby1.setId(babyModel.getId()); @@ -2402,7 +2399,8 @@ public class MatDeliverFacade { babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId())); babyModelQuery.setBuildType(2); babyModelQuery.setOrder("birth"); - // System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery()); + + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery()); List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); if (CollectionUtils.isEmpty(babyModelList)) { newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo());