jiangjiazhi / regional-platform

Commit ae85c1ce3e4284408581fefb1112020d2330a611

Authored by dongqin about 7 years ago

Exists in master and in 6 other branches

添加字段

Showing 5 changed files with 474 additions and 2 deletions

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/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

...	...	@@ -389,6 +389,98 @@
389	389	//妊娠异常
390	390	private String pregnancyExcpetion;
391	391
	392	+ // 丰润妇幼
	393	+
	394	+ //腹围 1-未测 2-拒测
	395	+ private String fuweiSelect;
	396	+ // 浮肿 1-未测 2-拒测
	397	+ private String edemaSelect;
	398	+ // 胎数 1-未测 2-拒测
	399	+ private String tireNumberSelect;
	400	+ /**
	401	+ * 胎动选项 1-未测 2-拒测
	402	+ */
	403	+ private String quickenSelect;
	404	+ /**
	405	+ * 血红蛋白选项 1-可选 2-未测 3-拒测 9-其他
	406	+ **/
	407	+ private String xhdbSelect;
	408	+ /**
	409	+ * 血红蛋白选项其他 - 对应的值
	410	+ **/
	411	+ private String xhdbSelectOtherVal;
	412	+ /**
	413	+ * 尿蛋白选项 1-未测 2-拒测 9-其他
	414	+ */
	415	+ private String ndbSelect;
	416	+ /**
	417	+ * 尿蛋白选项其他 - 对应的值
	418	+ */
	419	+ private String ndbSelectOtherVal;
	420	+
	421	+ public String getFuweiSelect() {
	422	+ return fuweiSelect;
	423	+ }
	424	+
	425	+ public void setFuweiSelect(String fuweiSelect) {
	426	+ this.fuweiSelect = fuweiSelect;
	427	+ }
	428	+
	429	+ public String getEdemaSelect() {
	430	+ return edemaSelect;
	431	+ }
	432	+
	433	+ public void setEdemaSelect(String edemaSelect) {
	434	+ this.edemaSelect = edemaSelect;
	435	+ }
	436	+
	437	+ public String getTireNumberSelect() {
	438	+ return tireNumberSelect;
	439	+ }
	440	+
	441	+ public void setTireNumberSelect(String tireNumberSelect) {
	442	+ this.tireNumberSelect = tireNumberSelect;
	443	+ }
	444	+
	445	+ public String getQuickenSelect() {
	446	+ return quickenSelect;
	447	+ }
	448	+
	449	+ public void setQuickenSelect(String quickenSelect) {
	450	+ this.quickenSelect = quickenSelect;
	451	+ }
	452	+
	453	+ public String getXhdbSelect() {
	454	+ return xhdbSelect;
	455	+ }
	456	+
	457	+ public void setXhdbSelect(String xhdbSelect) {
	458	+ this.xhdbSelect = xhdbSelect;
	459	+ }
	460	+
	461	+ public String getXhdbSelectOtherVal() {
	462	+ return xhdbSelectOtherVal;
	463	+ }
	464	+
	465	+ public void setXhdbSelectOtherVal(String xhdbSelectOtherVal) {
	466	+ this.xhdbSelectOtherVal = xhdbSelectOtherVal;
	467	+ }
	468	+
	469	+ public String getNdbSelect() {
	470	+ return ndbSelect;
	471	+ }
	472	+
	473	+ public void setNdbSelect(String ndbSelect) {
	474	+ this.ndbSelect = ndbSelect;
	475	+ }
	476	+
	477	+ public String getNdbSelectOtherVal() {
	478	+ return ndbSelectOtherVal;
	479	+ }
	480	+
	481	+ public void setNdbSelectOtherVal(String ndbSelectOtherVal) {
	482	+ this.ndbSelectOtherVal = ndbSelectOtherVal;
	483	+ }
