diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index 9f2780c..da4aafb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -585,6 +585,16 @@ public class PuerperaManageController extends BaseController { } /** + * 获取产妇基本信息 + * 上面的有bug + */ + @RequestMapping(value = "/wx/findp2", method = RequestMethod.GET) + @ResponseBody + public BaseResponse getWxPatent2(PatientQueryRequest request) { + return patientFacade.findPatient2(request, null); + } + + /** * @author dongqin * @description 根据身份证号,获取孕妇基本信息,此接口是对第三方提供服务的 * @date 10:09 2019/11/18 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 66d1662..4626ed7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -3724,11 +3724,17 @@ public class PatientFacade extends BaseServiceImpl { } public BaseResponse findPatient2(PatientQueryRequest patientQueryRequest, Integer userId) { - String hospitalId= autoMatchFacade.getHospitalId(userId); + String hospitalId; + if (userId==null){ + hospitalId=patientQueryRequest.getHospitalId(); + }else { + hospitalId= autoMatchFacade.getHospitalId(userId); + } + Integer type = patientQueryRequest.getType() != null ? patientQueryRequest.getType() : -1; Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), - patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), type, false, patientQueryRequest.getPid(), false); + patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), userId!=null?groupsFacade.findGroupHospital(userId, false):null, type, false, patientQueryRequest.getPid(), false); PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != patients) { if (type==3){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java index a4bfae6..105bb29 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java @@ -10,6 +10,15 @@ public class PatientQueryRequest { private String pid; private String vcCardNo; private Integer type; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } public Integer getType() { return type;