Commit 7e2262d0008c962eabf93c8098bb4ab40cedbcc9
1 parent
ee58c00a2a
Exists in
dev
#fix:优化建档页面产检医生逻辑
Showing 1 changed file with 50 additions and 44 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
7e2262d
| ... | ... | @@ -401,28 +401,31 @@ |
| 401 | 401 | if (dockerId!=null){ |
| 402 | 402 | patient.setLastCheckEmployeeId(String.valueOf(dockerId)); |
| 403 | 403 | }else { |
| 404 | - //准备添加数据 | |
| 405 | - Users users = new Users(); | |
| 406 | - users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 | |
| 407 | - //users.setDeptId(deptId); | |
| 408 | - users.setOrgId(Integer.valueOf(patient.getHospitalId())); | |
| 409 | - users.setName(yunRequest.getLastCheckEmployeeName()); | |
| 410 | - users.setAccount(yunRequest.getLastCheckEmployeeName()); | |
| 411 | - //users.setPhone(phone); | |
| 412 | - users.setEnable(1); | |
| 413 | - // users.setZhiChenId(zhiCId); | |
| 414 | - users.setPwd(MD5Utils.md5("123456").toUpperCase()); | |
| 415 | - //users.setRemarks(remarks); | |
| 416 | - // users.setKsId(ksId); | |
| 417 | - // users.setPublishId(user.getId()); | |
| 418 | - // users.setPublishName(user.getName()); | |
| 419 | - users.setYn(YnEnums.YES.getId()); | |
| 420 | - users.setModified(new Date()); | |
| 421 | - users.setCreated(new Date()); | |
| 422 | - // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); | |
| 423 | - // user.setDefaultPage(defaultPage); | |
| 424 | - usersService.addUsers(users); | |
| 425 | - patient.setLastCheckEmployeeId(String.valueOf(users.getId())); | |
| 404 | + if (StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())){ | |
| 405 | + //准备添加数据 | |
| 406 | + Users users = new Users(); | |
| 407 | + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 | |
| 408 | + //users.setDeptId(deptId); | |
| 409 | + users.setOrgId(Integer.valueOf(patient.getHospitalId())); | |
| 410 | + users.setName(yunRequest.getLastCheckEmployeeName()); | |
| 411 | + users.setAccount(yunRequest.getLastCheckEmployeeName()); | |
| 412 | + //users.setPhone(phone); | |
| 413 | + users.setEnable(1); | |
| 414 | + // users.setZhiChenId(zhiCId); | |
| 415 | + users.setPwd(MD5Utils.md5("123456").toUpperCase()); | |
| 416 | + //users.setRemarks(remarks); | |
| 417 | + // users.setKsId(ksId); | |
| 418 | + // users.setPublishId(user.getId()); | |
| 419 | + // users.setPublishName(user.getName()); | |
| 420 | + users.setYn(YnEnums.YES.getId()); | |
| 421 | + users.setModified(new Date()); | |
| 422 | + users.setCreated(new Date()); | |
| 423 | + // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); | |
| 424 | + // user.setDefaultPage(defaultPage); | |
| 425 | + usersService.addUsers(users); | |
| 426 | + patient.setLastCheckEmployeeId(String.valueOf(users.getId())); | |
| 427 | + } | |
| 428 | + | |
| 426 | 429 | } |
| 427 | 430 | } |
| 428 | 431 | |
| ... | ... | @@ -1686,28 +1689,31 @@ |
| 1686 | 1689 | if (dockerId!=null){ |
| 1687 | 1690 | patient.setLastCheckEmployeeId(String.valueOf(dockerId)); |
| 1688 | 1691 | }else { |
| 1689 | - //准备添加数据 | |
| 1690 | - Users users = new Users(); | |
| 1691 | - users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 | |
| 1692 | - //users.setDeptId(deptId); | |
| 1693 | - users.setOrgId(Integer.valueOf(patient.getHospitalId())); | |
| 1694 | - users.setName(yunRequest.getLastCheckEmployeeName()); | |
| 1695 | - users.setAccount(yunRequest.getLastCheckEmployeeName()); | |
| 1696 | - //users.setPhone(phone); | |
| 1697 | - users.setEnable(1); | |
| 1698 | - // users.setZhiChenId(zhiCId); | |
| 1699 | - users.setPwd(MD5Utils.md5("123456").toUpperCase()); | |
| 1700 | - //users.setRemarks(remarks); | |
| 1701 | - // users.setKsId(ksId); | |
| 1702 | - // users.setPublishId(user.getId()); | |
| 1703 | - // users.setPublishName(user.getName()); | |
| 1704 | - users.setYn(YnEnums.YES.getId()); | |
| 1705 | - users.setModified(new Date()); | |
| 1706 | - users.setCreated(new Date()); | |
| 1707 | - // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); | |
| 1708 | - // user.setDefaultPage(defaultPage); | |
| 1709 | - usersService.addUsers(users); | |
| 1710 | - patient.setLastCheckEmployeeId(String.valueOf(users.getId())); | |
| 1692 | + if(StringUtils.isNotEmpty(yunRequest.getLastCheckEmployeeName())){ | |
| 1693 | + //准备添加数据 | |
| 1694 | + Users users = new Users(); | |
| 1695 | + users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 | |
| 1696 | + //users.setDeptId(deptId); | |
| 1697 | + users.setOrgId(Integer.valueOf(patient.getHospitalId())); | |
| 1698 | + users.setName(yunRequest.getLastCheckEmployeeName()); | |
| 1699 | + users.setAccount(yunRequest.getLastCheckEmployeeName()); | |
| 1700 | + //users.setPhone(phone); | |
| 1701 | + users.setEnable(1); | |
| 1702 | + // users.setZhiChenId(zhiCId); | |
| 1703 | + users.setPwd(MD5Utils.md5("123456").toUpperCase()); | |
| 1704 | + //users.setRemarks(remarks); | |
| 1705 | + // users.setKsId(ksId); | |
| 1706 | + // users.setPublishId(user.getId()); | |
| 1707 | + // users.setPublishName(user.getName()); | |
| 1708 | + users.setYn(YnEnums.YES.getId()); | |
| 1709 | + users.setModified(new Date()); | |
| 1710 | + users.setCreated(new Date()); | |
| 1711 | + // users.setZhiChen(ZhiChenEnums.getById(zhiCId)); | |
| 1712 | + // user.setDefaultPage(defaultPage); | |
| 1713 | + usersService.addUsers(users); | |
| 1714 | + patient.setLastCheckEmployeeId(String.valueOf(users.getId())); | |
| 1715 | + } | |
| 1716 | + | |
| 1711 | 1717 | } |
| 1712 | 1718 | } |
| 1713 | 1719 |