diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 35fc01e..2213a15 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -395,6 +395,18 @@ public class SieveController extends BaseController { public BaseResponse importSerologySieve(@RequestParam MultipartFile file, HttpServletRequest request, HttpServletResponse response) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return sieveFacade.importSerologySieve2(file, loginState.getId(), response); + } /** + * 产筛导入3.0版 血清学筛查 + * sieveType=1 + * @param request + * @param response + */ + @RequestMapping(value = "/importSerologySieve1") + @ResponseBody + @TokenRequired + public BaseResponse importSerologySieve1(@RequestParam MultipartFile file, HttpServletRequest request, HttpServletResponse response) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return sieveFacade.importSerologySieve(file, loginState.getId(), response); } 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 7132946..df1541c 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 @@ -3061,7 +3061,7 @@ public class SieveFacade { } list.add(importResult); System.out.println("list: " + list.size()); - + System.out.println("importResult.toString(): "+importResult.toString()); //1 根据标本号更新数据 if (StringUtils.isEmpty(importResult.get样本编号()) ) { continue; @@ -3070,18 +3070,21 @@ public class SieveFacade { SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setNumber(importResult.get样本编号()); sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); - sieveApplyOrderQuery1.setHospitalId(hospitalId); + // sieveApplyOrderQuery1.setHospitalId(hospitalId); List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + + System.out.println("list1.size(): "+list1.size()); if (CollectionUtils.isEmpty(list1) ) { continue; } SieveApplyOrderModel sieveApplyOrderModel1 = list1.get(0); + System.out.println("sieveApplyOrderModel1 : "+sieveApplyOrderModel1.toString()); //判断如果没有LymsSieveId就更新上 if (StringUtils.isEmpty(sieveApplyOrderModel1.getLymsSieveId())) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setParentId(sieveApplyOrderModel1.getParentId()); - sieveQuery.setHospitalId(hospitalId); + //sieveQuery.setHospitalId(hospitalId); sieveQuery.setStatus(2); List modelList = sieveService.queryList(sieveQuery); if (CollectionUtils.isNotEmpty(modelList) && modelList.size() < 2) { @@ -3166,7 +3169,12 @@ public class SieveFacade { SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setLymsSieveId(sieveApplyOrderModel1.getLymsSieveId()); sieveResultQuery.setParentId(sieveApplyOrderModel1.getParentId()); + sieveResultQuery.setYn(YnEnums.YES.getId()); + System.out.println("sieveApplyOrderModel1.getLymsSieveId():"+sieveApplyOrderModel1.getLymsSieveId()); + System.out.println("sieveApplyOrderModel1.getParentId():"+sieveApplyOrderModel1.getParentId()); List sieveResultModellist = sieveService.queryListSieveResult(sieveResultQuery); + System.out.println("//避免一个产筛申请出现多次结果: "+sieveResultModellist.size()); + if(CollectionUtils.isNotEmpty(sieveResultModellist)){ SieveResultModel sieveResultModel = sieveResultModellist.get(0); sieveAddRequest.setId(sieveResultModel.getId()); @@ -3174,6 +3182,7 @@ public class SieveFacade { } sieveAddRequest.setExamineId(String.valueOf(id)); //审核者 sieveAddRequest.setCheckerId(String.valueOf(id)); //检验者 + System.out.println("sieveAddRequest: "+sieveAddRequest.toString() +" ---- id: "+id); addOneSieve(sieveAddRequest, id); //记录一下添加成功内容 operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId),sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息");