jiangjiazhi / regional-platform

Commit 7de1e04e1c148538a349c5fda0912881bbcb8ebd

Authored by shiyang about 4 years ago

Exists in master and in 6 other branches

出生证分娩数据增加字段产妇：fmddlb，fmddlx，gwrs，rsfxdm，cfyc。分娩儿童：cftc，babySeq，xsexm

Showing 4 changed files with 240 additions and 13 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.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/MaternalDeliverResult.java

...	...	@@ -216,10 +216,17 @@
216	216	private List<Integer> status;
217	217
218	218	/**
	219	+ *分娩地点类别代码
	220	+ */
	221	+ private String fmddlb;
	222	+ /**
	223	+ *分娩地点类型代码
	224	+ */
	225	+ private String fmddlx;
	226	+ /**
219	227	*本次是否属于高危妊娠
220	228	*/
221	229	private String gwrs;
222		-
223	230	/**
224	231	*妊娠风险评估分级代码
225	232	*/
226	233
...	...	@@ -228,15 +235,8 @@
228	235	*孕次
229	236	*/
230	237	private String cfyc;
231		- /**
232		- *分娩地点类别代码
233		- */
234		- private String fmddlb;
235		- /**
236		- *分娩地点类型代码
237		- */
238		- private String fmddlx;
239	238
	239	+
240	240	public String getFmddlb() {
241	241	return fmddlb;
242	242	}
243	243
...	...	@@ -801,10 +801,14 @@
801	801	private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他
802	802	private String otherInfo;
803	803
804		- //儿童出生序列号
805		- private String babySeq;
806		- //胎次该新生儿在本次分娩中出生的次序
	804	+ /**
	805	+ * 胎次该新生儿在本次分娩中出生的次序
	806	+ */
807	807	private String cftc;
	808	+ /**
	809	+ * 儿童出生序列号
	810	+ */
	811	+ private String babySeq;
808	812	/**
809	813	* 新生儿姓名
810	814	*/

...	...	@@ -4417,6 +4417,10 @@
4417	4417	babyMap.put("cjfy", temp.getCjfy());
4418	4418	babyMap.put("zl", temp.getZl());
4419	4419
	4420	+ babyMap.put("cftc", temp.getCftc());
	4421	+ babyMap.put("babySeq", temp.getBabySeq());
	4422	+ babyMap.put("xsexm", temp.getXsexm());
	4423	+
4420	4424	babyList.add(babyMap);
4421	4425	}
4422	4426	}
...	...	@@ -4436,6 +4440,12 @@
4436	4440
4437	4441	/** 优惠券编号 */
4438	4442	map.put("couponCode", couponService.findByUsedId(id));
	4443	+
	4444	+ map.put("fmddlb",data.getFmddlb());
	4445	+ map.put("fmddlx",data.getFmddlx());
	4446	+ map.put("gwrs",data.getGwrs());
	4447	+ map.put("rsfxdm",data.getRsfxdm());
	4448	+ map.put("cfyc",data.getCfyc());
4439	4449
4440	4450	br.setErrorcode(ErrorCodeConstants.SUCCESS);
4441	4451	br.setErrormsg("成功");

