smartor.git - Gitblit

			@@ -86,6 +86,8 @@

			@Autowired
			private IServiceTaskdeptService serviceTaskdeptService;
			@Autowired
			private IServiceTaskmedicalService serviceTaskmedicalService;

			@Autowired
			private IServiceTaskdiagService serviceTaskdiagService;
			@@ -122,6 +124,9 @@

			@Autowired
			private IServiceTaskScheduleService serviceTaskScheduleService;

			@Autowired
			private IPatArchiveService patArchiveService;

			@Autowired
			private ScheduleSubtaskBuilder scheduleSubtaskBuilder;
			@@ -407,7 +412,16 @@
			if (serviceSubtaskEntity.getSendstateView() == 3)
			serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
			}

			//患者获取随访任务-需要查询同个患者（身份证）所有的任务景宁
			if (StringUtils.isNotEmpty(serviceSubtaskEntity.getOrgid()) && serviceSubtaskEntity.getOrgid().equals("47255004333112711A1001")) {
			if(ObjectUtils.isNotEmpty(serviceSubtaskEntity.getPatid())){
			PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtaskEntity.getPatid());
			if(ObjectUtils.isNotEmpty(patArchive) && StringUtils.isNotEmpty(patArchive.getIdcardno())){
			serviceSubtaskEntity.setPatid(null);
			serviceSubtaskEntity.setSfzh(patArchive.getIdcardno());
			}
			}
			}
			List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskEntity);

			List<ServiceSubtaskRes> serviceSubtaskResList = new ArrayList<>();
			@@ -588,9 +602,30 @@
			* @return 结果
			*/
			@Override
			public int insertServiceSubtask(ServiceSubtask serviceSubtask) {
			public Map<String, Object> insertServiceSubtask(ServiceSubtask serviceSubtask) {
			serviceSubtask.setCreateTime(DateUtils.getNowDate());
			return serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
			serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
			RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
			String taskId = rsaPublicKeyExample.encryptedData(serviceSubtask.getTaskid().toString(), pub_key);
			String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
			String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
			ServiceOutPath serviceOutPath = new ServiceOutPath();
			serviceOutPath.setParam1(taskId);
			serviceOutPath.setParam2(patid);
			serviceOutPath.setCreateTime(new Date());
			serviceOutPath.setParam6(subId);
			serviceOutPath.setOrgid(serviceSubtask.getOrgid());
			iServiceOutPathService.insertServiceOutPath(serviceOutPath);
			//转成16进制
			String format = String.format("%03X", serviceOutPath.getId());
			serviceOutPath.setRadix(format);
			serviceOutPath.setUpdateTime(new Date());
			iServiceOutPathService.updateServiceOutPath(serviceOutPath);

			Map<String, Object> result = new HashMap<>();
			result.put("url", localIP + ":" + req_path + "/wt?p=" + format);
			result.put("subId",serviceSubtask.getId());
			return result;
			}

			/**
			@@ -861,6 +896,36 @@

			log.info("----serviceTaskSchedule的值为：{}", scheduleVO);
			serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
			} else if (serviceTaskVO.getAppltype().equals("6")) {
			ServiceTaskmedical serviceTaskmedical = new ServiceTaskmedical();
			serviceTaskmedical.setTaskId(serviceTask.getTaskid());
			serviceTaskmedical.setTaskName(serviceTask.getTaskName());
			serviceTaskmedical.setServiceType(serviceTaskVO.getServiceType());
			serviceTaskmedical.setLongtask(Long.valueOf(serviceTask.getLongTask()));
			if (serviceTaskVO.getLongTask() == 1) serviceTaskmedical.setLongtask(1L);
			serviceTaskmedical.setMedicalCode(serviceTaskVO.getIcd10code());
			serviceTaskmedical.setMedicalName(serviceTaskVO.getIcd10name());
			serviceTaskmedical.setGuid(serviceTask.getGuid());
			serviceTaskmedical.setOrgid(serviceTask.getOrgid());
			serviceTaskmedical.setCreateTime(new Date());
			serviceTaskmedical.setDeptCode(serviceTaskVO.getDeptcode());
			serviceTaskmedical.setDeptName(serviceTaskVO.getDeptname());
			serviceTaskmedical.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
			serviceTaskmedical.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
			//南华附一的icd10code是有重复的，所以不能用南华附一的icd10code去查询
			log.info("----serviceTaskmedical的值为：{}", serviceTaskmedical);
			if (!StringUtils.isEmpty(serviceTaskVO.getMedicalName())) {
			String[] medicalNames = serviceTaskVO.getMedicalName().split(",");
			String[] medicalcodes = serviceTaskVO.getMedicalCode().split(",");
			String[] medicalCompanys = serviceTaskVO.getMedicalCompany().split(",");
			for (int i = 0; i < medicalNames.length; i++) {
			serviceTaskmedical.setMedicalCode(medicalNames[i]);
			serviceTaskmedical.setMedicalName(medicalcodes[i]);
			if (ObjectUtils.isNotEmpty(medicalCompanys))
			serviceTaskmedical.setMedicalCompany(medicalcodes[i]);
			serviceTaskmedicalService.insertServiceTaskmedical(serviceTaskmedical);
			}
			}
			} else {
			ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
			serviceTaskdept.setTaskId(serviceTask.getTaskid());
			@@ -1134,6 +1199,51 @@
			}
			}

			} else if (serviceTaskVO.getAppltype().equals("6")) {
			ServiceTaskmedical serviceTaskmedical = new ServiceTaskmedical();
			serviceTaskmedical.setTaskId(serviceTask.getTaskid());
			serviceTaskmedical.setTaskName(serviceTask.getTaskName());
			if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
			throw new BaseException("药品编码为空");
			}
			serviceTaskmedical.setLongtask(Long.valueOf(serviceTask.getLongTask()));
			serviceTaskmedical.setMedicalName(serviceTaskVO.getMedicalName());
			serviceTaskmedical.setGuid(serviceTask1.getGuid());
			serviceTaskmedical.setServiceType(serviceTask1.getServiceType());
			serviceTaskmedical.setOrgid(serviceTask1.getOrgid());
			serviceTaskmedical.setDeptCode(serviceTask1.getDeptcode());
			serviceTaskmedical.setDeptName(serviceTask1.getDeptname());
			serviceTaskmedical.setWardCode(serviceTask1.getLeavehospitaldistrictcode());
			serviceTaskmedical.setWardName(serviceTask1.getLeavehospitaldistrictname());
			serviceTaskmedical.setUpdateTime(new Date());
			if (StringUtils.isNotEmpty(serviceTaskVO.getMedicalCode())) {
			String[] medicalCodes = serviceTaskVO.getMedicalCode().split(",");
			String[] medicalNames = serviceTaskVO.getMedicalName().split(",");
			String[] medicalCompany = serviceTaskVO.getMedicalCompany().split(",");
			if (!active.equals("nhfy") && !active.equals("druid")) {
			if (medicalCodes.length != medicalNames.length) {
			throw new BaseException("药品编码和药品名称数量不一致");
			}
			}
			for (int i = 0; i < medicalCodes.length; i++) {
			//先查询一下是否存在
			ServiceTaskmedical serviceTaskmedical1 = new ServiceTaskmedical();
			serviceTaskmedical1.setTaskId(serviceTaskVO.getTaskid());
			serviceTaskmedical1.setMedicalCode(medicalCodes[i]);
			serviceTaskmedical1.setMedicalName(medicalNames[i]);
			List<ServiceTaskmedical> serviceTaskmedicals = serviceTaskmedicalService.selectServiceTaskmedicalList(serviceTaskmedical1);
			serviceTaskmedical.setMedicalCode(medicalCodes[i]);
			serviceTaskmedical.setMedicalName(medicalNames[i]);
			log.info("----serviceTaskmedical更新的值为：{}", serviceTaskmedical);
			if (CollectionUtils.isNotEmpty(serviceTaskmedicals)) {
			serviceTaskmedical.setId(serviceTaskmedicals.get(0).getId());
			serviceTaskmedicalService.updateServiceTaskmedical(serviceTaskmedical);
			} else {
			serviceTaskmedicalService.insertServiceTaskmedical(serviceTaskmedical);
			}
			}
			}

			} else if (serviceTaskVO.getAppltype().equals("4")) {
			ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
			// if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {