jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 699783fc0c3abcd16813b693c5b767bc349763f6

Authored by hujiaqi
1 parent 90275d2c10
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

修改

Showing 3 changed files with 10 additions and 6 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 699783f
... ... @@ -65,6 +65,9 @@
65 65 patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
66 66 query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());
67 67 }
  68 + if(!StringUtils.isEmpty(patientsQuery.getSort())){
  69 + return iPatientDao.queryPatient(query.addOrder(Sort.Direction.ASC, patientsQuery.getSort()));
  70 + }
68 71  
69 72 return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id"));
70 73 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 699783f
... ... @@ -1439,12 +1439,12 @@
1439 1439 if(String.valueOf(YnEnums.YES.getId()).equals(request.getIsArea())){
1440 1440  
1441 1441 OrganizationQuery organizationQuery = new OrganizationQuery();
1442   - List<Integer> typeList = new ArrayList<>();
1443   - typeList.add(OrganizationTypeEnum.NY.getId());
1444   - typeList.add(OrganizationTypeEnum.FB.getId());
1445   - typeList.add(OrganizationTypeEnum.JMQY.getId());
1446   - typeList.add(OrganizationTypeEnum.TY.getId());
1447   - organizationQuery.setTypeList(typeList);
  1442 + // List<Integer> typeList = new ArrayList<>();
  1443 + // typeList.add(OrganizationTypeEnum.NY.getId());
  1444 + // typeList.add(OrganizationTypeEnum.FB.getId());
  1445 + // typeList.add(OrganizationTypeEnum.JMQY.getId());
  1446 + // typeList.add(OrganizationTypeEnum.TY.getId());
  1447 + // organizationQuery.setTypeList(typeList);
1448 1448 if(!StringUtils.isEmpty(request.getHospitalId())){
1449 1449 hospitalIdList.add(request.getHospitalId());
1450 1450 }else if(!StringUtils.isEmpty(request.getHospitalAreaId())){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java View file @ 699783f
... ... @@ -71,6 +71,7 @@
71 71 patientsQuery.setYn(YnEnums.YES.getId());
72 72 patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId()));
73 73 patientsQuery.setType(1);
  74 + patientsQuery.setSort("dueDate");
74 75 String doctorId = predictedStatisticsRequest.getDoctorId();
75 76 if (!StringUtils.isEmpty(doctorId)) {
76 77 patientsQuery.setLastCheckEmployeeId(doctorId);