jiangjiazhi / regional-platform

Commit 535499f7963c6c4f02b90d6ac4ff72559ba277af

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

update code

Showing 4 changed files with 47 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveRecordController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java
platform-operate-api/src/main/resources/config.properties

...	...	@@ -157,5 +157,18 @@
157	157	}
158	158
159	159
	160	+ /**
	161	+ * 获取编辑数据
	162	+ * @param id
	163	+ * @return
	164	+ */
	165	+ @RequestMapping(value = "/getSieveEditPatient", method = RequestMethod.GET)
	166	+ @ResponseBody
	167	+ @TokenRequired
	168	+ public BaseObjectResponse getSieveEditPatient(@RequestParam("id") String id) {
	169	+ return sieveRecordFacade.getSieveEditPatient(id);
	170	+ }
	171	+
	172	+
160	173	}

...	...	@@ -1215,7 +1215,7 @@
1215	1215	}
1216	1216
1217	1217
1218		- private PregnantInfoResult getResult(Patients p) {
	1218	+ public PregnantInfoResult getResult(Patients p) {
1219	1219	PregnantInfoResult result = new PregnantInfoResult();
1220	1220	result.setMensStartDay(p.getMensStartDay());
1221	1221	result.setMensEndDay(p.getMensEndDay());

...	...	@@ -15,6 +15,7 @@
15	15	import com.lyms.platform.operate.web.request.CqSieveQueryRequest;
16	16	import com.lyms.platform.operate.web.request.SieveAddRequest;
17	17	import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest;
	18	+import com.lyms.platform.operate.web.result.PregnantInfoResult;
18	19	import com.lyms.platform.operate.web.result.SieveDetailResult;
19	20	import com.lyms.platform.operate.web.result.SieveListResult;
20	21	import com.lyms.platform.operate.web.result.SieveResult;
...	...	@@ -81,8 +82,17 @@
81	82	public BaseResponse saveSieveRecord(YunBookbuildingAddRequest requestModel, Integer userId) {
82	83	try {
83	84	SieveRecordModel model = getPatientsData(requestModel);
84		- model.setOperUserId(userId);
85		- sieveRecordService.save(model);
	85	+ //id不为空就修改记录
	86	+ if (StringUtils.isNotEmpty(requestModel.getId()))
	87	+ {
	88	+ sieveRecordService.update(model,requestModel.getId());
	89	+ }
	90	+ else
	91	+ {
	92	+ model.setOperUserId(userId);
	93	+ sieveRecordService.save(model);
	94	+ }
	95	+
86	96	}
87	97	catch (Exception e)
88	98	{
...	...	@@ -381,6 +391,25 @@
381	391	br.setErrorcode(ErrorCodeConstants.SUCCESS);
382	392	br.setErrormsg("成功");
383	393	return br;
	394	+ }
	395	+
	396	+ public BaseObjectResponse getSieveEditPatient(String id) {
	397	+ SieveRecordQuery query = new SieveRecordQuery();
	398	+ query.setYn(YnEnums.YES.getId());
	399	+ query.setId(id);
	400	+ query.setStatus(0);
	401	+ PregnantInfoResult result = new PregnantInfoResult();
	402	+ List<SieveRecordModel> list = sieveRecordService.query(query);
	403	+ if (list != null && list.size() > 0) {
	404	+ Patients p = list.get(0);
	405	+ result = bookbuildingFacade.getResult(p);
	406	+ }
	407	+
	408	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	409	+ objectResponse.setData(result);
	410	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	411	+ objectResponse.setErrormsg("成功");
	412	+ return objectResponse;
384	413	}
385	414	}

1	1	#短信中心url
2		-#center_base_url=http://sms.healthbaby.com.cn/v1/
3		-center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
	2	+#center_base_url=https://weixin-push-save.healthbaby.com.cn
	3	+center_base_url=https://push.stage.platform.healthbaby.com.cn
4	4
5	5	#德州代金券地址
6	6	djq_url=http://127.0.0.1:9090/his/insertDzfyDjq