jiangjiazhi / regional-platform

Commit 852ea0787273ffa3d1fd0504a3069284f5d434da

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

孕前优生手动同步接口

Showing 2 changed files with 55 additions and 27 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java

...	...	@@ -2,8 +2,11 @@
2	2
3	3	import javax.servlet.http.HttpServletRequest;
4	4
	5	+import com.lyms.hospitalapi.lcfy.LcTyInterface;
	6	+import com.lyms.platform.common.constants.ErrorCodeConstants;
5	7	import com.lyms.platform.operate.web.request.YqysParamRequest;
6	8	import com.lyms.platform.operate.web.service.impl.PreEugebicsServiceImpl;
	9	+import com.lyms.platform.pojo.BasicConfig;
7	10	import com.lyms.platform.pojo.PreEugenicsBaseModel;
8	11	import org.springframework.beans.factory.annotation.Autowired;
9	12	import org.springframework.stereotype.Controller;
10	13
...	...	@@ -33,8 +36,9 @@
33	36
34	37	@Autowired
35	38	private PreEugebicsServiceImpl preEugebicsService;
	39	+ @Autowired
	40	+ private LcTyInterface lcTyInterface;
36	41	/**
37		- *
38	42	* 根据身份证号获取对应的孕前优生信息
39	43	*
40	44	* @param param
41	45
42	46
43	47
...	...	@@ -43,15 +47,37 @@
43	47	@RequestMapping(method = RequestMethod.GET, value = "/getInfoByIdCard")
44	48	@ResponseBody
45	49	@TokenRequired
46		- public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) {
47		- return iPreEugenicsService.getPatientInfoByIdCard(param,getUserId(request));
	50	+ public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param, HttpServletRequest request) {
	51	+ return iPreEugenicsService.getPatientInfoByIdCard(param, getUserId(request));
48	52	}
	53	+
49	54	@RequestMapping(method = RequestMethod.GET, value = "/getInfoByIdCardYqys")
50	55	@ResponseBody
51	56	public PreEugenicsBaseModel getPatientInfoByIdCardYqys(@JsonAlias YqysParamRequest param) {
52	57	return preEugebicsService.getPatientInfoByIdCardYqys(param);
53	58	}
	59	+ /**
	60	+ * 孕前优生临床检查定时数据手动同步
	61	+ * @param start 2020-03-08
	62	+ * @param end 2020-03-09
	63	+ * @return
	64	+ */
	65	+ @RequestMapping(method = RequestMethod.GET, value = "/timingCheck")
	66	+ @ResponseBody
	67	+ public BaseResponse timingCheck(String start ,String end) {
	68	+ start = start + "%2000:00:00";
	69	+ end = end+ "%2023:59:59";
	70	+ System.out.println("start: "+start+" , end: "+end);
	71	+ lcTyInterface.dzlcYqys(start,end);
	72	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	73	+ }
54	74
	75	+ @RequestMapping(method = RequestMethod.GET, value = "/getasicConfigYqys")
	76	+ @ResponseBody
	77	+ public BasicConfig getBasicConfigYqys(String id) {
	78	+ return preEugebicsService.getBasicConfigYqys(id);
	79	+ }
	80	+
55	81	/**
56	82	* 保存单个
57	83	*
...	...	@@ -61,7 +87,7 @@
61	87	@RequestMapping(method = RequestMethod.POST, value = "/add")
62	88	@ResponseBody
63	89	@TokenRequired
64		- public BaseResponse add( @RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) {
	90	+ public BaseResponse add(@RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) {
65	91	Integer userId = getUserId(request);
66	92	param.setCreateUser(userId.toString());
67	93	return iPreEugenicsService.add(param, getUserId(request));
...	...	@@ -76,7 +102,7 @@
76	102	@RequestMapping(method = RequestMethod.POST, value = "/edit")
77	103	@ResponseBody
78	104	@TokenRequired
79		- public BaseResponse edit( @RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) {
	105	+ public BaseResponse edit(@RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) {
80	106	Integer userId = getUserId(request);
81	107	param.setCreateUser(userId.toString());
82	108	return iPreEugenicsService.edit(param);
...	...	@@ -91,7 +117,7 @@
91	117	@RequestMapping(method = RequestMethod.GET, value = "/listPage")
92	118	@ResponseBody
93	119	@TokenRequired
94		- public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param,HttpServletRequest request) {
	120	+ public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param, HttpServletRequest request) {
95	121	return iPreEugenicsService.listPage(param, getUserId(request));
96	122	}
97	123
98	124
...	...	@@ -104,13 +130,14 @@
104	130	@RequestMapping(method = RequestMethod.GET, value = "/detail")
105	131	@ResponseBody
106	132	@TokenRequired
107		- public BaseResponse detail( @JsonAlias PreEugenicsBaseRequest param) {
	133	+ public BaseResponse detail(@JsonAlias PreEugenicsBaseRequest param) {
108	134	return iPreEugenicsService.detail(param);
109	135	}
110	136
111	137
112	138	/**
113	139	* 删除孕前优生
	140	+ *
114	141	* @param id
115	142	* @return
116	143	*/

...	...	@@ -6,6 +6,7 @@
6	6	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
7	7	import com.lyms.platform.operate.web.request.YqysParamRequest;
8	8	import com.lyms.platform.permission.service.UsersService;
	9	+import com.lyms.platform.pojo.BasicConfig;
