jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0b2a7ca287e53cf2ab6e6727c16b3bce6338051f

Authored by [wangbo]
1 parent 4ab7c94a91
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改儿保检查bug1

Showing 2 changed files with 5 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java View file @ 0b2a7ca
... ... @@ -79,6 +79,7 @@
79 79 patientsQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
80 80 List<Patients> list = patientsService.queryPatient(patientsQuery);
81 81 if(list != null && list.size() > 0){
  82 +
82 83 for(Patients patients : list){
83 84 try{
84 85 patients = getMainPatient(patients.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 0b2a7ca
... ... @@ -757,9 +757,10 @@
757 757  
758 758 public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, Integer highRisk, Integer waskSon, Integer page, Integer limit, Integer userId) {
759 759 boolean flag = false;
760   - List<String> hospital = groupsFacade.findGroupHospital(userId, false);
761   - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
762   - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  760 + // List<String> hospital = groupsFacade.findGroupHospital(userId, false);
  761 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  762 + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
  763 + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
763 764 if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) {
764 765 pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo),
765 766 Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo));