diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 811e6d1..d081dad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1188,6 +1188,10 @@ public class BookbuildingFacade { } } + if(StringUtils.isNotEmpty(yunRequest.getHusbandBirth())){//如果前端传入的丈夫生日,则用传入的数据 + patient.setHusbandBirth(DateUtil.parseYMD(yunRequest.getHusbandBirth())); + } + patient.setHcertificateNum(yunRequest.getHusbandCertificateNum()); patient.setHusbandPhone(yunRequest.getHusbandPhone()); patient.setHcountryId(yunRequest.getHusbandCountryId()); @@ -1353,7 +1357,7 @@ public class BookbuildingFacade { /****************丈夫信息**************/ result.setHusbandName(p.getHusbandName()); result.setHusbandPhone(p.getHusbandPhone()); - + result.setHusbandBirth(DateUtil.getyyyy_MM_dd(p.getHusbandBirth())); result.setHusbandCertificateTypeId(p.getHcertificateTypeId()); result.setHusbandCertificateNum(p.getHcertificateNum()); result.setHusbandCountryId(p.getHcountryId()); 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 06852a2..5c69afb 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 @@ -147,6 +147,7 @@ public class MatDeliverFacade { babyMap.put("0", b6); } + /** * 增加或者修改分娩记录 * @@ -281,10 +282,17 @@ public class MatDeliverFacade { maternalDeliverModel.setHospitalId(hospitalId); } //做分娩的时候需要删除产筛数据 - sieveService.deleteSieve(deliverAddRequest.getParentId(), hospitalId, null); maternalDeliverModel.setYn(YnEnums.YES.getId()); + //可能baby保存失败,所以导致babyId为null,这里为了处理打印出生医学证明 + for(MaternalDeliverModel.Baby baby:maternalDeliverModel.getBaby()){ + if(StringUtils.isEmpty(baby.getId())){//如果是空则创建一个uuid,但是baby表还是没有数据,处理办法是医生手动去建档(泉渝说) + baby.setId(com.lyms.platform.common.utils.StringUtils.uuid()); + } + } + + //新增分娩信息 matDeliverService.addMatDeliver(maternalDeliverModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index e0d143b..4ce2d40 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -208,6 +208,8 @@ public class YunBookbuildingAddRequest { private String husbandCertificateNum; //证件类型 private String husbandCertificateTypeId; + //丈夫生日 + private String husbandBirth; //国籍 private String husbandCountryId; //民族 @@ -304,6 +306,14 @@ public class YunBookbuildingAddRequest { @NotEmpty(message = "填写日期") private String fillDate; + public String getHusbandBirth() { + return husbandBirth; + } + + public void setHusbandBirth(String husbandBirth) { + this.husbandBirth = husbandBirth; + } + public String getFillDate() { return fillDate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 11b5ee6..0dda2d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -196,6 +196,8 @@ public class PregnantInfoResult { //丈夫姓名 private String husbandName; + //丈夫生日 + private String husbandBirth; //证件号 private String husbandCertificateNum; //证件类型 @@ -264,6 +266,14 @@ public class PregnantInfoResult { //分娩状态 0未终止妊娠 1终止妊娠 private Integer dueStatus; + public String getHusbandBirth() { + return husbandBirth; + } + + public void setHusbandBirth(String husbandBirth) { + this.husbandBirth = husbandBirth; + } + public boolean isSendCoupon() { return isSendCoupon; }