jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f9ca007dd9eb5d3c7870d10e68bfc3781b3bae59

Authored by litao@lymsh.com
2 parents 8340a41113 c96098f127
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ f9ca007
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.lyms.hospitalapi.dzfy.DzfyHisService;
3 4 import com.lyms.platform.biz.SequenceConstant;
4 5 import com.lyms.platform.biz.service.*;
5 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
... ... @@ -94,6 +95,9 @@
94 95 @Autowired
95 96 private OperateLogFacade operateLogFacade;
96 97  
  98 + @Autowired
  99 + private DzfyHisService dzfyHisService;
  100 +
97 101 /**
98 102 * 处理区域隐藏建档
99 103 *
... ... @@ -1841,7 +1845,15 @@
1841 1845 if (StringUtils.isNotEmpty(cardNo)) {
1842 1846 patientsQuery.setCardNo(cardNo);
1843 1847 } else if (StringUtils.isNotEmpty(vcCardNo)) {
1844   - patientsQuery.setVcCardNo(vcCardNo);
  1848 + //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy
  1849 + if ("1000000114".equals(hospitalId))
  1850 + {
  1851 + patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo));
  1852 + }
  1853 + else
  1854 + {
  1855 + patientsQuery.setVcCardNo(vcCardNo);
  1856 + }
1845 1857 } else if (StringUtils.isNotEmpty(id)) {
1846 1858 patientsQuery.setId(id);
1847 1859 } else if (StringUtils.isNotEmpty(pid)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ f9ca007
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.lyms.hospitalapi.dzfy.DzfyHisService;
3 4 import com.lyms.platform.biz.service.BabyService;
4 5 import com.lyms.platform.biz.service.DischargeAbstractBabyService;
5 6 import com.lyms.platform.biz.service.DischargeAbstractMotherService;
... ... @@ -61,6 +62,10 @@
61 62 private BabyService babyService;
62 63  
63 64 @Autowired
  65 + private DzfyHisService dzfyHisService;
  66 +
  67 +
  68 + @Autowired
64 69 private AntenatalExaminationFacade antenatalExaminationFacade;
65 70  
66 71 @Autowired
... ... @@ -157,6 +162,15 @@
157 162 DischargeAbstractQueryResult dischargeAbstractQueryResult = new DischargeAbstractQueryResult();
158 163 dischargeAbstractQueryResult.setErrorcode(ErrorCodeConstants.SUCCESS);
159 164  
  165 + String hospitalId;
  166 + try {
  167 + hospitalId = autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId());
  168 + } catch (Exception e) {
  169 + dischargeAbstractQueryResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  170 + dischargeAbstractQueryResult.setErrormsg("获取获取当前医院异常");
  171 + return dischargeAbstractQueryResult;
  172 + }
  173 +
160 174 PatientsQuery patientsQuery = new PatientsQuery();
161 175 patientsQuery.setYn(YnEnums.YES.getId());
162 176 List<Integer> typeList = new ArrayList<>();
... ... @@ -166,7 +180,20 @@
166 180 // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()));
167 181 patientsQuery.setTypeList(typeList);
168 182 patientsQuery.setCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getCardNo()) ? null : dischargeAbstractSaveRequest.getCardNo());
169   - patientsQuery.setVcCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getVcCardNo()) ? null : dischargeAbstractSaveRequest.getVcCardNo());
  183 +
  184 + //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy
  185 + if ("1000000114".equals(hospitalId))
  186 + {
  187 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(dischargeAbstractSaveRequest.getVcCardNo()))
  188 + {
  189 + patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(dischargeAbstractSaveRequest.getVcCardNo()));
  190 + }
  191 + }
  192 + else
  193 + {
  194 + patientsQuery.setVcCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getVcCardNo()) ? null : dischargeAbstractSaveRequest.getVcCardNo());
  195 + }
  196 +
170 197 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
171 198 if (patientsList == null || patientsList.size() == 0) {
172 199 dischargeAbstractQueryResult.setStatus("0");
... ... @@ -203,14 +230,7 @@
203 230 return dischargeAbstractQueryResult;
204 231 }
205 232  
206   - String hospitalId;
207   - try {
208   - hospitalId = autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId());
209   - } catch (Exception e) {
210   - dischargeAbstractQueryResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
211   - dischargeAbstractQueryResult.setErrormsg("获取获取当前医院异常");
212   - return dischargeAbstractQueryResult;
213   - }
  233 +
214 234  
215 235 if (!hospitalId.equals(patients.getFmHospital())) {
216 236 dischargeAbstractQueryResult.setStatus("6");