Commit c23f9e6bf35b33967b576cc2e00ace628a73443b
1 parent
960287e55a
Exists in
master
and in
6 other branches
update
Showing 3 changed files with 13 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AmniocentesisController.java
View file @
c23f9e6
| ... | ... | @@ -133,14 +133,14 @@ |
| 133 | 133 | |
| 134 | 134 | |
| 135 | 135 | /** |
| 136 | - * 添加羊穿记录 | |
| 136 | + * 添加羊穿记录手术 | |
| 137 | 137 | * @param request |
| 138 | 138 | * @param amnioRecordRequest |
| 139 | 139 | * @return |
| 140 | 140 | */ |
| 141 | 141 | @TokenRequired |
| 142 | 142 | @ResponseBody |
| 143 | - @RequestMapping(value = "/saveOrUpdateAmnioRecord", method = RequestMethod.GET) | |
| 143 | + @RequestMapping(value = "/saveOrUpdateAmnioRecord", method = RequestMethod.POST) | |
| 144 | 144 | public BaseResponse saveOrUpdateAmnioRecord(HttpServletRequest request, |
| 145 | 145 | @RequestBody AmnioRecordRequest amnioRecordRequest) { |
| 146 | 146 | return amniocentesisFacade.saveOrUpdateAmnioRecord(amnioRecordRequest, getUserId(request)); |
| ... | ... | @@ -156,7 +156,7 @@ |
| 156 | 156 | */ |
| 157 | 157 | @TokenRequired |
| 158 | 158 | @ResponseBody |
| 159 | - @RequestMapping(value = "/saveOrUpdateAmnioResult", method = RequestMethod.GET) | |
| 159 | + @RequestMapping(value = "/saveOrUpdateAmnioResult", method = RequestMethod.POST) | |
| 160 | 160 | public BaseResponse saveOrUpdateAmnioResult(HttpServletRequest request, |
| 161 | 161 | @RequestBody AmnioResultRequest amnioResultRequest) { |
| 162 | 162 | return amniocentesisFacade.saveOrUpdateAmnioResult(amnioResultRequest, getUserId(request)); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
c23f9e6
| ... | ... | @@ -193,6 +193,15 @@ |
| 193 | 193 | destModel.getAreaId(), destModel.getStreetId(), destModel.getAddress(), |
| 194 | 194 | basicConfigService)); |
| 195 | 195 | |
| 196 | + String referralHospital = ""; | |
| 197 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(destModel.getReferralHospital())) { | |
| 198 | + Organization organization = organizationService.getOrganization(Integer.parseInt(destModel.getReferralHospital())); | |
| 199 | + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { | |
| 200 | + referralHospital = organization.getName(); | |
| 201 | + } | |
| 202 | + } | |
| 203 | + data.setReferralHospital(referralHospital); | |
| 204 | + | |
| 196 | 205 | //医生 |
| 197 | 206 | String user = ""; |
| 198 | 207 | if (destModel.getUserId() != null) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmniocentesisInfoView.java
View file @
c23f9e6
| ... | ... | @@ -131,7 +131,7 @@ |
| 131 | 131 | setPoisonous(destModel.getPoisonous()); |
| 132 | 132 | setFamilyHistory(destModel.getFamilyHistory()); |
| 133 | 133 | setTangDanger(destModel.getTangDanger() == null ? "" : "0".equals(destModel.getTangDanger()) ? "低" : "1".equals(destModel.getTangDanger()) ? "中" : "高"); |
| 134 | - setReferralHospital(destModel.getReferralHospital()); | |
| 134 | + | |
| 135 | 135 | setOperation(destModel.getOperation()); |
| 136 | 136 | |
| 137 | 137 | setOrderDate(DateUtil.getyyyy_MM_dd(destModel.getOrderDate())); |