liquanyu / regional-platform

Commit 21caa5ad07f4e0333fdb53ee717e8b283d4ca87a

Authored by wtt almost 6 years ago

update

Showing 4 changed files with 389 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java

...	...	@@ -124,6 +124,47 @@
124	124	//VitD治疗（品名、剂量）
125	125	private String vitdzl;
126	126
	127	+ //血钙
	128	+ private String xgCheck;
	129	+ //血磷
	130	+ private String xlCheck;
	131	+ //血AKP
	132	+ private String xlakpCheck;
	133	+ //血25-(OH)D
	134	+ private String xlohdCheck;
	135	+
	136	+
	137	+ public String getXgCheck() {
	138	+ return xgCheck;
	139	+ }
	140	+
	141	+ public void setXgCheck(String xgCheck) {
	142	+ this.xgCheck = xgCheck;
	143	+ }
	144	+
	145	+ public String getXlCheck() {
	146	+ return xlCheck;
	147	+ }
	148	+
	149	+ public void setXlCheck(String xlCheck) {
	150	+ this.xlCheck = xlCheck;
	151	+ }
	152	+
	153	+ public String getXlakpCheck() {
	154	+ return xlakpCheck;
	155	+ }
	156	+
	157	+ public void setXlakpCheck(String xlakpCheck) {
	158	+ this.xlakpCheck = xlakpCheck;
	159	+ }
	160	+
	161	+ public String getXlohdCheck() {
	162	+ return xlohdCheck;
	163	+ }
	164	+
	165	+ public void setXlohdCheck(String xlohdCheck) {
	166	+ this.xlohdCheck = xlohdCheck;
	167	+ }
127	168
128	169	public String getCaseClosed() {
129	170	return caseClosed;

...	...	@@ -125,6 +125,11 @@
125	125	model.setHwhdDate(request.getHwhdDate());
126	126	model.setVitdzl(request.getVitdzl());
127	127
	128	+ model.setXgCheck(request.getXgCheck());
	129	+ model.setXlCheck(request.getXlCheck());
	130	+ model.setXlakpCheck(request.getXlakpCheck());
	131	+ model.setXlohdCheck(request.getXlohdCheck());
	132	+
128	133	return model;
129	134
130	135	}

...	...	@@ -75,7 +75,7 @@
75	75
76	76	//开始管理日期
77	77	private String startMdate;
78		- //出生史true是选中默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴
	78	+ //出生史 true是选中默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴
79	79	private Map<String, Object> birthHistory;
80	80	//6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
81	81	private Map<String, Object> feedingHistory6;
...	...	@@ -99,7 +99,7 @@
99	99	private String myqpxWeek;
100	100	//母孕期贫血情况：Hb
101	101	private String myqpxHb;
102		- //铁剂治疗 wu:true 无 you:true 有 yw:药物 jl:剂量 lc:疗程
	102	+ //铁剂治疗 "yesOrNo": "yes" no无 yes 有 yw:药物 jl:剂量 lc:疗程
103	103	private Map<String, Object> tjzl;
104	104	//母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
105	105	private Map<String, Object> mrwyHistory;
...	...	@@ -113,7 +113,7 @@
113	113	private String treatment;
114	114	//母孕期和哺乳期 wbc:true rzbz:true xzjl:true
115	115	private Map<String, Object> myqbrq;
116		- //儿童服用VitD wu:true 无 you:true 有 month:月 day:天 pm:品名 jl:剂量
	116	+ //儿童服用VitD "yesOrNo": "yes" no无 yes 有 , month:月 day:天 pm:品名 jl:剂量
