diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index cc1b856..6f19ae2 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -79,14 +79,12 @@ public class PatientsService { patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query)); query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit()); } - if (!StringUtils.isEmpty(patientsQuery.getDesc())) { return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, patientsQuery.getSort())); } if (!StringUtils.isEmpty(patientsQuery.getSort())) { return iPatientDao.queryPatient(query.addOrder(Sort.Direction.ASC, patientsQuery.getSort())); } - return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id")); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 10f7831..dcfd274 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2321,6 +2321,7 @@ public class MatDeliverFacade { // 分娩方式去另外一张表查 patientsQuery.setDesc("fmDate"); patientsQuery.setSort("fmDate"); + List patientsList = patientsService.queryPatient(patientsQuery); @@ -2415,6 +2416,7 @@ public class MatDeliverFacade { // 这里就设置分页内容 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); } else {//否则按常规查询 + System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); maternalDeliverModelList = matDeliverService.query(matDeliverQuery); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 95c1e9e..7705c2c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -446,6 +446,7 @@ public class PremaritalCheckupFacade { checkupResult.setTingliLeft(result.getTingliLeft()); checkupResult.setTingliRight(result.getTingliRight()); checkupResult.setYuyan(result.getYuyan()); + checkupResult.setSeJue(result.getSeJue()); return checkupResult; }