jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 9 changed files with 61 additions and 6 deletions

...	...	@@ -365,6 +365,19 @@
365	365	*/
366	366	private Map<String, Object> resultAdvice;
367	367
	368	+
	369	+ //0 或者空未上传国家网 1上传国家网
	370	+ private Integer sendCountry;
	371	+
	372	+ public Integer getSendCountry() {
	373	+ return sendCountry;
	374	+ }
	375	+
	376	+ public void setSendCountry(Integer sendCountry) {
	377	+ this.sendCountry = sendCountry;
	378	+ }
	379	+
	380	+
368	381	public String getId() {
369	382	return id;
370	383	}

...	...	@@ -162,5 +162,20 @@
162	162	public BaseResponse setDefectiveChildCheckItem(@PathVariable("id")String id){
163	163	return iPreEugenicsService.setPreEugenicsCheckItem(id);
164	164	}
	165	+
	166	+
	167	+
	168	+ /**
	169	+ * 标记已经发送国家网
	170	+ *
	171	+ * @param id
	172	+ * @return
	173	+ */
	174	+ @RequestMapping(method = RequestMethod.GET, value = "/setSendContry/{id}")
	175	+ @ResponseBody
	176	+ @TokenRequired
	177	+ public BaseResponse setSendContry(@PathVariable("id")String id) {
	178	+ return iPreEugenicsService.setSendContry(id);
	179	+ }
165	180	}

...	...	@@ -231,10 +231,9 @@
231	231	else
232	232	{
233	233	BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getPatientId());
234		- data.put("city", FunvCommonUtil.getBaseicConfigByid(babyModel.getCityId(), basicConfigService));
235		- data.put("area", FunvCommonUtil.getBaseicConfigByid(babyModel.getAreaId(), basicConfigService));
236	234	data.put("userName",babyModel.getName());
237	235	data.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated()));
	236	+ data.put("sex", babyModel.getSex() == null ? "" : SexEnum.getTextById(babyModel.getSex()));
238	237	data.put("position",model.getPosition());
239	238	data.put("sos",model.getSos());
240	239	data.put("tvalue",model.getTvalue());
...	...	@@ -245,7 +244,6 @@
245	244	data.put("adultPercent",model.getAdultPercent());
246	245	data.put("agePercent",model.getAgePercent());
247	246	data.put("slAge",model.getAge());
248		- data.put("sex", babyModel.getSex() == null ? "" : SexEnum.getTextById(babyModel.getSex()));
249	247	data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));
250	248	int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(),model.getCreated());
251	249

...	...	@@ -622,6 +622,7 @@
622	622	result.setAreaId(model.getAreaId());
623	623	result.setStreetId(model.getStreetId());
624	624	result.setAddress(model.getAddress());
	625	+ result.setChildExtAddrs(model.getChildExtAddrs());
625	626
626	627	result.setProvinceRegisterId(model.getProvinceRegisterId());
627	628	result.setCityRegisterId(model.getCityRegisterId());

...	...	@@ -4991,8 +4991,8 @@
4991	4991	result.setPhone(model.getPhone());
4992	4992	result.setWorkUnit(model.getWorkUnit());
4993	4993	//居住地
4994		- String liveAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
4995		- model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService);
	4994	+ String liveAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
	4995	+ model.getAreaId(), model.getStreetId(),model.getChildExtAddrs(), model.getAddress(), basicConfigService);
4996	4996
4997	4997	//户籍地址
4998	4998	String addressRegister = CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(),

1	1	package com.lyms.platform.operate.web.result;
2	2
3	3	import java.util.Date;
	4	+import java.util.List;
4	5	import java.util.Map;
5	6
6	7	/**
...	...	@@ -53,6 +54,7 @@
53	54	private String areaId;
54	55	private String streetId;
55	56	private String address;
	57	+ private List<String> childExtAddrs;
56	58	//户籍地址
57	59	private String provinceRegisterId;
58	60	private String cityRegisterId;
...	...	@@ -162,6 +164,14 @@
162	164
163	165	// 是否军嫂
164	166	private Integer military;
	167	+
	168	+ public List<String> getChildExtAddrs() {
	169	+ return childExtAddrs;
	170	+ }
	171	+
	172	+ public void setChildExtAddrs(List<String> childExtAddrs) {
	173	+ this.childExtAddrs = childExtAddrs;
	174	+ }
165	175
166	176	public Integer getMilitary() {
167	177	return military;

...	...	@@ -13,5 +13,7 @@
13	13	BaseResponse delete(String id);
14	14
15	15	BaseResponse setPreEugenicsCheckItem(String id);
	16	+
	17	+ BaseResponse setSendContry(String id);
16	18	}

...	...	@@ -513,5 +513,21 @@
513	513	}
514	514	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
515	515	}
	516	+
	517	+ @Override
	518	+ public BaseResponse setSendContry(String id) {
	519	+ PreEugenicsBaseModel model = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), PreEugenicsBaseModel.class);
	520	+ if (model != null) {
	521	+ if (StringUtils.isEmpty(id)) {
	522	+ return new BaseResponse("参数缺失", ErrorCodeConstants.PARAMETER_ERROR);
	523	+ }
	524	+ model.setSendCountry(1);
	525	+ Query query = Query.query(Criteria.where("id").is(id));
	526	+ Update update = MongoConvertHelper
	527	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
	528	+ mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class);
	529	+ }
	530	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	531	+ }
516	532	}