jiangjiazhi / regional-platform

Commit 1acd65984a245a9782e8fc592e8e90234ee494c3

Authored by liquanyu almost 4 years ago

Exists in master and in 6 other branches

update

Showing 11 changed files with 151 additions and 14 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
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/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java

...	...	@@ -378,6 +378,7 @@
378	378	//是否抽血 1不抽血
379	379	private Integer checkBlood;
380	380
	381	+ private Integer isSync;
381	382
382	383
383	384	public static long getSerialVersionUID() {

...	...	@@ -460,6 +460,16 @@
460	460
461	461	//1 未同步 2已经同步
462	462	private Integer isSync;
	463	+ //采血编号
	464	+ private String cxNum;
	465	+
	466	+ public String getCxNum() {
	467	+ return cxNum;
	468	+ }
	469	+
	470	+ public void setCxNum(String cxNum) {
	471	+ this.cxNum = cxNum;
	472	+ }
463	473
464	474	public Integer getIsSync() {
465	475	return isSync;

...	...	@@ -9,6 +9,7 @@
9	9	import com.lyms.platform.operate.web.request.YqysParamRequest;
10	10	import com.lyms.platform.operate.web.service.impl.PreEugebicsServiceImpl;
11	11	import com.lyms.platform.pojo.BasicConfig;
	12	+import com.lyms.platform.pojo.CervicalCancerModel;
12	13	import com.lyms.platform.pojo.PreEugenicsBaseModel;
13	14	import org.springframework.beans.factory.annotation.Autowired;
14	15	import org.springframework.stereotype.Controller;
15	16
16	17
...	...	@@ -259,11 +260,29 @@
259	260	@TokenRequired
260	261	@RequestMapping(value = "/exportRcCount", method = RequestMethod.GET)
261	262	public void exportRcCount(@RequestParam String time, HttpServletRequest request, HttpServletResponse response) {
262		- iPreEugenicsService.exportRcCount(time, getUserId(request),response);
	263	+ iPreEugenicsService.exportRcCount(time, getUserId(request), response);
263	264	}
264	265
265	266
	267	+ /**
	268	+ * 孕前优生
	269	+ * @param p
	270	+ * @param request
	271	+ * @return
	272	+ */
	273	+ @RequestMapping(method = RequestMethod.POST, value = "/syncPreEugenicsBase")
	274	+ @ResponseBody
	275	+ public BaseResponse syncPreEugenicsBase(@RequestBody PreEugenicsBaseModel p,
	276	+ HttpServletRequest request) {
	277	+ return iPreEugenicsService.syncPreEugenicsBase(p);
	278	+ }
266	279
	280	+ @RequestMapping(method = RequestMethod.GET, value = "/doSyncPreEugenicsBase")
	281	+ @ResponseBody
	282	+ public BaseResponse doSyncPreEugenicsBase(
	283	+ HttpServletRequest request) {
	284	+ return iPreEugenicsService.doSyncPreEugenicsBase();
	285	+ }
267	286
268	287	}

...	...	@@ -24,10 +24,8 @@
24	24	import com.lyms.platform.operate.web.request.AntExListQueryRequest;
25	25	import com.lyms.platform.operate.web.result.HighScoreResult;
26	26	import com.lyms.platform.operate.web.result.MaternalDeliverResult;
27		-import com.lyms.platform.operate.web.service.BabyEyeCheckService;
28		-import com.lyms.platform.operate.web.service.IBloodPressureService;
29		-import com.lyms.platform.operate.web.service.PatientWeightService;
30		-import com.lyms.platform.operate.web.service.SyncDataTaskService;
	27	+import com.lyms.platform.operate.web.service.*;
	28	+import com.lyms.platform.operate.web.service.impl.CervicalCancerServiceImpl;
31	29	import com.lyms.platform.operate.web.worker.AntexOtherHighRiskWorker;
32	30	import com.lyms.platform.operate.web.worker.AntexcOtherHighRiskWorker;
33	31	import com.lyms.platform.operate.web.worker.BabyBuildSerToPatientSerWorker;
...	...	@@ -4471,9 +4469,6 @@
4471	4469
4472	4470	return "syncPatientByHospitalId finish";
4473	4471	}
4474		- @Autowired
4475		- private PremaritalCheckupFacade premaritalCheckupFacade;
4476		-
4477	4472	@RequestMapping(value = "/setNumCode", method = RequestMethod.GET)
4478	4473	@ResponseBody
4479	4474	public String setNumCode() {
...	...	@@ -4606,5 +4601,26 @@
4606	4601	}
4607	4602	return "updateBabyFirstPyName finish";
4608	4603	}
	4604	+
	4605	+ @RequestMapping(value = "/doLhfySync", method = RequestMethod.GET)
	4606	+ @ResponseBody
	4607	+ public String doLhfySync() {
	4608	+ residentsArchiveFacade.doSyncResidentsArchive();
	4609	+ iPreEugenicsService.doSyncPreEugenicsBase();
	4610	+ cancerScreenService.doSyncCancerScreen();
	4611	+ cervicalCancerService.doSyncCervicalCancer();
	4612	+ premaritalCheckupFacade.doSyncPremaritalCheckup();
	4613	+ return "success";
	4614	+ }
	4615	+ @Autowired
	4616	+ private IPreEugenicsService iPreEugenicsService;
	4617	+ @Autowired
	4618	+ private CancerScreeningFacade cancerScreenService;
	4619	+ @Autowired
	4620	+ private CervicalCancerServiceImpl cervicalCancerService;
	4621	+ @Autowired
	4622	+ private PremaritalCheckupFacade premaritalCheckupFacade;
	4623	+ @Autowired
	4624	+ private ResidentsArchiveFacade residentsArchiveFacade;
