Commit 66e6feddfebf39b41744ca7b0e70b1f1c07e137d
1 parent
f22b2aa4a9
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 7 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
66e6fed
| ... | ... | @@ -2564,7 +2564,7 @@ |
| 2564 | 2564 | data.put("HC", sive.gethC()); |
| 2565 | 2565 | data.put("MannualEntry", sive.getMannualEntry());//B超孕天 |
| 2566 | 2566 | data.put("NT", sive.getnT()); |
| 2567 | - data.put("ResponsibleCode", sive.getApplyDoctor());//送检单位编号(送检医院) | |
| 2567 | + data.put("ResponsibleCode", sive.getResponsibleCode());//送检单位编号(送检医院) | |
| 2568 | 2568 | data.put("T21", sive.getT21());//既往T21 |
| 2569 | 2569 | data.put("T18", sive.getT18());//既往T18 |
| 2570 | 2570 | data.put("NTD", sive.getnTD());//既往NTD |
| ... | ... | @@ -2775,6 +2775,8 @@ |
| 2775 | 2775 | sieveAddRequest.setId(sieveResultModel.getId()); |
| 2776 | 2776 | addOneSieve(sieveAddRequest, id); |
| 2777 | 2777 | } |
| 2778 | + sieveAddRequest.setExamineId(String.valueOf(id)); //审核者 | |
| 2779 | + sieveAddRequest.setCheckerId(String.valueOf(id)); //检验者 | |
| 2778 | 2780 | addOneSieve(sieveAddRequest, id); |
| 2779 | 2781 | //记录一下添加成功内容 |
| 2780 | 2782 | operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId),sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java
View file @
66e6fed
| ... | ... | @@ -230,9 +230,11 @@ |
| 230 | 230 | //出生年月日 |
| 231 | 231 | sieveListResult.setBirthday(DateUtil.getyyyy_MM_dd(patients.getBirth())); |
| 232 | 232 | //身份证号码 |
| 233 | - sieveListResult.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); | |
| 233 | +// sieveListResult.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); | |
| 234 | + sieveListResult.setCardNo(patients.getCardNo()); | |
| 234 | 235 | //电话号码 |
| 235 | - sieveListResult.setPhone(DefenceUtils.getPhone(patients.getPhone())); | |
| 236 | +// sieveListResult.setPhone(DefenceUtils.getPhone(patients.getPhone())); | |
| 237 | + sieveListResult.setPhone(patients.getPhone()); | |
| 236 | 238 | //户籍地 |
| 237 | 239 | sieveListResult.setPlaceDomicile(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), |
| 238 | 240 | patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); |