jiangjiazhi / regional-platform

Commit e2e8085c1cc8b5aac833b3697f8105625797026a

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 178 additions and 59 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.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/BabySieveFacede.java
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml

...	...	@@ -902,7 +902,20 @@
902	902	.get(Calendar.DATE) + 1, 0, 0, 0);
903	903	return (int) (tommorowDate.getTimeInMillis() - curDate.getTimeInMillis()) / 1000;
904	904	}
905		-
	905	+ /**
	906	+ * 参照日期之前或之后days的日期
	907	+ *
	908	+ * @param days 天数(之前为负数,之后为正数)
	909	+ * @Author: 武涛涛
	910	+ * @Date: 2021/3/25 13:38
	911	+ */
	912	+ public static Date getBeforeOrAfter( int days) {
	913	+ Date date = new Date();
	914	+ Calendar calendar = Calendar.getInstance();
	915	+ calendar.setTime(date);
	916	+ calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + days);
	917	+ return calendar.getTime();
	918	+ }
906	919
907	920	/**
908	921	* 计算儿童的月龄

...	...	@@ -212,6 +212,15 @@
212	212	highRisks.put("4ec114d7-9c78-4dfc-878c-1139ef3ff04c", "5a40c73c422b03d4ad2bf7bf"); //骨盆狭窄或产道畸形，--- 生殖道畸形和骨盆狭小
213	213	highRisks.put("3af4b6fd-0bb9-4f4b-9d8f-916df71955cf", "5a430fe4422b03d4ad2bf82b"); //胸廓畸形伴轻度肺功能不全---- 胸廓畸形等伴轻度肺功能不全
214	214	}
	215	+
	216	+ @RequestMapping(method = RequestMethod.GET, value = "/babyShortMessageQhdTimerWork")
	217	+ @ResponseBody
	218	+ //增加产筛申请单
	219	+ public BaseResponse updateSieveApplyOrder() {
	220	+ babySieveFacede.babyShortMessageQhdTimerWork();
	221	+ return null;
	222	+ }
	223	+
215	224	/**
216	225	* 功能描述衡水线上修改采样孕周数据问题
217	226	* @author 武涛涛

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.lyms.platform.beans.MsgRequest;
3	4	import com.lyms.platform.biz.service.*;
4	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	6	import com.lyms.platform.common.enums.*;
...	...	@@ -29,6 +30,9 @@
29	30	import org.springframework.beans.factory.annotation.Autowired;
30	31	import org.springframework.beans.factory.annotation.Qualifier;
31	32	import org.springframework.data.domain.Sort;
	33	+import org.springframework.data.mongodb.core.MongoTemplate;
	34	+import org.springframework.data.mongodb.core.query.Criteria;
	35	+import org.springframework.data.mongodb.core.query.Query;
32	36	import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
33	37	import org.springframework.stereotype.Component;
34	38
...	...	@@ -73,6 +77,10 @@
73	77	@Autowired
74	78	private BabyService babyService;
75	79	@Autowired
	80	+ private MongoTemplate mongoTemplate;
	81	+ @Autowired
	82	+ private SmsConfigFacade smsConfigFacade;
	83	+ @Autowired
76	84	private UsersService usersService;
77	85
78	86	private static final String XS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/xs_save.do";//秦皇岛新筛四项样本添加
...	...	@@ -82,6 +90,7 @@
82	90	private static final String MSMS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/msms_save.do";//秦皇岛串联质谱样本添加
83	91	private static final String MSMS_UPDATE = "http://121.22.16.246:8091/MSMS/lyms/msms_update.do";//秦皇岛串联质谱样本更新
84	92	private static final String SEARCHRESULT = "http://121.22.16.246:8091/MSMS/lyms/searchResult.do";//秦皇岛串联结果查询接口
	93	+ public static final String SEND_TIME= PropertiesUtils.getPropertyValue("send_time");
85	94
86	95	/**
87	96	* 新生儿筛查申请前，查询孕妇是否在本院建档以及是否已经录入分娩记录
...	...	@@ -222,6 +231,7 @@
222	231
223	232	/**
224	233	* 初始化机构列表
	234	+ *
225	235	* @Author: 武涛涛
226	236	* @Date: 2020/11/18 8:52
227	237	*/
...	...	@@ -229,6 +239,7 @@
229	239	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS)
230	240	.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(XsescEnums.init());
231	241	}
	242	+
