Commit b654eac1339d8eea53b01f0fdd3a57351a2611c5
1 parent
ec0eb7c61b
Exists in
master
and in
6 other branches
秦皇岛双胎问题
Showing 2 changed files with 22 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
b654eac
| ... | ... | @@ -2594,7 +2594,7 @@ |
| 2594 | 2594 | cnames.put("SampleID", "SampleID");//样本号 |
| 2595 | 2595 | cnames.put("PatientID", "PatientID");//孕妇编号 |
| 2596 | 2596 | cnames.put("LastName", "LastName");//姓名 |
| 2597 | - cnames.put("FirstName", "");//姓名2 | |
| 2597 | + cnames.put("FirstName", "FirstName");//姓名2 | |
| 2598 | 2598 | // cnames.put("ApplicationNo", "ApplicationNo");//申请单号 |
| 2599 | 2599 | cnames.put("BirthDate", "BirthDate");//生日 |
| 2600 | 2600 | cnames.put("Address", "Address");//地址 |
| ... | ... | @@ -2627,7 +2627,11 @@ |
| 2627 | 2627 | cnames.put("Monozygous", "Monozygous");//单卵*/ |
| 2628 | 2628 | } |
| 2629 | 2629 | |
| 2630 | - | |
| 2630 | + /** | |
| 2631 | + * 功能描述 产筛导入3.0版 血清学筛查 | |
| 2632 | + * @author 武涛涛 | |
| 2633 | + * @date 2020/6/15 | |
| 2634 | + */ | |
| 2631 | 2635 | public void importSerologySieve(MultipartFile file, Integer id, HttpServletResponse response) { |
| 2632 | 2636 | //把MultipartFile转化为File 第一种 |
| 2633 | 2637 | CommonsMultipartFile cmf = (CommonsMultipartFile) file; |
| 2634 | 2638 | |
| ... | ... | @@ -2661,9 +2665,11 @@ |
| 2661 | 2665 | if (StringUtils.isEmpty(importResult.get样本编号()) ) { |
| 2662 | 2666 | continue; |
| 2663 | 2667 | } |
| 2668 | + String hospitalId = autoMatchFacade.getHospitalId(id); | |
| 2664 | 2669 | SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); |
| 2665 | 2670 | sieveApplyOrderQuery1.setNumber(importResult.get样本编号()); |
| 2666 | 2671 | sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); |
| 2672 | + sieveApplyOrderQuery1.setHospitalId(hospitalId); | |
| 2667 | 2673 | List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); |
| 2668 | 2674 | if (CollectionUtils.isEmpty(list1) ) { |
| 2669 | 2675 | continue; |
| ... | ... | @@ -2674,6 +2680,8 @@ |
| 2674 | 2680 | SieveQuery sieveQuery = new SieveQuery(); |
| 2675 | 2681 | sieveQuery.setYn(YnEnums.YES.getId()); |
| 2676 | 2682 | sieveQuery.setParentId(sieveApplyOrderModel1.getParentId()); |
| 2683 | + sieveQuery.setHospitalId(hospitalId); | |
| 2684 | + sieveQuery.setStatus(2); | |
| 2677 | 2685 | List<SieveModel> modelList = sieveService.queryList(sieveQuery); |
| 2678 | 2686 | if (CollectionUtils.isNotEmpty(modelList) && modelList.size() < 2) { |
| 2679 | 2687 | SieveModel sieveModel = modelList.get(0); |
| ... | ... | @@ -2758,6 +2766,8 @@ |
| 2758 | 2766 | addOneSieve(sieveAddRequest, id); |
| 2759 | 2767 | } |
| 2760 | 2768 | addOneSieve(sieveAddRequest, id); |
| 2769 | + //记录一下添加成功内容 | |
| 2770 | + operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId),sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息"); | |
| 2761 | 2771 | } |
| 2762 | 2772 | |
| 2763 | 2773 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
View file @
b654eac
| ... | ... | @@ -255,6 +255,8 @@ |
| 255 | 255 | |
| 256 | 256 | private String ypglx; |
| 257 | 257 | //iAssistantl数据传输格式说明,导出excel自动不足添加在此处，让前端输入 |
| 258 | + //胎儿数 是 整数型 取值范围1-9 | |
| 259 | + private String noOfFetuses; | |
| 258 | 260 | //孕妇编号 30个字符以内，只能包含字母，数字，下划线和短杠 |
| 259 | 261 | private String patientID; |
| 260 | 262 | //申请单号 |
| ... | ... | @@ -365,6 +367,14 @@ |
| 365 | 367 | |
| 366 | 368 | public void setT21(Integer t21) { |
| 367 | 369 | this.t21 = t21; |
| 370 | + } | |
| 371 | + | |
| 372 | + public String getNoOfFetuses() { | |
| 373 | + return noOfFetuses; | |
| 374 | + } | |
| 375 | + | |
| 376 | + public void setNoOfFetuses(String noOfFetuses) { | |
| 377 | + this.noOfFetuses = noOfFetuses; | |
| 368 | 378 | } |
| 369 | 379 | |
| 370 | 380 | public Integer getT18() { |