diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index acf99f0..733a081 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -18,6 +18,8 @@ public class AntExChuModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid(); + //预约住院分娩医院 + private String yyzyfmHospitalId; /** * start * 遵化需求新增字段 @@ -1366,6 +1368,14 @@ public class AntExChuModel extends BaseModel { return dirOpinion; } + public String getYyzyfmHospitalId() { + return yyzyfmHospitalId; + } + + public void setYyzyfmHospitalId(String yyzyfmHospitalId) { + this.yyzyfmHospitalId = yyzyfmHospitalId; + } + public void setDirOpinion(String dirOpinion) { this.dirOpinion = dirOpinion; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 89439ff..aa9d214 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -784,6 +784,21 @@ public class AntenatalExaminationFacade { trackDownRecordService.updateTrackDownParent(trackDownRecord, excAddRequest.getParentId()); }*/ antenatalExaminationService.addOneAntEx(antExChuModel); + /** + * 秦皇岛区域定制:初诊选择预约住院分娩医院同时,修改档案的预约住院分娩医院 + * @Author: 武涛涛 + * @Date: 2021/4/21 15:56 + */ + + Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); + //秦皇岛区域 + if(og!=null && "2".equals(og.getCityId()) && StringUtils.isNotEmpty(excAddRequest.getYyzyfmHospitalId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())){ + Patients patients1 = new Patients(); + patients1.setId(antExChuModel.getParentId()); + patients1.setYyzyfmHospitalId(excAddRequest.getYyzyfmHospitalId()); + patientsService.updatePatient(patients1); + } + excAddRequest.setId(antExChuModel.getId()); @@ -3925,6 +3940,8 @@ public class AntenatalExaminationFacade { } if (patients != null) { + antexListResult.setYyzyfmHospitalId(patients.getYyzyfmHospitalId()); + //测量数据 antexListResult.setMeasureData(measureInfoFacade.getMeasureInfo(patients.getPcerteTypeId(), patients.getCardNo(), hospitalId)); //产筛状态 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index 4ec0c61..64c94e8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -383,6 +383,11 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { //babyQuery.setCzOrfzProject("cz"); List babyHighRiskBabyModelList = babyHighRiskBabyService.queryAll(babyQuery); if (CollectionUtils.isNotEmpty(babyHighRiskBabyModelList)) { + BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyModelList.get(0); + if(babyHighRiskBabyModel.getNumber().equals(request.getNumber()) && babyHighRiskBabyModel.getBuildId().equals(request.getBuildId())){ + return false; + } + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); br.setErrormsg("编号已存在"); return true; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 8fff1cc..d62b3c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -21,7 +21,8 @@ import java.util.Map; @Form public class AntExcAddRequest implements IBasicRequestConvert { - + //预约住院分娩医院(初证预约住院分娩医院同时,修改档案的预约住院分娩医院) + private String yyzyfmHospitalId; /** * start * 遵化需求新增字段 @@ -1003,6 +1004,14 @@ public class AntExcAddRequest implements IBasicRequestConvert { return antil; } + public String getYyzyfmHospitalId() { + return yyzyfmHospitalId; + } + + public void setYyzyfmHospitalId(String yyzyfmHospitalId) { + this.yyzyfmHospitalId = yyzyfmHospitalId; + } + public void setAntil(String antil) { this.antil = antil; } @@ -2109,6 +2118,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setZywzzlContent(zywzzlContent); antExChuModel.setZyatzlState(zyatzlState); antExChuModel.setZyatzlContent(zyatzlContent); + antExChuModel.setYyzyfmHospitalId(yyzyfmHospitalId); //次要诊断 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 3fe0714..52e35d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -19,7 +19,8 @@ import java.util.Map; public class AntexListResult { private String id; - + //预约住院分娩医院 + private String yyzyfmHospitalId; private Integer pregnancyTimes; private Integer prodTime; private Integer abortion; @@ -236,6 +237,14 @@ public class AntexListResult { this.cardNo = cardNo; } + public String getYyzyfmHospitalId() { + return yyzyfmHospitalId; + } + + public void setYyzyfmHospitalId(String yyzyfmHospitalId) { + this.yyzyfmHospitalId = yyzyfmHospitalId; + } + public String getVcCardNo() { return vcCardNo; }