9	10	import org.springframework.beans.BeanUtils;
10	11	import org.springframework.beans.factory.annotation.Autowired;
11	12	import org.springframework.data.domain.Sort;
...	...	@@ -64,7 +65,7 @@
64	65	* @return
65	66	*/
66	67	@Override
67		- public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) {
	68	+ public BaseResponse getPatientInfoByIdCard(CommonParamRequest param, Integer userId) {
68	69	String hospitalId = autoMatchFacade.getHospitalId(userId);
69	70	String cardNo = param.getCardNo();
70	71	Query query = new Query();
...	...	@@ -82,7 +83,7 @@
82	83	query.addCriteria(Criteria.where("code").is(code));
83	84	}
84	85
85		- PreEugenicsBaseModel one = mongoTemplate.findOne(query, PreEugenicsBaseModel.class);
	86	+ PreEugenicsBaseModel one = mongoTemplate.findOne(query, PreEugenicsBaseModel.class);
86	87	if (one == null) {
87	88	if (StringUtils.isNotEmpty(cardNo)) {
88	89	ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), ResidentsArchiveModel.class);
...	...	@@ -139,7 +140,7 @@
139	140	if (StringUtils.isNotEmpty(param.getWifeCardNo())) {
140	141	query.addCriteria(Criteria.where("wifeCardNo").is(param.getWifeCardNo()));
141	142	}
142		- if(StringUtils.isNotEmpty(param.getHospitalId()) && StringUtils.isNotEmpty(param.getUserId())){
	143	+ if (StringUtils.isNotEmpty(param.getHospitalId()) && StringUtils.isNotEmpty(param.getUserId())) {
143	144	query.addCriteria(Criteria.where("hospitalId").is(param.getHospitalId()).and("createUser").is(param.getUserId()));
144	145	}
145	146	query.addCriteria(Criteria.where("hasUpload").is("2"));
146	147
...	...	@@ -147,7 +148,11 @@
147	148	return one;
148	149	}
149	150
	151	+ public BasicConfig getBasicConfigYqys(String id) {
	152	+ return basicConfigService.getOneBasicConfigById(id);
	153	+ }
150	154
	155	+
151	156	/**
152	157	* 保存单个
153	158	*
...	...	@@ -155,7 +160,7 @@
155	160	* @return
156	161	*/
157	162	@Override
158		- public BaseResponse add(PreEugenicsBaseRequest param,Integer userId) {
	163	+ public BaseResponse add(PreEugenicsBaseRequest param, Integer userId) {
159	164	String hospitalId = autoMatchFacade.getHospitalId(userId);
160	165	PreEugenicsBaseModel model = param;
161	166	model.setHospitalId(hospitalId);
...	...	@@ -169,8 +174,7 @@
169	174	/**
170	175	* 保存到lis
171	176	*/
172		- private void saveLis(final PreEugenicsBaseModel model)
173		- {
	177	+ private void saveLis(final PreEugenicsBaseModel model) {
174	178	new Thread(new Runnable() {
175	179	@Override
176	180	public void run() {
...	...	@@ -207,7 +211,7 @@
207	211	* @return
208	212	*/
209	213	@Override
210		- public BaseListResponse listPage(PreEugenicsBaseListRequest param,Integer userId) {
	214	+ public BaseListResponse listPage(PreEugenicsBaseListRequest param, Integer userId) {
211	215
212	216	String hospitalId = autoMatchFacade.getHospitalId(userId);
213	217	Query query = new Query();
...	...	@@ -339,7 +343,7 @@
339	343	if (StringUtils.isNotEmpty(idCardNo)) {
340	344	if (StringUtils.isNotEmpty(searchType)) {
341	345	if ("1".equals(searchType)) {
342		- return query.addCriteria(Criteria.where("husbandCardNo").is(idCardNo));
	346	+ return query.addCriteria(Criteria.where("husbandCardNo").is(idCardNo));
343	347	}
344	348	if ("2".equals(searchType)) {
345	349	return query.addCriteria(Criteria.where("wifeCardNo").is(idCardNo));
...	...	@@ -353,6 +357,7 @@
353	357
354	358	/**
355	359	* 添加丈夫户口所在地/丈夫现住址/妻子户口所在地/妻子现住地址省市区街道详细地址
	360	+ *
356	361	* @param model
357	362	* @return
358	363	*/
359	364
360	365
361	366
...	...	@@ -409,21 +414,17 @@
409	414	}
410	415
411	416
412		- private void setDoctorName(Map<String,Object> map)
413		- {
414		- if (map != null && map.size() > 0 && map.get("doctor") != null)
415		- {
	417	+ private void setDoctorName(Map<String, Object> map) {
	418	+ if (map != null && map.size() > 0 && map.get("doctor") != null) {
416	419	String doctor = String.valueOf(map.get("doctor"));
417		- String doctorStr = CommonsHelper.getUserName(doctor,usersService);
418		- map.put("doctorStr",doctorStr);
	420	+ String doctorStr = CommonsHelper.getUserName(doctor, usersService);
	421	+ map.put("doctorStr", doctorStr);
419	422	}
420		- if (map != null && map.size() > 0 && map.get("checkDoctor") != null)
421		- {
	423	+ if (map != null && map.size() > 0 && map.get("checkDoctor") != null) {
422	424	String doctor = String.valueOf(map.get("checkDoctor"));
423		- if (StringUtils.isNotEmpty(doctor))
424		- {
425		- String doctorStr = CommonsHelper.getUserName(doctor,usersService);
426		- map.put("checkDoctorStr",doctorStr);
	425	+ if (StringUtils.isNotEmpty(doctor)) {
	426	+ String doctorStr = CommonsHelper.getUserName(doctor, usersService);
	427	+ map.put("checkDoctorStr", doctorStr);
427	428	}
428	429	}
429	430	}