jiangjiazhi / regional-platform

Commit bbb794b70f08b7a1bf6d322c765e74fd60e0dc49

Authored by zhangchao almost 2 years ago

Exists in luanping and in 1 other branch

#新增威县服务同步类型：精准服务

Showing 3 changed files with 161 additions and 190 deletions

platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml

...	...	@@ -232,13 +232,7 @@
232	232	<if test="serType != null and serType >= 0">
233	233	and ser_type = #{serType,jdbcType=INTEGER}
234	234	</if>
235		- <if test="serTypes!=null">
236		- and ser_type in (
237		- <foreach item="serType" collection="serTypes" separator=",">
238		- #{serType}
239		- </foreach>
240		- )
241		- </if>
	235	+
242	236	<if test="serDoct != null and serDoct != ''">
243	237	and ser_doct = #{serDoct,jdbcType=VARCHAR}
244	238	</if>
...	...	@@ -278,6 +272,13 @@
278	272	<if test="hospitalId != null and hospitalId != ''">
279	273	and hospital_id = #{hospitalId,jdbcType=VARCHAR}
280	274	</if>
	275	+ <if test="serTypes!=null">
	276	+ and ser_type in (
	277	+ <foreach item="serType" collection="serTypes" separator=",">
	278	+ #{serType}
	279	+ </foreach>
	280	+ )
	281	+ </if>
281	282	<if test="serCode != null and serCode != ''">
282	283	and ser_code = #{serCode,jdbcType=VARCHAR}
283	284	</if>
...	...	@@ -662,7 +663,7 @@
662	663	`hospital_service_content` hso
663	664	INNER JOIN hospital_doct_service hds
664	665	on hso.id=hds.hosp_service_id
665		-where hso.hospital_id=#{hospitalId} and hso.ser_type in (3,4,6)
	666	+where hso.hospital_id=#{hospitalId} and hso.ser_type in (1,3,4,6)
666	667	</select>
667	668
668	669	</mapper>

...	...	@@ -29,6 +29,7 @@
29	29	import org.springframework.beans.factory.annotation.Autowired;
30	30	import org.springframework.stereotype.Component;
31	31
	32	+import javax.annotation.Resource;
