liquanyu / regional-platform

Download as
Browse Code »

Commit 3479cfd7b4c20e191c1b657e2fb2c61a32395d01

Authored by wtt
1 parent d562d492f5
Exists in master and in 1 other branch dev

滦平管床大夫支持手动输入和选择

Showing 4 changed files with 25 additions and 16 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 3479cfd
... ... @@ -1561,11 +1561,18 @@
1561 1561 maternalDeliverResult.setDeliverDoctor(map);
1562 1562 //分娩记录加住院管床大夫
1563 1563 if (StringUtils.isNotEmpty(deliverModel.getGcdfDoctorId())) {
1564   - Users users = usersService.getUsers(Integer.valueOf(deliverModel.getGcdfDoctorId()));
1565   - Map<String, String> map1 = new HashMap<>();
1566   - if (null != users) {
1567   - map1.put("id", users.getId() + "");
1568   - map1.put("name", users.getName());
  1564 +
  1565 + Map<String, String> map1 = null;
  1566 + try {
  1567 + Users users = usersService.getUsers(Integer.valueOf(deliverModel.getGcdfDoctorId()));
  1568 + map1 = new HashMap <>();
  1569 + if (null != users) {
  1570 + map1.put("id", users.getId() + "");
  1571 + map1.put("name", users.getName());
  1572 + }
  1573 + } catch (NumberFormatException e) {
  1574 + map.put("id", "-1");
  1575 + map1.put("name", deliverModel.getGcdfDoctorId());
1569 1576 }
1570 1577 maternalDeliverResult.setGcdfDoctorId(map1);
1571 1578 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 3479cfd
... ... @@ -3637,15 +3637,11 @@
3637 3637 }
3638 3638 } catch (NumberFormatException e) {
3639 3639 e.printStackTrace();
  3640 + map.put("gcdfDoctorId", data.getGcdfDoctorId());
3640 3641 }
3641 3642  
3642 3643 }
3643   - if (StringUtils.isNotEmpty( data.getGcdfDoctorId())) {
3644   - Users users = usersService.getUsers(Integer.valueOf( data.getGcdfDoctorId()));
3645   - if (null != users) {
3646   - map.put("gcdfDoctorId", users.getName());
3647   - }
3648   - }
  3644 +
3649 3645 if (StringUtils.isNotEmpty(data.getFmType())) {
3650 3646 map.put("fmType", FmTypeEnums.getFmDzNameById(data.getFmType()));
3651 3647 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 3479cfd
... ... @@ -32,7 +32,7 @@
32 32  
33 33 private String id;
34 34 //分娩记录加住院管床大夫
35   - @Pattern(regexp = ("[0-9]*"),message = "请传入id")
  35 +// @Pattern(regexp = ("[0-9]*"),message = "请传入id")
36 36 private String gcdfDoctorId;
37 37 /**
38 38 * 新加字段
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java View file @ 3479cfd
... ... @@ -231,10 +231,16 @@
231 231 chanResult.setfCh("");
232 232 }
233 233 if (StringUtils.isNotEmpty(maternalDeliverModels.get(0).getGcdfDoctorId())) {
234   - Users users = usersService.getUsers(Integer.valueOf(maternalDeliverModels.get(0).getGcdfDoctorId()));
235   - Map <String, String> map1 = new HashMap <>();
236   - if (null != users) {
237   - chanResult.setGcdfDoctorId(users.getName());//分娩时的管床大夫
  234 +
  235 + try {
  236 + Users users = usersService.getUsers(Integer.valueOf(maternalDeliverModels.get(0).getGcdfDoctorId()));
  237 + Map <String, String> map1 = new HashMap <>();
  238 + if (null != users) {
  239 + chanResult.setGcdfDoctorId(users.getName());//分娩时的管床大夫
  240 + }
  241 + } catch (NumberFormatException e) {
  242 + e.printStackTrace();
  243 + chanResult.setGcdfDoctorId(maternalDeliverModels.get(0).getGcdfDoctorId());//分娩时的管床大夫
238 244 }
239 245 }
240 246