smartor.git - Gitblit

			@@ -130,7 +130,7 @@
			private IServiceSubtaskRecordService serviceSubtaskRecordService;

			@Autowired
			IBaseSmsaccountService baseSmsaccountService;
			IIcd10Service iIcd10Service;

			@Autowired
			IPatArchiveService patArchiveService;
			@@ -253,7 +253,8 @@
			} catch (Exception e) {
			log.error("【dealHisData】新华数据采集异常", e);
			}
			} else if (active.trim().equals("hn")) {
			}
			else if (active.trim().equals("hn")) {
			try {
			// 河南数据采集
			HnDataGatherVO hnDataGatherVO = new HnDataGatherVO();
			@@ -268,7 +269,8 @@
			} catch (Exception e) {
			log.error("【dealHisData】河南数据采集异常", e);
			}
			} else if (active.trim().equals("sltd") \|\| active.trim().equals("nhfy")) {
			}
			else if (active.trim().equals("sltd") \|\| active.trim().equals("nhfy")) {
			//省立同德与华南附一用同一套采集方法（都是来未来提供）

			try {
			@@ -315,6 +317,9 @@
			}
			log.info("【dealHisData】省立同德“用户信息”结束采集数据：{}", aBoolean);
			}
			//疾病字典采集
			iIcd10Service.queryAddIcd10();

			// 省立同德数据采集
			for (Long cid : campusidList) {
			log.debug("【dealHisData】省立同德“预入院”开始采集数据，院区：{}", cid);
			@@ -324,6 +329,10 @@
			serviceSLTDInhospReqVO.setCampusId(cid);
			serviceSLTDInhospReqVO.setEncounterTimeStart(nowTime);
			serviceSLTDInhospReqVO.setEncounterTimeEnd(nowTime);
			if(active.trim().equals("nhfy")) {
			serviceSLTDInhospReqVO.setEncounterTimeStart(yesterdayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			serviceSLTDInhospReqVO.setEncounterTimeEnd(todayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			}
			List<String> list = new ArrayList<>();
			list.add("FH0109.22");
			list.add("FH0109.23");
			@@ -340,6 +349,10 @@
			serviceSLTDInhospReqVO.setEncounterTimeEnd(null);
			serviceSLTDInhospReqVO.setStartHeadTime(nowTime);
			serviceSLTDInhospReqVO.setStartTailTime(nowTime);
			if(active.trim().equals("nhfy")) {
			serviceSLTDInhospReqVO.setStartHeadTime(yesterdayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			serviceSLTDInhospReqVO.setStartTailTime(todayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			}
			List<String> listStr = new ArrayList<>();
			listStr.add("FH0109.26");
			serviceSLTDInhospReqVO.setStatusList(listStr);
			@@ -353,6 +366,10 @@
			serviceSLTDInhospReqVO.setStartTailTime(null);
			serviceSLTDInhospReqVO.setEncounterTimeStart(nowTime);
			serviceSLTDInhospReqVO.setEncounterTimeEnd(nowTime);
			if(active.trim().equals("nhfy")) {
			serviceSLTDInhospReqVO.setEncounterTimeStart(yesterdayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			serviceSLTDInhospReqVO.setEncounterTimeEnd(todayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			}
			serviceSLTDInhospReqVO.setStatusList(null);
			List<String> list1 = new ArrayList<>();
			list1.add("FH0108.01");
			@@ -387,6 +404,10 @@
			serviceSLTDInhospReqVO.setEncounterTimeEnd(null);
			serviceSLTDInhospReqVO.setPreOutHospitalHeadDate(nowTime);
			serviceSLTDInhospReqVO.setPreOutHospitalTailDate(nowTime);
			if(active.trim().equals("nhfy")) {
			serviceSLTDInhospReqVO.setPreOutHospitalHeadDate(yesterdayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			serviceSLTDInhospReqVO.setPreOutHospitalTailDate(todayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
			}
			serviceSLTDInhospReqVO.setHealthcareRecordTypeList(null);
			List<String> list2 = new ArrayList<>();
			// list2.add("FH0108.02");
			@@ -435,9 +456,7 @@
			log.error("【dealHisData】省立同德数据采集异常", e);
			}

			}

			/**
			} /**
			* 这个只是新华临时使用，平时用不到
			*/
			public void dealHisData2() {
			@@ -542,12 +561,12 @@
			ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
			serviceSubtaskVO.setTaskid(commonTaskcallMQ.getTaskid());
			serviceSubtaskVO.setSendstate(2L);
			serviceSubtaskVO.setIsVisitAgain(1);
			serviceSubtaskVO.setVisitTime(new Date());
			List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.queryServiceSubtaskList(serviceSubtaskVO);
			for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
			sfHandlle(serviceSubtask);
			}

			}
			}

			@@ -605,11 +624,20 @@

			//3.不是最后一个，获取到下一个执行方式(因为都是在今天执行，那就直接发出去就完了)
			sfHandlle(serviceSubtask);

			}

			}
			}

			/**
			* 设置失败任务默认值,并将失败任务重新置为成功
			* <p>
			* *@param failDay (失败天数：距离当前日期失败天数)
			*
			* @return
			*/
			public void setFailSubTaskDefalutVal() {
			String failDay = configService.selectConfigByKey("hosp.default.fail.day");
			if (StringUtils.isNotEmpty(failDay)) iServiceSubtaskService.setFailSubTaskDefalutVal(Long.valueOf(failDay));
			}


			@@ -619,7 +647,7 @@
			* @param date
			* @return
			*/
			public boolean isDateToday(Date date) {
			private boolean isDateToday(Date date) {
			if (date == null) {
			return false;
			}
			@@ -636,7 +664,7 @@
			*
			* @param serviceSubtask
			*/
			public void sfHandlle(ServiceSubtask serviceSubtask) {
			private void sfHandlle(ServiceSubtask serviceSubtask) {
			//这里需要根据身份证去重(给微信小程序的固定任务用的)
			List<ServiceSubtask> serviceSubtaskListFilter = new ArrayList<>();
			ServiceTask ivrTask1 = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
			@@ -655,7 +683,7 @@
			if (!Objects.isNull(patArchive) && patArchive.getNotrequiredFlag() == "1") {
			//不需要发送
			serviceSubtask.setResult("患者不需要随访");
			serviceSubtask.setRemark(patArchive.getNotrequiredreason());
			serviceSubtask.setRemark("患者不需要随访," + patArchive.getNotrequiredreason());
			serviceSubtask.setSendstate(4L);
			iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
			setSuccessPreachForm(serviceSubtask, "-1", "不需要执行", "6");
			@@ -751,10 +779,11 @@
			//先判断一下发的是不是宣教
			if (!"3".equals(serviceSubtask.getType())) {
			sendMagParam.setPhone(serviceSubtask.getPhone());
			sendMagParam.setUrl(localIP + ":" + req_path + "/wt?p=" + format);

			sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/wt?p=" + format : localIP + "/wt?p=" + format);
			//如果type是语音随访的话（说明补偿发送方式中有电话随访的方式，这里的外链就地址只能用/sf）
			if (serviceSubtask.getType().equals("1"))
			sendMagParam.setUrl(localIP + ":" + req_path + "/sf?p=" + format);
			sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/sf?p=" + format : localIP + "/sf?p=" + format);
			sendMagParam.setContent("您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
			if (active.equals("xh")) {
			sendMagParam.setContent("【新华医院】您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
			@@ -763,7 +792,7 @@
			HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid());
			if (heLibrary.getHetype().equals("1")) {
			sendMagParam.setPhone(serviceSubtask.getPhone());
			sendMagParam.setUrl(localIP + ":" + req_path + "/xj?p=" + format);
			sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/xj?p=" + format : localIP + "/xj?p=" + format);
			if (active.equals("ls") \|\| active.equals("sltd") \|\| active.equals("nhfy")) {
			sendMagParam.setContent("您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
			} else if (active.equals("xh")) {
			@@ -860,11 +889,11 @@
			serviceSubtask.setSendstate(3L);
			if (StringUtils.isNotEmpty(isSuccess) && isSuccess.equals("true")) {
			serviceSubtask.setResult("success");
			serviceSubtask.setRemark(serviceSubtask.getRemark() + "," + "短信发送成功");
			serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ",短信发送成功" : "短信发送成功");
			setSuccessPreachForm(serviceSubtask, sendPreachform, "短信发送成功", "2");
			} else {
			serviceSubtask.setResult("error");
			serviceSubtask.setRemark(serviceSubtask.getRemark() + "," + "短信发送失败" + now);
			serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ",短信发送失败" + now : "短信发送失败" + now);
			setSuccessPreachForm(serviceSubtask, sendPreachform, "短信发送失败" + now, "5");
			}
			} catch (Exception e) {