smartor.git - Gitblit

			@@ -479,7 +479,7 @@
			pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd);
			patMedInhospMapper.updatePatMedInhosp(pmiJB);
			} else if (CollectionUtils.isEmpty(serviceTaskdiags)) {
			errorIcd = "该患者所在病区未配置长期任务;";
			errorIcd = "该患者所患疾病未配置长期任务;";
			PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid());
			pmiJB.setDiagcheckFlag("2");
			pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd);
			@@ -856,7 +856,7 @@
			* @param check 是否需要校验
			* @param patMedInhosp1 病人出入院信息
			* @param patArchive 病人信息
			* @param type 随访类型(1-科室，2-病区，3-疾病）
			* @param type 随访类型(1-科室，2-病区，3-疾病 4-入院科室 5-入院病区)
			* @param config 配置信息 visit.early.day
			*/
			//将患者放到subtask中
			@@ -886,22 +886,41 @@
			patMedInhosp1.setLongTaskReason(longTaskReason + " & 该患者疾病长期任务不存在,任务ID为:" + taskid);
			patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
			return;
			} else if (type == 4) {
			patMedInhosp1.setInDeptcheckFlag("2");
			patMedInhosp1.setLongTaskReason(longTaskReason + " & 该患者入院科室长期任务不存在,任务ID为:" + taskid);
			patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
			return;
			} else if (type == 5) {
			patMedInhosp1.setInWardcheckFlag("2");
			patMedInhosp1.setLongTaskReason(longTaskReason + " & 该患者入院病区长期任务不存在,任务ID为:" + taskid);
			patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
			return;
			}
			} else {
			serviceTask = serviceTasks.get(0);
			}
			if (Objects.isNull(patMedInhosp1.getEndtime())) {
			if (patMedInhosp1.getInhospstate().equals("1") && Objects.isNull(patMedInhosp1.getEndtime())) {
			return;
			}
			//封装serviceSubtask
			ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive, config);
			ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive, config, type);
			if (ObjectUtils.isEmpty(serviceSubtask)) {
			return;
			}
			if (type != 2) {
			//科室和疾病都用科室填充
			serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeaveldeptcode());
			serviceSubtask.setVisitDeptName(patMedInhosp1.getLeaveldeptname());
			if (patMedInhosp1.getInhospstate().equals("1")) {
			serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeaveldeptcode());
			serviceSubtask.setVisitDeptName(patMedInhosp1.getLeaveldeptname());
			} else if (patMedInhosp1.getInhospstate().equals("0")) {
			serviceSubtask.setVisitDeptCode(patMedInhosp1.getDeptcode());
			serviceSubtask.setVisitDeptName(patMedInhosp1.getDeptname());
			if(type==5){
			serviceSubtask.setVisitDeptCode(patMedInhosp1.getHospitaldistrictcode());
			serviceSubtask.setVisitDeptName(patMedInhosp1.getHospitaldistrictname());
			}
			}
			} else if (type == 2) {
			serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
			serviceSubtask.setVisitDeptName(patMedInhosp1.getLeavehospitaldistrictname());
			@@ -1035,6 +1054,8 @@
			if (type == 1) patMedInhosp2.setDeptcheckFlag("1");
			if (type == 2) patMedInhosp2.setWardcheckFlag("1");
			if (type == 3) patMedInhosp2.setDiagcheckFlag("1");
			if (type == 4) patMedInhosp2.setInDeptcheckFlag("1");
			if (type == 5) patMedInhosp2.setInWardcheckFlag("1");
			patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
			} else {
			//生成子任务失败，
			@@ -1044,6 +1065,8 @@
			if (type == 1) patMedInhosp2.setDeptcheckFlag("2");
			if (type == 2) patMedInhosp2.setWardcheckFlag("2");
			if (type == 3) patMedInhosp2.setDiagcheckFlag("2");
			if (type == 4) patMedInhosp2.setInDeptcheckFlag("2");
			if (type == 5) patMedInhosp2.setInWardcheckFlag("2");
			patMedInhosp2.setRemark("生成子任务失败 " + type);
			patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
			}
			@@ -1235,7 +1258,7 @@


			//封装serviceSubtask
			private ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config) {
			private ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, Integer type) {
			//增加serviceTask判空
			// if(Objects.isNull(serviceTask)){
			// return null;
			@@ -1251,6 +1274,15 @@
			serviceSubtask.setDrname(patMedInhosp1.getDrname());
			serviceSubtask.setDeptcode(patMedInhosp1.getLeaveldeptcode());
			serviceSubtask.setDeptname(patMedInhosp1.getLeaveldeptname());
			serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
			serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
			if (type == 4 \|\| type == 5) {
			//设置入院的
			serviceSubtask.setDeptcode(patMedInhosp1.getDeptcode());
			serviceSubtask.setDeptname(patMedInhosp1.getDeptname());
			serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getHospitaldistrictcode());
			serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getHospitaldistrictname());
			}
			serviceSubtask.setLeaveicd10code(patMedInhosp1.getLeaveicd10code());
			serviceSubtask.setLeavediagname(patMedInhosp1.getDiagname());
			serviceSubtask.setTemplateid(serviceTask.getTemplateid());
			@@ -1270,6 +1302,7 @@
			serviceSubtask.setServiceType(serviceTask.getServiceType());
			serviceSubtask.setPreachform(serviceTask.getPreachform());
			serviceSubtask.setHospType("2");
			if (type == 4 \|\| type == 5) serviceSubtask.setHospType("6");
			serviceSubtask.setCreateTime(new Date());
			serviceSubtask.setUpdateTime(new Date());
			serviceSubtask.setCreateBy(patMedInhosp1.getNurseName());
			@@ -1277,17 +1310,24 @@
			serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
			serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
			serviceSubtask.setUpdateTime(new Date());
			//如果是宣教就设置为7
			if (serviceTask.getServiceType().equals("17")) serviceSubtask.setTaskSituation(7);
			//设置发送时间
			if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
			Date newDate = null;
			if (!Objects.isNull(patMedInhosp1.getEndtime())) {
			newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
			} else {
			patMedInhosp1.setDeptcheckFlag("2");
			patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 该患者疾病出院时间为空,出院记录ID为:" + patMedInhosp1.getInhospid());
			patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
			//如果出院时间为空，则返回一个新对象
			return new ServiceSubtask();
			//如果等于4,说明是入院宣教，入院不可能有endTime
			if (type != 4 && type != 5) {
			patMedInhosp1.setDeptcheckFlag("2");
			patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 该患者疾病出院时间为空,出院记录ID为:" + patMedInhosp1.getInhospid());
			patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
			//如果出院时间为空，则返回一个新对象
			return new ServiceSubtask();
			}
			//入院宣教，基本当天或隔天就要发出
			newDate = addDays(new Date(), serviceTask.getSendDay().intValue());
			}
			serviceSubtask.setLongSendTime(newDate);
			serviceSubtask.setVisitTime(newDate);