jiangjiazhi / regional-platform

Commit 3ac142306abf6d71b554a781316e65cda5d64528

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

妇科检查

Showing 3 changed files with 108 additions and 1 deletions

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

...	...	@@ -6,7 +6,6 @@
6	6
7	7	import java.util.Date;
8	8	import java.util.List;
9		-import java.util.Map;
10	9
11	10	/**
12	11	* 产前检查初诊模型
13	12
14	13
15	14
16	15
...	...	@@ -97,14 +96,24 @@
97	96	private String lungs;
98	97	//外阴
99	98	private String vulva;
	99	+ //外阴选项
	100	+ private String vulvaSele;
100	101	//阴道
101	102	private String vagina;
	103	+ //阴道选项
	104	+ private String vaginaSele;
102	105	// 宫颈
103	106	private String cervical;
	107	+ // 宫颈选项
	108	+ private String cervicalSele;
104	109	//子宫
105	110	private String uterus;
	111	+ //子宫选项
	112	+ private String uterusSele;
106	113	//附件
107	114	private String fujian;
	115	+ //附件选项
	116	+ private String fujianSele;
108	117	private Date created;
109	118	private String hospitalId;
110	119	private String bp;
111	120
112	121
...	...	@@ -590,8 +599,45 @@
590	599	this.cestationInfo = cestationInfo;
591	600	}
592	601
	602	+ public String getVulvaSele() {
	603	+ return vulvaSele;
	604	+ }
593	605
	606	+ public void setVulvaSele(String vulvaSele) {
	607	+ this.vulvaSele = vulvaSele;
	608	+ }
594	609
	610	+ public String getVaginaSele() {
	611	+ return vaginaSele;
	612	+ }
	613	+
	614	+ public void setVaginaSele(String vaginaSele) {
	615	+ this.vaginaSele = vaginaSele;
	616	+ }
	617	+
	618	+ public String getCervicalSele() {
	619	+ return cervicalSele;
	620	+ }
	621	+
	622	+ public void setCervicalSele(String cervicalSele) {
	623	+ this.cervicalSele = cervicalSele;
	624	+ }
	625	+
	626	+ public String getUterusSele() {
	627	+ return uterusSele;
	628	+ }
	629	+
	630	+ public void setUterusSele(String uterusSele) {
	631	+ this.uterusSele = uterusSele;
	632	+ }
	633	+
	634	+ public String getFujianSele() {
	635	+ return fujianSele;
	636	+ }
	637	+
	638	+ public void setFujianSele(String fujianSele) {
	639	+ this.fujianSele = fujianSele;
	640	+ }
595	641
596	642	public String getDiagnosis() {
597	643	return diagnosis;

...	...	@@ -1313,10 +1313,16 @@
1313	1313	map.put("heart", data.getHeart());
1314	1314	map.put("lungs", data.getLungs());
1315	1315	map.put("vulva", data.getVulva());
	1316	+ map.put("vulvaSele", data.getVulvaSele());
1316	1317	map.put("vagina", data.getVagina());
	1318	+ map.put("vaginaSele", data.getVaginaSele());
1317	1319	map.put("cervical", data.getCervical());
	1320	+ map.put("cervicalSele", data.getCervicalSele());
1318	1321	map.put("uterus", data.getUterus());
	1322	+ map.put("uterusSele", data.getUterusSele());
1319	1323	map.put("fujian", data.getFujian());
	1324	+ map.put("fujianSele", data.getFujianSele());
	1325	+
1320	1326
1321	1327	map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM));
1322	1328

...	...	@@ -88,14 +88,24 @@
88	88	private String lungs;
89	89	//外阴
90	90	private String vulva;
	91	+ //外阴选项
	92	+ private String vulvaSele;
91	93	//阴道
92	94	private String vagina;
	95	+ //阴道选项
	96	+ private String vaginaSele;
93	97	// 宫颈
94	98	private String cervical;
	99	+ // 宫颈选项
	100	+ private String cervicalSele;
95	101	//子宫
96	102	private String uterus;
	103	+ //子宫选项
	104	+ private String uterusSele;
97	105	//附件
98	106	private String fujian;
	107	+ //附件选项
	108	+ private String fujianSele;
99	109	// 宫高
100	110	private String gonggao;
101	111	// 宫高选项
...	...	@@ -320,6 +330,46 @@
320	330	//传染病史
321	331	private Map infectDiseases;
322	332
	333	+ public String getVulvaSele() {
	334	+ return vulvaSele;
	335	+ }
	336	+
	337	+ public void setVulvaSele(String vulvaSele) {
	338	+ this.vulvaSele = vulvaSele;
	339	+ }
	340	+
	341	+ public String getVaginaSele() {
	342	+ return vaginaSele;
	343	+ }
	344	+
	345	+ public void setVaginaSele(String vaginaSele) {
	346	+ this.vaginaSele = vaginaSele;
	347	+ }
	348	+
	349	+ public String getCervicalSele() {
	350	+ return cervicalSele;
	351	+ }
	352	+
	353	+ public void setCervicalSele(String cervicalSele) {
	354	+ this.cervicalSele = cervicalSele;
	355	+ }
	356	+
	357	+ public String getUterusSele() {
	358	+ return uterusSele;
	359	+ }
	360	+
	361	+ public void setUterusSele(String uterusSele) {
	362	+ this.uterusSele = uterusSele;
	363	+ }
	364	+
	365	+ public String getFujianSele() {
	366	+ return fujianSele;
	367	+ }
	368	+
	369	+ public void setFujianSele(String fujianSele) {
	370	+ this.fujianSele = fujianSele;
	371	+ }
	372	+
323	373	public String getSyjgSelect() {
324	374	return syjgSelect;
325	375	}
...	...	@@ -1102,6 +1152,11 @@
1102	1152	@Override
1103	1153	public AntExChuModel convertToDataModel() {
1104	1154	AntExChuModel antExChuModel = new AntExChuModel();
	1155	+ antExChuModel.setVulvaSele(vaginaSele);
	1156	+ antExChuModel.setVaginaSele(vaginaSele);
	1157	+ antExChuModel.setCervicalSele(cervicalSele);
	1158	+ antExChuModel.setUterusSele(uterusSele);
	1159	+ antExChuModel.setFujianSele(fujianSele);
1105	1160	antExChuModel.setYinchan(yinchan);
1106	1161	antExChuModel.setGongwaiyun(gongwaiyun);
1107	1162	antExChuModel.setYaowu(yaowu);