392	484
393	485	public String getfTthree() {
394	486	return fTthree;

...	...	@@ -301,6 +301,103 @@
301	301
302	302	private String aTSHR;
303	303
	304	+ /**
	305	+ * 腹围 1-未测 2-拒测
	306	+ */
	307	+ private String fuweiSelect;
	308	+ /**
	309	+ * 浮肿 1-未测 2-拒测
	310	+ */
	311	+ private String edemaSelect;
	312	+ /**
	313	+ * 胎数 1-未测 2-拒测
	314	+ */
	315	+ private String tireNumberSelect;
	316	+ /**
	317	+ * 胎动选项 1-未测 2-拒测
	318	+ */
	319	+ private String quickenSelect;
	320	+ /**
	321	+ * 血红蛋白选项 1-未测 2-拒测 9-其他
	322	+ **/
	323	+ private String xhdbSelect;
	324	+ /**
	325	+ * 血红蛋白选项其他 - 对应的值
	326	+ **/
	327	+ private String xhdbSelectOtherVal;
	328	+ /**
	329	+ * 尿蛋白选项 1-未测 2-拒测 9-其他
	330	+ */
	331	+ private String ndbSelect;
	332	+ /**
	333	+ * 尿蛋白选项其他 - 对应的值
	334	+ */
	335	+ private String ndbSelectOtherVal;
	336	+
	337	+ public String getFuweiSelect() {
	338	+ return fuweiSelect;
	339	+ }
	340	+
	341	+ public void setFuweiSelect(String fuweiSelect) {
	342	+ this.fuweiSelect = fuweiSelect;
	343	+ }
	344	+
	345	+ public String getEdemaSelect() {
	346	+ return edemaSelect;
	347	+ }
	348	+
	349	+ public void setEdemaSelect(String edemaSelect) {
	350	+ this.edemaSelect = edemaSelect;
	351	+ }
	352	+
	353	+ public String getTireNumberSelect() {
	354	+ return tireNumberSelect;
	355	+ }
	356	+
	357	+ public void setTireNumberSelect(String tireNumberSelect) {
	358	+ this.tireNumberSelect = tireNumberSelect;
	359	+ }
	360	+
	361	+ public String getQuickenSelect() {
	362	+ return quickenSelect;
	363	+ }
	364	+
	365	+ public void setQuickenSelect(String quickenSelect) {
	366	+ this.quickenSelect = quickenSelect;
	367	+ }
	368	+
	369	+ public String getXhdbSelect() {
	370	+ return xhdbSelect;
	371	+ }
	372	+
	373	+ public void setXhdbSelect(String xhdbSelect) {
	374	+ this.xhdbSelect = xhdbSelect;
	375	+ }
	376	+
	377	+ public String getXhdbSelectOtherVal() {
	378	+ return xhdbSelectOtherVal;
	379	+ }
	380	+
	381	+ public void setXhdbSelectOtherVal(String xhdbSelectOtherVal) {
	382	+ this.xhdbSelectOtherVal = xhdbSelectOtherVal;
	383	+ }
	384	+
	385	+ public String getNdbSelect() {
	386	+ return ndbSelect;
	387	+ }
	388	+
	389	+ public void setNdbSelect(String ndbSelect) {
	390	+ this.ndbSelect = ndbSelect;
	391	+ }
	392	+
	393	+ public String getNdbSelectOtherVal() {
	394	+ return ndbSelectOtherVal;
	395	+ }
	396	+
	397	+ public void setNdbSelectOtherVal(String ndbSelectOtherVal) {
	398	+ this.ndbSelectOtherVal = ndbSelectOtherVal;
	399	+ }
	400	+
304	401	public String getfTthree() {
305	402	return fTthree;
306	403	}

...	...	@@ -6,6 +6,7 @@
6	6	import com.lyms.platform.common.utils.JsonUtil;
7	7	import com.lyms.platform.operate.web.utils.CollectionUtils;
8	8	import com.lyms.platform.pojo.AntenatalExaminationModel;
	9	+import org.apache.commons.lang.StringUtils;
9	10	import org.hibernate.validator.constraints.NotEmpty;
10	11
11	12	import java.util.List;
...	...	@@ -277,6 +278,107 @@
277	278
278	279	private Double aTSHR;
279	280
	281	+ /**
	282	+ * 腹围 1-未测 2-拒测
	283	+ */
	284	+ private String fuweiSelect;
	285	+ /**
	286	+ * 浮肿 1-未测 2-拒测
	287	+ */
	288	+ private String edemaSelect;
	289	+ /**
	290	+ * 胎数 1-未测 2-拒测
	291	+ */
	292	+ private String tireNumberSelect;
	293	+ /**
	294	+ * 胎动选项 1-未测 2-拒测
	295	+ */
	296	+ private String quickenSelect;
	297	+ /**
	298	+ * 之前就有宫高选项 1-未测 2-拒测
	299	+ */
	300	+ //private String gongGaoSelect;
	301	+ /**
	302	+ * 血红蛋白选项 1-未测 2-拒测 9-其他
	303	+ **/
	304	+ private String xhdbSelect;
	305	+ /**
	306	+ * 血红蛋白选项其他 - 对应的值
	307	+ **/
	308	+ private String xhdbSelectOtherVal;
	309	+ /**
	310	+ * 尿蛋白选项 1-未测 2-拒测 9-其他
	311	+ */
	312	+ private String ndbSelect;
	313	+ /**
	314	+ * 尿蛋白选项其他 - 对应的值
	315	+ */
	316	+ private String ndbSelectOtherVal;
	317	+
	318	+ public String getFuweiSelect() {
	319	+ return fuweiSelect;
	320	+ }
	321	+
	322	+ public void setFuweiSelect(String fuweiSelect) {
	323	+ this.fuweiSelect = fuweiSelect;
	324	+ }
	325	+
	326	+ public String getEdemaSelect() {
	327	+ return edemaSelect;
	328	+ }
	329	+
	330	+ public void setEdemaSelect(String edemaSelect) {
	331	+ this.edemaSelect = edemaSelect;
	332	+ }
	333	+
	334	+ public String getTireNumberSelect() {
	335	+ return tireNumberSelect;
	336	+ }
	337	+
	338	+ public void setTireNumberSelect(String tireNumberSelect) {
	339	+ this.tireNumberSelect = tireNumberSelect;
	340	+ }
	341	+
	342	+ public String getQuickenSelect() {
	343	+ return quickenSelect;
	344	+ }
	345	+
	346	+ public void setQuickenSelect(String quickenSelect) {
	347	+ this.quickenSelect = quickenSelect;
	348	+ }
	349	+
	350	+ public String getXhdbSelect() {
	351	+ return xhdbSelect;
	352	+ }
	353	+
	354	+ public void setXhdbSelect(String xhdbSelect) {
	355	+ this.xhdbSelect = xhdbSelect;
	356	+ }
	357	+
	358	+ public String getXhdbSelectOtherVal() {
	359	+ return xhdbSelectOtherVal;
	360	+ }
	361	+
	362	+ public void setXhdbSelectOtherVal(String xhdbSelectOtherVal) {
	363	+ this.xhdbSelectOtherVal = xhdbSelectOtherVal;
	364	+ }
	365	+
	366	+ public String getNdbSelect() {
	367	+ return ndbSelect;
	368	+ }
	369	+
	370	+ public void setNdbSelect(String ndbSelect) {
	371	+ this.ndbSelect = ndbSelect;
	372	+ }
	373	+
	374	+ public String getNdbSelectOtherVal() {
	375	+ return ndbSelectOtherVal;
	376	+ }
	377	+
	378	+ public void setNdbSelectOtherVal(String ndbSelectOtherVal) {
	379	+ this.ndbSelectOtherVal = ndbSelectOtherVal;
	380	+ }
	381	+
280	382	public double getfTthree() {
281	383	return fTthree;
282	384	}
...	...	@@ -1109,6 +1211,31 @@
1109	1211	}
1110	1212	if (null != tgAb) {
1111	1213	examinationModel.setTgAb(df.format(tgAb));
	1214	+ }
	1215	+
	1216	+ if (StringUtils.isNotEmpty(fuweiSelect)){
	1217	+ examinationModel.setFuweiSelect(fuweiSelect);
	1218	+ }
	1219	+ if (StringUtils.isNotEmpty(edemaSelect)){
	1220	+ examinationModel.setEdemaSelect(edemaSelect);
	1221	+ }
	1222	+ if (StringUtils.isNotEmpty(tireNumberSelect)){
	1223	+ examinationModel.setTireNumberSelect(tireNumberSelect);
	1224	+ }
	1225	+ if (StringUtils.isNotEmpty(quickenSelect)){
	1226	+ examinationModel.setQuickenSelect(quickenSelect);
	1227	+ }
	1228	+ if (StringUtils.isNotEmpty(xhdbSelect)){
	1229	+ examinationModel.setXhdbSelect(xhdbSelect);
	1230	+ }
	1231	+ if (StringUtils.isNotEmpty(xhdbSelectOtherVal)){
	1232	+ examinationModel.setXhdbSelectOtherVal(xhdbSelectOtherVal);
	1233	+ }
	1234	+ if (StringUtils.isNotEmpty(ndbSelect)){
	1235	+ examinationModel.setNdbSelect(ndbSelect);
	1236	+ }
	1237	+ if (StringUtils.isNotEmpty(ndbSelectOtherVal)){
	1238	+ examinationModel.setNdbSelectOtherVal(ndbSelectOtherVal);
1112	1239	}
1113	1240
1114	1241	return examinationModel;

