jiangjiazhi / regional-platform

Commit dd9884f784ce4e1f72f09136efbb6e5f5ef03817

Authored by gengxiaokai almost 7 years ago

Exists in master and in 6 other branches

荣成男女婚检建档字段增加

Showing 5 changed files with 340 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java

...	...	@@ -530,10 +530,56 @@
530	530	private String impression;//印象
531	531	private String qzdbh;//亲子带编号
532	532
	533	+ private String hx;//呼吸
	534	+ private String xt;//心跳
	535	+ private String ys;//颜色
	536	+ private String cjfy;//刺激反应
	537	+ private String zl;//张力
	538	+
533	539	public Baby(){
534	540
535	541	}
536	542
	543	+ public String getHx() {
	544	+ return hx;
	545	+ }
	546	+
	547	+ public void setHx(String hx) {
	548	+ this.hx = hx;
	549	+ }
	550	+
	551	+ public String getXt() {
	552	+ return xt;
	553	+ }
	554	+
	555	+ public void setXt(String xt) {
	556	+ this.xt = xt;
	557	+ }
	558	+
	559	+ public String getYs() {
	560	+ return ys;
	561	+ }
	562	+
	563	+ public void setYs(String ys) {
	564	+ this.ys = ys;
	565	+ }
	566	+
	567	+ public String getCjfy() {
	568	+ return cjfy;
	569	+ }
	570	+
	571	+ public void setCjfy(String cjfy) {
	572	+ this.cjfy = cjfy;
	573	+ }
	574	+
	575	+ public String getZl() {
	576	+ return zl;
	577	+ }
	578	+
	579	+ public void setZl(String zl) {
	580	+ this.zl = zl;
	581	+ }
	582	+
537	583	public String getQzdbh() {
538	584	return qzdbh;
539	585	}
...	...	@@ -1832,6 +1878,70 @@
1832	1878	private String jmkz;//静脉扩张
1833	1879	private String zyDiagnosis;//主要诊断
1834	1880
	1881	+ private String ysqk;//羊水情况（0:清；1:Ⅰ度；2:Ⅱ度；3:Ⅲ度）
	1882	+ private String zgnmz;//椎管内麻醉(0:未选择；1:已选择)
	1883	+ private String dlfm;//导乐分娩(0:未选择；1:已选择)
	1884	+ private String fmzty;//分娩镇痛仪(0:未选择；1:已选择)
	1885	+ private String zypbfm;//专业陪伴分娩(0:未选择；1:已选择)
	1886	+ private String totalOneCxl;//阴道分娩产后1小时总出血量
	1887	+ private String xsebz;//新生儿备注
	1888	+
	1889	+
	1890	+ public String getYsqk() {
	1891	+ return ysqk;
	1892	+ }
	1893	+
	1894	+ public void setYsqk(String ysqk) {
	1895	+ this.ysqk = ysqk;
	1896	+ }
	1897	+
	1898	+ public String getZgnmz() {
	1899	+ return zgnmz;
	1900	+ }
	1901	+
	1902	+ public void setZgnmz(String zgnmz) {
	1903	+ this.zgnmz = zgnmz;
	1904	+ }
	1905	+
	1906	+ public String getDlfm() {
	1907	+ return dlfm;
	1908	+ }
	1909	+
	1910	+ public void setDlfm(String dlfm) {
	1911	+ this.dlfm = dlfm;
	1912	+ }
	1913	+
	1914	+ public String getFmzty() {
	1915	+ return fmzty;
	1916	+ }
	1917	+
	1918	+ public void setFmzty(String fmzty) {
	1919	+ this.fmzty = fmzty;
	1920	+ }
	1921	+
	1922	+ public String getZypbfm() {
	1923	+ return zypbfm;
	1924	+ }
	1925	+
	1926	+ public void setZypbfm(String zypbfm) {
	1927	+ this.zypbfm = zypbfm;
	1928	+ }
	1929	+
	1930	+ public String getTotalOneCxl() {
	1931	+ return totalOneCxl;
	1932	+ }
	1933	+
	1934	+ public void setTotalOneCxl(String totalOneCxl) {
	1935	+ this.totalOneCxl = totalOneCxl;
	1936	+ }
	1937	+
	1938	+ public String getXsebz() {
	1939	+ return xsebz;
	1940	+ }
	1941	+
	1942	+ public void setXsebz(String xsebz) {
	1943	+ this.xsebz = xsebz;
	1944	+ }
1835	1945
1836	1946	public String getFhqk() {
1837	1947	return fhqk;

...	...	@@ -1053,17 +1053,17 @@
1053	1053	ssy = chBpMap.get("ssy");
1054	1054	szy = chBpMap.get("szy");
1055	1055	}
1056		- map.put("SYSTILIC",ssy);
1057		- map.put("DIASTOLIC",szy);
	1056	+ map.put("SYSTILIC",szy);
	1057	+ map.put("DIASTOLIC",ssy);
