Commit de8f02071c07e99f9c6d801cbf0b0d83fb2140fb
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 3 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
View file @
de8f020
| ... | ... | @@ -94,7 +94,7 @@ |
| 94 | 94 | return applyOrderFacade.huadaCallback(syscode, sign, timestamp, params); |
| 95 | 95 | } |
| 96 | 96 | //华大基因，下载报告文件pdf |
| 97 | - @RequestMapping(method = RequestMethod.POST,value = "/huadaSieveapplyPdf") | |
| 97 | + @RequestMapping(method = RequestMethod.GET,value = "/huadaSieveapplyPdf") | |
| 98 | 98 | public void addSieveApplyOrder_ftp( @RequestParam(value = "sampleReportId") String sampleReportId, |
| 99 | 99 | HttpServletRequest request, HttpServletResponse response) { |
| 100 | 100 | applyOrderFacade.huadaFtp(sampleReportId, response); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
de8f020
| ... | ... | @@ -562,7 +562,8 @@ |
| 562 | 562 | // EDTA：EDTA |
| 563 | 563 | // K牌采血管：K牌采血管 |
| 564 | 564 | // G牌采血管：G牌采血管 |
| 565 | - request.setTubeType(sieveApplyOrderModel.getYpglx()); | |
| 565 | + String d = "1".equals(sieveApplyOrderModel.getFetusNum()) || "4".equals(sieveApplyOrderModel.getFetusNum()) ? "D" :""; | |
| 566 | + request.setTubeType(sieveApplyOrderModel.getYpglx() + d); | |
| 566 | 567 | // 孕周（格式：18w+1）注：“w”必须小写，“+”号后面的天数必须是0~6 |
| 567 | 568 | request.setGestationalWeeks(sieveApplyOrderModel.getYunSize()); |
| 568 | 569 | // 证件类型（01：身份证、02：护照） |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
de8f020
| ... | ... | @@ -811,7 +811,7 @@ |
| 811 | 811 | sieveResultEditInfo.put("sjgjx", model.getSjgjx()); |
| 812 | 812 | |
| 813 | 813 | sieveResultEditInfo.put("sampleInfoId", model.getSampleInfoId()); |
| 814 | - sieveResultEditInfo.put("sbstValue", model.getSampleReportId()); | |
| 814 | + sieveResultEditInfo.put("sampleReportId", model.getSampleReportId()); | |
| 815 | 815 | |
| 816 | 816 | sieveResultEditInfo.put("tszhzValue", model.getTszhzValue()); |
| 817 | 817 | sieveResultEditInfo.put("sbstValue", model.getSbstValue()); |
| ... | ... | @@ -949,6 +949,10 @@ |
| 949 | 949 | sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService)); |
| 950 | 950 | sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService)); |
| 951 | 951 | sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime())); |
| 952 | + | |
| 953 | + sieveResultInfo.put("sampleInfoId", sieveResultModel.getSampleInfoId()); | |
| 954 | + sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId()); | |
| 955 | + | |
| 952 | 956 | |
| 953 | 957 | String tszhzValue = ""; |
| 954 | 958 | if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) { |