...	...	@@ -153,8 +153,6 @@
153	153	private String fujianSele;
154	154	// 宫高
155	155	private String gonggao;
156		- // 宫高选项
157		- private String gongGaoSelect;
158	156	// 宫高类型
159	157	private String gongGaoType;
160	158	//腹围
...	...	@@ -228,6 +226,8 @@
228	226	private String bChao;
229	227	// 胎数
230	228	private String tireNumber;
	229	+ // 胎数 1-未测 2-拒测
	230	+ private String tireNumberSelect;
231	231	//血清谷丙转氨酶
232	232	private String xqgbzam;
233	233	//血清谷草转氨酶
...	...	@@ -346,6 +346,8 @@
346	346
347	347	//浮肿
348	348	private String edema;
	349	+ // 浮肿 1-未测 2-拒测
	350	+ private String edemaSelect;
349	351
350	352	/**
351	353	* 产检项
352	354
...	...	@@ -374,7 +376,99 @@
374	376	//妊娠异常
375	377	private String pregnancyExcpetion;
376	378
	379	+ /**
	380	+ * 胎动选项 1-未测 2-拒测
	381	+ */
	382	+ private String quickenSelect;
	383	+ /**
	384	+ * 宫高选项 1-未测 2-拒测
	385	+ */
	386	+ private String gongGaoSelect;
	387	+ /**
	388	+ * 腹围 1-未测 2-拒测
	389	+ */
	390	+ private String fuweiSelect;
	391	+ /**
	392	+ * 血红蛋白选项 1-未测 2-拒测 9-其他
	393	+ **/
	394	+ private String xhdbSelect;
	395	+ /**
	396	+ * 血红蛋白选项其他 - 对应的值
	397	+ **/
	398	+ private String xhdbSelectOtherVal;
	399	+ /**
	400	+ * 尿蛋白选项 1-未测 2-拒测 9-其他
	401	+ */
	402	+ private String ndbSelect;
	403	+ /**
	404	+ * 尿蛋白选项其他 - 对应的值
	405	+ */
	406	+ private String ndbSelectOtherVal;
