jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bb281270c2f17211c824bd1630b330bf02d7fb4f

Authored by wtt
1 parent abe77479a1
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 24 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java View file @ bb28127
... ... @@ -395,6 +395,18 @@
395 395 public BaseResponse importSerologySieve(@RequestParam MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
396 396 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
397 397 return sieveFacade.importSerologySieve2(file, loginState.getId(), response);
  398 + } /**
  399 + * 产筛导入3.0版 血清学筛查
  400 + * sieveType=1
  401 + * @param request
  402 + * @param response
  403 + */
  404 + @RequestMapping(value = "/importSerologySieve1")
  405 + @ResponseBody
  406 + @TokenRequired
  407 + public BaseResponse importSerologySieve1(@RequestParam MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
  408 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  409 + return sieveFacade.importSerologySieve(file, loginState.getId(), response);
398 410 }
399 411  
400 412  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ bb28127
... ... @@ -3061,7 +3061,7 @@
3061 3061 }
3062 3062 list.add(importResult);
3063 3063 System.out.println("list: " + list.size());
3064   -
  3064 + System.out.println("importResult.toString(): "+importResult.toString());
3065 3065 //1 根据标本号更新数据
3066 3066 if (StringUtils.isEmpty(importResult.get样本编号()) ) {
3067 3067 continue;
3068 3068  
3069 3069  
3070 3070  
... ... @@ -3070,18 +3070,21 @@
3070 3070 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
3071 3071 sieveApplyOrderQuery1.setNumber(importResult.get样本编号());
3072 3072 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
3073   - sieveApplyOrderQuery1.setHospitalId(hospitalId);
  3073 + // sieveApplyOrderQuery1.setHospitalId(hospitalId);
3074 3074 List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
  3075 +
  3076 + System.out.println("list1.size(): "+list1.size());
3075 3077 if (CollectionUtils.isEmpty(list1) ) {
3076 3078 continue;
3077 3079 }
3078 3080 SieveApplyOrderModel sieveApplyOrderModel1 = list1.get(0);
  3081 + System.out.println("sieveApplyOrderModel1 : "+sieveApplyOrderModel1.toString());
3079 3082 //判断如果没有LymsSieveId就更新上
3080 3083 if (StringUtils.isEmpty(sieveApplyOrderModel1.getLymsSieveId())) {
3081 3084 SieveQuery sieveQuery = new SieveQuery();
3082 3085 sieveQuery.setYn(YnEnums.YES.getId());
3083 3086 sieveQuery.setParentId(sieveApplyOrderModel1.getParentId());
3084   - sieveQuery.setHospitalId(hospitalId);
  3087 + //sieveQuery.setHospitalId(hospitalId);
3085 3088 sieveQuery.setStatus(2);
3086 3089 List<SieveModel> modelList = sieveService.queryList(sieveQuery);
3087 3090 if (CollectionUtils.isNotEmpty(modelList) && modelList.size() < 2) {
3088 3091  
... ... @@ -3166,7 +3169,12 @@
3166 3169 SieveResultQuery sieveResultQuery = new SieveResultQuery();
3167 3170 sieveResultQuery.setLymsSieveId(sieveApplyOrderModel1.getLymsSieveId());
3168 3171 sieveResultQuery.setParentId(sieveApplyOrderModel1.getParentId());
  3172 + sieveResultQuery.setYn(YnEnums.YES.getId());
  3173 + System.out.println("sieveApplyOrderModel1.getLymsSieveId():"+sieveApplyOrderModel1.getLymsSieveId());
  3174 + System.out.println("sieveApplyOrderModel1.getParentId():"+sieveApplyOrderModel1.getParentId());
3169 3175 List<SieveResultModel> sieveResultModellist = sieveService.queryListSieveResult(sieveResultQuery);
  3176 + System.out.println("//避免一个产筛申请出现多次结果: "+sieveResultModellist.size());
  3177 +
3170 3178 if(CollectionUtils.isNotEmpty(sieveResultModellist)){
3171 3179 SieveResultModel sieveResultModel = sieveResultModellist.get(0);
3172 3180 sieveAddRequest.setId(sieveResultModel.getId());
... ... @@ -3174,6 +3182,7 @@
3174 3182 }
3175 3183 sieveAddRequest.setExamineId(String.valueOf(id)); //审核者
3176 3184 sieveAddRequest.setCheckerId(String.valueOf(id)); //检验者
  3185 + System.out.println("sieveAddRequest: "+sieveAddRequest.toString() +" ---- id: "+id);
3177 3186 addOneSieve(sieveAddRequest, id);
3178 3187 //记录一下添加成功内容
3179 3188 operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId),sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息");