232	243	/**
233	244	* 新生儿筛查申请前，查询孕妇是否在本院建档以及是否已经录入分娩记录秦皇岛版
234	245	*
...	...	@@ -286,7 +297,7 @@
286	297	babySieveQhdManager.setPhone(pat.getPhone());
287	298	babySieveQhdManager.setBirthYMD(DateUtil.getYmd(babyModel.getBirth()));
288	299	babySieveQhdManager.setBabyName(babyModel.getName());
289		- if(StringUtils.isNotEmpty(babyModel.getBabyWeight())){
	300	+ if (StringUtils.isNotEmpty(babyModel.getBabyWeight())) {
290	301	Double d = Double.parseDouble(babyModel.getBabyWeight()) * 1000;
291	302	babySieveQhdManager.setWeight(d.toString());//体重
292	303	}
...	...	@@ -301,7 +312,7 @@
301	312	}
302	313	babySieveQhdManager.setBirthDays(DateUtil.getDays(babyModel.getBirth(), new Date()));//儿童出生天数
303	314
304		- if(CollectionUtils.isNotEmpty(mList)){
	315	+ if (CollectionUtils.isNotEmpty(mList)) {
305	316	MaternalDeliverModel maternalDeliverModel = mList.get(0);
306	317	babySieveQhdManager.setDueWeek(maternalDeliverModel.getDueWeek());//分娩孕周
307	318	babySieveQhdManager.setMatdeliverId(maternalDeliverModel.getId());//分娩ID
...	...	@@ -360,8 +371,6 @@
360	371	}
361	372
362	373
363		-
364		-
365	374	/**
366	375	* 新增或更新一条筛查申请记录
367	376	*
...	...	@@ -428,7 +437,7 @@
428	437	babySieveQhdService.updateBabySieveById(babySieveQhdModel, babySieveAddQhdRequest.getId());
429	438	BabyModel babyModel = convertSieveQhdBaby(babySieveAddQhdRequest, userId, babySieveQhdModel);
430	439	babyBookbuildingService.updateBabyBuild(babyModel, babySieveQhdModel.getBabyId());
431		- addOrUpdateBabySc(userId, babySieveQhdModel, hospital,"update");
	440	+ addOrUpdateBabySc(userId, babySieveQhdModel, hospital, "update");
432	441	}
433	442	BaseObjectResponse objectResponse = new BaseObjectResponse();
434	443	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -448,7 +457,7 @@
448	457	babyModel.setSieveStatuseNw("1");
449	458	babyBookbuildingService.updateBabyBuild(babyModel, babySieveQhdModel.getBabyId());
450	459	//儿童筛查保存同步到对方系统秦皇岛
451		- addOrUpdateBabySc(userId, babySieveQhdModel, hospital,"add");
	460	+ addOrUpdateBabySc(userId, babySieveQhdModel, hospital, "add");
452	461	}
453	462	BaseObjectResponse objectResponse = new BaseObjectResponse();
454	463	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
455	464
456	465
...	...	@@ -461,9 +470,10 @@
461	470
462	471	}
463	472	}
	473	+
464	474	/**
	475	+ * 秦皇岛医院自动获取儿童筛查数据状态
465	476	*
466		- *秦皇岛医院自动获取儿童筛查数据状态
467	477	* @Author: 武涛涛
468	478	* @Date: 2020/12/22 13:56
469	479	*/
470	480
...	...	@@ -471,10 +481,10 @@
471	481	Date startDate1 = DateUtil.getDayFirstSecond(new Date());
472	482	Date endDate1 = DateUtil.getDayLastSecond(new Date());
473	483	System.out.println("start=" + startDate1 + "end=" + endDate1);
474		- babySieveList(startDate1, endDate1,null,null,null,null);
	484	+ babySieveList(startDate1, endDate1, null, null, null, null);