377	407
	408	+ public String getQuickenSelect() {
	409	+ return quickenSelect;
	410	+ }
	411	+
	412	+ public void setQuickenSelect(String quickenSelect) {
	413	+ this.quickenSelect = quickenSelect;
	414	+ }
	415	+
	416	+ public String getFuweiSelect() {
	417	+ return fuweiSelect;
	418	+ }
	419	+
	420	+ public void setFuweiSelect(String fuweiSelect) {
	421	+ this.fuweiSelect = fuweiSelect;
	422	+ }
	423	+
	424	+ public String getXhdbSelect() {
	425	+ return xhdbSelect;
	426	+ }
	427	+
	428	+ public void setXhdbSelect(String xhdbSelect) {
	429	+ this.xhdbSelect = xhdbSelect;
	430	+ }
	431	+
	432	+ public String getXhdbSelectOtherVal() {
	433	+ return xhdbSelectOtherVal;
	434	+ }
	435	+
	436	+ public void setXhdbSelectOtherVal(String xhdbSelectOtherVal) {
	437	+ this.xhdbSelectOtherVal = xhdbSelectOtherVal;
	438	+ }
	439	+
	440	+ public String getNdbSelect() {
	441	+ return ndbSelect;
	442	+ }
	443	+
	444	+ public void setNdbSelect(String ndbSelect) {
	445	+ this.ndbSelect = ndbSelect;
	446	+ }
	447	+
	448	+ public String getNdbSelectOtherVal() {
	449	+ return ndbSelectOtherVal;
	450	+ }
	451	+
	452	+ public void setNdbSelectOtherVal(String ndbSelectOtherVal) {
	453	+ this.ndbSelectOtherVal = ndbSelectOtherVal;
	454	+ }
	455	+
	456	+ public String getTireNumberSelect() {
	457	+ return tireNumberSelect;
	458	+ }
	459	+
	460	+ public void setTireNumberSelect(String tireNumberSelect) {
	461	+ this.tireNumberSelect = tireNumberSelect;
	462	+ }
	463	+
	464	+ public String getEdemaSelect() {
	465	+ return edemaSelect;
	466	+ }
	467	+
	468	+ public void setEdemaSelect(String edemaSelect) {
	469	+ this.edemaSelect = edemaSelect;
	470	+ }
	471	+
