jiangjiazhi / regional-platform

Authored by rui.zhang about 9 years ago

Exists in master and in 8 other branches

Showing 3 changed files

...	...	@@ -57,6 +57,9 @@
57	57	private String getShortArgs(Object[] obj) {
58	58	StringBuilder builder = new StringBuilder("(");
59	59	for (Object o : obj) {
	60	+ if(null==o){
	61	+ continue;
	62	+ }
60	63	if (o.getClass().isPrimitive()) {
61	64	builder.append(o);
62	65	} else {
63	66
...	...	@@ -65,9 +68,9 @@
65	68	builder.append(",");
66	69	}
67	70	if(builder.toString().endsWith(",")){
68		- builder.deleteCharAt(builder.length()-1).append(")");
	71	+ builder.deleteCharAt(builder.length() - 1);
69	72	}
70		- return builder.toString();
	73	+ return builder.append(")").toString();
71	74	}
72	75	}

...	...	@@ -75,6 +75,7 @@
75	75	puerperaQuery.setKeyword(managerRequest.getKeyword());
76	76	puerperaQuery.setCommunityId(managerRequest.getCommunityId());
77	77	puerperaQuery.setVisitstatus(managerRequest.getVisitstatus());
	78	+ puerperaQuery.setNeed("1");
78	79	puerperaQuery.setYn(YnEnums.YES.getId());
79	80	// 调用service查询
80	81

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import com.lyms.platform.common.utils.DateUtil;
	4	+import com.lyms.platform.common.utils.JsonUtil;
3	5	import com.lyms.platform.pojo.Patients;
	6	+import com.lyms.platform.pojo.PuerperaModel;
4	7	import org.apache.commons.lang.StringUtils;
5	8
6		-import com.lyms.platform.common.utils.DateUtil;
7		-import com.lyms.platform.pojo.PuerperaModel;
	9	+import java.util.Map;
8	10
9	11	/**
10	12	* 产妇管理结果
11		- *
	13	+ *
12	14	* @author Administrator
13	15	*/
14	16	public class PuerperaResult {
...	...	@@ -116,7 +118,16 @@
116	118	}
117	119
118	120	public PuerperaResult convertToResult(Patients model) {
119		- setAddress(model.getAddress());
	121	+ String addr = "";
	122	+ if (StringUtils.isNotEmpty(model.getAddress())) {
	123	+ try {
	124	+ Map map = JsonUtil.str2Obj(model.getAddress(), Map.class);
	125	+ addr = map.get("d").toString();
	126	+ } catch (Exception e) {
	127	+ addr = "";
	128	+ }
	129	+ }
	130	+ setAddress(addr);
120	131	setId(model.getId());
121	132	setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
122	133	setVisit(model.getIsVisit() == 0 ? "未访视" : "已访视");