475	485	}
476	486
477		- public void babySieveList(Date startDate1, Date endDate1,String xsTiaoXingMa,String msTiaoXingMa,String id,String babyId) {
	487	+ public void babySieveList(Date startDate1, Date endDate1, String xsTiaoXingMa, String msTiaoXingMa, String id, String babyId) {
478	488	BabySieveQuery babySieveQuery = new BabySieveQuery();
479	489	babySieveQuery.setCaiXueTimeStart(startDate1);
480	490	babySieveQuery.setCaiXueTimeEnd(endDate1);
481	491
482	492
483	493
484	494
485	495
486	496
487	497
...	...	@@ -493,28 +503,28 @@
493	503
494	504	List <BabySieveQhdModel> babySieveQhdModels = babySieveQhdService.getBabySieveQuery(babySieveQuery);
495	505	System.out.println(babySieveQuery.convertToQuery().convertToMongoQuery());
496		- for(BabySieveQhdModel babySieveQhdModel:babySieveQhdModels){
	506	+ for (BabySieveQhdModel babySieveQhdModel : babySieveQhdModels) {
497	507	Map map = new HashMap();
498		- map.put("sign","774856af6fc8bbaaf00705886d512fe2");
	508	+ map.put("sign", "774856af6fc8bbaaf00705886d512fe2");
499	509	map.put("pid", "1553");
500	510	String dshospitalId = XsescEnums.getYchospitalId(babySieveQhdModel.getSsHospital()).getDshospitalId();
501		- map.put("ssHospital",dshospitalId);
	511	+ map.put("ssHospital", dshospitalId);
502	512	// map.put("ssHospital","1623");//测试使用1623
503	513	try {
504	514	//新筛四病
505		- if(StringUtils.isNotEmpty(babySieveQhdModel.getTestItem())){
	515	+ if (StringUtils.isNotEmpty(babySieveQhdModel.getTestItem())) {
506	516	map.put("tiaoXingMa", babySieveQhdModel.getXsTiaoXingMa());
507	517	String xs = HttpClientUtil.doGet(XSSEARCHRESULT, map, "utf-8", null);
508	518	JSONObject jsonObject = JsonUtil.getObj(xs);
509		- if (jsonObject != null && jsonObject.get("state").equals(1)){
	519	+ if (jsonObject != null && jsonObject.get("state").equals(1)) {
510	520	BabySieveQhdModel bSieve = new BabySieveQhdModel();
511		- JSONObject jsonObjectData = jsonObject.getJSONObject("data");
512		- if(jsonObjectData!=null){
513		- if(jsonObjectData.get("positive").equals(0)){
	521	+ JSONObject jsonObjectData = jsonObject.getJSONObject("data");
	522	+ if (jsonObjectData != null) {
	523	+ if (jsonObjectData.get("positive").equals(0)) {
514	524	bSieve.setXscsjg("2");//（1阳性、2阴性 4召回）
515		- }else if(jsonObjectData.get("positive").equals(1)){
	525	+ } else if (jsonObjectData.get("positive").equals(1)) {
516	526	bSieve.setXscsjg("1");
517		- }else if(jsonObjectData.get("recall_state").equals(1)){
	527	+ } else if (jsonObjectData.get("recall_state").equals(1)) {
518	528	bSieve.setXscsjg("4");
519	529	}
520	530	bSieve.setXsresultJSON(jsonObjectData.toString()); //检查详细存储起来
...	...	@@ -523,8 +533,8 @@
523	533	updateBabyBuildSieve(babySieveQhdModel, bSieve);
524	534
525	535	}
526		- }else {
527		- operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "新筛四病结果异常");
	536	+ } else {
	537	+ operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()), babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "新筛四病结果异常");
528	538	}
529	539
530	540	}
531	541
532	542
533	543
534	544
535	545
...	...	@@ -533,21 +543,21 @@
533	543	}
534	544	try {
535	545	//串联质谱 MSMS
536		- if(StringUtils.isNotEmpty(babySieveQhdModel.getMsms())){
	546	+ if (StringUtils.isNotEmpty(babySieveQhdModel.getMsms())) {
537	547	map.put("tiaoXingMa", babySieveQhdModel.getMsTiaoXingMa());
538	548	String xs = HttpClientUtil.doGet(SEARCHRESULT, map, "utf-8", null);
539	549	JSONObject jsonObject = JsonUtil.getObj(xs);
540		- if (jsonObject != null && jsonObject.get("state").equals(1)){
	550	+ if (jsonObject != null && jsonObject.get("state").equals(1)) {
541	551	BabySieveQhdModel bSieve = new BabySieveQhdModel();
542		- JSONObject jsonObjectData = jsonObject.getJSONObject("data");
543		- if(jsonObjectData!=null){
544		- JSONObject patien = jsonObjectData.getJSONObject("patien");
	552	+ JSONObject jsonObjectData = jsonObject.getJSONObject("data");
	553	+ if (jsonObjectData != null) {
	554	+ JSONObject patien = jsonObjectData.getJSONObject("patien");
545	555	//串联里面Status2，1正常 2异常 4召回 6临床确诊
546		- if(patien!=null && patien.get("status2").equals(1)){
	556	+ if (patien != null && patien.get("status2").equals(1)) {
547	557	bSieve.setClcsjg("2");
548		- }else if(patien!=null && patien.get("status2").equals(2)){
	558	+ } else if (patien != null && patien.get("status2").equals(2)) {
549	559	bSieve.setClcsjg("1");
550		- }else if(patien!=null && patien.get("status2")!=null){
	560	+ } else if (patien != null && patien.get("status2") != null) {
551	561	bSieve.setClcsjg(patien.get("status2").toString());
552	562	}
553	563	bSieve.setClresultJSON(jsonObjectData.toString()); //检查详细存储起来
...	...	@@ -555,8 +565,8 @@
555	565	babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId());
556	566	updateBabyBuildSieve(babySieveQhdModel, bSieve);
557	567	}
558		- }else {
559		- operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "串联质谱结果异常");
	568	+ } else {
	569	+ operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()), babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "串联质谱结果异常");
560	570	}
561	571	}
562	572	} catch (NumberFormatException e) {
...	...	@@ -565,6 +575,79 @@
565	575	}
566	576	}
567	577
	578	+ /**
	579	+ * 儿保出生日期42天后，还没有正式的保存儿童建档，发送一条短信
	580	+ *
	581	+ * @Author: 武涛涛
	582	+ * @Date: 2020/12/22 13:56
	583	+ */
	584	+ public void babyShortMessageQhdTimerWork() {
	585	+ Date startDate1 = DateUtil.getDayFirstSecond(DateUtil.getBeforeOrAfter(-42));
	586	+ Date endDate1 = DateUtil.getDayLastSecond(new Date());
	587	+ System.out.println("start=" + startDate1 + "end=" + endDate1);
	588	+
	589	+ babyShortMessageQhdList(startDate1, endDate1, null, null, null, null);
	590	+ }
	591	+
	592	+ public void babyShortMessageQhdList(Date startDate1, Date endDate1, String xsTiaoXingMa, String msTiaoXingMa, String id, String babyId) {
	593	+ //查询到新生儿建档提醒有医院，是否有配置此权限 2启用
	594	+ ModularFunctionConfigModel functionConfigModel = mongoTemplate.findOne(Query.query(Criteria.where("$where").is(String.format("function(){\n" +
	595	+ " var configs = this.configs;\n" +
	596	+ " if(configs!=null){\n" +
	597	+ " for ( var i = 0; i < configs.length; i++) {\n" +
	598	+ " if(configs[i] != null ){\n" +
	599	+ " if( configs[i].type == 99){\n" +
	600	+ " if( configs[i].value == 2){\n" +
	601	+ " return true;\n" +
	602	+ " }\n" +
	603	+ " \n" +
	604	+ " }\n" +
	605	+ " }\n" +
	606	+ " } \n" +
	607	+ " }\n" +
	608	+ " }"))),ModularFunctionConfigModel.class);
	609	+ //判断是否为开启状态，空的话就是没有权限
	610	+ if (null == functionConfigModel) {
	611	+ return;
	612	+ }
	613	+ //1 获取42天前日期，获取满足实际范围并且是当前医院分娩的儿童， yn 0 dataStatus 1,
	614	+ BabyModelQuery babyModelQuery = new BabyModelQuery();
	615	+ babyModelQuery.setHospitalId(functionConfigModel.getHospitalId());
	616	+ babyModelQuery.setBirthStart(startDate1);
	617	+ babyModelQuery.setBirthEnd(endDate1);
	618	+ babyModelQuery.setYn(YnEnums.NO.getId());
	619	+ babyModelQuery.setDataStatus(true);
	620	+ List <BabyModel> babyList = babyService.queryBabyWithQuery(babyModelQuery);
	621	+ if (CollectionUtils.isEmpty(babyList)) {
	622	+ return;
	623	+ }
	624	+ List <MsgRequest> messages = new ArrayList <>();
	625	+ for (BabyModel baby : babyList) {
	626	+ MsgRequest mr = new MsgRequest();
	627	+ String content = "您的宝宝已满月，应到具有儿保检查的妇幼医院进行体检，促进宝宝正常发育，已经体检请忽略消息";
	628	+ mr.setFirst(content);
	629	+ mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
	630	+ mr.setPhone(baby.getMphone());
	631	+ mr.setTypeId(ProjectTypeEnums.YNXT.getId());
	632	+ mr.setPlanTime(DateUtil.getyyyy_MM_dd(new Date())+" 16:00:00");
	633	+ mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
	634	+ mr.setStatus(SmsStatusEnums.WFS.getId());
	635	+ mr.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId());
	636	+ mr.setHospitalId(baby.getHospitalId());
	637	+ mr.setPatientId(baby.getId());
	638	+ mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
	639	+ mr.setSmsStatus(SmsStatusEnums.WFS.getId());
	640	+ mr.setServiceType(2);
	641	+ messages.add(mr);
	642	+ ExceptionUtils.catchException("baby build msg = " + mr);
	643	+
	644	+ }
	645	+ if (CollectionUtils.isNotEmpty(messages)) {
	646	+ smsConfigFacade.saveMsg(messages, null); //查看发送短信列表是否有该信息。
	647	+ }
	648	+
	649	+ }
	650	+
568	651	private void updateBabyBuildSieve(BabySieveQhdModel babySieveQhdModel, BabySieveQhdModel bSieve) {
569	652	BabyModel model = new BabyModel();
570	653	model.setXscsjg(bSieve.getXscsjg());
571	654
572	655
573	656
574	657
575	658
576	659
577	660
578	661
579	662
...	...	@@ -588,45 +671,45 @@
588	671	map.put("pid", "1553");
589	672	map.put("momName", babySieveQhdModel.getMomName());
590	673	String dshospitalId = XsescEnums.getYchospitalId(babySieveQhdModel.getSsHospital()).getDshospitalId();
591		- map.put("ssHospital",dshospitalId);
	674	+ map.put("ssHospital", dshospitalId);
592	675	// map.put("ssHospital","1623");//测试使用1623
593		- map.put("phone",babySieveQhdModel.getPhone());
	676	+ map.put("phone", babySieveQhdModel.getPhone());
594	677	map.put("zhuYuanNum", babySieveQhdModel.getZhuYuanNum());
595	678	map.put("buruSum", babySieveQhdModel.getBuruSum());
596	679	String yunZhou1 = "0";
597	680	String yunZhou_tian = "0";
598		- if(StringUtils.isNotEmpty(babySieveQhdModel.getYunZhou())){
	681	+ if (StringUtils.isNotEmpty(babySieveQhdModel.getYunZhou())) {
599	682	String yunZhou = babySieveQhdModel.getYunZhou();
600	683	yunZhou1 = yunZhou.contains("周") ? yunZhou.substring(0, yunZhou.indexOf("周")) : "0";//39周+4天
601		- yunZhou_tian = yunZhou.contains("天") ? yunZhou.substring(yunZhou.indexOf("+")+1, yunZhou.indexOf("天")) : "0";
	684	+ yunZhou_tian = yunZhou.contains("天") ? yunZhou.substring(yunZhou.indexOf("+") + 1, yunZhou.indexOf("天")) : "0";
602	685	}
603		- map.put("yunZhou",yunZhou1);
604		- map.put("yunZhou_tian",yunZhou_tian);
605		- map.put("sex", "1".equals(babySieveQhdModel.getSex())?"男":("0".equals(babySieveQhdModel.getSex())?"女":"不明"));
	686	+ map.put("yunZhou", yunZhou1);
	687	+ map.put("yunZhou_tian", yunZhou_tian);
	688	+ map.put("sex", "1".equals(babySieveQhdModel.getSex()) ? "男" : ("0".equals(babySieveQhdModel.getSex()) ? "女" : "不明"));
606	689	map.put("bornTime", DateUtil.getyyyy_MM_dd(babySieveQhdModel.getBornTime()));
607	690	map.put("caiXueTime", DateUtil.getyyyy_MM_dd(babySieveQhdModel.getCaiXueTime()));
608		- if(babySieveQhdModel.getWeight().contains(".0")){
609		- map.put("weight",babySieveQhdModel.getWeight().substring(0,babySieveQhdModel.getWeight().indexOf(".0")));
610		- }else {
	691	+ if (babySieveQhdModel.getWeight().contains(".0")) {
	692	+ map.put("weight", babySieveQhdModel.getWeight().substring(0, babySieveQhdModel.getWeight().indexOf(".0")));
	693	+ } else {
611	694	map.put("weight", babySieveQhdModel.getWeight());
612	695	}
613	696	map.put("address", babySieveQhdModel.getAddress());
614	697	map.put("householdNature", babySieveQhdModel.getHouseholdNature());
615		- map.put("householdType", babySieveQhdModel.getHouseholdType());
616		- if("2".equals(babySieveQhdModel.getPay_type())){//（1 自费、2 免费）
	698	+ map.put("householdType", babySieveQhdModel.getHouseholdType());
	699	+ if ("2".equals(babySieveQhdModel.getPay_type())) {//（1 自费、2 免费）
617	700	map.put("pay_type", "free");//默认 dis_free 自费 free 免费
618		- }else{
	701	+ } else {
619	702	map.put("pay_type", "dis_free");
620	703	}
621	704	map.put("idcard", babySieveQhdModel.getIdcard());
622		- if("add".equals(state)){
623		- if(StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())){
	705	+ if ("add".equals(state)) {
	706	+ if (StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())) {
624	707	map.put("testItem", babySieveQhdModel.getTestItem());
625	708	map.put("xsTiaoXingMa", babySieveQhdModel.getXsTiaoXingMa());
626	709	String xs = HttpClientUtil.doGet(XS_SAVE, map, "utf-8", null);
627	710	operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, xs, OptActionEnums.ADD.getId(), "保存儿童筛查新筛四项");
628	711	}
629		- if(StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())){
	712	+ if (StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())) {
630	713	map.put("msms", babySieveQhdModel.getMsms());
631	714	map.put("msTiaoXingMa", babySieveQhdModel.getMsTiaoXingMa());
632	715	map.remove("testItem");
633	716
...	...	@@ -634,13 +717,13 @@
634	717	String cl = HttpClientUtil.doGet(MSMS_SAVE, map, "utf-8", null);
635	718	operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, cl, OptActionEnums.ADD.getId(), "保存儿童筛查串联质谱样");
636	719	}
637		- }else if("update".equals(state)){
638		- if(StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())){
	720	+ } else if ("update".equals(state)) {
	721	+ if (StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())) {
639	722	map.put("xsTiaoXingMa", babySieveQhdModel.getXsTiaoXingMa());
640	723	String xs = HttpClientUtil.doGet(XS_UPDATE, map, "utf-8", null);
641	724	operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, xs, OptActionEnums.UPDATE.getId(), "修改儿童筛查新筛四项");
642	725	}
643		- if(StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())){
	726	+ if (StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())) {
644	727	map.put("msTiaoXingMa", babySieveQhdModel.getMsTiaoXingMa());
645	728	map.remove("xsTiaoXingMa");
646	729	String cl = HttpClientUtil.doGet(MSMS_UPDATE, map, "utf-8", null);
...	...	@@ -649,8 +732,6 @@
649	732	}
650	733
651	734
652		-
653		-
654	735	}
655	736
656	737	/**
657	738
658	739
...	...	@@ -891,13 +972,13 @@
891	972	e.printStackTrace();
892	973	}
893	974	}
894		- if(StringUtils.isNotEmpty(babySieveAddQhdRequest.getTestItem()) ){
	975	+ if (StringUtils.isNotEmpty(babySieveAddQhdRequest.getTestItem())) {
895	976	String testItem = babySieveAddQhdRequest.getTestItem();
896	977	String substring1 = testItem.substring(testItem.length() - 1, testItem.length());
897		- if(",".equals(substring1) && babySieveAddQhdRequest.getTestItem().contains(",")){
	978	+ if (",".equals(substring1) && babySieveAddQhdRequest.getTestItem().contains(",")) {
898	979	String substring = babySieveAddQhdRequest.getTestItem().substring(0, babySieveAddQhdRequest.getTestItem().length() - 1);
899		- babyModelQuery.setTestItem(testItem.substring(0, testItem.length()-1));
900		- }else {
	980	+ babyModelQuery.setTestItem(testItem.substring(0, testItem.length() - 1));
	981	+ } else {
901	982	//新筛四病
902	983	babyModelQuery.setTestItem(babySieveAddQhdRequest.getTestItem());
903	984	}
...	...	@@ -1037,8 +1118,6 @@
1037	1118	}
1038	1119	return br;
1039	1120	}
1040		-
1041		-
1042	1121
1043	1122
1044	1123	/**

...	...	@@ -146,6 +146,16 @@
146	146	<property name="concurrent" value="false"></property>
147	147	</bean>
148	148
	149	+ <!-- 儿保出生日期42天后，还没有正式的保存儿童建档，发送一条短信-->
	150	+ <bean id="babyShortMessageQhdTimerWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
	151	+ <!-- 要调用的bean -->
	152	+ <property name="targetObject" ref="babySieveFacede"></property>
	153	+ <!-- 要调用的Method -->
	154	+ <property name="targetMethod" value="babyShortMessageQhdTimerWork"></property>
	155	+ <!-- 是否并发,false表示如果发生错误也不影响下一次的调用 -->
	156	+ <property name="concurrent" value="false"></property>
	157	+ </bean>
	158	+
149	159	<!-- 秦皇岛医院分娩接口-->
150	160	<bean id="qhdFmTimerWork" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
151	161	<!-- 要调用的bean -->
...	...	@@ -245,6 +255,13 @@
245	255	<property name="cronExpression" value="0 0 0 * * ? "></property>
246	256	<!--<property name="cronExpression" value="0/5 * * * * ? "></property>-->
247	257	</bean>
	258	+
	259	+ <!-- 配置一个触发器 0 0 0/1 * * ?-->
	260	+ <bean id="babyShortMessageQhdTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
	261	+ <property name="jobDetail" ref="babyShortMessageQhdTimerWork"></property>
	262	+ <property name="cronExpression" value="0 0 0 * * ? "></property>
	263	+ <!--<property name="cronExpression" value="0/5 * * * * ? "></property>-->
	264	+ </bean>
248	265	<!-- 配置一个触发器 0 0 1 * * ?-->
249	266	<bean id="qhdFmHistoryTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
250	267	<property name="jobDetail" ref="qhdFmHistoryTimerWork"></property>
...	...	@@ -561,6 +578,7 @@
561	578	<property name="triggers" >
562	579	<list>
563	580	<!--<ref bean="babySieveQhdTrigger"/>-->
	581	+ <!--<ref bean="babyShortMessageQhdTrigger"/>-->
564	582	<ref bean="qhdChuZhengTrigger"/>
565	583	<ref bean="patientSyncMysqlTrigger"/>
566	584