jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 473c8612768192bb3725f2e8a708ed6f729e231c

Authored by liquanyu
2 parents 076adcc42f 70f0de4025
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/regional-plat… 

…form into nobuildprocess

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 473c861
... ... @@ -966,9 +966,11 @@
966 966 }
967 967 }
968 968 }
969   - patientsQuery.setLimit(childbirthManagerRequest.getLimit());
970   - patientsQuery.setPage(childbirthManagerRequest.getPage());
971   - patientsQuery.setNeed("need");
  969 + if (!childbirthManagerRequest.isExcel()) {
  970 + patientsQuery.setLimit(childbirthManagerRequest.getLimit());
  971 + patientsQuery.setPage(childbirthManagerRequest.getPage());
  972 + patientsQuery.setNeed("need");
  973 + }
972 974 patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId()) ? null : childbirthManagerRequest.getRegisterProvinceId());
973 975 patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId()) ? null : childbirthManagerRequest.getRegisterCityId());
974 976 patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId()) ? null : childbirthManagerRequest.getRegisterAreaId());
975 977  
... ... @@ -1256,10 +1258,12 @@
1256 1258 }
1257 1259 }
1258 1260 babyModelQuery.setDueType(StringUtils.isEmpty(newBabyManagerRequest.getDueType()) ? null : newBabyManagerRequest.getDueType());
1259   - babyModelQuery.setPage(newBabyManagerRequest.getPage());
1260   - babyModelQuery.setLimit(newBabyManagerRequest.getLimit());
  1261 + if (!newBabyManagerRequest.isExcel()) {
  1262 + babyModelQuery.setPage(newBabyManagerRequest.getPage());
  1263 + babyModelQuery.setLimit(newBabyManagerRequest.getLimit());
  1264 + babyModelQuery.setNeed("Need");
  1265 + }
1261 1266 babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
1262   - babyModelQuery.setNeed("Need");
1263 1267 babyModelQuery.setBuildType(2);
1264 1268 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
1265 1269 if (CollectionUtils.isEmpty(babyModelList)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 473c861
... ... @@ -756,6 +756,8 @@
756 756  
757 757 PatientsQuery patientsQuery = new PatientsQuery();
758 758 patientsQuery.setYn(YnEnums.YES.getId());
  759 + patientsQuery.setLimit(patientManagerRequest.getLimit());
  760 + patientsQuery.setPage(patientManagerRequest.getLimit());
759 761 patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()));
760 762 patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId());
761 763 patientsQuery.setCityRegisterId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 473c861
... ... @@ -149,7 +149,17 @@
149 149 */
150 150 private String initQuery;
151 151  
  152 + private boolean isExcel;
  153 +
152 154 private Integer operatorId;
  155 +
  156 + public boolean isExcel() {
  157 + return isExcel;
  158 + }
  159 +
  160 + public void setExcel(boolean excel) {
  161 + isExcel = excel;
  162 + }
153 163  
154 164 public String getQueryNo() {
155 165 return queryNo;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java View file @ 473c861
... ... @@ -28,9 +28,19 @@
28 28 */
29 29 private String dueType;
30 30  
  31 + private boolean isExcel;
  32 +
31 33 // TODO 条码号暂时不管
32 34  
33 35 private Integer operatorId;
  36 +
  37 + public boolean isExcel() {
  38 + return isExcel;
  39 + }
  40 +
  41 + public void setExcel(boolean excel) {
  42 + isExcel = excel;
  43 + }
34 44  
35 45 public String getQueryNo() {
36 46 return queryNo;