jiangjiazhi / regional-platform

Commit 12949550347691886ed0ae315934a155bd8fb4ca

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

秦皇岛定制。产检时增加产筛情况。要同步到主档案

Showing 6 changed files with 71 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java

...	...	@@ -519,6 +519,16 @@
519	519	public String ctgab;
520	520	//TPOAb抗甲状腺过氧化物抗体
521	521	public String ctpoab;
	522	+ //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
	523	+ public Integer productionSieveType;
	524	+
	525	+ public Integer getProductionSieveType() {
	526	+ return productionSieveType;
	527	+ }
	528	+
	529	+ public void setProductionSieveType(Integer productionSieveType) {
	530	+ this.productionSieveType = productionSieveType;
	531	+ }
522	532
523	533	public String getJw() {
524	534	return jw;

...	...	@@ -400,6 +400,17 @@
400	400	//2h
401	401	private String bloodSugar2h;
402	402
	403	+ //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
	404	+ public Integer productionSieveType;
	405	+
	406	+ public Integer getProductionSieveType() {
	407	+ return productionSieveType;
	408	+ }
	409	+
	410	+ public void setProductionSieveType(Integer productionSieveType) {
	411	+ this.productionSieveType = productionSieveType;
	412	+ }
	413	+
403	414	public String getBloodSugarKf() {
404	415	return bloodSugarKf;
405	416	}

...	...	@@ -440,6 +440,16 @@
440	440
441	441	//推荐人
442	442	private String recommend;
	443	+ //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
	444	+ public Integer productionSieveType;
	445	+
	446	+ public Integer getProductionSieveType() {
	447	+ return productionSieveType;
	448	+ }
	449	+
	450	+ public void setProductionSieveType(Integer productionSieveType) {
	451	+ this.productionSieveType = productionSieveType;
	452	+ }
443	453
444	454	public String getRecommend() {
445	455	return recommend;

...	...	@@ -472,6 +472,13 @@
472	472	//添加复诊时添加追访信息
473	473	addTrackDownInfo(userId, patients, antExAddRequest.getNextCheckTime());
474	474	}
	475	+ //秦皇岛定制。如果productionSieveType 0：未产筛 1：已产筛要同步到主档案(如果这个字段前段没有传。说明不需要同步。)
	476	+ if("216".equals(hospitalId) && null!=antExAddRequest.getProductionSieveType()){
	477	+ Patients patients=new Patients();
	478	+ patients.setId(antExAddRequest.getParentId());
	479	+ patients.setProductionSieveType(antExAddRequest.getProductionSieveType());
	480	+ patientsService.updatePatient(patients);
	481	+ }
475	482	//自动数据处理
476	483	updateAutoData(model, antExAddRequest, hospitalId);
477	484	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
...	...	@@ -929,6 +936,14 @@
929	936	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("您已经做过初诊");
930	937	}
931	938	}
	939	+ //秦皇岛定制。如果productionSieveType 0：未产筛 1：已产筛要同步到主档案(如果这个字段前段没有传。说明不需要同步。)
	940	+ if("216".equals(hospitalId) && null!=excAddRequest.getProductionSieveType()){
	941	+ Patients patients=new Patients();
	942	+ patients.setId(excAddRequest.getParentId());
	943	+ patients.setProductionSieveType(excAddRequest.getProductionSieveType());
	944	+ patientsService.updatePatient(patients);
	945	+ }
	946	+
932	947	/**
933	948	* 秦皇岛区域定制：初诊选择预约住院分娩医院同时，修改档案的预约住院分娩医院
934	949	* @Author: 武涛涛

...	...	@@ -388,7 +388,17 @@
388	388	private String oldTeamName;//变更前医生团队名字
389	389	private String reason;//换团队的原因
390	390
	391	+ //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
	392	+ public Integer productionSieveType;
391	393
	394	+ public Integer getProductionSieveType() {
	395	+ return productionSieveType;
	396	+ }
	397	+
	398	+ public void setProductionSieveType(Integer productionSieveType) {
	399	+ this.productionSieveType = productionSieveType;
	400	+ }
	401	+
392	402	public String getBloodSugarKf() {
393	403	return bloodSugarKf;
394	404	}
...	...	@@ -1522,7 +1532,9 @@
1522	1532	examinationModel.setBloodSugarKf(bloodSugarKf);
1523	1533	examinationModel.setBloodSugar1h(bloodSugar1h);
1524	1534	examinationModel.setBloodSugar2h(bloodSugar2h);
1525		-
	1535	+ if(null!=productionSieveType) {
	1536	+ examinationModel.setProductionSieveType(productionSieveType);
	1537	+ }
1526	1538	return examinationModel;
1527	1539	}
1528	1540

...	...	@@ -509,8 +509,17 @@
509	509	public String ctgab;
510	510	//TPOAb抗甲状腺过氧化物抗体
511	511	public String ctpoab;
	512	+ //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
	513	+ public Integer productionSieveType;
512	514
	515	+ public Integer getProductionSieveType() {
	516	+ return productionSieveType;
	517	+ }
513	518
	519	+ public void setProductionSieveType(Integer productionSieveType) {
	520	+ this.productionSieveType = productionSieveType;
	521	+ }
	522	+
514	523	public String getJw() {
515	524	return jw;
516	525	}
...	...	@@ -2559,6 +2568,9 @@
2559	2568	antExChuModel.setCtsh(ctsh);
2560	2569	antExChuModel.setCtgab(ctgab);
2561	2570	antExChuModel.setCtpoab(ctpoab);
	2571	+ if(null!=productionSieveType) {
	2572	+ antExChuModel.setProductionSieveType(productionSieveType);
	2573	+ }
2562	2574	return antExChuModel;
2563	2575	}
2564	2576

秦皇岛定制 。产检时增加产筛情况。 要同步到主档案

秦皇岛定制。产检时增加产筛情况。要同步到主档案