jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 56 additions and 2 deletions

...	...	@@ -736,6 +736,17 @@
736	736	}
737	737	/***********************************************************/
738	738
	739	+ //滦平儿童建档下次检查项
	740	+ private String nextCheckItem;
	741	+
	742	+ public String getNextCheckItem() {
	743	+ return nextCheckItem;
	744	+ }
	745	+
	746	+ public void setNextCheckItem(String nextCheckItem) {
	747	+ this.nextCheckItem = nextCheckItem;
	748	+ }
	749	+
739	750	public Integer getDeafnessGene() {
740	751	return deafnessGene;
741	752	}

...	...	@@ -518,6 +518,8 @@
518	518
519	519	model.setId(request.getId());
520	520	model.setPid(pid);
	521	+ //滦平儿童建档-下次检查项
	522	+ model.setNextCheckItem(request.getNextCheckItem());
521	523	patientsService.updateRefer(model);
522	524	//如果当前是建档医院,那么需要修改其他非建档医院的数据
523	525	if (autoMatchFacade.checkBStatus(userId)) {
...	...	@@ -901,6 +903,8 @@
901	903	model.setEndCase(0);//秦皇岛，默认未结案
902	904
903	905	setRiskCode(model);
	906	+ //滦平儿童建档-下次检查项
	907	+ model.setNextCheckItem(request.getNextCheckItem());
904	908	model = babyBookbuildingService.addBabyBookbuilding(model);
905	909
906	910
...	...	@@ -1760,6 +1764,10 @@
1760	1764	List <Map <String, Object>> riskList = mongoUtil.findColor(patients.getRiskFactorId());
1761	1765	result.setmHighRiskReason(riskList);
1762	1766	}
	1767	+ }
	1768	+ //滦平-儿童建档下次检查项
	1769	+ if(StringUtils.isNotEmpty(model.getNextCheckItem())){
	1770	+ result.setNextCheckItem(model.getNextCheckItem());
1763	1771	}
1764	1772	}
1765	1773

...	...	@@ -4678,7 +4678,7 @@
4678	4678	/**
4679	4679	* 1-4个月
4680	4680	*/
4681		- cms=1;cme=4;
	4681	+ cms=1;cme=3;
4682	4682	middleHls="60";middleHln="89";
4683	4683	matterHls="30";matterHln="59";severityHll="30";
4684	4684	break;
...	...	@@ -4686,7 +4686,7 @@
4686	4686	/**
4687	4687	* 4-6个月
4688	4688	*/
4689		- cms=4;cme=6;
	4689	+ cms=4;cme=5;
4690	4690	//（90-100g/l）
4691	4691	lightHls="90";lightHln="100"; middleHls="60";middleHln="89";
4692	4692	matterHls="30";matterHln="59";severityHll="30";

...	...	@@ -5600,6 +5600,10 @@
5600	5600	result.setDiseases(diseases.toString());
5601	5601
5602	5602	result.setRiskCode(com.lyms.platform.common.utils.StringUtils.riskCodeStr(model.getRiskCode()));
	5603	+ //滦平-儿童建档下次检查项
	5604	+ if(StringUtils.isNotEmpty(model.getNextCheckItem())){
	5605	+ result.setNextCheckItem(model.getNextCheckItem());
	5606	+ }
5603	5607	}
5604	5608
5605	5609	/** 优惠券编号 */

...	...	@@ -420,6 +420,17 @@
420	420
421	421	/********************************************/
422	422
	423	+ //滦平儿童建档下次检查项
	424	+ private String nextCheckItem;
	425	+
	426	+ public String getNextCheckItem() {
	427	+ return nextCheckItem;
	428	+ }
	429	+
	430	+ public void setNextCheckItem(String nextCheckItem) {
	431	+ this.nextCheckItem = nextCheckItem;
	432	+ }
	433	+
423	434	public List<String> getDiseases() {
424	435	return diseases;
425	436	}

...	...	@@ -362,6 +362,16 @@
362	362
363	363	/********************************************/
364	364
	365	+ //滦平儿童建档下次检查项
	366	+ private String nextCheckItem;
	367	+
	368	+ public String getNextCheckItem() {
	369	+ return nextCheckItem;
	370	+ }
	371	+
	372	+ public void setNextCheckItem(String nextCheckItem) {
	373	+ this.nextCheckItem = nextCheckItem;
	374	+ }
365	375	public List<Map> getDiseases() {
366	376	return diseases;
367	377	}

...	...	@@ -355,6 +355,16 @@
355	355
356	356	/********************************************/
357	357
	358	+ //滦平儿童建档下次检查项
	359	+ private String nextCheckItem;
	360	+
	361	+ public String getNextCheckItem() {
	362	+ return nextCheckItem;
	363	+ }
	364	+
	365	+ public void setNextCheckItem(String nextCheckItem) {
	366	+ this.nextCheckItem = nextCheckItem;
	367	+ }
358	368	public String getDiseases() {
359	369	return diseases;
360	370	}