117	117	private Map<String, Object> vitd;
118	118	//体征 fl:true 方颅□ lgcz:true 肋骨串珠□ lrggk:true 肋软骨沟□ jxk:true 鸡胸□ szk:true 手(足)镯□ xxt:true X型腿□ oxtk:true O型腿□
119	119	private Map<String, Object> tiz;
...	...	@@ -126,6 +126,46 @@
126	126	//VitD治疗（品名、剂量）
127	127	private String vitdzl;
128	128
	129	+ //血钙
	130	+ private String xgCheck;
	131	+ //血磷
	132	+ private String xlCheck;
	133	+ //血AKP
	134	+ private String xlakpCheck;
	135	+ //血25-(OH)D
	136	+ private String xlohdCheck;
	137	+
	138	+ public String getXgCheck() {
	139	+ return xgCheck;
	140	+ }
	141	+
	142	+ public String getXlCheck() {
	143	+ return xlCheck;
	144	+ }
	145	+
	146	+ public String getXlakpCheck() {
	147	+ return xlakpCheck;
	148	+ }
	149	+
	150	+ public String getXlohdCheck() {
	151	+ return xlohdCheck;
	152	+ }
	153	+
	154	+ public void setXgCheck(String xgCheck) {
	155	+ this.xgCheck = xgCheck;
	156	+ }
	157	+
	158	+ public void setXlCheck(String xlCheck) {
	159	+ this.xlCheck = xlCheck;
	160	+ }
	161	+
	162	+ public void setXlakpCheck(String xlakpCheck) {
	163	+ this.xlakpCheck = xlakpCheck;
	164	+ }
	165	+
	166	+ public void setXlohdCheck(String xlohdCheck) {
	167	+ this.xlohdCheck = xlohdCheck;
	168	+ }
