jiangjiazhi / regional-platform

Authored by shiyang almost 4 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 103 additions and 12 deletions

...	...	@@ -2321,6 +2321,7 @@
2321	2321	model.setYhipJoint(checkModel.getYhipJoint());
2322	2322	//新加中医指导
2323	2323	model.setTcmGuide(checkModel.getTcmGuide());
	2324	+ model.setWcOtherHighRisk(checkModel.getWcOtherHighRisk());
2324	2325
2325	2326	return model;
2326	2327

...	...	@@ -6,6 +6,7 @@
6	6	import com.lyms.platform.common.utils.StringUtils;
7	7	import com.lyms.platform.operate.web.facade.HosptialHighRiskFacade;
8	8	import com.lyms.platform.pojo.AntenatalExaminationModel;
	9	+import com.mchange.v2.uid.UidUtils;
9	10	import scala.actors.threadpool.Arrays;
10	11
11	12	import java.util.Iterator;
...	...	@@ -535,6 +536,21 @@
535	536	//操作人id
536	537	private String operaterUserId;
537	538
	539	+ /**
	540	+ * 围场孕妇产检新加字段
	541	+ */
	542	+ //孕妇NT
	543	+ private String wcNt;
	544	+
	545	+ public String getWcNt() {
	546	+ return wcNt;
	547	+ }
	548	+
	549	+ public void setWcNt(String wcNt) {
	550	+ this.wcNt = wcNt;
	551	+ }
	552	+ /************************/
	553	+
538	554	public String getOperaterUserId() {
539	555	return operaterUserId;
540	556	}
...	...	@@ -1289,7 +1305,10 @@
1289	1305	setHivkt(destModel.getHivkt());
1290	1306	setBamnio(destModel.getBamnio());
1291	1307	setOperaterUserId(destModel.getOperaterUserId());
1292		-
	1308	+ //围场孕妇产检新加字段nt
	1309	+ if(StringUtils.isNotEmpty(destModel.getWcNt())){
	1310	+ setWcNt(destModel.getWcNt());
	1311	+ }
1293	1312	return this;
1294	1313	}
1295	1314

...	...	@@ -656,6 +656,21 @@
656	656	//患者签名
657	657	private String patientSign;
658	658
	659	+ /**
	660	+ * 围场孕妇产检新加字段
	661	+ */
	662	+ //孕妇NT
	663	+ private String wcNt;
	664	+
	665	+ public String getWcNt() {
	666	+ return wcNt;
	667	+ }
	668	+
	669	+ public void setWcNt(String wcNt) {
	670	+ this.wcNt = wcNt;
	671	+ }
	672	+ /***********************************************/
	673	+
659	674	public String getDoctorSign() {
660	675	return doctorSign;
661	676	}
...	...	@@ -2265,6 +2280,11 @@
2265	2280	setMonthCompliance(antExChuModel.getMonthCompliance());
2266	2281	setCheckResult(antExChuModel.getCheckResult());
2267	2282	setOperaterUserId(antExChuModel.getOperaterUserId());
	2283	+
	2284	+ //围场孕妇产检新加字段-孕妇NT
	2285	+ if(StringUtils.isNotEmpty(antExChuModel.getWcNt())){
	2286	+ setWcNt(antExChuModel.getWcNt());
	2287	+ }
2268	2288	}
2269	2289	return this;
2270	2290	}

...	...	@@ -609,18 +609,7 @@
609	609	private Integer endCase;
610	610	private String outcome;
611	611
612		- /新增字段中医指导/
613		- //中医指导
614		- private String tcmGuide;
615	612
616		- public String getTcmGuide() {
617		- return tcmGuide;
618		- }
619		-
620		- public void setTcmGuide(String tcmGuide) {
621		- this.tcmGuide = tcmGuide;
622		- }
623		-
624	613	//儿童疾病
625	614	private List<Map> diseases;
626	615
...	...	@@ -740,6 +729,34 @@
740	729	private String socialContactIA;
741	730	private String socialContactDQ;
742	731
	732	+ /新增字段中医指导/
	733	+ //中医指导
	734	+ private String tcmGuide;
	735	+
	736	+ public String getTcmGuide() {
	737	+ return tcmGuide;
	738	+ }
	739	+
	740	+ public void setTcmGuide(String tcmGuide) {
	741	+ this.tcmGuide = tcmGuide;
	742	+ }
	743	+ /****************************/
	744	+
	745	+ /**
	746	+ * 围场-儿童建档和儿童体检添加字段
	747	+ */
	748	+ //儿童高危-其它高危
	749	+ private String wcOtherHighRisk;
	750	+
	751	+ public String getWcOtherHighRisk() {
	752	+ return wcOtherHighRisk;
	753	+ }
	754	+
	755	+ public void setWcOtherHighRisk(String wcOtherHighRisk) {
	756	+ this.wcOtherHighRisk = wcOtherHighRisk;
	757	+ }
	758	+
	759	+ /********************************************/
743	760
744	761	public String getExerciseIA() {
745	762	return exerciseIA;

...	...	@@ -176,6 +176,40 @@
176	176	*/
177	177	private String orderScreenDescription;
178	178
	179	+ /**
	180	+ * 围场出院小结页面新增字段
	181	+ */
	182	+ //耳聋基因筛查 0：未筛查，1：已筛查
	183	+ private Integer deafnessGene;
	184	+ //筛查日期
	185	+ private String deafnessGeneDate;
	186	+ //检查医生
	187	+ private String deafnessCheckDoctor;
	188	+
	189	+ public Integer getDeafnessGene() {
	190	+ return deafnessGene;
	191	+ }
	192	+
	193	+ public void setDeafnessGene(Integer deafnessGene) {
	194	+ this.deafnessGene = deafnessGene;
	195	+ }
	196	+
	197	+ public String getDeafnessGeneDate() {
	198	+ return deafnessGeneDate;
	199	+ }
	200	+
	201	+ public void setDeafnessGeneDate(String deafnessGeneDate) {
	202	+ this.deafnessGeneDate = deafnessGeneDate;
	203	+ }
	204	+
	205	+ public String getDeafnessCheckDoctor() {
	206	+ return deafnessCheckDoctor;
	207	+ }
	208	+
	209	+ public void setDeafnessCheckDoctor(String deafnessCheckDoctor) {
	210	+ this.deafnessCheckDoctor = deafnessCheckDoctor;
	211	+ }
	212	+
179	213	public String getIsHighRisk() {
180	214	return isHighRisk;
181	215	}