jiangjiazhi / regional-platform

Commit 1eea62b55dc53c2a648febc3b0afc351f8d42d82

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

威海分娩字段添加

Showing 4 changed files with 214 additions and 1 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java
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

...	...	@@ -11,7 +11,11 @@
11	11	* Created by Administrator on 2016/6/24 0024.
12	12	*/
13	13	public enum FmTypeEnums {
14		- O("顺产", "1"), O1("剖宫产", "2");
	14	+ O("顺产", "1"),
	15	+ O1("剖宫产", "2"),
	16	+ O2("胎吸","3"),
	17	+ O3("自由体位","4"),
	18	+ O4("臀牵引","5");
15	19
16	20	private FmTypeEnums(String name, String id) {
17	21	this.id = id;

...	...	@@ -523,10 +523,29 @@
523	523	private String stReflex;//手头反射
524	524	private String sAbility;//吮能力
525	525
	526	+ private String umbilicus;//脐
	527	+ private String umXqFy;//脐带血清反应
	528	+
526	529	public Baby(){
527	530
528	531	}
529	532
	533	+ public String getUmbilicus() {
	534	+ return umbilicus;
	535	+ }
	536	+
	537	+ public void setUmbilicus(String umbilicus) {
	538	+ this.umbilicus = umbilicus;
	539	+ }
	540	+
	541	+ public String getUmXqFy() {
	542	+ return umXqFy;
	543	+ }
	544	+
	545	+ public void setUmXqFy(String umXqFy) {
	546	+ this.umXqFy = umXqFy;
	547	+ }
	548	+
530	549	public String getDueTime() {
531	550	return dueTime;
532	551	}
...	...	@@ -1725,6 +1744,16 @@
1725	1744	private String sszcjg;//手术助产经过
1726	1745	private String remarks;//备注
1727	1746
	1747	+ /*****威海再次新增字段（12月计划中）*****/
	1748	+ private Integer gravidity;//孕次
	1749	+ private String department;//科室(1：产一；2：产二)
	1750	+ private List<String> myzd;//母婴阻断
	1751	+ private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
	1752	+ private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
	1753	+ private String ssRecord;//手术记录
	1754	+ private List<Map> ssCount;//手术清点
	1755	+ private String ssProcedure;//所施手术
	1756	+
1728	1757	public Integer getParity() {
1729	1758	return parity;
1730	1759	}
...	...	@@ -1835,6 +1864,70 @@
1835	1864
1836	1865	public void setRemarks(String remarks) {
1837	1866	this.remarks = remarks;
	1867	+ }
	1868	+
	1869	+ public Integer getGravidity() {
	1870	+ return gravidity;
	1871	+ }
	1872	+
	1873	+ public void setGravidity(Integer gravidity) {
	1874	+ this.gravidity = gravidity;
	1875	+ }
	1876	+
	1877	+ public String getDepartment() {
	1878	+ return department;
	1879	+ }
	1880	+
	1881	+ public void setDepartment(String department) {
	1882	+ this.department = department;
	1883	+ }
	1884	+
	1885	+ public List<String> getMyzd() {
	1886	+ return myzd;
	1887	+ }
	1888	+
	1889	+ public void setMyzd(List<String> myzd) {
	1890	+ this.myzd = myzd;
	1891	+ }
	1892	+
	1893	+ public String getAnalMode() {
	1894	+ return analMode;
	1895	+ }
	1896	+
	1897	+ public void setAnalMode(String analMode) {
	1898	+ this.analMode = analMode;
	1899	+ }
	1900	+
	1901	+ public String getHyCondition() {
	1902	+ return hyCondition;
	1903	+ }
	1904	+
	1905	+ public void setHyCondition(String hyCondition) {
	1906	+ this.hyCondition = hyCondition;
	1907	+ }
	1908	+
	1909	+ public String getSsRecord() {
	1910	+ return ssRecord;
	1911	+ }
	1912	+
	1913	+ public void setSsRecord(String ssRecord) {
	1914	+ this.ssRecord = ssRecord;
	1915	+ }
	1916	+
	1917	+ public List<Map> getSsCount() {
	1918	+ return ssCount;
	1919	+ }
	1920	+
	1921	+ public void setSsCount(List<Map> ssCount) {
	1922	+ this.ssCount = ssCount;
	1923	+ }
	1924	+
	1925	+ public String getSsProcedure() {
	1926	+ return ssProcedure;
	1927	+ }
	1928	+
	1929	+ public void setSsProcedure(String ssProcedure) {
	1930	+ this.ssProcedure = ssProcedure;
1838	1931	}
1839	1932	}

...	...	@@ -2767,7 +2767,15 @@
2767	2767	map.put("sszcjg",data.getSszcjg());
2768	2768	map.put("remarks",data.getRemarks());
2769	2769	/****************************************************/
	2770	+ map.put("gravidity",data.getGravidity());
	2771	+ map.put("department",data.getDepartment());
	2772	+ map.put("myzd",data.getAnalMode());
	2773	+ map.put("hyCondition",data.getHyCondition());
	2774	+ map.put("ssRecord",data.getSsRecord());
	2775	+ map.put("ssCount",data.getSsCount());
	2776	+ map.put("ssProcedure",data.getSsProcedure());
2770	2777
	2778	+
2771	2779	/* 产后生理 */
2772	2780	map.put("maternalInfo", data.getMaternalInfo() == null ? "" : CfEnums.getTitle(data.getMaternalInfo()));
2773	2781	map.put("deathCause", com.lyms.platform.common.utils.StringUtils.isEmpty(data.getDeathCause()) ? "--" : DeathCauseEnums.getName(data.getDeathCause()));
...	...	@@ -3044,6 +3052,8 @@
3044	3052	babyMap.put("stReflex",temp.getStReflex());
3045	3053	babyMap.put("sAbility",temp.getsAbility());
3046	3054	/********************************/
	3055	+ babyMap.put("umbilicus",temp.getUmbilicus());
	3056	+ babyMap.put("umXqFy",temp.getUmXqFy());
3047	3057
3048	3058	babyList.add(babyMap);
3049	3059	}

