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 28a78be..1b972a0 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 @@ -33,7 +33,7 @@ import java.util.*; /** * 分娩记录信息 - *
+ *
* Created by Administrator on 2016/6/17 0017. */ @Component @@ -134,7 +134,7 @@ public class MatDeliverFacade { //表示区域的 if (StringUtils.isNotEmpty(organizationGroupsFacade.findByCurrentUserId(hospitalId))) { - String parentId =antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId,-1); + String parentId = antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId, -1); if (StringUtils.isEmpty(parentId)) { logger.warn("get handHideBuild parentId is null."); } @@ -194,7 +194,7 @@ public class MatDeliverFacade { patientsLocal.setIsAutoFm(YnEnums.NO.getId()); patientsLocal.setType(3); patientsLocal.setFmHospital(deliverAddRequest.getFmHospital()); - patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString()); + patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString()); try { patientsLocal.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate)); } catch (Exception e) { @@ -306,13 +306,13 @@ public class MatDeliverFacade { for (MatDeliverAddRequest.Baby baby : list) { MaternalDeliverModel.Baby babyModel = baby.convertToDataModel(); //判断妊娠结局是活产才添加数据 - BabyModel babyModel1=new BabyModel(); - MatDeliverQuery query=new MatDeliverQuery(); + BabyModel babyModel1 = new BabyModel(); + MatDeliverQuery query = new MatDeliverQuery(); query.setId(deliverAddRequest.getId()); babyModel1.setParentId(deliverAddRequest.getParentId()); if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { babyModel1.setYn(YnEnums.YES.getId()); - }else{ + } else { babyModel1.setYn(YnEnums.NO.getId()); } babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime())); @@ -346,7 +346,7 @@ public class MatDeliverFacade { patients1.setType(3); patients1.setIsAutoFm(YnEnums.NO.getId()); patients1.setFmHospital(deliverAddRequest.getFmHospital()); - patients1.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString()); + patients1.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString()); try { patients1.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate)); } catch (Exception e) { @@ -391,8 +391,10 @@ public class MatDeliverFacade { if (fmDate.getTime() >= DateUtil.addDay(patients.getLastMenses(), 168).getTime()) { patients.setFmDate(fmDate); patients.setType(3); - //修改buildtype为0 http://jira.healthbaby.com.cn/browse/WEB-808 - patients.setBuildType(0); + //自动分娩的时候修改buildtype为0 http://jira.healthbaby.com.cn/browse/WEB-808 + if (null != patients.getBuildType() && patients.getBuildType() == 2) { + patients.setBuildType(0); + } patientsService.updatePatient(patients); } } @@ -576,7 +578,7 @@ public class MatDeliverFacade { */ public BaseResponse queryMatDeliver(MatDeliverQueryRequest deliverQueryRequest, Integer userId) { - String hospital=autoMatchFacade.getHospitalId(userId); + String hospital = autoMatchFacade.getHospitalId(userId); //获取 /* Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, -1); if (null == patients) { @@ -585,18 +587,18 @@ public class MatDeliverFacade { Organization og = organizationService.getOrganization(Integer.valueOf(hospital)); //区域模式 - boolean isEnable=og.getbStatus()==1; + boolean isEnable = og.getbStatus() == 1; //外院的孕妇 - Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false, null,true); + Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false, null, true); //外院的产妇 // Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3); //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug //本院的孕妇 - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 1, false, null,isEnable); + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId, false), 1, false, null, isEnable); //本院产妇 - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 3, false, null,isEnable); + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId, false), 3, false, null, isEnable); PersonModelQuery personModelQuery = new PersonModelQuery(); String pid = ""; if (null != patients1) { @@ -1121,7 +1123,7 @@ public class MatDeliverFacade { // 居住类型 if (childbirthManagerRequest.getInitQuery().contains("pliveTypeId")) { try { - if(StringUtils.isNotEmpty(patients.getPliveTypeId())) { + if (StringUtils.isNotEmpty(patients.getPliveTypeId())) { childbirthManagerQueryModel.setPliveTypeId(basicConfigService.getOneBasicConfigById(patients.getPliveTypeId()).getName()); } } catch (Exception e) { @@ -1132,7 +1134,7 @@ public class MatDeliverFacade { // 户口类型 if (childbirthManagerRequest.getInitQuery().contains("pcensusTypeId")) { try { - if(StringUtils.isNotEmpty(patients.getPcensusTypeId())) { + if (StringUtils.isNotEmpty(patients.getPcensusTypeId())) { childbirthManagerQueryModel.setPcensusTypeId(basicConfigService.getOneBasicConfigById(patients.getPcensusTypeId()).getName()); } } catch (Exception e) { @@ -1346,19 +1348,19 @@ public class MatDeliverFacade { Map