smartor.git - Gitblit

			@@ -10,6 +10,7 @@
			import com.ruoyi.common.utils.SecurityUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.smartor.domain.*;
			import com.smartor.domain.DTO.PatMedInhospDTO;
			import com.smartor.domain.entity.ServiceSubtaskEntity;
			import com.smartor.mapper.*;
			import com.smartor.service.IPatMedInhospService;
			@@ -110,6 +111,24 @@
			patMedInhosp1.setTagname(tagname);
			}
			return patMedInhospList;
			}

			@Override
			public List<PatMedInhospDTO> selectPatMedInhospByApplication(PatMedInhosp patMedInhosp) {
			List<PatMedInhosp> patMedInhosps = selectPatMedInhospList(patMedInhosp);
			if (!org.springframework.util.CollectionUtils.isEmpty(patMedInhosps)) {
			return null;
			}
			List<PatMedInhospDTO> patMedInhospDTOList = DtoConversionUtils.sourceToTarget(patMedInhosps, PatMedInhospDTO.class);
			for (PatMedInhospDTO pmd : patMedInhospDTOList) {
			ServiceSubtaskEntity serviceSubtask = new ServiceSubtaskEntity();
			serviceSubtask.setServiceType("4");
			serviceSubtask.setInhospid(pmd.getInhospid());
			List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtask);
			if (CollectionUtils.isNotEmpty(serviceSubtasks)) pmd.setFinishFlag("1");
			}

			return patMedInhospDTOList;
			}

			@Override
			@@ -811,10 +830,10 @@
			if (ObjectUtils.isEmpty(serviceSubtask)) {
			return;
			}
			if(StringUtils.isNotEmpty(patMedOperationItem.getDeptcode())){
			if (StringUtils.isNotEmpty(patMedOperationItem.getDeptcode())) {
			serviceSubtask.setVisitDeptCode(patMedOperationItem.getDeptcode());
			serviceSubtask.setVisitDeptName(patMedOperationItem.getDeptname());
			}else {
			} else {
			serviceSubtask.setVisitDeptCode(patMedOperationItem.getHospitaldistrictcode());
			serviceSubtask.setVisitDeptName(patMedOperationItem.getHospitaldistrictname());
			}
			@@ -974,6 +993,7 @@
			serviceSubtask.setSex(patArchive.getSex());
			serviceSubtask.setAge(patArchive.getAge());
			serviceSubtask.setSendstate(2L);
			serviceSubtask.setCampusid(patMedInhosp1.getCampusid());
			serviceSubtask.setManagementDoctor(patMedInhosp1.getManagementDoctor());
			serviceSubtask.setManagementDoctorCode(patMedInhosp1.getManagementDoctorCode());
			serviceSubtask.setStarttime(patMedInhosp1.getStarttime());