From 5caccd0045b57572637137f4e7bb89f6d65c066d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 14 Oct 2020 13:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E8=AE=B0=E5=BD=95=E5=87=BA?= =?UTF-8?q?=E7=94=9F=E8=AF=81=E6=98=8E=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BookbuildingFacade.java | 84 ++++++++++++++-------- 1 file changed, 54 insertions(+), 30 deletions(-) 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 82bd18f..0af35f8 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 @@ -1779,41 +1779,65 @@ public class BookbuildingFacade { patient.setAreaPostRestId(yunRequest.getChildbirthAreaId()); patient.setStreetPostRestId(yunRequest.getChildbirthStreetId()); - //丈夫信息 - patient.setHusbandName(yunRequest.getHusbandName()); - patient.setHcertificateTypeId(yunRequest.getHusbandCertificateTypeId()); - - if (StringUtils.isNotEmpty(yunRequest.getHusbandCertificateTypeId()) && StringUtils.isNotEmpty(yunRequest.getHusbandCertificateNum())) { - BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); - basicConfigQuery.setId(yunRequest.getHusbandCertificateTypeId()); - basicConfigQuery.setYn(YnEnums.YES.getId()); - List data = basicConfigService.queryBasicConfig(basicConfigQuery); - if (CollectionUtils.isNotEmpty(data)) { - //身份证类型得到丈夫的生日 必须为身份证类型 - if (StringUtils.isNotEmpty(data.get(0).getCode()) && "SFZ".endsWith(data.get(0).getCode())) { - String cardNo = yunRequest.getHusbandCertificateNum(); - Date birth = StringUtils.getBirthDay(cardNo); - patient.setHusbandBirth(birth); + + if(yunRequest.getReqHusband() != null && yunRequest.getReqHusband()) + { + //丈夫信息 + patient.setHusbandName(""); + patient.setHcertificateTypeId(""); + patient.setHusbandBirth(null); + patient.setHcertificateNum(""); + patient.setHusbandPhone(""); + patient.setHcountryId(""); + patient.setHnationId(""); + patient.setHprofessionTypeId(""); + patient.setHworkUnit(""); + patient.setHaddressRegister(""); + patient.setHprovinceRegisterId(""); + patient.setHcityRegisterId(""); + patient.setHareaRegisterId(""); + patient.setHstreetRegisterId(""); + patient.setHlevelTypeId(""); + } + else + { + //丈夫信息 + patient.setHusbandName(yunRequest.getHusbandName()); + patient.setHcertificateTypeId(yunRequest.getHusbandCertificateTypeId()); + + if (StringUtils.isNotEmpty(yunRequest.getHusbandCertificateTypeId()) && StringUtils.isNotEmpty(yunRequest.getHusbandCertificateNum())) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setId(yunRequest.getHusbandCertificateTypeId()); + basicConfigQuery.setYn(YnEnums.YES.getId()); + List data = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(data)) { + //身份证类型得到丈夫的生日 必须为身份证类型 + if (StringUtils.isNotEmpty(data.get(0).getCode()) && "SFZ".endsWith(data.get(0).getCode())) { + String cardNo = yunRequest.getHusbandCertificateNum(); + Date birth = StringUtils.getBirthDay(cardNo); + patient.setHusbandBirth(birth); + } } } - } - if (StringUtils.isNotEmpty(yunRequest.getHusbandBirth())) {//如果前端传入的丈夫生日，则用传入的数据 - patient.setHusbandBirth(DateUtil.parseYMD(yunRequest.getHusbandBirth())); + if (StringUtils.isNotEmpty(yunRequest.getHusbandBirth())) {//如果前端传入的丈夫生日，则用传入的数据 + patient.setHusbandBirth(DateUtil.parseYMD(yunRequest.getHusbandBirth())); + } + + patient.setHcertificateNum(yunRequest.getHusbandCertificateNum()); + patient.setHusbandPhone(yunRequest.getHusbandPhone()); + patient.setHcountryId(yunRequest.getHusbandCountryId()); + patient.setHnationId(yunRequest.getHusbandNationId()); + patient.setHprofessionTypeId(yunRequest.getHusbandProfessionTypeId()); + patient.setHworkUnit(yunRequest.getHusbandWorkUnit()); + patient.setHaddressRegister(yunRequest.getHusbandAddressRegister()); + patient.setHprovinceRegisterId(yunRequest.getHusbandProvinceRegisterId()); + patient.setHcityRegisterId(yunRequest.getHusbandCityRegisterId()); + patient.setHareaRegisterId(yunRequest.getHusbandAreaRegisterId()); + patient.setHstreetRegisterId(yunRequest.getHusbandStreetRegisterId()); + patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId()); } - patient.setHcertificateNum(yunRequest.getHusbandCertificateNum()); - patient.setHusbandPhone(yunRequest.getHusbandPhone()); - patient.setHcountryId(yunRequest.getHusbandCountryId()); - patient.setHnationId(yunRequest.getHusbandNationId()); - patient.setHprofessionTypeId(yunRequest.getHusbandProfessionTypeId()); - patient.setHworkUnit(yunRequest.getHusbandWorkUnit()); - patient.setHaddressRegister(yunRequest.getHusbandAddressRegister()); - patient.setHprovinceRegisterId(yunRequest.getHusbandProvinceRegisterId()); - patient.setHcityRegisterId(yunRequest.getHusbandCityRegisterId()); - patient.setHareaRegisterId(yunRequest.getHusbandAreaRegisterId()); - patient.setHstreetRegisterId(yunRequest.getHusbandStreetRegisterId()); - patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId()); if (yunRequest.getExpType() != null) { if (yunRequest.getExpType() == ExpYunEnums.SGY.getId()) { -- 1.8.3.1