jiangjiazhi / regional-platform

Commit 7b0396ba735273138bf942ec489e742269928de0

Authored by yangfei almost 8 years ago

Exists in master and in 6 other branches

产检增加字段

Showing 7 changed files with 153 additions and 23 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/GongJingEnums.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.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
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java

...	...	@@ -141,7 +141,7 @@
141	141	public enum WeiZhi {
142	142	// 宫颈硬度（选择框为：软、中、硬、其他（填写））
143	143	// 4.宫颈位置（选择框为：前、中、后、其他（填写））
144		- Ruan("前", "前"), Zhong("中", "中"), Ying("后", "后");
	144	+ Ruan("前", "1"), Zhong("中", "2"), Ying("后", "3"),QiTa("其他","4");
145	145
146	146	WeiZhi(String name, String value) {
147	147	this.name = name;
...	...	@@ -170,9 +170,7 @@
170	170
171	171	//宫颈硬度
172	172	public enum YinDu {
173		- // 宫颈硬度（选择框为：软、中、硬、其他（填写））
174		- // 4.宫颈位置（选择框为：前、中、后、其他（填写））
175		- Ruan("软", "软"), Zhong("中", "中"), Ying("硬", "硬");
	173	+ Ruan("软", "1"), Zhong("中", "2"), Ying("硬", "3"),QiTa("其他","4");
176	174
177	175	YinDu(String name, String value) {
178	176	this.name = name;

...	...	@@ -75,6 +75,8 @@
75	75	private String cestationInfo;
76	76	// 宫高
77	77	private String gonggao;
	78	+ // 宫高类型
	79	+ private String gonggaoType;
78	80	//腹围
79	81	private String fuwei;
80	82	//胎数
...	...	@@ -467,6 +469,14 @@
467	469
468	470	public void setGonggao(String gonggao) {
469	471	this.gonggao = gonggao;
	472	+ }
	473	+
	474	+ public String getGonggaoType() {
	475	+ return gonggaoType;
	476	+ }
	477	+
	478	+ public void setGonggaoType(String gonggaoType) {
	479	+ this.gonggaoType = gonggaoType;
470	480	}
471	481
472	482	public String getHeight() {

...	...	@@ -50,6 +50,8 @@
50	50	private String bp;
51	51	//宫高
52	52	private String gongGao;
	53	+ //宫高类型
	54	+ private String gongGaoType;
53	55	//腹围
54	56	private String abdominalCircumference;
55	57	//浮肿
...	...	@@ -108,6 +110,14 @@
108	110	private String cDueWeek;
109	111	//操作人
110	112	private Integer operator;
	113	+
	114	+ public String getGongGaoType() {
	115	+ return gongGaoType;
	116	+ }
	117	+
	118	+ public void setGongGaoType(String gongGaoType) {
	119	+ this.gongGaoType = gongGaoType;
	120	+ }
111	121
112	122	public String getBloodSugar2() {
113	123	return bloodSugar2;

...	...	@@ -403,10 +403,7 @@
403	403	return resp;
404	404	}
405	405	}
406		-
407	406	AntExChuModel antExChuModel = excAddRequest.convertToDataModel();
408		-
409		-
410	407	//表示区域的
411	408	if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
412	409	String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId, 1);
413	410
414	411
415	412
416	413
417	414
418	415
...	...	@@ -2148,12 +2145,19 @@
2148	2145	map.put("getTaiPan", getTaiPan());
2149	2146	map.put("getTaiShu", getTaiShu());
2150	2147	map.put("fuzhong", getFuZhong());
	2148	+ //胎膜
2151	2149	map.put("getTaiMo", getTm());
	2150	+ //宫颈硬度
2152	2151	map.put("getGjyd", getGJYD());
	2152	+ //宫颈位置
2153	2153	map.put("getGjwz", getGJWZ());
	2154	+ //先露位置
2154	2155	map.put("getXlwz", getXLWZ());
	2156	+ //阴道检测
2155	2157	map.put("getYdjc", getYDJC());
	2158	+ //宫高
2156	2159	map.put("getGongGao", getGongGao());
	2160	+ //横指
2157	2161	map.put("getHengZhi", getHengZhi());
2158	2162	map.put("getHighRisk", basicConfigFacade.getHighRisk());
2159	2163	map.put("jws", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID));

...	...	@@ -45,17 +45,15 @@
45	45	private Map bp;
46	46	//宫高
47	47	private String gongGao;
	48	+ //宫高类型
	49	+ private String gongGaoType;
48	50	//腹围
49	51	private String abdominalCircumference;
50	52	//浮肿
51	53	private String edema;
52	54	//胎数
53	55	private String tireNumber;
54		- //胎数据
55		- /* Double heartRate;
56		- FetalPosition 胎方位
57		- FetalPresentation 胎先露
58		- join 衔接*/
	56	+ //胎数详情
59	57	private List<MatDeliverAddRequest.Placenta> tireData;
60	58	//血红蛋白
61	59	private String hemoglobin;
...	...	@@ -173,6 +171,14 @@
173	171	this.typeYc = typeYc;
174	172	}
175	173
	174	+ public String getGongGaoType() {
	175	+ return gongGaoType;
	176	+ }
	177	+
	178	+ public void setGongGaoType(String gongGaoType) {
	179	+ this.gongGaoType = gongGaoType;
	180	+ }
	181	+
176	182	@Override
177	183	public AntenatalExaminationModel convertToDataModel() {
178	184	AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
...	...	@@ -185,6 +191,7 @@
185	191	examinationModel.setWeight(weight);
186	192	examinationModel.setBp(JsonUtil.obj2JsonString(bp));
187	193	examinationModel.setGongGao(gongGao);
	194	+ examinationModel.setGongGaoType(gongGaoType);
188	195	examinationModel.setAbdominalCircumference(abdominalCircumference);
189	196	examinationModel.setEdema(edema);
190	197	examinationModel.setTireNumber(tireNumber);

...	...	@@ -95,25 +95,17 @@
95	95	private String fujian;
96	96	// 宫高
97	97	private String gonggao;
	98	+ // 宫高类型
	99	+ private String gonggaoType;
98	100	//腹围
99	101	private String fuwei;
100	102	//胎数
101	103	private String tireNumber1;
102	104	//血压
103	105	private Map bp;
104		-
105		-
106	106	private String bg;
107		-
	107	+ //胎数
108	108	private List<MatDeliverAddRequest.Placenta> placentas;
109		- /*//心率
110		- private double heartRate;
111		- //胎方位
112		- private String fetalPosition;
113		- //胎先露
114		- private String fetalPresentation;
115		- // 衔接
116		- private String join;*/
117	109	//高危因素
118	110	private List highrisk ;
119	111	//高危评分
...	...	@@ -255,6 +247,14 @@
255	247	this.couponType = couponType;
256	248	}
257	249
	250	+ public String getGonggaoType() {
	251	+ return gonggaoType;
	252	+ }
	253	+
	254	+ public void setGonggaoType(String gonggaoType) {
	255	+ this.gonggaoType = gonggaoType;
	256	+ }
	257	+
258	258	public String getBarCode() {
259	259	return barCode;
260	260	}
...	...	@@ -1005,6 +1005,7 @@
1005	1005	antExChuModel.setBaricIndex(baricIndex);
1006	1006	antExChuModel.setCestationInfo(JsonUtil.obj2JsonString(cestationInfo));
1007	1007	antExChuModel.setGonggao(gonggao);
	1008	+ antExChuModel.setGonggaoType(gonggaoType);
1008	1009	antExChuModel.setFuwei(fuwei);
1009	1010	antExChuModel.setTireNumber1(tireNumber1);
1010	1011	antExChuModel.setPlacentas(placentas);

...	...	@@ -422,6 +422,106 @@
422	422	private String fetalPresentation;
423	423	// 衔接
424	424	private String join;
	425	+ //先露位置
	426	+ private Integer xlwz;
	427	+ //宫颈开大
	428	+ private Double gjkd;
	429	+ //宫颈容受
	430	+ private Double gjrs;
	431	+ //宫颈位置
	432	+ private Integer gjwz;
	433	+ //宫颈位置其他
	434	+ private String gjwzOther;
	435	+ //宫颈硬度
	436	+ private Integer gjyd;
	437	+ //宫颈硬度其他
	438	+ private String gjydOther;
	439	+ //胎膜
	440	+ private Integer tm;
	441	+ //阴道检测
	442	+ private Integer ydjc;
	443	+ //羊水指数
	444	+ private Integer yszs;
	445	+
	446	+ public Integer getXlwz() {
	447	+ return xlwz;
	448	+ }
	449	+
	450	+ public void setXlwz(Integer xlwz) {
	451	+ this.xlwz = xlwz;
	452	+ }
	453	+
	454	+ public Double getGjkd() {
	455	+ return gjkd;
	456	+ }
	457	+
	458	+ public void setGjkd(Double gjkd) {
	459	+ this.gjkd = gjkd;
	460	+ }
	461	+
	462	+ public Double getGjrs() {
	463	+ return gjrs;
	464	+ }
	465	+
	466	+ public void setGjrs(Double gjrs) {
	467	+ this.gjrs = gjrs;
	468	+ }
	469	+
	470	+ public Integer getGjwz() {
	471	+ return gjwz;
	472	+ }
	473	+
	474	+ public void setGjwz(Integer gjwz) {
	475	+ this.gjwz = gjwz;
	476	+ }
	477	+
	478	+ public String getGjwzOther() {
	479	+ return gjwzOther;
	480	+ }
	481	+
	482	+ public void setGjwzOther(String gjwzOther) {
	483	+ this.gjwzOther = gjwzOther;
	484	+ }
	485	+
	486	+ public Integer getGjyd() {
	487	+ return gjyd;
	488	+ }
	489	+
	490	+ public void setGjyd(Integer gjyd) {
	491	+ this.gjyd = gjyd;
	492	+ }
	493	+
	494	+ public String getGjydOther() {
	495	+ return gjydOther;
	496	+ }
	497	+
	498	+ public void setGjydOther(String gjydOther) {
	499	+ this.gjydOther = gjydOther;
	500	+ }
	501	+
	502	+ public Integer getTm() {
	503	+ return tm;
	504	+ }
	505	+
	506	+ public void setTm(Integer tm) {
	507	+ this.tm = tm;
	508	+ }
	509	+
	510	+ public Integer getYdjc() {
	511	+ return ydjc;
	512	+ }
	513	+
	514	+ public void setYdjc(Integer ydjc) {
	515	+ this.ydjc = ydjc;
	516	+ }
	517	+
	518	+ public Integer getYszs() {
	519	+ return yszs;
	520	+ }
	521	+
	522	+ public void setYszs(Integer yszs) {
	523	+ this.yszs = yszs;
	524	+ }
425	525
426	526	public String getFetalPosition() {
427	527	return fetalPosition;