jiangjiazhi / regional-platform

Commit 7ef64d5738abfd66a53163511ed2a342ead15c4e

Authored by zhangchao over 1 year ago

Exists in dev

#fix:修改丰宁产检数据同步导入问题

Showing 4 changed files with 60 additions and 49 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.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/PatientServiceFacade.java

...	...	@@ -407,8 +407,7 @@
407	407	*
408	408	* @return
409	409	*/
410		- public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) {
411		- String hospitalId = autoMatchFacade.getHospitalId(userId);
	410	+ public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) { String hospitalId = autoMatchFacade.getHospitalId(userId);
412	411	PatientsQuery patientsQuery = new PatientsQuery();
413	412	List<Patients> patientses = null;
414	413	if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) {

...	...	@@ -1594,7 +1594,8 @@
1594	1594	//根据patient查询是否存在追访信息
1595	1595	TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
1596	1596	downRecordQuery.setParentId(patient.getId());
1597		- downRecordQuery.setStatus(3);
	1597	+ //TODO 不知道这个status是干嘛用的所以注释了测试有问题的话再放开
	1598	+ //downRecordQuery.setStatus(3);
1598	1599	List <TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
1599	1600	if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
1600	1601	TrackDownRecord trackDownRecord1 = records.get(0);

...	...	@@ -606,7 +606,7 @@
606	606	//根据patient查询是否存在追访信息
607	607	TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
608	608	downRecordQuery.setParentId(patient.getId());
609		- downRecordQuery.setStatus(3);
	609	+ // downRecordQuery.setStatus(3);
610	610	List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
611	611	if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
612	612	TrackDownRecord trackDownRecord1 = records.get(0);
...	...	@@ -1388,7 +1388,7 @@
1388	1388	for (int i = 0, j = patientList.size(); i < j; i++) {
1389	1389	Patients patients = patientList.get(i);
1390	1390	try {
1391		- patientServiceFacade.sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",patients.getType());
	1391	+ patientServiceFacade.sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",patients.getType(),null);
1392	1392	} catch (Exception e) {
1393	1393	logger.error("weekSync InterruptedException," + e.getMessage());
1394	1394	}
...	...	@@ -4051,8 +4051,8 @@
4051	4051	PatientsQuery patientsQuery = new PatientsQuery();
4052	4052	patientsQuery.setYn(1);
4053	4053	patientsQuery.setHospitalId("2100001504");
4054		- if (StringUtils.isNotEmpty(map.get("username"))) {
4055		- patientsQuery.setName(map.get("username"));
	4054	+ if (StringUtils.isNotEmpty(map.get("cardNo"))) {
	4055	+ patientsQuery.setCardNo(map.get("cardNo"));
4056	4056	//判断该身份证号码是否有孕妇建档在该医院
4057	4057	final List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
4058	4058	if (CollectionUtils.isNotEmpty(patients)) {
...	...	@@ -4072,7 +4072,7 @@
4072	4072	downRecordQuery.setParentId(patient.getId());
4073	4073	trackDownRecordService.delete(downRecordQuery);
4074	4074	}
4075		- yunBookbuildingService.delete(patientsQuery);
	4075	+ //yunBookbuildingService.delete(patientsQuery);
4076	4076	}
4077	4077	}
4078	4078	}
4079	4079
...	...	@@ -4926,9 +4926,7 @@
4926	4926
4927	4927	public void insertBatch2(String name) {
4928	4928
4929		-
4930	4929	List<Map<String, String>> list = ExcelUtil.readExcl("E:\\建档数据同步\\" + name, 2);//
4931		-
4932	4930	for (final Map<String, String> map : list) {
4933	4931	commonThreadPool.execute(new Runnable() {
4934	4932	@Override
4935	4933
4936	4934
4937	4935
...	...	@@ -4936,15 +4934,20 @@
4936	4934	PatientsQuery patientsQuery = new PatientsQuery();
4937	4935	patientsQuery.setYn(1);
4938	4936	patientsQuery.setHospitalId("2100001504");
	4937	+ patientsQuery.setType(1);
4939	4938	boolean b = false;
4940	4939	Patients patient = null;
	4940	+ Integer num=1;
4941	4941	if (StringUtils.isNotEmpty(map.get("cardNo"))) {
4942		- patientsQuery.setCardNo(map.get("cardNo"));
	4942	+ patientsQuery.setCardNo(map.get("cardNo").trim());
4943	4943	//判断该身份证号码是否有孕妇建档在该医院
4944	4944	final List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
4945	4945	if (CollectionUtils.isNotEmpty(patients)) {
4946	4946	b = true;
4947	4947	patient = patients.get(0);
	4948	+ if (patient.getNextCheckTime()!=null&&patient.getNextCheckTime().compareTo(DateUtil.parseYMD(map.get("nextCheckTime")))<0){
	4949	+ num=2;
	4950	+ }
4948	4951	} else {
4949	4952	patient = new Patients();
4950	4953	}
...	...	@@ -4966,7 +4969,7 @@
4966	4969	}
4967	4970	}
4968	4971	if (StringUtils.isEmpty(map.get("lastMenses"))){
4969		- patient.setLastMenses(DateUtil.getCurrentDueDate(map.get("currentDueDate"), map.get("checkDate")));
	4972	+ patient.setLastMenses(DateUtil.getCurrentDueDate(map.get("currentDueDate"), map.get("bookbuildingDate")));
4970	4973	}else {
4971	4974	patient.setLastMenses(DateUtil.parseYMD(map.get("lastMenses")));
4972	4975	}
4973	4976
...	...	@@ -4988,15 +4991,15 @@
4988	4991	if (StringUtils.isNotEmpty(map.get("cardNo"))) {
4989	4992
4990	4993	PersonModelQuery personModelQuery = new PersonModelQuery();
4991		- personModelQuery.setCardNo(map.get("cardNo"));
	4994	+ personModelQuery.setCardNo(map.get("cardNo").trim());
4992	4995	personModelQuery.setYn(YnEnums.YES.getId());
4993	4996	personModelQuery.setTypes(new Integer[]{1, 3}); //孕妇或者产妇基本信息
4994	4997	List<PersonModel> personModels = personService.queryPersons(personModelQuery);
4995	4998
4996	4999	PersonModel pmodel = new PersonModel();
4997	5000	pmodel.setName(map.get("username"));
4998		- pmodel.setPhone(map.get("phone"));
4999		- pmodel.setCardNo(map.get("cardNo"));
	5001	+ pmodel.setPhone(map.get("phone").trim());
	5002	+ pmodel.setCardNo(map.get("cardNo").trim());
5000	5003	pmodel.setType(type);
5001	5004	pmodel.setModified(new Date());
5002	5005	if (CollectionUtils.isNotEmpty(personModels) && personModels.get(0) != null) {
5003	5006
...	...	@@ -5010,14 +5013,14 @@
5010	5013	}
5011	5014	patient.setYn(1);
5012	5015	patient.setUsername(map.get("username"));
5013		- patient.setCardNo(map.get("cardNo"));
	5016	+ patient.setCardNo(map.get("cardNo").trim());
5014	5017	patient.setHospitalId("2100001504");
5015	5018	patient.setBookbuildingDate(DateUtil.parseYMD(map.get("bookbuildingDate")));
5016	5019	patient.setAge(Integer.valueOf(map.get("age")));
5017	5020	patient.setBirth(DateUtil.parseYMD(map.get("birth")));
5018	5021
5019	5022	// patient.setAddressRegister(map.get("xian") + map.get("xiang") + map.get("cun"));
5020		- patient.setPhone(map.get("phone"));
	5023	+ patient.setPhone(map.get("phone").trim());
5021	5024	patient.setFirstCheckId(String.valueOf(patient.getOperator()));
5022	5025	patient.setFirstCheckTime(patient.getBookbuildingDate());
5023	5026	if (patient.getLastMenses() != null) {
...	...	@@ -5119,7 +5122,7 @@
5119	5122	}
5120	5123
5121	5124
5122		- Integer num = Integer.valueOf(map.get("num"));
	5125	+ // Integer num = Integer.valueOf(map.get("num"));
5123	5126	AntExRecordModel antExRecordModel = new AntExRecordModel();
5124	5127	AntExChuModel antExChuModel = new AntExChuModel();
5125	5128	String riskFactor = map.get("name");
5126	5129
...	...	@@ -5204,8 +5207,10 @@
5204	5207	antExChuModel.setPid(patient.getPid());
5205	5208	antExChuModel.setProdDoctor(String.valueOf(patient.getOperator()));
5206	5209
	5210	+
	5211	+ antExChuModel= antenatalExaminationService.addOneAntEx(antExChuModel);
	5212	+ antExRecordModel.setfId(antExChuModel.getId());
5207	5213	antExRecordService.addOneRecord(antExRecordModel);
5208		- antenatalExaminationService.addOneAntEx(antExChuModel);
5209	5214	//初诊是添加追访记录
5210	5215	addTrackDownInfo(patient.getOperator(), patient);
5211	5216	}
...	...	@@ -5227,8 +5232,11 @@
5227	5232	antenatalExaminationModel.setNextCheckTime(DateUtil.parseYMD(map.get("nextCheckTime")));
5228	5233	antenatalExaminationModel.setCurrentDueDate(map.get("currentDueDate"));
5229	5234	antenatalExaminationModel.setCheckDate(DateUtil.parseYMD(map.get("checkDate")));
5230		- antenatalExaminationService.addOneBabyAnt(antenatalExaminationModel);
5231		- antExRecordService.addOneRecord(antExRecordModel);
	5235	+ antenatalExaminationModel=antenatalExaminationService.addOneBabyAnt(antenatalExaminationModel);
	5236	+ antExRecordModel.setfId(antenatalExaminationModel.getId());
	5237	+ antExRecordService.addOneRecord(antExRecordModel);
	5238	+ //添加复诊时添加追访信息
	5239	+ antenatalExaminationFacade.addTrackDownInfo(patient.getOperator(), patient, map.get("nextCheckTime"));
5232	5240	}
5233	5241	}
5234	5242	});

