From a8fd9bab167dce627abc4a74c5a526391f973722 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 22 Dec 2016 18:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 8438ade..43c2bb7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -60,8 +60,6 @@ public class AntenatalExaminationFacade { private DeleteProcessHandler deleteProcessHandler; @Autowired private AntExRecordService recordService; - @Value(("#{configProperties['run.region']}")) - private String runType; @Autowired private OrganizationGroupsFacade groupsFacade; @@ -89,7 +87,7 @@ public class AntenatalExaminationFacade { } //表示区域的 - if (ErrorCodeConstants.RUN_MODE.equals(runType) && StringUtils.isEmpty(parentId) && StringUtils.isNotEmpty(pid)) { + if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && StringUtils.isNotEmpty(pid)) { patients = findOnePatient(null, null, null, null, 1, false, pid, false); patients.setSource(patients.getId()); patients.setId(null); @@ -296,7 +294,7 @@ public class AntenatalExaminationFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); //表示区域的 - if (ErrorCodeConstants.RUN_MODE.equals(runType)) { + if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId); if (StringUtils.isEmpty(parentId)) { //打印日志 @@ -1713,9 +1711,6 @@ public class AntenatalExaminationFacade { patients = list.get(0); } } else { - - //区域模式 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 1, false, null, og.getbStatus() == 1); //查询产妇数据 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false); @@ -1729,16 +1724,13 @@ public class AntenatalExaminationFacade { // //查询是否还有其他记录 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null, false); // } - patients=findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 3, false, null, og.getbStatus() == 1); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 3, false, null, og.getbStatus() == 1); - //区域模式 - if (ErrorCodeConstants.RUN_MODE.equals(runType)) { - //原来单机 - if (null != patients) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档"); - } - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); + //原来单机 + if (null != patients) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档"); } + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); } -- 1.8.3.1