jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 9 additions and 1 deletions

...	...	@@ -25,7 +25,6 @@
25	25
26	26	@Autowired
27	27	private ITrackDownService trackDownService;
28		-
29	28	@Autowired
30	29	private TrackDownFacade downFacade;
31	30	@Autowired

...	...	@@ -9,6 +9,7 @@
9	9	import com.lyms.platform.common.result.RespBuilder;
10	10	import com.lyms.platform.common.utils.DateUtil;
11	11	import com.lyms.platform.common.utils.StringUtils;
	12	+import com.lyms.platform.common.utils.SystemConfig;
12	13	import com.lyms.platform.operate.web.request.TrackDownQueryRequest;
13	14	import com.lyms.platform.operate.web.utils.CommonsHelper;
14	15	import com.lyms.platform.pojo.*;
...	...	@@ -170,6 +171,13 @@
170	171	map.put("phone", resid.getPhone());
171	172	map.put("cardNo", resid.getCertificateNum());
172	173	map.put("age", DateUtil.getAge(resid.getBirthday()));
	174	+ if (resid.getSex().equals(SystemConfig.WOMAN_ID)){
	175	+ map.put("sex",0);
	176	+ }else if (resid.getSex().equals(SystemConfig.MAN_ID)){
	177	+ map.put("sex",1);
	178	+ }else{
	179	+ map.put("sex",1);
	180	+ }
173	181	} else {
174	182	Patients patients = patientsService.findOnePatientById(parentId);
175	183	if (patients != null) {
...	...	@@ -180,6 +188,7 @@
180	188	map.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));
181	189	map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */
182	190	map.put("trackCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(trackType).and("yn").is(1)), TrackDown.class)); /** 访视次数 */
	191	+ map.put("sex",0);
183	192	map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
184	193	}
185	194	}