jiangjiazhi / regional-platform

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

Showing 6 changed files with 154 additions and 5 deletions

...	...	@@ -616,7 +616,7 @@
616	616	private String lncs;
617	617	private String xzcs;
618	618	/**
619		- * 隆化-儿童检查增加：听性脑干反应、耳声发射
	619	+ * 隆化儿保需求问题2022.1.4
620	620	*/
621	621	//听性脑干反应左右
622	622	private Map<String, String> ztxng;
...	...	@@ -624,6 +624,37 @@
624	624	//耳声发射左右
625	625	private Map<String, String> zesfs;
626	626	private Map<String, String> yesfs;
	627	+
	628	+ //轻度贫血
	629	+ private Map<String,String> mildAnaemia;
	630	+ //中度贫血
	631	+ private Map<String,String> moderateAnaemia;
	632	+ //心脏杂音
	633	+ private Map<String,String> heartMurmur;
	634	+
	635	+ public Map<String, String> getMildAnaemia() {
	636	+ return mildAnaemia;
	637	+ }
	638	+
	639	+ public void setMildAnaemia(Map<String, String> mildAnaemia) {
	640	+ this.mildAnaemia = mildAnaemia;
	641	+ }
	642	+
	643	+ public Map<String, String> getModerateAnaemia() {
	644	+ return moderateAnaemia;
	645	+ }
	646	+
	647	+ public void setModerateAnaemia(Map<String, String> moderateAnaemia) {
	648	+ this.moderateAnaemia = moderateAnaemia;
	649	+ }
	650	+
	651	+ public Map<String, String> getHeartMurmur() {
	652	+ return heartMurmur;
	653	+ }
	654	+
	655	+ public void setHeartMurmur(Map<String, String> heartMurmur) {
	656	+ this.heartMurmur = heartMurmur;
	657	+ }
627	658
628	659	public Map<String, String> getZtxng() {
629	660	return ztxng;

...	...	@@ -650,6 +650,16 @@
650	650	if(MapUtils.isNotEmpty(request.getYesfs())){
651	651	model.setYesfs(request.getYesfs());
652	652	}
	653	+ //轻度贫血、中度贫血、心脏杂音
	654	+ if(MapUtils.isNotEmpty(request.getMildAnaemia())){
	655	+ model.setMildAnaemia(request.getMildAnaemia());
	656	+ }
	657	+ if(MapUtils.isNotEmpty(request.getModerateAnaemia())){
	658	+ model.setModerateAnaemia(request.getModerateAnaemia());
	659	+ }
	660	+ if(MapUtils.isNotEmpty(request.getHeartMurmur())){
	661	+ model.setHeartMurmur(request.getHeartMurmur());
	662	+ }
653	663
654	664	return model;
655	665	}
...	...	@@ -2556,6 +2566,16 @@
2556	2566	}
2557	2567	if(MapUtils.isNotEmpty(checkModel.getYesfs())){
2558	2568	model.setYesfs(checkModel.getYesfs());
	2569	+ }
	2570	+ //轻度贫血、中度贫血、心脏杂音
	2571	+ if(MapUtils.isNotEmpty(checkModel.getMildAnaemia())){
	2572	+ model.setMildAnaemia(checkModel.getMildAnaemia());
	2573	+ }
	2574	+ if(MapUtils.isNotEmpty(checkModel.getModerateAnaemia())){
	2575	+ model.setModerateAnaemia(checkModel.getModerateAnaemia());
	2576	+ }
	2577	+ if(MapUtils.isNotEmpty(checkModel.getHeartMurmur())){
	2578	+ model.setHeartMurmur(checkModel.getHeartMurmur());
2559	2579	}
2560	2580
2561	2581	return model;

...	...	@@ -6405,7 +6405,16 @@
6405	6405	if(MapUtils.isNotEmpty(checkModel.getYesfs())){
6406	6406	model.setYesfs(checkModel.getYesfs());
6407	6407	}
6408		-
	6408	+ //轻度贫血、中度贫血、心脏杂音
	6409	+ if(MapUtils.isNotEmpty(checkModel.getMildAnaemia())){
	6410	+ model.setMildAnaemia(checkModel.getMildAnaemia());
	6411	+ }
	6412	+ if(MapUtils.isNotEmpty(checkModel.getModerateAnaemia())){
	6413	+ model.setModerateAnaemia(checkModel.getModerateAnaemia());
	6414	+ }
	6415	+ if(MapUtils.isNotEmpty(checkModel.getHeartMurmur())){
	6416	+ model.setHeartMurmur(checkModel.getHeartMurmur());
	6417	+ }
6409	6418	return model;
6410	6419
6411	6420	}

