jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a8fd9bab167dce627abc4a74c5a526391f973722

Authored by jiangjiazhi
1 parent 90f145f43a
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改产检删除

Showing 1 changed file with 7 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ a8fd9ba
... ... @@ -60,8 +60,6 @@
60 60 private DeleteProcessHandler deleteProcessHandler;
61 61 @Autowired
62 62 private AntExRecordService recordService;
63   - @Value(("#{configProperties['run.region']}"))
64   - private String runType;
65 63  
66 64 @Autowired
67 65 private OrganizationGroupsFacade groupsFacade;
... ... @@ -89,7 +87,7 @@
89 87 }
90 88  
91 89 //表示区域的
92   - if (ErrorCodeConstants.RUN_MODE.equals(runType) && StringUtils.isEmpty(parentId) && StringUtils.isNotEmpty(pid)) {
  90 + if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && StringUtils.isNotEmpty(pid)) {
93 91 patients = findOnePatient(null, null, null, null, 1, false, pid, false);
94 92 patients.setSource(patients.getId());
95 93 patients.setId(null);
... ... @@ -296,7 +294,7 @@
296 294 String hospitalId = autoMatchFacade.getHospitalId(userId);
297 295  
298 296 //表示区域的
299   - if (ErrorCodeConstants.RUN_MODE.equals(runType)) {
  297 + if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
300 298 String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId);
301 299 if (StringUtils.isEmpty(parentId)) {
302 300 //打印日志
... ... @@ -1713,9 +1711,6 @@
1713 1711 patients = list.get(0);
1714 1712 }
1715 1713 } else {
1716   -
1717   - //区域模式
1718   -
1719 1714 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 1, false, null, og.getbStatus() == 1);
1720 1715 //查询产妇数据
1721 1716 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false);
1722 1717  
1723 1718  
... ... @@ -1729,16 +1724,13 @@
1729 1724 // //查询是否还有其他记录
1730 1725 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null, false);
1731 1726 // }
1732   - patients=findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 3, false, null, og.getbStatus() == 1);
  1727 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 3, false, null, og.getbStatus() == 1);
1733 1728  
1734   - //区域模式
1735   - if (ErrorCodeConstants.RUN_MODE.equals(runType)) {
1736   - //原来单机
1737   - if (null != patients) {
1738   - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档");
1739   - }
1740   - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检");
  1729 + //原来单机
  1730 + if (null != patients) {
  1731 + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档");
1741 1732 }
  1733 + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检");
1742 1734 }
1743 1735  
1744 1736