129	169
130	170	public String getCaseClosed() {
131	171	return caseClosed;

...	...	@@ -3,8 +3,8 @@
3	3
4	4	import com.lyms.platform.common.base.IBasicResultConvert;
5	5	import com.lyms.platform.common.utils.DateUtil;
	6	+import com.lyms.platform.operate.web.utils.FunvCommonUtil;
6	7	import com.lyms.platform.pojo.BabyNutritionSpecialtyModel;
7		-import com.lyms.platform.pojo.BabyPsychologistModel;
8	8
9	9	import java.util.Date;
10	10	import java.util.Map;
11	11
...	...	@@ -69,8 +69,10 @@
69	69	private String startMdate;
70	70	//出生史true是选中默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴
71	71	private Map<String, Object> birthHistory;
	72	+ private String birthHistoryStr;
72	73	//6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
73	74	private Map<String, Object> feedingHistory6;
	75	+ private String feedingHistory6Str;
74	76	//开始食物转换年龄
75	77	private String foodToAge;
76	78	//既往患病情况
77	79
78	80
...	...	@@ -91,10 +93,12 @@
91	93	private String myqpxWeek;
92	94	//母孕期贫血情况：Hb
93	95	private String myqpxHb;
94		- //铁剂治疗 wu:true 无 you:true 有 yw:药物 jl:剂量 lc:疗程
	96	+ //铁剂治疗 yw:药物 jl:剂量 lc:疗程
95	97	private Map<String, Object> tjzl;
	98	+ private String tjzlStr;
96	99	//母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
97	100	private Map<String, Object> mrwyHistory;
	101	+ private String mrwyHistoryStr;
98	102	//儿童开始添加含铁食物年龄
99	103	private String kstjhtswage;
100	104	//儿童既往患病情况
101	105
102	106
103	107
...	...	@@ -105,12 +109,24 @@
105	109	private String treatment;
106	110	//母孕期和哺乳期 wbc:true rzbz:true xzjl:true
107	111	private Map<String, Object> myqbrq;
	112	+ private String myqbrqStr;
108	113	//儿童服用VitD wu:true 无 you:true 有 month:月 day:天 pm:品名 jl:剂量
109	114	private Map<String, Object> vitd;
	115	+ private String vitdStr;
110	116	//体征 fl:true 方颅□ lgcz:true 肋骨串珠□ lrggk:true 肋软骨沟□ jxk:true 鸡胸□ szk:true 手(足)镯□ xxt:true X型腿□ oxtk:true O型腿□
111	117	private Map<String, Object> tiz;
	118	+ private String tizStr;
112	119	//血液检查
113	120	private String bloodCheck;
	121	+ //血钙
	122	+ private String xgCheck;
	123	+ //血磷
	124	+ private String xlCheck;
	125	+ //血AKP
	126	+ private String xlakpCheck;
	127	+ //血25-(OH)D
	128	+ private String xlohdCheck;
	129	+
114	130	//X线检查
115	131	private String xxCheck;
116	132	//户外活动时间（小时/日）
117	133
...	...	@@ -118,7 +134,94 @@
118	134	//VitD治疗（品名、剂量）
119	135	private String vitdzl;
120	136
	137	+ public String getXgCheck() {
	138	+ return xgCheck;
	139	+ }
121	140
	141	+ public void setXgCheck(String xgCheck) {
	142	+ this.xgCheck = xgCheck;
	143	+ }
	144	+
	145	+ public String getXlCheck() {
	146	+ return xlCheck;
	147	+ }
	148	+
	149	+ public void setXlCheck(String xlCheck) {
	150	+ this.xlCheck = xlCheck;
	151	+ }
	152	+
	153	+ public String getXlakpCheck() {
	154	+ return xlakpCheck;
	155	+ }
	156	+
	157	+ public void setXlakpCheck(String xlakpCheck) {
	158	+ this.xlakpCheck = xlakpCheck;
	159	+ }
	160	+
	161	+ public String getXlohdCheck() {
	162	+ return xlohdCheck;
	163	+ }
	164	+
	165	+ public void setXlohdCheck(String xlohdCheck) {
	166	+ this.xlohdCheck = xlohdCheck;
	167	+ }
	168	+
	169	+ public String getBirthHistoryStr() {
	170	+ return birthHistoryStr;
	171	+ }
	172	+
	173	+ public void setBirthHistoryStr(String birthHistoryStr) {
	174	+ this.birthHistoryStr = birthHistoryStr;
	175	+ }
	176	+
	177	+ public String getFeedingHistory6Str() {
	178	+ return feedingHistory6Str;
	179	+ }
	180	+
	181	+ public void setFeedingHistory6Str(String feedingHistory6Str) {
	182	+ this.feedingHistory6Str = feedingHistory6Str;
	183	+ }
	184	+
	185	+ public String getTjzlStr() {
	186	+ return tjzlStr;
	187	+ }
	188	+
	189	+ public void setTjzlStr(String tjzlStr) {
	190	+ this.tjzlStr = tjzlStr;
	191	+ }
	192	+
	193	+ public String getMrwyHistoryStr() {
	194	+ return mrwyHistoryStr;
	195	+ }
	196	+
	197	+ public void setMrwyHistoryStr(String mrwyHistoryStr) {
	198	+ this.mrwyHistoryStr = mrwyHistoryStr;
	199	+ }
	200	+
	201	+ public String getMyqbrqStr() {
	202	+ return myqbrqStr;
	203	+ }
	204	+
	205	+ public void setMyqbrqStr(String myqbrqStr) {
	206	+ this.myqbrqStr = myqbrqStr;
	207	+ }
	208	+
	209	+ public String getVitdStr() {
	210	+ return vitdStr;
	211	+ }
	212	+
	213	+ public void setVitdStr(String vitdStr) {
	214	+ this.vitdStr = vitdStr;
	215	+ }
	216	+
	217	+ public String getTizStr() {
	218	+ return tizStr;
	219	+ }
	220	+
	221	+ public void setTizStr(String tizStr) {
	222	+ this.tizStr = tizStr;
	223	+ }
	224	+
122	225	public String getCaseClosed() {
123	226	return caseClosed;
124	227	}
...	...	@@ -599,6 +702,201 @@
599	702	setVitdzl(destModel.getVitdzl());
600	703
601	704
	705	+
	706	+ return this;
	707	+ }
	708	+ public BabyNutritionSpecialtyResult convertToShowResult(BabyNutritionSpecialtyModel destModel) {
	709	+
	710	+ setId(destModel.getId());
	711	+ setBuildId(destModel.getBuildId());
	712	+ setPid(destModel.getPid());
	713	+ //createDate modifyDate
	714	+ setHospitalId(destModel.getHospitalId());
	715	+ setMname(destModel.getMname());
	716	+ setMcertNo(destModel.getMcertNo());
	717	+ setMphone(destModel.getMphone());
	718	+ setName(destModel.getName());
	719	+ setEncoded(destModel.getEncoded());
	720	+ setCertNo(destModel.getCertNo());
	721	+ if(destModel.getSex()==0){
	722	+ setSex("女");
	723	+ }else if(destModel.getSex()==1){
	724	+ setSex("男");
	725	+ }else {
	726	+ setSex("_");
	727	+ }
	728	+ setVcCardNo(destModel.getVcCardNo());
	729	+ setsINCard(destModel.getsINCard());
	730	+ setBirthday(DateUtil.getYyyyMmDd(destModel.getBirthday()));
	731	+
	732	+ setYyProject(destModel.getYyProject());
	733	+ setCheckDate(DateUtil.getYyyyMmDd(destModel.getCheckDate()));
	734	+ setCheckMonth(destModel.getCheckMonth());
	735	+ //checkDoctor
	736	+ setNextDate(DateUtil.getYyyyMmDd(destModel.getNextDate()));
	737	+ setCaseClosed(destModel.getCaseClosed());
	738	+ setcCDate(DateUtil.getYyyyMmDd(destModel.getcCDate()));
	739	+ setcCOutcome(destModel.getcCOutcome());
	740	+ setStartMdate(destModel.getStartMdate());
	741	+ //出生史
	742	+ String getBirthHistory = "";
	743	+ try {
	744	+ if (destModel.getBirthHistory()!=null ) {
	745	+ Map<String, Object> map = destModel.getBirthHistory();
	746	+ String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
	747	+ if ("no".equals(yesOrNo)) {
	748	+ getBirthHistory = "无";
	749	+ } else if ("yes".equals(yesOrNo)) {
	750	+ boolean zc = map.get("zc") == null ? false : (boolean)map.get("zc");
	751	+ if (zc) {
	752	+ getBirthHistory += " 早产,";
	753	+ }
	754	+ boolean dcstz = map.get("dcstz") == null ? false : (boolean)map.get("dcstz");
	755	+ if (dcstz) {
	756	+ getBirthHistory += " 低出生体重,";
	757	+ }
	758	+ boolean dt = map.get("dt") == null ? false : (boolean)map.get("dt");
	759	+ if (dt) {
	760	+ getBirthHistory += " 多胎,";
	761	+ }
	762	+ boolean jdy = map.get("jdy") == null ? false : (boolean)map.get("jdy");
	763	+ if (jdy) {
	764	+ getBirthHistory += " 巨大婴,";
	765	+ }
	766	+ getBirthHistory = FunvCommonUtil.spitd(getBirthHistory);
	767	+ }
	768	+ }
	769	+ } catch (Exception e) {
	770	+ e.printStackTrace();
	771	+ }
	772	+ setBirthHistoryStr(getBirthHistory);
	773	+ setBirthHistory(destModel.getBirthHistory());
	774	+ //6个月内喂养史
	775	+ String getFeedingHistory6 = "";
	776	+ try {
	777	+ if (destModel.getFeedingHistory6()!=null ) {
	778	+ Map<String, Object> map = destModel.getFeedingHistory6();
	779	+
	780	+ boolean cmr = map.get("cmr") == null ? false : (boolean)map.get("cmr");
	781	+ if (cmr) {
	782	+ getFeedingHistory6 += " 纯母乳,";
	783	+ }
	784	+ boolean bfmr = map.get("bfmr") == null ? false : (boolean)map.get("bfmr");
	785	+ if (bfmr) {
	786	+ getFeedingHistory6 += " 部分母乳,";
	787	+ }
	788	+ boolean pfn = map.get("pfn") == null ? false : (boolean)map.get("pfn");
	789	+ if (pfn) {
	790	+ getFeedingHistory6 += " 配方奶,";
	791	+ }
	792	+ getFeedingHistory6 = FunvCommonUtil.spitd(getFeedingHistory6);
	793	+ }
	794	+ } catch (Exception e) {
	795	+ e.printStackTrace();
	796	+ }
	797	+ setFeedingHistory6Str(getFeedingHistory6);
	798	+ setFeedingHistory6(destModel.getFeedingHistory6());
	799	+
	800	+ setFoodToAge(destModel.getFoodToAge());
	801	+ setSituation(destModel.getSituation());
	802	+ setHeight(destModel.getHeight());
	803	+ setWeight(destModel.getWeight());
	804	+ setAssess(destModel.getAssess());
	805	+ setProblem(destModel.getProblem());
	806	+ setGuidance(destModel.getGuidance());
	807	+ setCheckId(destModel.getCheckId());
	808	+ setMyqpxWeek(destModel.getMyqpxWeek());
	809	+ setMyqpxHb(destModel.getMyqpxHb());
	810	+
	811	+ //铁剂治疗
	812	+ setTjzl(destModel.getTjzl());
	813	+ //母乳喂养情况
	814	+ String getMrwyHistory = "";
	815	+ try {
	816	+ if (destModel.getMrwyHistory()!=null ) {
	817	+ Map<String, Object> map = destModel.getMrwyHistory();
	818	+
	819	+ boolean cmr = map.get("cmr") == null ? false : (boolean)map.get("cmr");
	820	+ if (cmr) {
	821	+ getMrwyHistory += " 纯母乳,";
	822	+ }
	823	+ boolean bfmr = map.get("bfmr") == null ? false : (boolean)map.get("bfmr");
	824	+ if (bfmr) {
	825	+ getMrwyHistory += " 部分母乳,";
	826	+ }
	827	+ boolean pfn = map.get("pfn") == null ? false : (boolean)map.get("pfn");
	828	+ if (pfn) {
	829	+ getMrwyHistory += " 配方奶,";
	830	+ }
	831	+ getMrwyHistory = FunvCommonUtil.spitd(getMrwyHistory);
	832	+
	833	+ }
	834	+ } catch (Exception e) {
	835	+ e.printStackTrace();
	836	+ }
	837	+ setMrwyHistory(destModel.getMrwyHistory());
	838	+ setMrwyHistoryStr(getMrwyHistory);
	839	+
	840	+ setKstjhtswage(destModel.getKstjhtswage());
	841	+ setJwhbqk(destModel.getJwhbqk());
	842	+ setHb(destModel.getHb());
	843	+ setTreatment(destModel.getTreatment());
	844	+ setMyqbrq(destModel.getMyqbrq());
	845	+
	846	+
	847	+ setVitd(destModel.getVitd());
	848	+ //体征
	849	+ String getTiz = "";
	850	+ try {
	851	+ if (destModel.getTiz()!=null ) {
	852	+ Map<String, Object> map = destModel.getTiz();
	853	+
	854	+ boolean fl = map.get("fl") == null ? false : (boolean)map.get("fl");
	855	+ if (fl) {
	856	+ getTiz += " 方颅,";
	857	+ }
	858	+ boolean lgcz = map.get("lgcz") == null ? false : (boolean)map.get("lgcz");
	859	+ if (lgcz) {
	860	+ getTiz += " 肋骨串珠,";
	861	+ }
	862	+ boolean lrggk = map.get("lrggk") == null ? false : (boolean)map.get("lrggk");
	863	+ if (lrggk) {
	864	+ getTiz += " 肋软骨沟,";
	865	+ }
	866	+ boolean jxk = map.get("jxk") == null ? false : (boolean)map.get("jxk");
	867	+ if (jxk) {
	868	+ getTiz += " 鸡胸,";
	869	+ }
	870	+ boolean szk = map.get("szk") == null ? false : (boolean)map.get("szk");
	871	+ if (szk) {
	872	+ getTiz += " 手(足)镯,";
	873	+ }
	874	+ boolean xxt = map.get("xxt") == null ? false : (boolean)map.get("xxt");
	875	+ if (xxt) {
	876	+ getTiz += " X型腿,";
	877	+ }
	878	+ boolean oxtk = map.get("oxtk") == null ? false : (boolean)map.get("oxtk");
	879	+ if (oxtk) {
	880	+ getTiz += " O型腿,";
	881	+ }
	882	+ getTiz = FunvCommonUtil.spitd(getTiz);
	883	+
	884	+ }
	885	+ } catch (Exception e) {
	886	+ e.printStackTrace();
	887	+ }
	888	+ setTiz(destModel.getTiz());
	889	+ setTizStr(getTiz);
	890	+
	891	+ setBloodCheck(destModel.getBloodCheck());
	892	+ setXxCheck(destModel.getXxCheck());
	893	+ setHwhdDate(destModel.getHwhdDate());
	894	+ setVitdzl(destModel.getVitdzl());
	895	+
	896	+ setXgCheck(destModel.getXgCheck());
	897	+ setXlCheck(destModel.getXlCheck());
	898	+ setXlakpCheck(destModel.getXlakpCheck());
	899	+ setXlohdCheck(destModel.getXlohdCheck());
602	900
603	901	return this;
604	902	}