smartor.git - Gitblit

			@@ -22,13 +22,11 @@
			import com.smartor.common.MtSubmitSmUtil;
			import com.smartor.common.ScheduleSubtaskBuilder;
			import com.smartor.config.PhoneUtils;
			import com.smartor.domain.DTO.QuestionCountKsOrBqDTO;
			import com.smartor.domain.DTO.QuestionResultDTO;
			import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
			import com.smartor.domain.*;
			import com.smartor.domain.VO.HeLibraryCountVO;
			import com.smartor.domain.VO.QuestionResultVO;
			import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
			import com.smartor.domain.VO.TransferDeptVO;
			import com.smartor.domain.VO.*;
			import com.smartor.domain.entity.ServiceSubtaskEntity;
			import com.smartor.mapper.*;
			import com.smartor.service.*;
			@@ -672,10 +670,8 @@
			//如果不存在，则新增
			ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
			if (ObjectUtils.isNotEmpty(serviceTask)) {
			serviceSubtask.setDeptcode(serviceTask.getDeptcode());
			serviceSubtask.setTaskDesc(serviceTask.getTaskDesc());
			serviceSubtask.setTaskName(serviceTask.getTaskName());
			serviceSubtask.setDeptname(serviceTask.getDeptname());
			serviceSubtask.setTemplatename(serviceTask.getTemplatename());
			}

			@@ -2923,12 +2919,10 @@
			collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
			break;
			case "management_doctor_code":
			rawData = rawData.stream()
			.peek(item -> {
			rawData = rawData.stream().peek(item -> {
			item.setDrname(item.getManagementDoctor());
			item.setDrcode(item.getManagementDoctorCode());
			})
			.collect(Collectors.toList());
			}).collect(Collectors.toList());
			collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getManagementDoctorCode()).orElse("Unknown")));
			break;
			case "deptcode":
			@@ -5028,11 +5022,7 @@
			// 如果有多条目标值，拆分成多行
			for (String value : values) {
			//先去 result 中查一下，有没有这个 questiontext 和对应的 targetvalue
			ServiceSubtaskDetailRatioExport existingExport = result.stream()
			.filter(e -> e.getQuestiontext().equals(export.getQuestiontext())
			&& value.trim().equals(e.getTargetvalue()))
			.findFirst()
			.orElse(null);
			ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> e.getQuestiontext().equals(export.getQuestiontext()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
			if (existingExport != null && existingExport.getRatio().equals("0") && existingExport.getCount().equals("0")) {
			//如果存在，则将 result 里的这个问题所对应的 Targetvalue=value 这条数据更新成当前这条数据
			if(value.equals(export.getOptionresult())) {
			@@ -5063,6 +5053,53 @@
			return result;
			}

			/*
			* 根据科室或病区统计问卷选项(科室、题目查询的科室评分表)
			*/
			@Override
			public List<QuestionCountKsOrBqDTO> statQuestionOptionByKsOrBq(QuestionCountKsOrBqVO questionCountKsOrBqVO) {
			List<QuestionCountKsOrBqDTO> questionCountKsOrBqDTOS = serviceSubtaskMapper.statQuestionOptionByKsOrBq(questionCountKsOrBqVO);

			// 处理 targetvalue：按 & 分割成多条记录
			List<QuestionCountKsOrBqDTO> result = new ArrayList<>();
			for (QuestionCountKsOrBqDTO questionCountKsOrBqDTO : questionCountKsOrBqDTOS) {
			if (StringUtils.isNotEmpty(questionCountKsOrBqDTO.getTargetvalue()) && questionCountKsOrBqDTO.getTargetvalue().contains("&")) {
			String[] values = questionCountKsOrBqDTO.getTargetvalue().split("&");
			// 如果有多条目标值，拆分成多行
			for (String value : values) {
			//先去 result 中查一下，有没有这个 questiontext 和对应的 targetvalue
			QuestionCountKsOrBqDTO existingExport = result.stream().filter(e -> e.getQeustionText().equals(questionCountKsOrBqDTO.getQeustionText()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
			if (existingExport != null && existingExport.getAnswerCount().equals("0") && existingExport.getSingleScore().equals("0")) {
			//如果存在，则将 result 里的这个问题所对应的 Targetvalue=value 这条数据更新成当前这条数据
			if (value.equals(questionCountKsOrBqDTO.getAsrtext())) {
			existingExport.setAsrtext(questionCountKsOrBqDTO.getAsrtext());
			existingExport.setAnswerCount(questionCountKsOrBqDTO.getAnswerCount());
			existingExport.setSingleScore(questionCountKsOrBqDTO.getSingleScore());
			existingExport.setAvgScore(questionCountKsOrBqDTO.getAvgScore());
			}
			} else if (existingExport != null && !existingExport.getAnswerCount().equals("0")) {
			continue;
			} else {
			QuestionCountKsOrBqDTO qcDto = DtoConversionUtils.sourceToTarget(questionCountKsOrBqDTO, QuestionCountKsOrBqDTO.class);
			qcDto.setTargetvalue(value.trim()); // targetvalue 显示单个选项
			if (!value.equals(qcDto.getAsrtext())) {
			existingExport.setAsrtext(null);
			existingExport.setAnswerCount("0");
			existingExport.setSingleScore("0");
			existingExport.setAvgScore("0");
			}
			result.add(qcDto);
			}
			}
			} else {
			// targetvalue 不包含 &，直接添加到结果
			result.add(questionCountKsOrBqDTO);
			}
			}

			return result;
			}

			@Override
			public List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(List<Long> subtaskIds, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd,String valueType) {
			//先清理一下重复数据
			@@ -5080,11 +5117,7 @@
			// 如果有多条目标值，拆分成多行
			for (String value : values) {
			//先去 result 中查一下，有没有这个 questiontext 和对应的 targetvalue
			ServiceSubtaskDetailRatioExport existingExport = result.stream()
			.filter(e -> e.getQuestiontext().equals(export.getQuestiontext())
			&& value.trim().equals(e.getTargetvalue()))
			.findFirst()
			.orElse(null);
			ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> e.getQuestiontext().equals(export.getQuestiontext()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
			if (existingExport != null && existingExport.getRatio().equals("0") && existingExport.getCount().equals("0")) {
			//如果存在，则将 result 里的这个问题所对应的 Targetvalue=value 这条数据更新成当前这条数据
			if(value.equals(export.getOptionresult())) {