...	...	@@ -445,6 +445,68 @@
445	445	*/
446	446	private Integer cesareanTimeType;
447	447
	448	+ /**
	449	+ *分娩地点类别代码
	450	+ */
	451	+ private String fmddlb;
	452	+ /**
	453	+ *分娩地点类型代码
	454	+ */
	455	+ private String fmddlx;
	456	+ /**
	457	+ *本次是否属于高危妊娠
	458	+ */
	459	+ private String gwrs;
	460	+ /**
	461	+ *妊娠风险评估分级代码
	462	+ */
	463	+ private String rsfxdm;
	464	+ /**
	465	+ *孕次
	466	+ */
	467	+ private String cfyc;
	468	+
	469	+
	470	+ public String getFmddlb() {
	471	+ return fmddlb;
	472	+ }
	473	+
	474	+ public void setFmddlb(String fmddlb) {
	475	+ this.fmddlb = fmddlb;
	476	+ }
	477	+
	478	+ public String getFmddlx() {
	479	+ return fmddlx;
	480	+ }
	481	+
	482	+ public void setFmddlx(String fmddlx) {
	483	+ this.fmddlx = fmddlx;
	484	+ }
	485	+
	486	+ public String getGwrs() {
	487	+ return gwrs;
	488	+ }
	489	+
	490	+ public void setGwrs(String gwrs) {
	491	+ this.gwrs = gwrs;
	492	+ }
	493	+
	494	+ public String getRsfxdm() {
	495	+ return rsfxdm;
	496	+ }
	497	+
	498	+ public void setRsfxdm(String rsfxdm) {
	499	+ this.rsfxdm = rsfxdm;
	500	+ }
	501	+
	502	+ public String getCfyc() {
	503	+ return cfyc;
	504	+ }
	505	+
	506	+ public void setCfyc(String cfyc) {
	507	+ this.cfyc = cfyc;
	508	+ }
	509	+
448	510	public Integer getCesareanTimeType() {
449	511	return cesareanTimeType;
450	512	}
...	...	@@ -564,6 +626,12 @@
564	626	//抛宫产次数类型
565	627	maternalDeliverModel.setCesareanTimeType(cesareanTimeType);
566	628
	629	+ maternalDeliverModel.setFmddlb(fmddlb);
	630	+ maternalDeliverModel.setFmddlx(fmddlx);
	631	+ maternalDeliverModel.setGwrs(gwrs);
	632	+ maternalDeliverModel.setRsfxdm(rsfxdm);
	633	+ maternalDeliverModel.setCfyc(cfyc);
	634	+
567	635	return maternalDeliverModel;
568	636	}
569	637
...	...	@@ -1404,6 +1472,43 @@
1404	1472	private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他
1405	1473	private String otherInfo;//其他详细说明
1406	1474
	1475	+ /**
	1476	+ * 胎次该新生儿在本次分娩中出生的次序
	1477	+ */
	1478	+ private String cftc;
	1479	+ /**
	1480	+ * 儿童出生序列号
	1481	+ */
	1482	+ private String babySeq;
	1483	+ /**
	1484	+ * 新生儿姓名
	1485	+ */
	1486	+ private String xsexm;
	1487	+
	1488	+ public String getCftc() {
	1489	+ return cftc;
	1490	+ }
	1491	+
	1492	+ public void setCftc(String cftc) {
	1493	+ this.cftc = cftc;
	1494	+ }
	1495	+
	1496	+ public String getBabySeq() {
	1497	+ return babySeq;
	1498	+ }
	1499	+
	1500	+ public void setBabySeq(String babySeq) {
	1501	+ this.babySeq = babySeq;
	1502	+ }
	1503	+
	1504	+ public String getXsexm() {
	1505	+ return xsexm;
	1506	+ }
	1507	+
	1508	+ public void setXsexm(String xsexm) {
	1509	+ this.xsexm = xsexm;
	1510	+ }
	1511	+
1407	1512	public String getBabyQX() {
1408	1513	return babyQX;
1409	1514	}
...	...	@@ -1559,6 +1664,10 @@
1559	1664	/*******201905计划威海妇幼新增字段*******/
1560	1665	baby.setBabyQX(babyQX);
1561	1666	baby.setOtherInfo(otherInfo);
	1667	+
	1668	+ baby.setCftc(cftc);
	1669	+ baby.setBabySeq(babySeq);
	1670	+ baby.setXsexm(xsexm);
1562	1671	return baby;
1563	1672	}
1564	1673

