jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7e5d4b4f61fd510706c463622d411ab7ef199842

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

修改风险因素

Showing 3 changed files with 41 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 7e5d4b4
... ... @@ -368,6 +368,7 @@
368 368  
369 369 //建档医生
370 370 private String bookbuildingDoctor;
  371 + private List<String> bookbuildingDoctorList;
371 372  
372 373 //档案编号
373 374 private String fileCode;
... ... @@ -868,6 +869,9 @@
868 869 if (bookbuildingDoctor != null) {
869 870 condition = condition.and("bookbuildingDoctor", bookbuildingDoctor, MongoOper.IS);
870 871 }
  872 + if (CollectionUtils.isNotEmpty(bookbuildingDoctorList)) {
  873 + condition = condition.and("bookbuildingDoctor", bookbuildingDoctorList, MongoOper.IN);
  874 + }
871 875 if (visitstatus != -1) {
872 876 condition = condition.and("isVisit", visitstatus, MongoOper.IS);
873 877 }
... ... @@ -1291,6 +1295,14 @@
1291 1295  
1292 1296 public void setHusbandPhone(String husbandPhone) {
1293 1297 this.husbandPhone = husbandPhone;
  1298 + }
  1299 +
  1300 + public List<String> getBookbuildingDoctorList() {
  1301 + return bookbuildingDoctorList;
  1302 + }
  1303 +
  1304 + public void setBookbuildingDoctorList(List<String> bookbuildingDoctorList) {
  1305 + this.bookbuildingDoctorList = bookbuildingDoctorList;
1294 1306 }
1295 1307 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 7e5d4b4
... ... @@ -14,6 +14,7 @@
14 14 import com.lyms.platform.operate.web.request.MatDeliverQueryRequest;
15 15 import com.lyms.platform.operate.web.request.NewBabyManagerRequest;
16 16 import com.lyms.platform.operate.web.result.*;
  17 +import com.lyms.platform.operate.web.utils.CommonsHelper;
17 18 import com.lyms.platform.permission.model.Organization;
18 19 import com.lyms.platform.permission.model.OrganizationQuery;
19 20 import com.lyms.platform.permission.model.Users;
... ... @@ -75,6 +76,9 @@
75 76 @Autowired
76 77 private DataPermissionService dataPermissionService;
77 78  
  79 + @Autowired
  80 + private BasicConfigService basicConfigService;
  81 +
78 82 @Value(("#{configProperties['run.region']}"))
79 83 private String runType;
80 84  
... ... @@ -962,6 +966,9 @@
962 966 }
963 967 }
964 968 }
  969 + patientsQuery.setLimit(childbirthManagerRequest.getLimit());
  970 + patientsQuery.setPage(childbirthManagerRequest.getPage());
  971 + patientsQuery.setNeed("need");
965 972 patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId())?null:childbirthManagerRequest.getRegisterProvinceId());
966 973 patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId())?null:childbirthManagerRequest.getRegisterCityId());
967 974 patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId())?null:childbirthManagerRequest.getRegisterAreaId());
... ... @@ -969,7 +976,7 @@
969 976 patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getLivingCityId())?null:childbirthManagerRequest.getLivingCityId());
970 977 patientsQuery.setAreaId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId())?null:childbirthManagerRequest.getLivingAreaId());
971 978 patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone());
972   - patientsQuery.setQueryNo1(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo())?null:childbirthManagerRequest.getQueryNo());
  979 + patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo())?null:childbirthManagerRequest.getQueryNo());
973 980 patientsQuery.setFmHospitalList(hospitalList);
974 981 String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
975 982 patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
... ... @@ -1014,6 +1021,8 @@
1014 1021 childbirthManagerQueryModel.setpId(maternalDeliverModel.getPid());
1015 1022 childbirthManagerQueryModel.setPatientId(patients.getId());
1016 1023 childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
  1024 + // 居住地
  1025 + childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
