diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 652911b..5c51115 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -2594,7 +2594,7 @@ public class SieveFacade { cnames.put("SampleID", "SampleID");//样本号 cnames.put("PatientID", "PatientID");//孕妇编号 cnames.put("LastName", "LastName");//姓名 - cnames.put("FirstName", "");//姓名2 + cnames.put("FirstName", "FirstName");//姓名2 // cnames.put("ApplicationNo", "ApplicationNo");//申请单号 cnames.put("BirthDate", "BirthDate");//生日 cnames.put("Address", "Address");//地址 @@ -2627,7 +2627,11 @@ public class SieveFacade { cnames.put("Monozygous", "Monozygous");//单卵*/ } - + /** + * 功能描述 产筛导入3.0版 血清学筛查 + * @author 武涛涛 + * @date 2020/6/15 + */ public void importSerologySieve(MultipartFile file, Integer id, HttpServletResponse response) { //把MultipartFile转化为File 第一种 CommonsMultipartFile cmf = (CommonsMultipartFile) file; @@ -2661,9 +2665,11 @@ public class SieveFacade { if (StringUtils.isEmpty(importResult.get样本编号()) ) { continue; } + String hospitalId = autoMatchFacade.getHospitalId(id); SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setNumber(importResult.get样本编号()); sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + sieveApplyOrderQuery1.setHospitalId(hospitalId); List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); if (CollectionUtils.isEmpty(list1) ) { continue; @@ -2674,6 +2680,8 @@ public class SieveFacade { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setParentId(sieveApplyOrderModel1.getParentId()); + sieveQuery.setHospitalId(hospitalId); + sieveQuery.setStatus(2); List modelList = sieveService.queryList(sieveQuery); if (CollectionUtils.isNotEmpty(modelList) && modelList.size() < 2) { SieveModel sieveModel = modelList.get(0); @@ -2758,6 +2766,8 @@ public class SieveFacade { addOneSieve(sieveAddRequest, id); } addOneSieve(sieveAddRequest, id); + //记录一下添加成功内容 + operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId),sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index 8de85c0..46e327d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -255,6 +255,8 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert