diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BookbuildingCouponQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BookbuildingCouponQuery.java index 99f7334..e0e9105 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BookbuildingCouponQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BookbuildingCouponQuery.java @@ -17,6 +17,15 @@ public class BookbuildingCouponQuery extends BaseQuery { private String areaId; private String hospitalId; private List personIds; + private String yyzyfmHospitalId; + + public String getYyzyfmHospitalId() { + return yyzyfmHospitalId; + } + + public void setYyzyfmHospitalId(String yyzyfmHospitalId) { + this.yyzyfmHospitalId = yyzyfmHospitalId; + } public List getPersonIds() { return personIds; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 3363406..e566081 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -5403,33 +5403,37 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public BaseObjectResponse bookbuildingCoupon(BookbuildingCouponQuery query) { BaseObjectResponse objectResponse = new BaseObjectResponse(); - List personList=new ArrayList<>(); - if(StringUtils.isNotEmpty(query.getName()) || StringUtils.isNotEmpty(query.getCardNo())){ - PersonModelQuery personModelQuery = new PersonModelQuery(); - personModelQuery.setYn(YnEnums.YES.getId()); + List patientsList=new ArrayList<>(); + if(StringUtils.isNotEmpty(query.getName()) || StringUtils.isNotEmpty(query.getCardNo()) || + StringUtils.isNotEmpty(query.getYyzyfmHospitalId())){ + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); if (StringUtils.isNotEmpty(query.getName())) { - personModelQuery.setName(query.getName()); + patientsQuery.setName(query.getName()); } if (StringUtils.isNotEmpty(query.getCardNo())) { - personModelQuery.setCardNo(query.getCardNo()); + patientsQuery.setCardNo(query.getCardNo()); + } + if (StringUtils.isNotEmpty(query.getYyzyfmHospitalId())) { + patientsQuery.setYyzyfmHospitalId(query.getYyzyfmHospitalId()); } - personList = personService.queryPersons(personModelQuery); + patientsList = patientsService.queryPatient(patientsQuery); //没查到 - if(CollectionUtils.isEmpty(personList)){ + if(CollectionUtils.isEmpty(patientsList)){ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; } } - List personIds=new ArrayList<>(); - for (PersonModel personModel : personList) { - if (StringUtils.isNotEmpty(personModel.getId())) { - personIds.add(personModel.getId()); + List patientpIds=new ArrayList<>(); + for (Patients patients : patientsList) { + if (StringUtils.isNotEmpty(patients.getPid())) { + patientpIds.add(patients.getPid()); } } - //查询姓名身份证结果放入mysql查询 - if(CollectionUtils.isNotEmpty(personIds)){ - query.setPersonIds(personIds); + //筛选档案信息结果放入mysql查询 + if(CollectionUtils.isNotEmpty(patientpIds)){ + query.setPersonIds(patientpIds); } //分页数据 query.mysqlBuild(couponMapper.bookbuildingCouponCount(query)); @@ -5439,11 +5443,22 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List result=new ArrayList<>(); for (Map bookbuildingCoupon : bookbuildingCouponList) { Map map=new HashedMap(); - PersonModel personModel = mongoTemplate.findById(bookbuildingCoupon.get("userid").toString(), PersonModel.class); - map.put("name", StringUtils.isNotEmpty(personModel.getName())?personModel.getName():""); - map.put("phone", StringUtils.isNotEmpty(personModel.getPhone())?personModel.getPhone():""); - map.put("cardNo", StringUtils.isNotEmpty(personModel.getCardNo())?personModel.getCardNo():""); + PatientsQuery patientsQuery2 = new PatientsQuery(); + patientsQuery2.setYn(YnEnums.YES.getId()); + patientsQuery2.setPid(bookbuildingCoupon.get("userid").toString()); + List patients =patientsService.queryPatient(patientsQuery2); + Patients patientsModel=new Patients(); + if(CollectionUtils.isNotEmpty(patients)){ + patientsModel = patients.get(0); + } + map.put("name", StringUtils.isNotEmpty(patientsModel.getUsername())?patientsModel.getUsername():""); + map.put("phone", StringUtils.isNotEmpty(patientsModel.getPhone())?patientsModel.getPhone():""); + map.put("cardNo", StringUtils.isNotEmpty(patientsModel.getCardNo())?patientsModel.getCardNo():""); + String address=CommonsHelper.getResidence(patientsModel.getProvinceRegisterId(), patientsModel.getCityRegisterId(), patientsModel.getAreaRegisterId(), patientsModel.getStreetRegisterId(), patientsModel.getAddressRegister(), basicConfigService); + map.put("address", address); map.put("hospitalName", bookbuildingCoupon.get("hospitalname")); + String yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId()); + map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:""); map.put("created", bookbuildingCoupon.get("created")); result.add(map);