smartor.git - Gitblit

			@@ -727,7 +727,7 @@
			//再入院逻辑
			//景宁出院首次（7天）随访一定要做
			boolean firstVisit = false;
			if (orgId.equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
			if (orgId.equals("47255004333112711A1001")) {
			firstVisit = true;
			}
			if (!firstVisit) {
			@@ -1251,7 +1251,7 @@
			}
			//景宁出院首次（7天）随访一定要做
			boolean firstVisit = false;
			if (serviceSubtask1.getOrgid().equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
			if (serviceSubtask1.getOrgid().equals("47255004333112711A1001")) {
			firstVisit = true;
			}
			if (!firstVisit) {

			@@ -671,8 +671,12 @@
			patMedInhosp.setInhospstate("0");
			List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
			PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask1.getPatid());

			if (patMedInhospList.size() > 0) {
			//景宁新增再次随访不能触发患者再入院
			boolean inhospAgain = true;
			if (serviceSubtask1.getOrgid().equals("47255004333112711A1001")) {
			inhospAgain = false;
			}
			if (patMedInhospList.size() > 0 && inhospAgain) {
			serviceSubtask1.setIsVisitAgain(2);
			serviceSubtask1.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ";患者再入院了" : "患者再入院了");
			serviceSubtask1.setSendstate(4L);

	smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史