1058	1058	if(data.getBreast() != null){
1059		- if("1".equals(data.getBreast())){
	1059	+ if("1".equals(data.getBreast()) \|\| 1 == data.getBreast()){
1060	1060	map.put("UBERCODE","1");
1061	1061	}else{
1062	1062	map.put("UBERCODE","2");
1063	1063	}
1064	1064	}
1065	1065	if(data.getLochia() != null){
1066		- if("1".equals(data.getLochia())){
	1066	+ if("1".equals(data.getLochia()) \|\| 1 == data.getLochia()){
1067	1067	map.put("LOCHIACODE","1");
1068	1068	}else{
1069	1069	map.put("LOCHIACODE","2");
...	...	@@ -1071,7 +1071,7 @@
1071	1071	}
1072	1072	map.put("UTERUSABNORMDESC",data.getMatrix());
1073	1073	if(data.getWound() != null){
1074		- if("1".equals(data.getWound())){
	1074	+ if("1".equals(data.getWound()) \|\| 1 == data.getWound()){
1075	1075	map.put("WOUNDCODE","1");
1076	1076	}else{
1077	1077	map.put("WOUNDCODE","2");
...	...	@@ -1079,7 +1079,7 @@
1079	1079	}
1080	1080	map.put("OTHERSDESC",data.getOtherDesc());
1081	1081	if(data.getHealthType() != null){
1082		- if("1".equals(data.getHealthType())){
	1082	+ if("1".equals(data.getHealthType()) \|\| 1 == data.getHealthType()){
1083	1083	map.put("FOLLOWUPCLASSIFYCODE","1");
1084	1084	}else{
1085	1085	map.put("FOLLOWUPCLASSIFYCODE","2");
...	...	@@ -1088,7 +1088,7 @@
1088	1088	map.put("FOLLOWUPCLASSIFYVALUE",null);
1089	1089	map.put("BODYTEMPERATURE",data.getTemperature());
1090	1090	if(data.getIsRefer() != null){
1091		- if("1".equals(data.getIsRefer())){
	1091	+ if("1".equals(data.getIsRefer()) \|\| 1 == data.getIsRefer()){
1092	1092	map.put("REFERRALCODE","1");
1093	1093	}else if("2".equals(data.getIsRefer())){
1094	1094	map.put("REFERRALCODE","2");
...	...	@@ -1161,7 +1161,7 @@
1161	1161	mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
1162	1162	mongoQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
1163	1163	list1 = postReviewService.findWithList(mongoQuery);
1164		- if((null != list && list.size() > 0) && (null != list1 && list1.size() > 0)){
	1164	+ if((null != list && list.size() > 0) \|\| (null != list1 && list1.size() > 0)){
1165	1165	allList.addAll(list);
1166	1166	allList.addAll(list1);
1167	1167	}

...	...	@@ -2786,6 +2786,9 @@
2786	2786	map.put("jmkz",data.getJmkz());
2787	2787	map.put("zyDiagnosis",data.getZyDiagnosis() != null ? data.getZyDiagnosis().replace("\n","</br>") : "");
2788	2788
	2789	+ map.put("ysqk",data.getYsqk());
	2790	+ map.put("zgnmz",data.getZgnmz());
	2791	+
2789	2792	/* 产后生理 */
2790	2793	map.put("maternalInfo", data.getMaternalInfo() == null ? "" : CfEnums.getTitle(data.getMaternalInfo()));
2791	2794	map.put("deathCause", com.lyms.platform.common.utils.StringUtils.isEmpty(data.getDeathCause()) ? "--" : DeathCauseEnums.getName(data.getDeathCause()));
...	...	@@ -4701,6 +4704,16 @@
4701	4704	result.setXyzns(model.getXyzns());
4702	4705	result.setZnstzk(model.getZnstzk());
4703	4706	result.setJtbm(model.getJtbm());
	4707	+
	4708	+ result.setIsOrNotrdl(model.getIsOrNotrdl());
	4709	+ result.setIsOrNotSc(model.getIsOrNotSc());
	4710	+ result.setIsOrNotSr(model.getIsOrNotSr());
	4711	+ result.setIsOrNotXy(model.getIsOrNotXy());
	4712	+ result.setJizhi(model.getJizhi());
	4713	+ result.setIsOrNotBdXy(model.getIsOrNotBdXy());
	4714	+ result.setBdXyHours(model.getBdXyHours());
	4715	+ result.setIsOrNotYj(model.getIsOrNotYj());
	4716	+ result.setYjMl(model.getYjMl());
4704	4717
4705	4718
4706	4719	return result;

...	...	@@ -351,7 +351,17 @@
351	351	private String jmkz;//静脉扩张
352	352	private String zyDiagnosis;//主要诊断
353	353
	354	+ private String ysqk;//羊水情况（0:清；1:Ⅰ度；2:Ⅱ度；3:Ⅲ度）
	355	+ private String zgnmz;//椎管内麻醉(0:未选择；1:已选择)
	356	+ private String dlfm;//导乐分娩(0:未选择；1:已选择)
	357	+ private String fmzty;//分娩镇痛仪(0:未选择；1:已选择)
	358	+ private String zypbfm;//专业陪伴分娩(0:未选择；1:已选择)
	359	+ private String totalOneCxl;//阴道分娩产后1小时总出血量
	360	+ private String xsebz;//新生儿备注
354	361
	362	+
	363	+
	364	+
355	365	@Override
356	366	public MaternalDeliverModel convertToDataModel() {
357	367	MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
358	368
359	369
...	...	@@ -435,10 +445,73 @@
435	445	maternalDeliverModel.setJmkz(jmkz);
436	446	maternalDeliverModel.setZyDiagnosis(zyDiagnosis);
437	447
	448	+ maternalDeliverModel.setYsqk(ysqk);
	449	+ maternalDeliverModel.setZgnmz(zgnmz);
	450	+ maternalDeliverModel.setDlfm(dlfm);
	451	+ maternalDeliverModel.setFmzty(fmzty);
	452	+ maternalDeliverModel.setZypbfm(zypbfm);
	453	+ maternalDeliverModel.setTotalOneCxl(totalOneCxl);
	454	+ maternalDeliverModel.setXsebz(xsebz);
	455	+
438	456	return maternalDeliverModel;
439	457	}
440	458
	459	+ public String getYsqk() {
	460	+ return ysqk;
	461	+ }
441	462
	463	+ public void setYsqk(String ysqk) {
	464	+ this.ysqk = ysqk;
	465	+ }
	466	+
	467	+ public String getZgnmz() {
	468	+ return zgnmz;
	469	+ }
	470	+
	471	+ public void setZgnmz(String zgnmz) {
	472	+ this.zgnmz = zgnmz;
	473	+ }
	474	+
	475	+ public String getDlfm() {
	476	+ return dlfm;
	477	+ }
	478	+
	479	+ public void setDlfm(String dlfm) {
	480	+ this.dlfm = dlfm;
	481	+ }
	482	+
	483	+ public String getFmzty() {
	484	+ return fmzty;
	485	+ }
	486	+
	487	+ public void setFmzty(String fmzty) {
	488	+ this.fmzty = fmzty;
	489	+ }
	490	+
	491	+ public String getZypbfm() {
	492	+ return zypbfm;
	493	+ }
	494	+
	495	+ public void setZypbfm(String zypbfm) {
	496	+ this.zypbfm = zypbfm;
	497	+ }
	498	+
	499	+ public String getTotalOneCxl() {
	500	+ return totalOneCxl;
	501	+ }
	502	+
	503	+ public void setTotalOneCxl(String totalOneCxl) {
	504	+ this.totalOneCxl = totalOneCxl;
	505	+ }
	506	+
	507	+ public String getXsebz() {
	508	+ return xsebz;
	509	+ }
	510	+
	511	+ public void setXsebz(String xsebz) {
	512	+ this.xsebz = xsebz;
	513	+ }
	514	+
442	515	public String getFhqk() {
443	516	return fhqk;
444	517	}
...	...	@@ -1128,6 +1201,12 @@
1128	1201	private String impression;//印象
1129	1202	private String qzdbh;//亲子带编号
1130	1203
	1204	+ private String hx;//呼吸
	1205	+ private String xt;//心跳
	1206	+ private String ys;//颜色
	1207	+ private String cjfy;//刺激反应
	1208	+ private String zl;//张力
	1209	+
1131	1210	@Override
1132	1211	public MaternalDeliverModel.Baby convertToDataModel() {
1133	1212	MaternalDeliverModel.Baby baby= new MaternalDeliverModel.Baby();
1134	1213
...	...	@@ -1241,7 +1320,53 @@
1241	1320	baby.setImpression(impression);
1242	1321	baby.setQzdbh(qzdbh);
1243	1322
	1323	+ baby.setHx(hx);
	1324	+ baby.setXt(xt);
	1325	+ baby.setYs(ys);
	1326	+ baby.setCjfy(cjfy);
	1327	+ baby.setZl(zl);
	1328	+
1244	1329	return baby;
	1330	+ }
	1331	+
	1332	+ public String getHx() {
	1333	+ return hx;
	1334	+ }
	1335	+
	1336	+ public void setHx(String hx) {
	1337	+ this.hx = hx;
	1338	+ }
	1339	+
	1340	+ public String getXt() {
	1341	+ return xt;
	1342	+ }
	1343	+
	1344	+ public void setXt(String xt) {
	1345	+ this.xt = xt;
	1346	+ }
	1347	+
	1348	+ public String getYs() {
	1349	+ return ys;
	1350	+ }
	1351	+
	1352	+ public void setYs(String ys) {
	1353	+ this.ys = ys;
	1354	+ }
	1355	+
	1356	+ public String getCjfy() {
	1357	+ return cjfy;
	1358	+ }
	1359	+
	1360	+ public void setCjfy(String cjfy) {
	1361	+ this.cjfy = cjfy;
	1362	+ }
	1363	+
	1364	+ public String getZl() {
	1365	+ return zl;
	1366	+ }
	1367	+
	1368	+ public void setZl(String zl) {
	1369	+ this.zl = zl;
1245	1370	}
1246	1371
1247	1372	public String getQzdbh() {

...	...	@@ -85,6 +85,18 @@
85	85	//建档号
86	86	private String id;
87	87
	88	+ /*********荣成新增男性建档字段********/
	89	+ private String isOrNotrdl;//是否进食肉、蛋类（0：否；1：是；默认为1）
	90	+ private String isOrNotSc;//是否厌食蔬菜（0：否；1：是；默认为0）
	91	+ private String isOrNotSr;//是否有食用生肉嗜好（0：否；1：是；默认为0）
	92	+ private String isOrNotXy;//是否吸烟（0：否；1：是；默认为0）
	93	+ private String jizhi;//每天抽烟几支
	94	+ private String isOrNotBdXy;//是否存在被动吸烟（0：否；1：偶尔；2：经常；默认为0）
	95	+ private String bdXyHours;//平均每天被动吸烟分钟数
	96	+ private String isOrNotYj;//是否饮酒（0：否；1：偶尔；2：经常；默认为0）
	97	+ private String yjMl;//每天饮酒量
	98	+ /*********荣成新增男性建档字段********/
	99	+
88	100	/*********荣成新增女性建档字段********/
89	101	private String ccnl;//初潮年龄
90	102	private String mcyj;//末次月经时间
...	...	@@ -109,6 +121,78 @@
109	121	private String znstzk;//子女身体状况（0：健康；1：疾病）
110	122	private String jtbm;//注明具体病名
111	123
	124	+
	125	+ public String getIsOrNotrdl() {
	126	+ return isOrNotrdl;
	127	+ }
	128	+
	129	+ public void setIsOrNotrdl(String isOrNotrdl) {
	130	+ this.isOrNotrdl = isOrNotrdl;
	131	+ }
	132	+
	133	+ public String getIsOrNotSc() {
	134	+ return isOrNotSc;
	135	+ }
	136	+
	137	+ public void setIsOrNotSc(String isOrNotSc) {
	138	+ this.isOrNotSc = isOrNotSc;
	139	+ }
	140	+
	141	+ public String getIsOrNotSr() {
	142	+ return isOrNotSr;
	143	+ }
	144	+
	145	+ public void setIsOrNotSr(String isOrNotSr) {
	146	+ this.isOrNotSr = isOrNotSr;
	147	+ }
	148	+
	149	+ public String getIsOrNotXy() {
	150	+ return isOrNotXy;
	151	+ }
	152	+
	153	+ public void setIsOrNotXy(String isOrNotXy) {
	154	+ this.isOrNotXy = isOrNotXy;
	155	+ }
	156	+
	157	+ public String getJizhi() {
	158	+ return jizhi;
	159	+ }
	160	+
	161	+ public void setJizhi(String jizhi) {
	162	+ this.jizhi = jizhi;
	163	+ }
	164	+
	165	+ public String getIsOrNotBdXy() {
	166	+ return isOrNotBdXy;
	167	+ }
	168	+
	169	+ public void setIsOrNotBdXy(String isOrNotBdXy) {
	170	+ this.isOrNotBdXy = isOrNotBdXy;
	171	+ }
	172	+
	173	+ public String getBdXyHours() {
	174	+ return bdXyHours;
	175	+ }
	176	+
	177	+ public void setBdXyHours(String bdXyHours) {
	178	+ this.bdXyHours = bdXyHours;
	179	+ }
	180	+
	181	+ public String getIsOrNotYj() {
	182	+ return isOrNotYj;
	183	+ }
	184	+
	185	+ public void setIsOrNotYj(String isOrNotYj) {
	186	+ this.isOrNotYj = isOrNotYj;
	187	+ }
	188	+
	189	+ public String getYjMl() {
	190	+ return yjMl;
	191	+ }
	192	+
	193	+ public void setYjMl(String yjMl) {
	194	+ this.yjMl = yjMl;
	195	+ }
112	196
113	197	public String getCcnl() {
114	198	return ccnl;