1017 1026 // 电话转换
1018 1027 childbirthManagerQueryModel.setPhone(StringUtils.isEmpty(patients.getPhone()) ? "" : patients.getPhone().substring(0, 3) + "****" + patients.getPhone().substring(7));
1019 1028 childbirthManagerQueryModel.setHusbandPhone(StringUtils.isEmpty(patients.getHusbandPhone()) ? "" : patients.getHusbandPhone().substring(0, 3) + "****" + patients.getHusbandPhone().substring(7));
... ... @@ -1226,7 +1235,7 @@
1226 1235 }
1227 1236  
1228 1237 childbirthManagerResult.setData(childbirthManagerQueryModelList);
1229   - childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
  1238 + childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
1230 1239 childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
1231 1240 childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
1232 1241 return childbirthManagerResult;
... ... @@ -1302,7 +1311,7 @@
1302 1311 newBabyManagerQueryModel.setDueType("顺产");
1303 1312 }
1304 1313 if ("2".equals(dueType)) {
1305   - newBabyManagerQueryModel.setDueType("刨宫产");
  1314 + newBabyManagerQueryModel.setDueType("剖宫产");
1306 1315 }
1307 1316 newBabyManagerQueryModelList.add(newBabyManagerQueryModel);
1308 1317 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 7e5d4b4
... ... @@ -16,6 +16,8 @@
16 16 import com.lyms.platform.operate.web.worker.WorkHR;
17 17 import com.lyms.platform.permission.model.Organization;
18 18 import com.lyms.platform.permission.model.OrganizationQuery;
  19 +import com.lyms.platform.permission.model.Users;
  20 +import com.lyms.platform.permission.model.UsersQuery;
19 21 import com.lyms.platform.permission.service.OrganizationService;
20 22 import com.lyms.platform.permission.service.UsersService;
21 23 import com.lyms.platform.pojo.*;
... ... @@ -758,6 +760,20 @@
758 760 patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId());
759 761 patientsQuery.setCityRegisterId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId());
760 762 patientsQuery.setAreaRegisterId(StringUtils.isEmpty(patientManagerRequest.getAreaRegisterId()) ? null : patientManagerRequest.getAreaRegisterId());
  763 + UsersQuery usersQuery = new UsersQuery();
  764 + usersQuery.setName(patientManagerRequest.getBookbuildingDoctor());
  765 + usersQuery.setYn(YnEnums.YES.getId());
  766 + List<Users> usersList = usersService.queryUsers(usersQuery);
  767 + if(CollectionUtils.isNotEmpty(usersList)){
  768 + List<String> bookbuildingDoctorList = new ArrayList<>();
  769 + for (Users users : usersList) {
  770 + bookbuildingDoctorList.add(users.getId().toString());
  771 + }
  772 + patientsQuery.setBookbuildingDoctorList(bookbuildingDoctorList);
  773 + }
  774 + patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceId()) ? null : patientManagerRequest.getProvinceId());
  775 + patientsQuery.setCityId(StringUtils.isEmpty(patientManagerRequest.getCityId()) ? null : patientManagerRequest.getCityId());
  776 + patientsQuery.setAreaId(StringUtils.isEmpty(patientManagerRequest.getAreaId()) ? null : patientManagerRequest.getAreaId());
761 777 patientsQuery.setNeed("need");
762 778 if (StringUtils.isNotEmpty(patientManagerRequest.getBookBuildingDate())) {
763 779 try {
... ... @@ -767,9 +783,7 @@
767 783 // 什么都不做，这里是数据传入错误了
768 784 }
769 785 }
770   - patientsQuery.setName(StringUtils.isEmpty(patientManagerRequest.getUserName()) ? null : patientManagerRequest.getUserName());
771   - patientsQuery.setCardNo(StringUtils.isEmpty(patientManagerRequest.getCardNo()) ? null : patientManagerRequest.getCardNo());
772   - patientsQuery.setPhone(StringUtils.isEmpty(patientManagerRequest.getPhone()) ? null : patientManagerRequest.getPhone());
  786 + patientsQuery.setName(StringUtils.isEmpty(patientManagerRequest.getQueryNo()) ? null : patientManagerRequest.getQueryNo());
773 787  
774 788 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
775 789 List<PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList<>();