378	472	public Double getfTthree() {
379	473	return fTthree;
380	474	}
...	...	@@ -1966,6 +2060,31 @@
1966	2060	antExChuModel.setPregnancyMethod(pregnancyMethod);
1967	2061	antExChuModel.setMonthCompliance(monthCompliance);
1968	2062	antExChuModel.setPregnancyExcpetion(pregnancyExcpetion);
	2063	+
	2064	+ if (StringUtils.isNotEmpty(fuweiSelect)){
	2065	+ antExChuModel.setFuweiSelect(fuweiSelect);
	2066	+ }
	2067	+ if (StringUtils.isNotEmpty(edemaSelect)){
	2068	+ antExChuModel.setEdemaSelect(edemaSelect);
	2069	+ }
	2070	+ if (StringUtils.isNotEmpty(tireNumberSelect)){
	2071	+ antExChuModel.setTireNumberSelect(tireNumberSelect);
	2072	+ }
	2073	+ if (StringUtils.isNotEmpty(quickenSelect)){
	2074	+ antExChuModel.setQuickenSelect(quickenSelect);
	2075	+ }
	2076	+ if (StringUtils.isNotEmpty(xhdbSelect)){
	2077	+ antExChuModel.setXhdbSelect(xhdbSelect);
	2078	+ }
	2079	+ if (StringUtils.isNotEmpty(xhdbSelectOtherVal)){
	2080	+ antExChuModel.setXhdbSelectOtherVal(xhdbSelectOtherVal);
	2081	+ }
	2082	+ if (StringUtils.isNotEmpty(ndbSelect)){
	2083	+ antExChuModel.setNdbSelect(ndbSelect);
	2084	+ }
	2085	+ if (StringUtils.isNotEmpty(ndbSelectOtherVal)){
	2086	+ antExChuModel.setNdbSelectOtherVal(ndbSelectOtherVal);
	2087	+ }
1969	2088	return antExChuModel;
1970	2089	}
1971	2090

...	...	@@ -928,6 +928,7 @@
928	928	private Double heartRate;
929	929	//胎方位
930	930	private String fetalPosition;
	931	+
931	932	//胎先露
932	933	private String fetalPresentation;
933	934	// 衔接
...	...	@@ -952,6 +953,42 @@
952	953	private String ydjc;
953	954	//羊水指数
954	955	private Double yszs;
	956	+ /**
	957	+ * 胎心率 1-未测 2-拒测
	958	+ */
	959	+ private String heartRateSelect;
	960	+ /**
	961	+ * 胎方位选项 1-未测 2-拒测
	962	+ */
	963	+ private String fetalPositionSelect;
	964	+ /**
	965	+ * 衔接选项 1-已测 2-未测
	966	+ */
	967	+ private String joinSelect;
	968	+
	969	+ public String getHeartRateSelect() {
	970	+ return heartRateSelect;
	971	+ }
	972	+
	973	+ public void setHeartRateSelect(String heartRateSelect) {
	974	+ this.heartRateSelect = heartRateSelect;
	975	+ }
	976	+
	977	+ public String getFetalPositionSelect() {
	978	+ return fetalPositionSelect;
	979	+ }
	980	+
	981	+ public void setFetalPositionSelect(String fetalPositionSelect) {
	982	+ this.fetalPositionSelect = fetalPositionSelect;
	983	+ }
	984	+
	985	+ public String getJoinSelect() {
	986	+ return joinSelect;
	987	+ }
	988	+
	989	+ public void setJoinSelect(String joinSelect) {
	990	+ this.joinSelect = joinSelect;
	991	+ }
955	992
956	993	public Double getHeartRate() {
957	994	return heartRate;