...	...	@@ -10,6 +10,7 @@
10	10
11	11	import java.io.Serializable;
12	12	import java.util.Date;
	13	+import java.util.HashMap;
13	14	import java.util.List;
14	15	import java.util.Map;
15	16
16	17
...	...	@@ -212,7 +213,70 @@
212	213	this.tHloseBloodL = tHloseBloodL;
213	214	}
214	215
	216	+ public Integer getGravidity() {
	217	+ return gravidity;
	218	+ }
215	219
	220	+ public void setGravidity(Integer gravidity) {
	221	+ this.gravidity = gravidity;
	222	+ }
	223	+
	224	+ public String getDepartment() {
	225	+ return department;
	226	+ }
	227	+
	228	+ public void setDepartment(String department) {
	229	+ this.department = department;
	230	+ }
	231	+
	232	+ public List<String> getMyzd() {
	233	+ return myzd;
	234	+ }
	235	+
	236	+ public void setMyzd(List<String> myzd) {
	237	+ this.myzd = myzd;
	238	+ }
	239	+
	240	+ public String getAnalMode() {
	241	+ return analMode;
	242	+ }
	243	+
	244	+ public void setAnalMode(String analMode) {
	245	+ this.analMode = analMode;
	246	+ }
	247	+
	248	+ public String getHyCondition() {
	249	+ return hyCondition;
	250	+ }
	251	+
	252	+ public void setHyCondition(String hyCondition) {
	253	+ this.hyCondition = hyCondition;
	254	+ }
	255	+
	256	+ public String getSsRecord() {
	257	+ return ssRecord;
	258	+ }
	259	+
	260	+ public void setSsRecord(String ssRecord) {
	261	+ this.ssRecord = ssRecord;
	262	+ }
	263	+
	264	+ public List<Map> getSsCount() {
	265	+ return ssCount;
	266	+ }
	267	+
	268	+ public void setSsCount(List<Map> ssCount) {
	269	+ this.ssCount = ssCount;
	270	+ }
	271	+
	272	+ public String getSsProcedure() {
	273	+ return ssProcedure;
	274	+ }
	275	+
	276	+ public void setSsProcedure(String ssProcedure) {
	277	+ this.ssProcedure = ssProcedure;
	278	+ }
	279	+
216	280	/****威海妇幼新增分娩记录字段****/
217	281	private Integer parity;//胎次
218	282	private String gsqsDate;//宫缩起始时间
...	...	@@ -230,6 +294,17 @@
230	294	private String remarks;//备注
231	295
232	296
	297	+ /*****威海再次新增字段（12月计划中）*****/
	298	+ private Integer gravidity;//孕次
	299	+ private String department;//科室(1：产一；2：产二)
	300	+ private List<String> myzd;//母婴阻断
	301	+ private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
	302	+ private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
	303	+ private String ssRecord;//手术记录
	304	+ private List<Map> ssCount;//手术清点
	305	+ private String ssProcedure;//所施手术
	306	+
	307	+
233	308	@Override
234	309	public MaternalDeliverModel convertToDataModel() {
235	310	MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
...	...	@@ -292,6 +367,16 @@
292	367	maternalDeliverModel.setSszcjg(sszcjg);
293	368	maternalDeliverModel.setRemarks(remarks);
294	369
	370	+ //威海再次新增
	371	+ maternalDeliverModel.setGravidity(gravidity);
	372	+ maternalDeliverModel.setDepartment(department);
	373	+ maternalDeliverModel.setMyzd(myzd);
	374	+ maternalDeliverModel.setAnalMode(analMode);
	375	+ maternalDeliverModel.setHyCondition(hyCondition);
	376	+ maternalDeliverModel.setSsRecord(ssRecord);
	377	+ maternalDeliverModel.setSsCount(ssCount);
	378	+ maternalDeliverModel.setSsProcedure(ssProcedure);
	379	+
295	380	return maternalDeliverModel;
296	381	}
297	382
...	...	@@ -929,6 +1014,8 @@
929	1014	private String stReflex;//手头反射
930	1015	private String sAbility;//吮能力
931	1016	/***********新增结束**********/
	1017	+ private String umbilicus;//脐
	1018	+ private String umXqFy;//脐带血清反应
932	1019
933	1020	@Override
934	1021	public MaternalDeliverModel.Baby convertToDataModel() {
935	1022
...	...	@@ -1036,7 +1123,26 @@
1036	1123	baby.setStReflex(stReflex);
1037	1124	baby.setsAbility(sAbility);
1038	1125
	1126	+ baby.setUmbilicus(umbilicus);
	1127	+ baby.setUmXqFy(umXqFy);
	1128	+
1039	1129	return baby;
	1130	+ }
	1131	+
	1132	+ public String getUmbilicus() {
	1133	+ return umbilicus;
	1134	+ }
	1135	+
	1136	+ public void setUmbilicus(String umbilicus) {
	1137	+ this.umbilicus = umbilicus;
	1138	+ }
	1139	+
	1140	+ public String getUmXqFy() {
	1141	+ return umXqFy;
	1142	+ }
	1143	+
	1144	+ public void setUmXqFy(String umXqFy) {
	1145	+ this.umXqFy = umXqFy;
1040	1146	}
1041	1147
1042	1148	public String getCsStatus() {