diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index ed5a456..2d18246 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -64,6 +64,8 @@ public class ApplyOrderFacade { @Autowired private BabyCheckFacade babyCheckFacade; + @Autowired + private OrganizationGroupsFacade groupsFacade; /** * 增加转诊申请 @@ -79,9 +81,19 @@ public class ApplyOrderFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(referralApplyOrderModel.getParentId()); + String hospital = autoMatchFacade.getHospitalId(userId); + //表示区域的 + if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospital))) { + String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId); + if (StringUtils.isEmpty(parentId)) { + //打印日志 + } + referralApplyOrderModel.setParentId(parentId); + referralApplyOrderAddRequest.setParentId(parentId); + } + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(referralApplyOrderModel.getParentId()); - String hospital = autoMatchFacade.getHospitalId(userId); referralApplyOrderQuery.setOutHospitalId(hospital); //如果填写的汉字,并且改医院在我们系统存在则把他转成id if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && !NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java index 73b0de9..ba77a29 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java @@ -12,6 +12,10 @@ import com.lyms.platform.pojo.ReferralApplyOrderModel; */ @Form public class ReferralApplyOrderAddRequest implements IBasicRequestConvert { + + private + String pid; + @FormParam private String parentId; @FormParam @@ -29,6 +33,13 @@ public class ReferralApplyOrderAddRequest implements IBasicRequestConvert> { if (CollectionUtils.isNotEmpty(withList)) { chanResult.setcTimes(withList.size()); if (null != withList.get(0).getNextCheckTime()) { - nextCheckTime = DateUtil.getyyyy_MM_dd(withList.get(0).getNextCheckTime()); + nextCheckTime = DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()); } postReviewQuery.setHospitalId(hospital); @@ -138,8 +138,8 @@ public class QuanChanPatientWorker implements Callable> { }else{ chanResult.setcHTimes(withList.size()); } - if (StringUtils.isNotEmpty(withList.get(0).getProdDoctor())) { - Users users = usersService.getUsers(NumberUtils.toInt(withList.get(0).getProdDoctor())); + if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); if (null != users) { chanResult.setCheckDoctor(users.getName()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java index 893aad8..3730134 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java @@ -177,41 +177,41 @@ public class QuanPatientWorker implements Callable> { patientsService.updatePatient(patients1); } - nextCheckTime = DateUtil.getyyyy_MM_dd(examinationModels.get(0).getNextCheckTime()); + nextCheckTime = DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()); - if (StringUtils.isNotEmpty(examinationModels.get(0).getCheckDoctor())) { - if (NumberUtils.isNumber(examinationModels.get(0).getCheckDoctor())) { - Users users = usersService.getUsers(NumberUtils.toInt(examinationModels.get(0).getCheckDoctor())); + if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { + if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); if (null != users) { quanPatientsResult.setCheckDoctor(users.getName()); } else { - quanPatientsResult.setCheckDoctor(examinationModels.get(0).getCheckDoctor()); + quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } else { - quanPatientsResult.setCheckDoctor(examinationModels.get(0).getCheckDoctor()); + quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } } else { List list = antExService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(list)) { - nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()); - if (StringUtils.isNotEmpty(list.get(0).getProdDoctor())) { - if (NumberUtils.isNumber(list.get(0).getProdDoctor())) { - Users users = usersService.getUsers(NumberUtils.toInt(list.get(0).getProdDoctor())); + nextCheckTime = DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()); + if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { + if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); if (null != users) { quanPatientsResult.setCheckDoctor(users.getName()); } else { - quanPatientsResult.setCheckDoctor(list.get(0).getProdDoctor()); + quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } else { - quanPatientsResult.setCheckDoctor(list.get(0).getProdDoctor()); + quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } - Patients patients1=new Patients(); + /*Patients patients1=new Patients(); patients1.setId(patients.getId()); patients1.setLastCTime(list.get(0).getCheckTime()); - patientsService.updatePatient(patients1); + patientsService.updatePatient(patients1);*/ } } stopWatch.stop(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index fbcf9a7..2f95310 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -127,7 +127,6 @@ public class WorkHR implements Callable> { } } - riskPatientsResult.setbTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); antExChuQuery.setPid(patients.getPid()); antExChuQuery.setYn(YnEnums.YES.getId()); @@ -149,56 +148,27 @@ public class WorkHR implements Callable> { List examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); if (CollectionUtils.isNotEmpty(examinationModels)) { - //设置最后一次检查时间 - if (null == patients.getLastCTime()) { - List list = new ArrayList<>(); - for (AntenatalExaminationModel antEx : examinationModels) { - list.add(antEx.getCheckDate()); - } - - Collections.sort(list, new Comparator() { - @Override - public int compare(Date o1, Date o2) { - if (o1 != null && o1.after(o2)) { - return -1; - } - if (o1 != null && o1.before(o2)) { - return 1; - } - return 0; - } - }); - Patients patients1 = new Patients(); - patients1.setId(patients.getId()); - patients1.setLastCTime(list.get(0)); - patientsService.updatePatient(patients1); - } - - if (NumberUtils.isNumber(examinationModels.get(0).getCheckDoctor())) { - Users users = usersService.getUsers(NumberUtils.toInt(examinationModels.get(0).getCheckDoctor())); + if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); if (null != users) { riskPatientsResult.setCheckDoctor(users.getName()); } else { - riskPatientsResult.setCheckDoctor(examinationModels.get(0).getCheckDoctor()); + riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } - nextCheckTime = DateUtil.getyyyy_MM_dd(examinationModels.get(0).getNextCheckTime()); + nextCheckTime = DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()); } else { List list = antExService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(list)) { - nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()); - if (NumberUtils.isNumber(list.get(0).getProdDoctor())) { - Users users = usersService.getUsers(NumberUtils.toInt(list.get(0).getProdDoctor())); + nextCheckTime = DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()); + if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); if (null != users) { riskPatientsResult.setCheckDoctor(users.getName()); } else { - riskPatientsResult.setCheckDoctor(list.get(0).getProdDoctor()); + riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } - Patients patients1 = new Patients(); - patients1.setId(patients.getId()); - patients1.setLastCTime(list.get(0).getCheckTime()); - patientsService.updatePatient(patients1); } } stopWatch.stop();