4609	4625	}

...	...	@@ -15,10 +15,12 @@
15	15	import com.lyms.platform.common.utils.*;
16	16	import com.lyms.platform.operate.web.request.*;
17	17	import com.lyms.platform.operate.web.result.*;
	18	+import com.lyms.platform.operate.web.service.IPreEugenicsService;
18	19	import com.lyms.platform.operate.web.service.ITrackDownService;
19	20	import com.lyms.platform.operate.web.service.PatientWeightService;
20	21	import com.lyms.platform.operate.web.service.RareBloodGroupService;
21	22	import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
	23	+import com.lyms.platform.operate.web.service.impl.CervicalCancerServiceImpl;
22	24	import com.lyms.platform.operate.web.utils.CommonsHelper;
23	25	import com.lyms.platform.operate.web.utils.JxlsUtils;
24	26	import com.lyms.platform.operate.web.worker.*;
...	...	@@ -3272,5 +3274,24 @@
3272	3274
3273	3275	return new BaseObjectResponse().setData(datas).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
3274	3276	}
	3277	+
	3278	+ public void doLhfySync() {
	3279	+ System.out.println("doLhfySync-----------------------------");
	3280	+ residentsArchiveFacade.doSyncResidentsArchive();
	3281	+ iPreEugenicsService.doSyncPreEugenicsBase();
	3282	+ cancerScreenService.doSyncCancerScreen();
	3283	+ cervicalCancerService.doSyncCervicalCancer();
	3284	+ premaritalCheckupFacade.doSyncPremaritalCheckup();
	3285	+ }
	3286	+ @Autowired
	3287	+ private IPreEugenicsService iPreEugenicsService;
	3288	+ @Autowired
	3289	+ private CancerScreeningFacade cancerScreenService;
	3290	+ @Autowired
	3291	+ private CervicalCancerServiceImpl cervicalCancerService;
	3292	+ @Autowired
	3293	+ private PremaritalCheckupFacade premaritalCheckupFacade;
	3294	+ @Autowired
	3295	+ private ResidentsArchiveFacade residentsArchiveFacade;
3275	3296	}

...	...	@@ -249,6 +249,7 @@
249	249	//返回婚检信息
250	250	public PremaritalCheckupResult getResult(PremaritalCheckup result) {
251	251	PremaritalCheckupResult checkupResult = new PremaritalCheckupResult();
	252	+ checkupResult.setCxNum(result.getCxNum());
252	253	checkupResult.setId(result.getId());
253	254	checkupResult.setParentId(result.getId());
254	255	checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
...	...	@@ -649,6 +650,7 @@
649	650	} else {
650	651	checkup.setSexType(2);
651	652	}
	653	+ checkup.setCxNum(addRequest.getCxNum());
