jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 27 additions and 1 deletions

...	...	@@ -20,6 +20,9 @@
20	20	private static final long serialVersionUID = SerialIdEnum.MaternalDeliverModel.getCid();
21	21
22	22	private String id;
	23	+ /新加字段*/
	24	+ //产次
	25	+ private Integer dueCount;
23	26	//产妇id
24	27	private String parentId;
25	28	private String pid;
...	...	@@ -152,6 +155,14 @@
152	155	* 是否结案 1-未结案、2-已结案
153	156	*/
154	157	private Integer isClose;
	158	+
	159	+ public Integer getDueCount() {
	160	+ return dueCount;
	161	+ }
	162	+
	163	+ public void setDueCount(Integer dueCount) {
	164	+ this.dueCount = dueCount;
	165	+ }
155	166
156	167	public String getMatFollowId() {
157	168	return matFollowId;

...	...	@@ -180,6 +180,7 @@
180	180	model.setNd(request.getNd());
181	181	model.setYgbmky(request.getYgbmky());
182	182	model.setYgeky(request.getYgeky());
	183	+ model.setYgbmkt(request.getYgbmkt());
183	184	model.setYgekt(request.getYgekt());
184	185	model.setYghxkt(request.getYghxkt());
185	186	model.setWlTong(request.getWlTong());

...	...	@@ -3274,6 +3274,7 @@
3274	3274	model.setYgeky(FunvCommonUtil.checkYiGan(checkModel.getYgeky()));
3275	3275	model.setYgekt(FunvCommonUtil.checkYiGan(checkModel.getYgekt()));
3276	3276	model.setYghxkt(FunvCommonUtil.checkYiGan(checkModel.getYghxkt()));
	3277	+ model.setYgbmkt(FunvCommonUtil.checkYiGan(checkModel.getYgbmkt()));
3277	3278
3278	3279	model.setWlTong(UnitUtils.unitSplice(checkModel.getWlTong(), UnitConstants.UMOLL));
3279	3280	model.setWlXin(UnitUtils.unitSplice(checkModel.getWlXin(), UnitConstants.UMOLL));
...	...	@@ -3541,7 +3542,7 @@
3541	3542	String qt = map.get("qt") == null ? "" : map.get("qt").toString();
3542	3543	if ("true".equals(qt)) {
3543	3544	String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
3544		- drugGllergic += " " + qtText + ",";
	3545	+ drugGllergic += " 其他:" + qtText + ",";
3545	3546	}
3546	3547	drugGllergic = FunvCommonUtil.spitd(drugGllergic);
3547	3548	}

...	...	@@ -17,6 +17,10 @@
17	17	@Form
18	18	public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDeliverModel>{
19	19	private String id;
	20	+
	21	+ /新加字段*/
	22	+ //产次
	23	+ private Integer dueCount;
20	24	//
21	25	private String pid;
22	26	//产妇id
...	...	@@ -89,6 +93,14 @@
89	93
90	94	private Integer couponType;
91	95
	96	+ public Integer getDueCount() {
	97	+ return dueCount;
	98	+ }
	99	+
	100	+ public void setDueCount(Integer dueCount) {
	101	+ this.dueCount = dueCount;
	102	+ }
	103	+
92	104	public String getCouponCode() {
93	105	return couponCode;
94	106	}
...	...	@@ -180,6 +192,7 @@
180	192	@Override
181	193	public MaternalDeliverModel convertToDataModel() {
182	194	MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
	195	+ maternalDeliverModel.setDueCount(dueCount);
183	196	maternalDeliverModel.setFmType(fmType);
184	197	maternalDeliverModel.setFmAddr(fmAddr);
185	198	maternalDeliverModel.setParentId(parentId);