jiangjiazhi / regional-platform

Authored by wtt about 4 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 53 additions and 2 deletions

...	...	@@ -18,6 +18,8 @@
18	18
19	19	private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
20	20
	21	+ //预约住院分娩医院
	22	+ private String yyzyfmHospitalId;
21	23	/**
22	24	* start
23	25	* 遵化需求新增字段
...	...	@@ -1364,6 +1366,14 @@
1364	1366
1365	1367	public String getDirOpinion() {
1366	1368	return dirOpinion;
	1369	+ }
	1370	+
	1371	+ public String getYyzyfmHospitalId() {
	1372	+ return yyzyfmHospitalId;
	1373	+ }
	1374	+
	1375	+ public void setYyzyfmHospitalId(String yyzyfmHospitalId) {
	1376	+ this.yyzyfmHospitalId = yyzyfmHospitalId;
1367	1377	}
1368	1378
1369	1379	public void setDirOpinion(String dirOpinion) {

...	...	@@ -784,6 +784,21 @@
784	784	trackDownRecordService.updateTrackDownParent(trackDownRecord, excAddRequest.getParentId());
785	785	}*/
786	786	antenatalExaminationService.addOneAntEx(antExChuModel);
	787	+ /**
	788	+ * 秦皇岛区域定制：初诊选择预约住院分娩医院同时，修改档案的预约住院分娩医院
	789	+ * @Author: 武涛涛
	790	+ * @Date: 2021/4/21 15:56
	791	+ */
	792	+
	793	+ Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId));
	794	+ //秦皇岛区域
	795	+ if(og!=null && "2".equals(og.getCityId()) && StringUtils.isNotEmpty(excAddRequest.getYyzyfmHospitalId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())){
	796	+ Patients patients1 = new Patients();
	797	+ patients1.setId(antExChuModel.getParentId());
	798	+ patients1.setYyzyfmHospitalId(excAddRequest.getYyzyfmHospitalId());
	799	+ patientsService.updatePatient(patients1);
	800	+ }
	801	+
787	802	excAddRequest.setId(antExChuModel.getId());
788	803
789	804
...	...	@@ -3925,6 +3940,8 @@
3925	3940	}
3926	3941
3927	3942	if (patients != null) {
	3943	+ antexListResult.setYyzyfmHospitalId(patients.getYyzyfmHospitalId());
	3944	+
3928	3945	//测量数据
3929	3946	antexListResult.setMeasureData(measureInfoFacade.getMeasureInfo(patients.getPcerteTypeId(), patients.getCardNo(), hospitalId));
3930	3947	//产筛状态

...	...	@@ -383,6 +383,11 @@
383	383	//babyQuery.setCzOrfzProject("cz");
384	384	List <BabyHighRiskBabyModel> babyHighRiskBabyModelList = babyHighRiskBabyService.queryAll(babyQuery);
385	385	if (CollectionUtils.isNotEmpty(babyHighRiskBabyModelList)) {
	386	+ BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyModelList.get(0);
	387	+ if(babyHighRiskBabyModel.getNumber().equals(request.getNumber()) && babyHighRiskBabyModel.getBuildId().equals(request.getBuildId())){
	388	+ return false;
	389	+ }
	390	+
386	391	br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
387	392	br.setErrormsg("编号已存在");
388	393	return true;

...	...	@@ -21,7 +21,8 @@
21	21	@Form
22	22	public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
23	23
24		-
	24	+ //预约住院分娩医院(初证预约住院分娩医院同时，修改档案的预约住院分娩医院)
	25	+ private String yyzyfmHospitalId;
25	26	/**
26	27	* start
27	28	* 遵化需求新增字段
...	...	@@ -1003,6 +1004,14 @@
1003	1004	return antil;
1004	1005	}
1005	1006
	1007	+ public String getYyzyfmHospitalId() {
	1008	+ return yyzyfmHospitalId;
	1009	+ }
	1010	+
	1011	+ public void setYyzyfmHospitalId(String yyzyfmHospitalId) {
	1012	+ this.yyzyfmHospitalId = yyzyfmHospitalId;
	1013	+ }
	1014	+
1006	1015	public void setAntil(String antil) {
1007	1016	this.antil = antil;
1008	1017	}
...	...	@@ -2109,6 +2118,7 @@
2109	2118	antExChuModel.setZywzzlContent(zywzzlContent);
2110	2119	antExChuModel.setZyatzlState(zyatzlState);
2111	2120	antExChuModel.setZyatzlContent(zyatzlContent);
	2121	+ antExChuModel.setYyzyfmHospitalId(yyzyfmHospitalId);
2112	2122
2113	2123
2114	2124	//次要诊断

...	...	@@ -19,7 +19,8 @@
19	19	public class AntexListResult {
20	20
21	21	private String id;
22		-
	22	+ //预约住院分娩医院
	23	+ private String yyzyfmHospitalId;
23	24	private Integer pregnancyTimes;
24	25	private Integer prodTime;
25	26	private Integer abortion;
...	...	@@ -234,6 +235,14 @@
234	235
235	236	public void setCardNo(String cardNo) {
236	237	this.cardNo = cardNo;
	238	+ }
	239	+
	240	+ public String getYyzyfmHospitalId() {
	241	+ return yyzyfmHospitalId;
	242	+ }
	243	+
	244	+ public void setYyzyfmHospitalId(String yyzyfmHospitalId) {
	245	+ this.yyzyfmHospitalId = yyzyfmHospitalId;
237	246	}
238	247
239	248	public String getVcCardNo() {