...	...	@@ -577,7 +577,7 @@
577	577	private String lncs;
578	578	private String xzcs;
579	579	/**
580		- * 隆化-儿童检查增加：听性脑干反应、耳声发射
	580	+ * 隆化儿保需求问题2022.1.4
581	581	*/
582	582	//听性脑干反应左右
583	583	private Map ztxng;
584	584
...	...	@@ -585,7 +585,36 @@
585	585	//耳声发射左右
586	586	private Map zesfs;
587	587	private Map yesfs;
	588	+ //轻度贫血
	589	+ private Map<String,String> mildAnaemia;
	590	+ //中度贫血
	591	+ private Map<String,String> moderateAnaemia;
	592	+ //心脏杂音
	593	+ private Map<String,String> heartMurmur;
588	594
	595	+ public Map<String, String> getMildAnaemia() {
	596	+ return mildAnaemia;
	597	+ }
	598	+
	599	+ public void setMildAnaemia(Map<String, String> mildAnaemia) {
	600	+ this.mildAnaemia = mildAnaemia;
	601	+ }
	602	+
	603	+ public Map<String, String> getModerateAnaemia() {
	604	+ return moderateAnaemia;
	605	+ }
	606	+
	607	+ public void setModerateAnaemia(Map<String, String> moderateAnaemia) {
	608	+ this.moderateAnaemia = moderateAnaemia;
	609	+ }
	610	+
	611	+ public Map<String, String> getHeartMurmur() {
	612	+ return heartMurmur;
	613	+ }
	614	+
	615	+ public void setHeartMurmur(Map<String, String> heartMurmur) {
	616	+ this.heartMurmur = heartMurmur;
	617	+ }
589	618
590	619	public Map getZtxng() {
591	620	return ztxng;

...	...	@@ -794,7 +794,7 @@
794	794	private String xzcs;
795	795
796	796	/**
797		- * 隆化-儿童检查增加：听性脑干反应、耳声发射
	797	+ * 隆化儿保需求问题2022.1.4
798	798	*/
799	799	//听性脑干反应左右
800	800	private Map ztxng;
...	...	@@ -802,6 +802,36 @@
802	802	//耳声发射左右
803	803	private Map zesfs;
804	804	private Map yesfs;
	805	+ //轻度贫血
	806	+ private Map<String,String> mildAnaemia;
	807	+ //中度贫血
	808	+ private Map<String,String> moderateAnaemia;
	809	+ //心脏杂音
	810	+ private Map<String,String> heartMurmur;
	811	+
	812	+ public Map<String, String> getMildAnaemia() {
	813	+ return mildAnaemia;
	814	+ }
	815	+
	816	+ public void setMildAnaemia(Map<String, String> mildAnaemia) {
	817	+ this.mildAnaemia = mildAnaemia;
	818	+ }
	819	+
	820	+ public Map<String, String> getModerateAnaemia() {
	821	+ return moderateAnaemia;
	822	+ }
	823	+
	824	+ public void setModerateAnaemia(Map<String, String> moderateAnaemia) {
	825	+ this.moderateAnaemia = moderateAnaemia;
	826	+ }
	827	+
	828	+ public Map<String, String> getHeartMurmur() {
	829	+ return heartMurmur;
	830	+ }
	831	+
	832	+ public void setHeartMurmur(Map<String, String> heartMurmur) {
	833	+ this.heartMurmur = heartMurmur;
	834	+ }
805	835
806	836	public Map getZtxng() {
807	837	return ztxng;

...	...	@@ -817,7 +817,7 @@
817	817	private String xzcs;
818	818
819	819	/**
820		- * 隆化-儿童检查增加：听性脑干反应、耳声发射
	820	+ * 隆化儿保需求问题2022.1.4
821	821	*/
822	822	//听性脑干反应左右
823	823	private Map ztxng;
...	...	@@ -825,6 +825,36 @@
825	825	//耳声发射左右
826	826	private Map zesfs;
827	827	private Map yesfs;
	828	+ //轻度贫血
	829	+ private Map<String,String> mildAnaemia;
	830	+ //中度贫血
	831	+ private Map<String,String> moderateAnaemia;
	832	+ //心脏杂音
	833	+ private Map<String,String> heartMurmur;
	834	+
	835	+ public Map<String, String> getMildAnaemia() {
	836	+ return mildAnaemia;
	837	+ }
	838	+
	839	+ public void setMildAnaemia(Map<String, String> mildAnaemia) {
	840	+ this.mildAnaemia = mildAnaemia;
	841	+ }
	842	+
	843	+ public Map<String, String> getModerateAnaemia() {
	844	+ return moderateAnaemia;
	845	+ }
	846	+
	847	+ public void setModerateAnaemia(Map<String, String> moderateAnaemia) {
	848	+ this.moderateAnaemia = moderateAnaemia;
	849	+ }
	850	+
	851	+ public Map<String, String> getHeartMurmur() {
	852	+ return heartMurmur;
	853	+ }
	854	+
	855	+ public void setHeartMurmur(Map<String, String> heartMurmur) {
	856	+ this.heartMurmur = heartMurmur;
	857	+ }
828	858
829	859	public Map getZtxng() {
830	860	return ztxng;