smartor.git - Gitblit

			@@ -866,7 +866,7 @@
			log.info("该手术对应手术等级的长期任务不存在,任务ID为：{}", taskid);
			patMedOperationItem.setOpercheckFlag("2");
			patMedOperationItem.setLongTaskReason(longTaskReason + " & 该手术对应手术等级的长期任务不存在,任务ID为:" + taskid);
			patMedOperationItemMapper.insertPatMedOperationItem(patMedOperationItem);
			patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
			return;
			} else {
			serviceTask = serviceTasks.get(0);
			@@ -1187,9 +1187,12 @@
			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);
			patMedOperationItem.setOpercheckFlag("2");
			patMedOperationItem.setRemark(patMedOperationItem.getRemark() + "& 该患者手术出院时间为空,手术详情ID为:" + patMedOperationItem.getId());
			patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
			// patMedInhosp1.setDeptcheckFlag("2");
			// patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 该患者手术出院时间为空,出院记录ID为:" + patMedInhosp1.getInhospid());
			// patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
			//如果出院时间为空，则返回一个新对象
			return new ServiceSubtask();
			}
			@@ -1292,19 +1295,31 @@
			continue;
			}
			// 根据患者的疾病，获取该疾病的长期任务
			ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
			serviceTaskoper.setLongtask(1L);
			serviceTaskoper.setOrgid(opItem.getOrgid());
			serviceTaskoper.setOplevelcode(opItem.getOplevelcode());

			//根据科室、病区过滤
			List<ServiceTaskoper> serviceTaskopersDept = new ArrayList<>();
			if(StringUtils.isNotEmpty(opItem.getLeaveldeptcode())){
			serviceTaskoper.setDeptCode(opItem.getLeaveldeptcode());
			}else {
			serviceTaskoper.setWardCode(opItem.getLeavehospitaldistrictcode());
			ServiceTaskoper serviceTaskoper1 = new ServiceTaskoper();
			serviceTaskoper1.setLongtask(1L);
			serviceTaskoper1.setOrgid(opItem.getOrgid());
			serviceTaskoper1.setOplevelcode(opItem.getOplevelcode());
			serviceTaskoper1.setDeptCode(opItem.getLeaveldeptcode());
			serviceTaskopersDept = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper1);
			}

			List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);

			List<ServiceTaskoper> serviceTaskopersWard = new ArrayList<>();
			if(StringUtils.isNotEmpty(opItem.getLeavehospitaldistrictcode())){
			ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
			serviceTaskoper2.setLongtask(1L);
			serviceTaskoper2.setOrgid(opItem.getOrgid());
			serviceTaskoper2.setOplevelcode(opItem.getOplevelcode());
			serviceTaskoper2.setWardCode(opItem.getLeavehospitaldistrictcode());
			serviceTaskopersWard = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper2);
			}


			List<ServiceTaskoper> serviceTaskopers = new ArrayList<>();
			serviceTaskopers.addAll(serviceTaskopersDept);
			serviceTaskopers.addAll(serviceTaskopersWard);
			//如果部门模板为空（将deptIsNull设置为true）
			if (CollectionUtils.isEmpty(serviceTaskopers) \|\| serviceTaskopers.size() == 0) {
			PatMedOperationItem patMedOperationItem = patMedOperationItemMapper.selectPatMedOperationItemById(opItem.getId());
			@@ -1312,8 +1327,8 @@
			patMedOperationItem.setLongTaskReason(patMedOperationItem.getLongTaskReason() + "所患的手术未配置长期任务;");
			patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
			} else {
			for (ServiceTaskoper serviceTaskoper1 : serviceTaskopers) {
			writeInSubTaskForOp(serviceTaskoper1.getTaskId(), true, opItem, config);
			for (ServiceTaskoper serviceTaskoper : serviceTaskopers) {
			writeInSubTaskForOp(serviceTaskoper.getTaskId(), true, opItem, config);
			}
			}