jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 36 additions and 3 deletions

...	...	@@ -281,9 +281,6 @@
281	281	/* 基本信息 */
282	282	//孕妇基本信息
283	283	map.put("id", data.getId());
284		- map.put("neoDeathTodo", data.getNeoDeathTodo());
285		- map.put("yinchan", data.getYinchan());
286		- map.put("gongwaiyun", data.getGongwaiyun());
287	284	map.put("yaowu", data.getYaowu());
288	285	map.put("birthDefectTodo", data.getBirthDefectTodo());
289	286	map.put("diagnosisOther", data.getDiagnosisOther());
...	...	@@ -398,6 +395,9 @@
398	395	map.put("prodTime", UnitUtils.unitSplice(data.getProdTime(), UnitConstants.CI));
399	396	map.put("delivery", UnitUtils.unitSplice(data.getDelivery(), UnitConstants.CI));
400	397	map.put("planedProd", UnitUtils.unitSplice(data.getPlanedProd(), UnitConstants.CI));
	398	+ map.put("neoDeathTodo", UnitUtils.unitSplice(data.getNeoDeathTodo(), UnitConstants.CI));
	399	+ map.put("yinchan", UnitUtils.unitSplice(data.getYinchan(), UnitConstants.CI));
	400	+ map.put("gongwaiyun", UnitUtils.unitSplice(data.getGongwaiyun(), UnitConstants.CI));
401	401	//流产
402	402	String abortion = "";
403	403	abortion = UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI);

...	...	@@ -79,6 +79,12 @@
79	79	private Integer prodTime;
80	80	// 顺产
81	81	private Integer delivery;
	82	+ //引产
	83	+ private String yinchan;
	84	+ //宫外孕
	85	+ private String gongwaiyun;
	86	+ //药物流产次数
	87	+ private String yaowu;
82	88	//刨宫产
83	89	private Integer planedProd;
84	90	//流产
...	...	@@ -485,6 +491,30 @@
485	491	return gonggao;
486	492	}
487	493
	494	+ public String getYinchan() {
	495	+ return yinchan;
	496	+ }
	497	+
	498	+ public void setYinchan(String yinchan) {
	499	+ this.yinchan = yinchan;
	500	+ }
	501	+
	502	+ public String getGongwaiyun() {
	503	+ return gongwaiyun;
	504	+ }
	505	+
	506	+ public void setGongwaiyun(String gongwaiyun) {
	507	+ this.gongwaiyun = gongwaiyun;
	508	+ }
	509	+
	510	+ public String getYaowu() {
	511	+ return yaowu;
	512	+ }
	513	+
	514	+ public void setYaowu(String yaowu) {
	515	+ this.yaowu = yaowu;
	516	+ }
	517	+
488	518	public void setGonggao(String gonggao) {
489	519	this.gonggao = gonggao;
490	520	}
...	...	@@ -961,6 +991,9 @@
961	991	if(null!=antExChuModel.getBp()){
962	992	setBp(JsonUtil.str2Obj(antExChuModel.getBp(),Map.class));
963	993	}
	994	+ setYaowu(antExChuModel.getYaowu());
	995	+ setGongwaiyun(antExChuModel.getGongwaiyun());
	996	+ setYinchan(antExChuModel.getYinchan());
964	997	setNeoDeathTodo(antExChuModel.getNeoDeathTodo());
965	998	setBirthDefectTodo(antExChuModel.getBirthDefectTodo());
966	999	setHeart(antExChuModel.getHeart());