fangcheng / regional-platform

Download as
Browse Code »

Commit 9a2071ab10b5706f693c52eb7453bd7bd8e3489a

Authored by hujiaqi
1 parent 3fb37d520e
Exists in master and in 1 other branch nobuildprocess

修改风险因素

Showing 2 changed files with 25 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 9a2071a
... ... @@ -904,8 +904,8 @@
904 904  
905 905 if (StringUtils.isNotEmpty(childbirthManagerRequest.getBirthDate())) {
906 906 try {
907   - patientsQuery.setBirthStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[0]);
908   - patientsQuery.setBirthEnd(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[1]);
  907 + patientsQuery.setFmDateStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[0]);
  908 + patientsQuery.setFmDateEnd(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[1]);
909 909 } catch (Exception e) {
910 910 // 什么都不做，这里是数据传入错误了
911 911 }
... ... @@ -953,6 +953,26 @@
953 953 ChildbirthManagerQueryModel childbirthManagerQueryModel = new ChildbirthManagerQueryModel();
954 954 BeanUtils.copy(patients, childbirthManagerQueryModel);
955 955 BeanUtils.copy(maternalDeliverModel, childbirthManagerQueryModel);
  956 + // 查询分娩方式
  957 + String deliveryModeJson = maternalDeliverModel.getDeliveryMode();
  958 + Map<String, String> deliveryModeMap = JsonUtil.getMap(deliveryModeJson);
  959 + if (MapUtils.isNotEmpty(deliveryModeMap) && StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) {
  960 + for (FmTypeEnums fmTypeEnums : FmTypeEnums.values()) {
  961 + if (fmTypeEnums.getId().equals(deliveryModeMap.get("fmfs"))) {
  962 + childbirthManagerQueryModel.setDeliveryMode(fmTypeEnums.getName());
  963 + break;
  964 + }
  965 + }
  966 + }
  967 + // 产妇情况
  968 + if (StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) {
  969 + for (CfEnums cfEnums : CfEnums.values()) {
  970 + if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) {
  971 + childbirthManagerQueryModel.setMaternalInfo(cfEnums.getName());
  972 + break;
  973 + }
  974 + }
  975 + }
956 976 // 查询接生医生
957 977 try {
958 978 childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 9a2071a
... ... @@ -40,7 +40,7 @@
40 40 * @createTime 2016年12月07日 14时14分
41 41 * @discription 分娩方式
42 42 */
43   - private String DeliveryMode;
  43 + private String deliveryMode;
44 44  
45 45 /**
46 46 * @auther HuJiaqi
47 47  
... ... @@ -86,11 +86,11 @@
86 86 }
87 87  
88 88 public String getDeliveryMode() {
89   - return DeliveryMode;
  89 + return deliveryMode;
90 90 }
91 91  
92 92 public void setDeliveryMode(String deliveryMode) {
93   - DeliveryMode = deliveryMode;
  93 + this.deliveryMode = deliveryMode;
94 94 }
95 95  
96 96 public Integer getOperatorId() {