...	...	@@ -561,7 +561,7 @@
561	561	patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
562	562	bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
563	563
564		- sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.YUNOBJ.getId());
	564	+ sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.YUNOBJ.getId(),1);
565	565
566	566	} else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) {
567	567	System.out.println("555555555555555555555555");
...	...	@@ -584,7 +584,7 @@
584	584	patient.setServiceType(ServiceTypeEnums.ADD_MAT_DELIVER_SERVICE.getId());
585	585	patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
586	586	bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
587		- sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.CHANOBJ.getId());
	587	+ sendServiceMsg(patients,SmsServiceEnums.FWKT.getId(),"您好，请点击此处查看开通服务内容详情。","大同市第一人民医院",ServiceObjEnums.CHANOBJ.getId(),1);
588	588
589	589	}
590	590	}
...	...	@@ -598,7 +598,7 @@
598	598	return baseResponse;
599	599	}
600	600	//大同医院服务推送\短信
601		- public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1,Integer objType){
	601	+ public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1,Integer objType,Integer type){
602	602	System.out.println("333333333333333333333");
603	603	if ("2100002419".equals(patient.getHospitalId())) {
604	604	try {
...	...	@@ -627,31 +627,34 @@
627	627	mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
628	628	mr.setWxTempId(WxTempleteIdEnums.YUX_XUE_KE_CHEN_FB.getId());
629	629	messages.add(mr);
630		- String title = "服务提醒短信";
631		- String messageContent = "【大同市第一人民医院】" + "欢迎加入我院健康咨询服务：请微信-添加朋友-公众号-搜索“美生孕育”关注；点击开通成功提醒，手机号获取验证码成功登录宝贝孕程小程序。请确保登录成功并持续关注“美生孕育”公众号，正常接收产检提醒，享受个性化指导文章推送、孕期随访及营养指导等服务。";
632		- MsgRequest request = new MsgRequest();
633		- //1 推送服务， 2 推送和短信服务，3短信服务
634		- request.setServiceType(3);
635		- //短信发送状态
636		- request.setSmsStatus(SmsStatusEnums.WFS.getId());
637		- //平台ID
638		- request.setTypeId(ProjectTypeEnums.YNXT.getId());
639		- //服务对象 1孕妇 2儿童 3产妇
640		- request.setObjType(1);
641		- request.setPhone(patient.getPhone());
642		- request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
643		- request.setSubTypeId(SmsServiceEnums.DXFW.getId());
644		- request.setStatus(MsgStatusEnums.NO_SEND.getId());
645		- request.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
646		- request.setHospitalId("2100002419");
647		- request.setPatientId(patient.getId());
648		- request.setTempId(patient.getId());
649		- mr.setWxTempId(WxTempleteIdEnums.YUX_XUE_KE_CHEN_FB.getId());
650		- request.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
651		- request.setFirst(messageContent);
652		- request.setKeyword1(title);
653		- request.setKeyword2(DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),0)));
654		- messages.add(request);
	630	+ if (type!=null){
	631	+ String title = "服务提醒短信";
	632	+ String messageContent = "【大同市第一人民医院】" + "欢迎加入我院健康咨询服务：请微信-添加朋友-公众号-搜索“美生孕育”关注；点击开通成功提醒，手机号获取验证码成功登录宝贝孕程小程序。请确保登录成功并持续关注“美生孕育”公众号，正常接收产检提醒，享受个性化指导文章推送、孕期随访及营养指导等服务。";
	633	+ MsgRequest request = new MsgRequest();
	634	+ //1 推送服务， 2 推送和短信服务，3短信服务
	635	+ request.setServiceType(3);
	636	+ //短信发送状态
	637	+ request.setSmsStatus(SmsStatusEnums.WFS.getId());
	638	+ //平台ID
	639	+ request.setTypeId(ProjectTypeEnums.YNXT.getId());
	640	+ //服务对象 1孕妇 2儿童 3产妇
	641	+ request.setObjType(1);
	642	+ request.setPhone(patient.getPhone());
	643	+ request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
	644	+ request.setSubTypeId(SmsServiceEnums.DXFW.getId());
	645	+ request.setStatus(MsgStatusEnums.NO_SEND.getId());
	646	+ request.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
	647	+ request.setHospitalId("2100002419");
	648	+ request.setPatientId(patient.getId());
	649	+ request.setTempId(patient.getId());
	650	+ mr.setWxTempId(WxTempleteIdEnums.YUX_XUE_KE_CHEN_FB.getId());
	651	+ request.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
	652	+ request.setFirst(messageContent);
	653	+ request.setKeyword1(title);
	654	+ request.setKeyword2(DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),0)));
	655	+ messages.add(request);
	656	+ }
	657	+
655	658	smsConfigFacade.saveMsg(messages, patient.getHospitalId());
656	659	} catch (Exception e) {
657	660	logger.error("sendServiceMsg Exception " + e);