32	33	import java.util.*;
33	34
34	35	/**
35	36
36	37
...	...	@@ -223,16 +224,14 @@
223	224	}
224	225
225	226
226		-
227		-
228	227	map.put("towns", towns);
229	228
230	229	// 居住类别
231	230	List<BasicConfigResult> liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID);
232	231	//秦皇岛需求-增加有居住证，客服配置（其他地区不需要这个选项）
233		- if(StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)){
	232	+ if (StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)) {
234	233	for (BasicConfigResult basicConfigResult : liveType) {
235		- if("有居住证".equals(basicConfigResult.getName())){
	234	+ if ("有居住证".equals(basicConfigResult.getName())) {
236	235	liveType.remove(basicConfigResult);
237	236	break;
238	237	}
239	238
240	239
241	240
242	241
243	242
244	243
245	244
246	245
247	246
248	247
249	248
250	249
...	...	@@ -300,107 +299,114 @@
300	299
301	300	/**
302	301	* 威县开通服务同步任务
303		- * 只同步 6围产小助理/3血糖管理服务/4血压管理服务
	302	+ * 只同步 6围产小助理/3血糖管理服务/4血压管理服务/1精准医疗服务
304	303	*/
305		- public void patientServiceSync(){
	304	+ public void patientServiceSync() {
306	305	logger.info("patientServiceSync start");
307		- String hospitalId="2100002421";
308		- List<Map<String, Object>> mapList= patientServiceService.selectServiceByHospital(hospitalId);
309		- if (CollectionUtils.isNotEmpty(mapList)){
310		- Integer [] serTypes={3,4,6};
	306	+ final String hospitalId = "2100002421";
	307	+ List<Map<String, Object>> mapList = patientServiceService.selectServiceByHospital(hospitalId);
	308	+ if (CollectionUtils.isNotEmpty(mapList)) {
	309	+ logger.info("patientServiceSync mapList is not null");
	310	+ final Integer[] serTypes = {1,3, 4, 6};
311	311	PatientServiceQuery patientQuery = new PatientServiceQuery();
312	312	patientQuery.setHospitalId(hospitalId);
313	313	patientQuery.setSerTypes(serTypes);
314	314	List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
315	315
316		- PatientsQuery patientsQuery=new PatientsQuery();
	316	+ PatientsQuery patientsQuery = new PatientsQuery();
317	317	patientsQuery.setHospitalId(hospitalId);
318	318	patientsQuery.setExtEnable(false);
319	319	patientsQuery.setBuildTypeNot(1);
320	320	patientsQuery.setYn(YnEnums.YES.getId());
321		- if (CollectionUtils.isNotEmpty(patientServices)){
322		- List<String> ids=new ArrayList<>();
323		- for (int i = 0,j=patientServices.size(); i < j; i++) {
324		- PatientService patientService= patientServices.get(i);
325		- ids.add(patientService.getParentid());
	321	+ if (CollectionUtils.isNotEmpty(patientServices)) {
	322	+ logger.info("patientServiceSync patientServices is not null");
	323	+ List<String> ids = new ArrayList<>();
	324	+ Set<String> set = new HashSet<>();
	325	+ for (int i = 0, j = patientServices.size(); i < j; i++) {
	326	+ PatientService patientService = patientServices.get(i);
	327	+ set.add(patientService.getParentid());
326	328	}
	329	+ ids.addAll(set);
327	330	patientsQuery.setIdns(ids);
328	331	}
329		- List<Patients> patientsList= patientsService.queryPatient(patientsQuery);
330		- if (CollectionUtils.isNotEmpty(patientsList)){
331		- for (int i = 0,j=mapList.size(); i < j; i++) {
332		- Map<String,Object> params= mapList.get(i);
333		- Integer serType= Integer.parseInt(String.valueOf(params.get("serType")));
334		- String createUser=String.valueOf(params.get("doctId"));
335		- for (int k = 0,f=patientsList.size(); k < f; k++) {
336		- Patients patients= patientsList.get(k);
337		- String parentId= patients.getId();
338		- //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
339		- /* PatientServiceQuery patientQuery = new PatientServiceQuery();
340		- patientQuery.setParentid(parentId);
341		- patientQuery.setSerType(serType);
342		- List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
343		- if (CollectionUtils.isNotEmpty(patientServices)) {
344		- continue;
345		- }*/
346		- PatientService pser = new PatientService();
347		- pser.setCreateUser(createUser);
348		- pser.setCreateDate(patients.getCreated());
349		- //设置服务对象类型服务人类型(1-孕妇、2-儿童)
350		- pser.setPerType(1);
351		- pser.setPid(patients.getPid());
352		- //如果有数据源id，取主档案id
353		- if (StringUtils.isNotEmpty(patients.getSource())) {
354		- pser.setParentid(patients.getSource());
355		- }else {
356		- pser.setParentid(parentId);
357		- }
358		- pser.setId(UUID.randomUUID().toString().replace("-", ""));
359		- //开通医院
360		- pser.setHospitalId(hospitalId);
361		- //默认开通状态
362		- pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
363		- //服务类型
364		- pser.setSerType(serType);
365		- //默认已经领取
366		- pser.setStatus(2);
367		- //默认待同步
368		- pser.setSynStatus(1);
369		- //领取时间
370		- pser.setReceiveDate(new Date());
371		- //领取操作医生id
372		- pser.setReceiveUser(createUser);
373		- //服务开通操作时间
374		- pser.setUpdateDate(new Date());
375		- //服务开通操作人
376		- pser.setUpdateUser(createUser);
377		- //默认是全孕周42
378		- pser.setDoctorWeek(42);
379		- pser.setServiceWeek(42);
	332	+ final List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
	333	+ if (CollectionUtils.isNotEmpty(patientsList)) {
	334	+ logger.info("patientServiceSync patientsList is not null");
	335	+ for (int i = 0, j = mapList.size(); i < j; i++) {
	336	+ Map<String, Object> params = mapList.get(i);
	337	+ final Integer serType = Integer.parseInt(String.valueOf(params.get("serType")));
	338	+ final String createUser = String.valueOf(params.get("doctId"));
	339	+ new Thread(new Runnable() {
	340	+ @Override
	341	+ public void run() {
	342	+ for (int k = 0, f = patientsList.size(); k < f; k++) {
	343	+ Patients patients = patientsList.get(k);
380	344
381		- setServiceRecordAdd(pser, patients);
	345	+ logger.info("patientServiceSync Thread start");
	346	+ String parentId = patients.getId();
	347	+ PatientService pser = new PatientService();
	348	+ pser.setCreateUser(createUser);
	349	+ pser.setCreateDate(patients.getCreated());
	350	+ //设置服务对象类型服务人类型(1-孕妇、2-儿童)
	351	+ pser.setPerType(1);
	352	+ pser.setPid(patients.getPid());
	353	+ //如果有数据源id，取主档案id
	354	+ if (StringUtils.isNotEmpty(patients.getSource())) {
	355	+ pser.setParentid(patients.getSource());
	356	+ } else {
	357	+ pser.setParentid(parentId);
	358	+ }
	359	+ pser.setId(UUID.randomUUID().toString().replace("-", ""));
	360	+ //开通医院
	361	+ pser.setHospitalId(hospitalId);
	362	+ //默认开通状态
	363	+ pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
	364	+ //服务类型
	365	+ pser.setSerType(serType);
	366	+ //默认已经领取
	367	+ pser.setStatus(2);
	368	+ //默认待同步
	369	+ pser.setSynStatus(1);
	370	+ //领取时间
	371	+ pser.setReceiveDate(new Date());
	372	+ //领取操作医生id
	373	+ pser.setReceiveUser(createUser);
	374	+ //服务开通操作时间
	375	+ pser.setUpdateDate(new Date());
	376	+ //服务开通操作人
	377	+ pser.setUpdateUser(createUser);
	378	+ //默认是全孕周42
	379	+ pser.setDoctorWeek(42);
	380	+ pser.setServiceWeek(42);
382	381
383		- patientServiceService.addPatientService(pser);
	382	+ setServiceRecordAdd(pser, patients);
	383	+ patientServiceService.addPatientService(pser);
	384	+ operateLogFacade.addAddOptLog(Integer.valueOf(createUser), Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务");
	385	+ if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == serType) {//孕期精准指导同步到建档
384	386
385		- operateLogFacade.addAddOptLog(Integer.valueOf(createUser), Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务");
	387	+ Patients patient = new Patients();
	388	+ patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
	389	+ patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
	390	+ bookbuildingFacade.updatePatientSerById(parentId, patient);
386	391
387		-
388		- if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == serType) {
389		- PatientServiceQuery query = new PatientServiceQuery();
390		- query.setParentid(parentId);
391		- query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId());
392		- int count = patientServiceService.queryPatientServiceCount(query);
393		- //是否有增值服务--没有则处理标准服务
394		- if (count == 0) {
395		- Patients patient = new Patients();
396		- patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
397		- patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
398		- bookbuildingFacade.updatePatientSerById(parentId, patient);
	392	+ }else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == serType) {
	393	+ PatientServiceQuery query = new PatientServiceQuery();
	394	+ query.setParentid(parentId);
	395	+ query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId());
	396	+ int count = patientServiceService.queryPatientServiceCount(query);
	397	+ //是否有增值服务--没有则处理标准服务
	398	+ if (count == 0) {
	399	+ Patients patient = new Patients();
	400	+ patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
	401	+ patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
	402	+ bookbuildingFacade.updatePatientSerById(parentId, patient);
	403	+ }
	404	+ }
	405	+ logger.info("patientServiceSync Thread end");
399	406	}
400	407	}
401		- }
	408	+ }).start();
402	409	}
403		- logger.info("addPatientServiceAll end");
404	410	}
405	411	}
406	412	logger.info("patientServiceSync end");
407	413
...	...	@@ -479,10 +485,10 @@
479	485	//服务开通操作人
480	486	pser.setUpdateUser(String.valueOf(userId));
481	487
482		- if (serInfo.containsKey("device") && StringUtils.isNotEmpty(serInfo.get("device")) ) {
	488	+ if (serInfo.containsKey("device") && StringUtils.isNotEmpty(serInfo.get("device"))) {
483	489	pser.setDevice(Integer.parseInt(serInfo.get("device")));
484	490	}
485		- if (serInfo.containsKey("deviceCon") && StringUtils.isNotEmpty(serInfo.get("deviceCon")) ) {
	491	+ if (serInfo.containsKey("deviceCon") && StringUtils.isNotEmpty(serInfo.get("deviceCon"))) {
486	492	pser.setDeviceCon(Integer.parseInt(serInfo.get("deviceCon")));
487	493	}
488	494	if (serInfo.containsKey("doctorWeek")) {
489	495
...	...	@@ -553,11 +559,9 @@
553	559	return baseResponse;
554	560	}
555	561
556		- public void setServiceRecordAdd(PatientService pser, Patients patients)
557		- {
	562	+ public void setServiceRecordAdd(PatientService pser, Patients patients) {
558	563	Date currentDate = new Date();
559		- if (pser.getCreateDate() != null)
560		- {
	564	+ if (pser.getCreateDate() != null) {
561	565	currentDate = pser.getCreateDate();
562	566	}
563	567
564	568
565	569
566	570
567	571
568	572
...	...	@@ -569,32 +573,28 @@
569	573	Integer serviceWeek = pser.getServiceWeek();
570	574	Integer doctorService = pser.getDoctorWeek();
571	575
572		- if (serviceWeek != null)
573		- {
	576	+ if (serviceWeek != null) {
574	577
575	578	Date endTime = DateUtil.addWeek(currentDate, serviceWeek);
576		- if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
577		- {
	579	+ if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) {
578	580	endTime = DateUtil.addWeek(lastMenses, 42);
579	581	}
580	582	Integer endWeek = DateUtil.getWeek(lastMenses, currentDate) + serviceWeek;
581		- endWeek = endWeek > 42 ? 42 : endWeek;
	583	+ endWeek = endWeek > 42 ? 42 : endWeek;
582	584
583	585	pser.setSerStartTime(currentDate);
584	586	pser.setSerEndTime(endTime);
585	587	pser.setSerStartWeek(DateUtil.getWeek(lastMenses, currentDate));
586	588	pser.setSerEndWeek(endWeek);
587	589	}
588		- if (doctorService != null)
589		- {
	590	+ if (doctorService != null) {
590	591	Date endTime = DateUtil.addWeek(currentDate, doctorService);
591		- if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
592		- {
	592	+ if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) {
593	593	endTime = DateUtil.addWeek(lastMenses, 42);
594	594	}
595	595
596	596	Integer endWeek = DateUtil.getWeek(lastMenses, currentDate) + doctorService;
597		- endWeek = endWeek > 42 ? 42 : endWeek;
	597	+ endWeek = endWeek > 42 ? 42 : endWeek;
598	598
599	599	pser.setDocStartTime(currentDate);
600	600	pser.setDocEndTime(endTime);
601	601
602	602
603	603
604	604
605	605
...	...	@@ -604,38 +604,31 @@
604	604	}
605	605
606	606
607		- public void setServiceRecordUpdate(PatientService pser, Patients patients)
608		- {
	607	+ public void setServiceRecordUpdate(PatientService pser, Patients patients) {
609	608	Date lastMenses = patients.getLastMenses();
610	609	Integer serviceWeek = pser.getServiceWeek();
611	610	Integer doctorWeek = pser.getDoctorWeek();
612		- if (pser.getId() != null)
613		- {
614		- if (serviceWeek != null && serviceWeek > 0)
615		- {
	611	+ if (pser.getId() != null) {
	612	+ if (serviceWeek != null && serviceWeek > 0) {
616	613	//未过期
617		- if (pser.getSerEndTime() != null && pser.getSerEndTime().getTime() > new Date().getTime())
618		- {
	614	+ if (pser.getSerEndTime() != null && pser.getSerEndTime().getTime() > new Date().getTime()) {
619	615
620	616	Date startTime = pser.getSerStartTime();
621	617	Date endTime = DateUtil.addWeek(pser.getSerEndTime(), serviceWeek);
622		- if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
623		- {
	618	+ if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) {
624	619	endTime = DateUtil.addWeek(lastMenses, 42);
625	620	}
626	621
627	622	Integer startWeek = DateUtil.getWeek(lastMenses, startTime);
628	623	Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek;
629		- endWeek = endWeek > 42 ? 42 : endWeek;
	624	+ endWeek = endWeek > 42 ? 42 : endWeek;
630	625
631	626	pser.setSerStartTime(startTime);
632	627	pser.setSerEndTime(endTime);
633	628
634	629	pser.setSerStartWeek(startWeek);
635	630	pser.setSerEndWeek(endWeek);
636		- }
637		- else
638		- {
	631	+ } else {
639	632	pser.setSerStartTime(new Date());
640	633	pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek));
641	634	pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date()));
642	635
643	636
...	...	@@ -643,29 +636,24 @@
643	636	}
644	637	}
645	638
646		- if (doctorWeek != null && doctorWeek > 0)
647		- {
648		- if (pser.getDocEndTime() != null && pser.getDocEndTime().getTime() > new Date().getTime())
649		- {
650		- Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorWeek);
651		- if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
652		- {
	639	+ if (doctorWeek != null && doctorWeek > 0) {
	640	+ if (pser.getDocEndTime() != null && pser.getDocEndTime().getTime() > new Date().getTime()) {
	641	+ Date endTime = DateUtil.addWeek(pser.getDocEndTime(), doctorWeek);
	642	+ if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) {
653	643	endTime = DateUtil.addWeek(lastMenses, 42);
654	644	}
655	645	Date startTime = pser.getSerStartTime();
656	646
657	647	Integer startWeek = DateUtil.getWeek(lastMenses, startTime);
658	648	Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorWeek;
659		- endWeek = endWeek > 42 ? 42 : endWeek;
	649	+ endWeek = endWeek > 42 ? 42 : endWeek;
660	650
661	651	pser.setDocEndTime(endTime);
662	652	pser.setDocStartTime(startTime);
663	653
664	654	pser.setDocStartWeek(startWeek);
665	655	pser.setDocEndWeek(endWeek);
666		- }
667		- else
668		- {
	656	+ } else {
669	657	pser.setDocStartTime(new Date());
670	658	pser.setDocEndTime(DateUtil.addWeek(new Date(), doctorWeek));
671	659	pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date()));
672	660
673	661
...	...	@@ -716,19 +704,17 @@
716	704	}
717	705
718	706	//增加购买孕周 cfl
719		- if(before.getSerStatus() == 1 && ps.getSerStatus() ==1){
720		- if (ps.getServiceWeek() != null && ps.getServiceWeek() > 0)
721		- {
722		- ps.setServiceWeek(ps.getServiceWeek() + (before.getServiceWeek() != null ? before.getServiceWeek():0));
	707	+ if (before.getSerStatus() == 1 && ps.getSerStatus() == 1) {
	708	+ if (ps.getServiceWeek() != null && ps.getServiceWeek() > 0) {
	709	+ ps.setServiceWeek(ps.getServiceWeek() + (before.getServiceWeek() != null ? before.getServiceWeek() : 0));
723	710	}
724		- if (ps.getDoctorWeek() != null && ps.getDoctorWeek() > 0)
725		- {
726		- ps.setDoctorWeek(ps.getDoctorWeek() + (before.getDoctorWeek() != null ? before.getDoctorWeek():0));
	711	+ if (ps.getDoctorWeek() != null && ps.getDoctorWeek() > 0) {
	712	+ ps.setDoctorWeek(ps.getDoctorWeek() + (before.getDoctorWeek() != null ? before.getDoctorWeek() : 0));
727	713	}
728	714	}
729	715	//修改服务时增加孕周内容 cfl 20231019
730	716	Patients patients = patientsService.findOnePatientById(ps.getParentid());
731		- setServiceRecordUpdate(ps,patients);
	717	+ setServiceRecordUpdate(ps, patients);
732	718
733	719	patientServiceService.updatePatientService(ps);
734	720
735	721
...	...	@@ -769,10 +755,10 @@
769	755	}
770	756	babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest);
771	757	} else {
772		- //孕妇建档服务数据处理
	758	+ //孕妇建档服务数据处理
773	759	Patients patient = new Patients();
774	760	if (PatientSerEnums.SerTypeEnums.yqjzzd.getId().intValue() == ps.getSerType().intValue()) {
775		- //孕期精准指导同步到建档
	761	+ //孕期精准指导同步到建档
776	762	patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
777	763	if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId().intValue()) {
778	764	patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
...	...	@@ -783,7 +769,7 @@
783	769	} else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.zt.getId().intValue()) {
784	770	patient.setServiceStatus(ServiceStatusEnums.SUSPEND.getId());
785	771	}
786		- }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == ps.getSerType().intValue()){
	772	+ } else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == ps.getSerType().intValue()) {
787	773	PatientServiceQuery query = new PatientServiceQuery();
788	774	query.setParentid(after.getParentid());
789	775	query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId());
790	776
...	...	@@ -826,14 +812,14 @@
826	812	result.setId(ps.getId());
827	813	if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童
828	814	BabyModel model = babyService.getOneBabyById(ps.getParentid());
829		- if(model!=null){
	815	+ if (model != null) {
830	816	result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
831	817	result.setBabyName(StringUtils.emptyDeal(model.getName()));
832	818	result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));
833	819	result.setName(StringUtils.emptyDeal(model.getMname()));
834	820	result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
835		- }else {
836		- System.out.println("根据儿童Id没有找到儿童："+ps.getParentid());
	821	+ } else {
	822	+ System.out.println("根据儿童Id没有找到儿童：" + ps.getParentid());
837	823	}
838	824	} else {
839	825	Patients patients = patientsService.findOnePatientById(ps.getParentid());
840	826
...	...	@@ -853,14 +839,13 @@
853	839
854	840	if (!"-".equals(result.getRiskFactor()) && org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) {
855	841	result.setRiskFactor(result.getRiskFactor() + "," + patients.getoRiskFactor());
856		- }else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor()))
857		- {
	842	+ } else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) {
858	843	result.setRiskFactor(patients.getoRiskFactor());
859	844	}
860	845	//高危等级颜色
861	846	result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId()));
862		- }else{
863		- System.out.println("根据孕妇id没有找到孕妇建档："+ps.getParentid());
	847	+ } else {
	848	+ System.out.println("根据孕妇id没有找到孕妇建档：" + ps.getParentid());
864	849	}
865	850	}
866	851	if (StringUtils.isNotEmpty(ps.getHospitalId())) {//查询医院名称
...	...	@@ -893,9 +878,8 @@
893	878	result.setSerType(ps.getSerType());
894	879	String serType = PatientSerEnums.SerTypeEnums.getTitle(ps.getSerType());
895	880
896		- if (ps.getSerType() != null && PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType())
897		- {
898		- serType+=getServiceCricle(ps.getParentid());
	881	+ if (ps.getSerType() != null && PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()) {
	882	+ serType += getServiceCricle(ps.getParentid());
899	883	}
900	884
901	885	result.setSerTypeStr(serType);
902	886
903	887
904	888
...	...	@@ -945,31 +929,23 @@
945	929	return result;
946	930	}
947	931
948		- public String getServiceCricle(String patientId)
949		- {
950		- TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery();
	932	+ public String getServiceCricle(String patientId) {
	933	+ TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery();
951	934	stquery.setForeignId(patientId);
952	935	stquery.setSort(" createTime desc");
953	936	stquery.setgEndTime(new Date());
954	937	String serType = "";
955		- List<TServiceTimeRecord> tsList = serviceTimeRecordService.selectServiceTimeRecords(stquery);
956		- if (CollectionUtils.isNotEmpty(tsList))
957		- {
	938	+ List<TServiceTimeRecord> tsList = serviceTimeRecordService.selectServiceTimeRecords(stquery);
	939	+ if (CollectionUtils.isNotEmpty(tsList)) {
958	940	TServiceTimeRecord serviceTimeRecord = tsList.get(0);
959		- if (serviceTimeRecord.getType() != null)
960		- {
961		- if (serviceTimeRecord.getType() == 1)
962		- {
963		- serType+="(单次)";
	941	+ if (serviceTimeRecord.getType() != null) {
	942	+ if (serviceTimeRecord.getType() == 1) {
	943	+ serType += "(单次)";
	944	+ } else if (serviceTimeRecord.getType() == 2) {
	945	+ serType += "(一个月)";
	946	+ } else if (serviceTimeRecord.getType() == 3) {
	947	+ serType += "(一个季度)";
964	948	}
965		- else if (serviceTimeRecord.getType() == 2)
966		- {
967		- serType+="(一个月)";
968		- }
969		- else if (serviceTimeRecord.getType() == 3)
970		- {
971		- serType+="(一个季度)";
972		- }
973	949	}
974	950	}
975	951	return serType;
976	952
...	...	@@ -1284,10 +1260,10 @@
1284	1260
1285	1261	/**
1286	1262	* 默认服务开通
	1263	+ *
1287	1264	* @return
1288	1265	*/
1289		- public List<Map<String, String>> defaultServiceOpen()
1290		- {
	1266	+ public List<Map<String, String>> defaultServiceOpen() {
1291	1267	//标准服务开通
1292	1268	List<Map<String, String>> serInfos = new ArrayList<>();
1293	1269	// Map<String, String> serMap = new HashMap<>();
...	...	@@ -1297,7 +1273,6 @@
1297	1273	}
1298	1274
1299	1275
1300		-
1301	1276	/**
1302	1277	* 同步医院医生服务价格配置
1303	1278	*
1304	1279
1305	1280
1306	1281
...	...	@@ -1372,31 +1347,26 @@
1372	1347	return map;
1373	1348	}
1374	1349
1375		- public void doServiceEndExcute()
1376		- {
	1350	+ public void doServiceEndExcute() {
1377	1351
1378	1352	PatientServiceQuery patientQuery = new PatientServiceQuery();
1379	1353	patientQuery.setSerEndTime(new Date());
1380	1354	patientQuery.setStatus(1);
1381	1355	List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
1382		- if (CollectionUtils.isNotEmpty(patientServices))
1383		- {
1384		- for (PatientService service : patientServices)
1385		- {
	1356	+ if (CollectionUtils.isNotEmpty(patientServices)) {
	1357	+ for (PatientService service : patientServices) {
1386	1358	service.setSerType(1);
1387	1359	service.setSerStatus(3);
1388	1360	patientServiceService.updatePatientService(service);
1389	1361
1390	1362	Patients patients = patientsService.findOnePatientById(service.getParentid());
1391		- if (patients != null)
1392		- {
	1363	+ if (patients != null) {
1393	1364	patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
1394	1365	patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
1395	1366	patientsService.updatePatient(patients);
1396	1367	}
1397	1368	}
1398	1369	}
1399		-
1400	1370
1401	1371
1402	1372	// TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery();

...	...	@@ -668,7 +668,7 @@
668	668	<!-- 配置一个触发器 0 0 18 * * ?-->
669	669	<bean id="patientServiceSyncTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
670	670	<property name="jobDetail" ref="patientServiceSyncWork"></property>
671		- <property name="cronExpression" value="0 0 18 * * ?"></property>
	671	+ <property name="cronExpression" value="0 45 17 * * ?"></property>
672	672	</bean>
673	673
674	674