...	...	@@ -222,6 +222,67 @@
222	222	*/
223	223	private Integer cesareanTimeType;
224	224
	225	+ /**
	226	+ *分娩地点类别代码
	227	+ */
	228	+ private String fmddlb;
	229	+ /**
	230	+ *分娩地点类型代码
	231	+ */
	232	+ private String fmddlx;
	233	+ /**
	234	+ *本次是否属于高危妊娠
	235	+ */
	236	+ private String gwrs;
	237	+ /**
	238	+ *妊娠风险评估分级代码
	239	+ */
	240	+ private String rsfxdm;
	241	+ /**
	242	+ *孕次
	243	+ */
	244	+ private String cfyc;
	245	+
	246	+ public String getFmddlb() {
	247	+ return fmddlb;
	248	+ }
	249	+
	250	+ public void setFmddlb(String fmddlb) {
	251	+ this.fmddlb = fmddlb;
	252	+ }
	253	+
	254	+ public String getFmddlx() {
	255	+ return fmddlx;
	256	+ }
	257	+
	258	+ public void setFmddlx(String fmddlx) {
	259	+ this.fmddlx = fmddlx;
	260	+ }
	261	+
	262	+ public String getGwrs() {
	263	+ return gwrs;
	264	+ }
	265	+
	266	+ public void setGwrs(String gwrs) {
	267	+ this.gwrs = gwrs;
	268	+ }
	269	+
	270	+ public String getRsfxdm() {
	271	+ return rsfxdm;
	272	+ }
	273	+
	274	+ public void setRsfxdm(String rsfxdm) {
	275	+ this.rsfxdm = rsfxdm;
	276	+ }
	277	+
	278	+ public String getCfyc() {
	279	+ return cfyc;
	280	+ }
	281	+
	282	+ public void setCfyc(String cfyc) {
	283	+ this.cfyc = cfyc;
	284	+ }
	285	+
225	286	public Integer getCesareanTimeType() {
226	287	return cesareanTimeType;
227	288	}
...	...	@@ -675,6 +736,11 @@
675	736	//抛宫产次数类型
676	737	setCesareanTimeType(null!=destModel.getCesareanTimeType()?destModel.getCesareanTimeType():null);
677	738
	739	+ setFmddlb(destModel.getFmddlb());
	740	+ setFmddlx(destModel.getFmddlx());
	741	+ setGwrs(destModel.getGwrs());
	742	+ setRsfxdm(destModel.getRsfxdm());
	743	+ setCfyc(destModel.getCfyc());
678	744	return this;
679	745	}
680	746
681	747
...	...	@@ -898,8 +964,19 @@
898	964	/*******201905计划威海妇幼新增字段*******/
899	965	private String babyQX;
900	966	private String otherInfo;
	967	+ /**
	968	+ * 胎次该新生儿在本次分娩中出生的次序
	969	+ */
	970	+ private String cftc;
	971	+ /**
	972	+ * 儿童出生序列号
	973	+ */
	974	+ private String babySeq;
	975	+ /**
	976	+ * 新生儿姓名
	977	+ */
	978	+ private String xsexm;
901	979
902		-
903	980	public Baby() {
904	981	}//增加无参构造方法
905	982
...	...	@@ -1018,6 +1095,33 @@
1018	1095	if ("4".equals(babyModel.getBabyQX())) {
1019	1096	setOtherInfo(babyModel.getOtherInfo());
1020	1097	}
	1098	+ setCftc(babyModel.getCftc());
	1099	+ setBabySeq(babyModel.getBabySeq());
	1100	+ setXsexm(babyModel.getXsexm());
	1101	+ }
	1102	+
	1103	+ public String getCftc() {
	1104	+ return cftc;
	1105	+ }
	1106	+
	1107	+ public void setCftc(String cftc) {
	1108	+ this.cftc = cftc;
	1109	+ }
	1110	+
	1111	+ public String getBabySeq() {
	1112	+ return babySeq;
	1113	+ }
	1114	+
	1115	+ public void setBabySeq(String babySeq) {
	1116	+ this.babySeq = babySeq;
	1117	+ }
	1118	+
	1119	+ public String getXsexm() {
	1120	+ return xsexm;
	1121	+ }
	1122	+
	1123	+ public void setXsexm(String xsexm) {
	1124	+ this.xsexm = xsexm;
1021	1125	}
1022	1126
1023	1127	public String getHx() {