smartor.git - Gitblit

			@@ -141,16 +141,6 @@
			public PatMedRes selectPatMedInhospListCount(PatMedReq patMedReq) {
			PatMedRes patMedRes = null;
			// 获取当前登陆人的部门权限
			if (org.springframework.util.CollectionUtils.isEmpty(patMedReq.getDeptcodeList())) {
			// Long userId = SecurityUtils.getUserId();
			// List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
			// List<String> deptCode = new ArrayList<>();
			// for (SysDept sysDept : sysDepts) {
			// deptCode.add(sysDept.getDeptId().toString());
			// }
			// patMedReq.setDeptcodeList(deptCode);
			// patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
			}
			patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
			return patMedRes;
			}
			@@ -448,6 +438,7 @@

			/**
			* 多维度随访
			*
			* @param config
			* @return
			*/
			@@ -486,14 +477,12 @@
			* 按维度找到所有匹配长期任务，批量生成 subtask
			* type: 1=科室, 2=病区, 3=疾病
			*/
			private void processTasksByDimension(PatMedInhosp patMedInhosp1,
			PatArchive patArchive,
			String config, int type) {
			private void processTasksByDimension(PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, int type) {
			List<Long> matchedTaskIds = findMatchingTaskIds(patMedInhosp1, type);

			if (CollectionUtils.isEmpty(matchedTaskIds)) {
			String reason = getDimensionReason(type);
			markFlagAsNoConfig(patMedInhosp1, type, reason);
			String reason = getDimensionReason(type);
			markFlagAsNoConfig(patMedInhosp1, type, reason);
			return;
			}

			@@ -503,11 +492,11 @@
			}
			}

			private String getDimensionReason(int type){
			private String getDimensionReason(int type) {
			switch (type) {
			case 1: { // 科室
			return "未找到科室匹配的长期任务";
			}
			}
			case 2: { // 病区
			return "未找到病区匹配的长期任务";
			}
			@@ -518,9 +507,7 @@
			return "多维长期任务-匹配类型为空";
			}

			private void markFlagAsNoConfig(PatMedInhosp patMedInhosp,
			int type,
			String reason){
			private void markFlagAsNoConfig(PatMedInhosp patMedInhosp, int type, String reason) {
			switch (type) {
			case 1: { // 科室
			patMedInhosp.setDeptcheckFlag("2");
			@@ -544,14 +531,14 @@

			}

			private void markAllFlagsAsError(PatMedInhosp patMedInhosp,
			String reason){
			private void markAllFlagsAsError(PatMedInhosp patMedInhosp, String reason) {
			patMedInhosp.setDeptcheckFlag("2");
			patMedInhosp.setWardcheckFlag("2");
			patMedInhosp.setDiagcheckFlag("2");
			patMedInhosp.setRemark(reason);
			patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
			}

			/**
			* 根据维度类型查询匹配的长期任务 ID 列表
			*/
			@@ -563,8 +550,7 @@
			query.setDeptCode(patMedInhosp1.getLeaveldeptcode());
			query.setDeptType("1");
			query.setOrgid(patMedInhosp1.getOrgid());
			return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
			.stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
			return serviceTaskdeptMapper.selectServiceTaskdeptList(query).stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
			}
			case 2: { // 病区
			ServiceTaskdept query = new ServiceTaskdept();
			@@ -572,8 +558,7 @@
			query.setDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
			query.setDeptType("2");
			query.setOrgid(patMedInhosp1.getOrgid());
			return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
			.stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
			return serviceTaskdeptMapper.selectServiceTaskdeptList(query).stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
			}
			case 3: { // 疾病
			if (StringUtils.isEmpty(patMedInhosp1.getLeaveicd10code())) return Collections.emptyList();
			@@ -581,8 +566,7 @@
			query.setLongtask(1L);
			query.setIcd10code(patMedInhosp1.getLeaveicd10code());
			query.setOrgid(patMedInhosp1.getOrgid());
			return serviceTaskdiagMapper.selectServiceTaskdiagList(query)
			.stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
			return serviceTaskdiagMapper.selectServiceTaskdiagList(query).stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
			}
			}
			return Collections.emptyList();
			@@ -748,13 +732,12 @@
			}

			/**
			*
			* @param taskid 任务id
			* @param check 是否需要校验
			* @param taskid 任务id
			* @param check 是否需要校验
			* @param patMedInhosp1 病人出入院信息
			* @param patArchive 病人信息
			* @param type 随访类型(1-科室，2-病区，3-疾病）
			* @param config 配置信息 visit.early.day
			* @param patArchive 病人信息
			* @param type 随访类型(1-科室，2-病区，3-疾病）
			* @param config 配置信息 visit.early.day
			*/
			//将患者放到subtask中
			private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive, Integer type, String config) {
			@@ -1119,8 +1102,7 @@
			}
			//景宁出院首次（7天）随访一定要做
			boolean firstVisit = false;
			if (serviceSubtask1.getOrgid().equals("47255004333112711A1001")
			&& serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
			if (serviceSubtask1.getOrgid().equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
			firstVisit = true;
			}
			if (!firstVisit) {