jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d21ea83370e3fad5d1e2b659aa5be5665c78afa0

Authored by zhangchao
1 parent 9071f17497
Exists in dev

#fix:优化产检医生手输异常

Showing 1 changed file with 5 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ d21ea83
... ... @@ -1561,11 +1561,13 @@
1561 1561 */
1562 1562 public BaseResponse updatePregnantById(String id, YunBookbuildingAddRequest yunRequest, Integer userId, boolean isSync) {
1563 1563  
  1564 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  1565 +
1564 1566 BaseResponse br = new BaseResponse();
1565 1567 PatientsQuery patientsQuery = new PatientsQuery();
1566 1568 patientsQuery.setYn(YnEnums.YES.getId());
1567 1569 patientsQuery.setType(1);
1568   - patientsQuery.setHospitalId(yunRequest.getHospitalId());
  1570 + patientsQuery.setHospitalId(hospitalId);
1569 1571 patientsQuery.setBuildTypeEq(0);
1570 1572 patientsQuery.setDueStatus(0);
1571 1573  
... ... @@ -1685,7 +1687,7 @@
1685 1687 //如果建档医生是空则创建医生
1686 1688 if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())){
1687 1689  
1688   - Integer dockerId= usersService.getUserId(patient.getHospitalId(),yunRequest.getLastCheckEmployeeName());
  1690 + Integer dockerId= usersService.getUserId(hospitalId,yunRequest.getLastCheckEmployeeName());
1689 1691 if (dockerId!=null){
1690 1692 patient.setLastCheckEmployeeId(String.valueOf(dockerId));
1691 1693 }else {
... ... @@ -1694,7 +1696,7 @@
1694 1696 Users users = new Users();
1695 1697 users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户
1696 1698 //users.setDeptId(deptId);
1697   - users.setOrgId(Integer.valueOf(patient.getHospitalId()));
  1699 + users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId())?patient.getHospitalId():hospitalId));
1698 1700 users.setName(yunRequest.getLastCheckEmployeeName());
1699 1701 users.setAccount(yunRequest.getLastCheckEmployeeName());
1700 1702 //users.setPhone(phone);