Commit 44b30435fa07b38141c81c6f84fd11912a6553af
1 parent
e2c4987c82
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 5 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
44b3043
| ... | ... | @@ -636,7 +636,7 @@ |
| 636 | 636 | } |
| 637 | 637 | } |
| 638 | 638 | sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx()); |
| 639 | - sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify()); | |
| 639 | +// sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify()); | |
| 640 | 640 | sieveQuery.setPage(cqSieveQueryRequest.getPage()); |
| 641 | 641 | sieveQuery.setLimit(cqSieveQueryRequest.getLimit()); |
| 642 | 642 | |
| ... | ... | @@ -963,6 +963,7 @@ |
| 963 | 963 | sieveApplyOrderQuery1.setHospitalId(pat.getHospitalId()); |
| 964 | 964 | |
| 965 | 965 | map.put("patientInfo", patientBaseResult); |
| 966 | + map.put("cardNo", pat.getCardNo()); | |
| 966 | 967 | } |
| 967 | 968 | |
| 968 | 969 | if (type == 4) { |
| ... | ... | @@ -2704,9 +2705,9 @@ |
| 2704 | 2705 | } |
| 2705 | 2706 | } |
| 2706 | 2707 | //1.1 修改产筛申请内容,先暂时修改B超孕天 |
| 2707 | - //sieveApplyOrderModel1.setMannualEntry(importResult.getB超孕天() != null ? Integer.parseInt(importResult.getB超孕天()) : 0); | |
| 2708 | - //applyOrderService.updateSieve(sieveApplyOrderModel1); | |
| 2709 | - //1.2 添加产筛申请结果 | |
| 2708 | + sieveApplyOrderModel1.setStatus(2); | |
| 2709 | + applyOrderService.updateSieve(sieveApplyOrderModel1); | |
| 2710 | + | |
| 2710 | 2711 | SieveAddRequest sieveAddRequest = new SieveAddRequest(); |
| 2711 | 2712 | sieveAddRequest.setPublishName(String.valueOf(id));//录入人员 |
| 2712 | 2713 | sieveAddRequest.setResultTime(importResult.get风险评估时间()); //结果录入时间 |