652	654
653	655	/* 配偶信息 */
654	656	if (addRequest.getDeliverStatus() != null) {
...	...	@@ -1172,6 +1174,7 @@
1172	1174	map.put("username", username);
1173	1175	//map.put("certificateNum", FunvCommonUtil.getId(certificateNum));
1174	1176	map.put("certificateNum", certificateNum);
	1177	+ map.put("cxNum", checkup.getCxNum());
1175	1178	map.put("phone", phone);
1176	1179	if (null != checkup.getJianChaJieGuo()) {
1177	1180	if (2 == checkup.getJianChaJieGuo()) {
...	...	@@ -1215,6 +1218,7 @@
1215	1218	cnames.put("premaritalUpTime", "婚检时间");
1216	1219	cnames.put("username", "姓名");
1217	1220	cnames.put("certificateNum", "证件号");
	1221	+ cnames.put("cxNum", "采血编号");
1218	1222	cnames.put("phone", "联系方式");
1219	1223	cnames.put("jianChaJieGuo", "结果");
1220	1224	cnames.put("yiXueYiJian", "医学意见");

...	...	@@ -991,7 +991,7 @@
991	991	map.put("nationId", FunvCommonUtil.getBaseicConfigByid(data.getNationId(), basicConfigService));
992	992	map.put("marriageId", FunvCommonUtil.getBaseicConfigByid(data.getMarriageId(), basicConfigService));
993	993	map.put("certificateTypeId", FunvCommonUtil.getBaseicConfigByid(data.getCertificateTypeId(), basicConfigService));
994		- map.put("certificateNum", FunvCommonUtil.getId(data.getCertificateNum()));
	994	+ map.put("certificateNum", data.getCertificateNum());
995	995	map.put("censusTypeId", FunvCommonUtil.getBaseicConfigByid(data.getCensusTypeId(), basicConfigService));
996	996	map.put("liveTypeId", FunvCommonUtil.getBaseicConfigByid(data.getLiveTypeId(), basicConfigService));
997	997	map.put("levelTypeId", FunvCommonUtil.getBaseicConfigByid(data.getLevelTypeId(), basicConfigService));
...	...	@@ -1003,7 +1003,7 @@
1003	1003	}
1004	1004	}
1005	1005	map.put("age", data.getAge());
1006		- map.put("phone", DefenceUtils.getPhone(data.getPhone()));
	1006	+ map.put("phone", data.getPhone());
1007	1007	map.put("workUnit", data.getWorkUnit());
1008	1008	map.put("residence", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
1009	1009	data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));

...	...	@@ -450,6 +450,16 @@
450	450	//用户签名
451	451	private String userSign;
452	452
	453	+ //采血编号
	454	+ private String cxNum;
	455	+
	456	+ public String getCxNum() {
	457	+ return cxNum;
	458	+ }
	459	+
	460	+ public void setCxNum(String cxNum) {
	461	+ this.cxNum = cxNum;
	462	+ }
453	463
454	464	public String getBaseSign() {
455	465	return baseSign;

...	...	@@ -426,7 +426,16 @@
426	426	private String fkjjState;
427	427
428	428	private String numCode;
	429	+ //采血编号
	430	+ private String cxNum;
429	431
	432	+ public String getCxNum() {
	433	+ return cxNum;
	434	+ }
	435	+
	436	+ public void setCxNum(String cxNum) {
	437	+ this.cxNum = cxNum;
	438	+ }
430	439	public String getNumCode() {
431	440	return numCode;
432	441	}

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.common.result.BaseResponse;
5	5	import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest;
6	6	import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest;
	7	+import com.lyms.platform.pojo.PreEugenicsBaseModel;
7	8
8	9	import javax.servlet.http.HttpServletResponse;
9	10
...	...	@@ -28,5 +29,8 @@
28	29
29	30	void exportRcCount(String time, Integer userId, HttpServletResponse response);
30	31
	32	+ BaseResponse syncPreEugenicsBase(PreEugenicsBaseModel p);
	33	+
	34	+ BaseResponse doSyncPreEugenicsBase();
31	35	}

