jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 79f75f2fabb3c49313da92013df138214e4375fb

Authored by jiangjiazhi
1 parent 1a55433e26
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

分娩作废产检劵

Showing 1 changed file with 6 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 79f75f2
... ... @@ -1724,20 +1724,18 @@
1724 1724 }
1725 1725 }
1726 1726 } else {
  1727 + if(StringUtils.isEmpty(queryRequest.getCardNo())&&StringUtils.isEmpty(queryRequest.getVcCardNo())){
  1728 + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件");
  1729 + }
1727 1730 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null,currentGroupHospital , 1, false, null, og.getbStatus() == 1);
1728 1731 //查询产妇数据
1729 1732 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false);
1730 1733 }
1731 1734  
1732 1735 if (null == patients) {
1733   -// if (ErrorCodeConstants.RUN_MODE.equals(runType)) {
1734   -// //查询是否还有其他记录
1735   -// patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null, true);
1736   -// } else {
1737   -// //查询是否还有其他记录
1738   -// patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null, false);
1739   -// }
1740   - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
  1736 + if(StringUtils.isNotEmpty(queryRequest.getCardNo())&&StringUtils.isNotEmpty( queryRequest.getVcCardNo())){
  1737 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
  1738 + }
1741 1739  
1742 1740 //原来单机
1743 1741 if (null != patients) {