...	...	@@ -15,8 +15,7 @@
15	15	import com.lyms.platform.permission.model.OrganizationQuery;
16	16	import com.lyms.platform.permission.service.OrganizationService;
17	17	import com.lyms.platform.permission.service.UsersService;
18		-import com.lyms.platform.pojo.BasicConfig;
19		-import com.lyms.platform.pojo.PremaritalCheckup;
	18	+import com.lyms.platform.pojo.*;
20	19	import com.lyms.platform.query.PremaritalCheckupQuery;
21	20	import com.lyms.platform.query.ResidentsArchiveQuery;
22	21	import org.apache.commons.collections.CollectionUtils;
...	...	@@ -42,8 +41,6 @@
42	41	import com.lyms.platform.operate.web.result.PreEugenicsBaseListResult;
43	42	import com.lyms.platform.operate.web.service.IPreEugenicsService;
44	43	import com.lyms.platform.operate.web.utils.CommonsHelper;
45		-import com.lyms.platform.pojo.PreEugenicsBaseModel;
46		-import com.lyms.platform.pojo.ResidentsArchiveModel;
47	44
48	45	import javax.servlet.http.HttpServletResponse;
49	46
...	...	@@ -248,6 +245,7 @@
248	245	model.setSendCountry(0);
249	246	model.setHospitalId(hospitalId);
250	247	model.setCreated(new Date());
	248	+ model.setIsSync(1);
251	249	mongoTemplate.insert(model);
252	250	return new BaseResponse();
253	251	}
...	...	@@ -274,6 +272,7 @@
274	272	@Override
275	273	public BaseResponse edit(PreEugenicsBaseRequest param) {
276	274	PreEugenicsBaseModel model = param;
	275	+ model.setIsSync(1);
277	276	String id = model.getId();
278	277	if (StringUtils.isEmpty(id)) {
279	278	return new BaseResponse("参数缺失", ErrorCodeConstants.PARAMETER_ERROR);
...	...	@@ -927,6 +926,8 @@
927	926	}
928	927
929	928
	929	+
	930	+
930	931	private List <Map <String, Object>> getDatas(String time, Integer userId) {
931	932	String hospitalId = autoMatchFacade.getHospitalId(userId);
932	933	Organization organization = organizationService.getOrganization(Integer.valueOf(hospitalId));
...	...	@@ -1019,6 +1020,48 @@
1019	1020	}
1020	1021	return total;
1021	1022	}
	1023	+
	1024	+
	1025	+ @Override
	1026	+ public BaseResponse syncPreEugenicsBase(PreEugenicsBaseModel p) {
	1027	+ PreEugenicsBaseModel model = mongoTemplate.findOne(Query.query(Criteria.where("id").is(p.getId())), PreEugenicsBaseModel.class);
	1028	+ if (model != null) {
	1029	+ Query query = Query.query(Criteria.where("id").is(p.getId()));
	1030	+ Update update = MongoConvertHelper
	1031	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(p));
	1032	+ mongoTemplate.updateFirst(query, update, CervicalCancerModel.class);
	1033	+ }
	1034	+ else
	1035	+ {
	1036	+ mongoTemplate.insert(p);
	1037	+ }
	1038	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	1039	+ }
	1040	+
	1041	+ @Override
	1042	+ public BaseResponse doSyncPreEugenicsBase() {
	1043	+ List<PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(Query.query(Criteria.where("isSync").is(1)), PreEugenicsBaseModel.class);
	1044	+ if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(preEugenicsBaseModels))
	1045	+ {
	1046	+ for (PreEugenicsBaseModel model : preEugenicsBaseModels)
	1047	+ {
	1048	+ model.setIsSync(2);
	1049	+ String json = JsonUtil.obj2Str1(model);
	1050	+ System.out.println(json);
	1051	+ String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/cervicalCancer/syncCervicalCancer",json);
	1052	+
	1053	+
	1054	+ Query query = Query.query(Criteria.where("id").is(model.getId()));
	1055	+ Update update = MongoConvertHelper
	1056	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
	1057	+ mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class);
	1058	+
	1059	+ System.out.println("doSyncPreEugenicsBase=" + syncRsult);
	1060	+ }
	1061	+ }
	1062	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	1063	+ }
	1064	+ public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url");
1022	1065	}
1023	1066
1024	1067	class Total {