diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java index 1dd224f..0fa7b55 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java @@ -1,5 +1,6 @@ package com.czlis.liswork.controller.work; +import com.czlis.common.annotation.Anonymous; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.liswork.service.LisWorkPageInfoService; @@ -32,6 +33,7 @@ public class LisWorkPageInfoController extends BaseController { return lisWorkPageInfoService.getRedo(jyrq,yq,ybh); } + @Anonymous @ApiOperation("获取历史结果") @GetMapping("/history") public Result getHistory(Date jyrq,String yq,String ybh){ diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/HistoryResultDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/HistoryResultDTO.java new file mode 100644 index 0000000..c1bf9fd --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/HistoryResultDTO.java @@ -0,0 +1,23 @@ +package com.czlis.liswork.pojo.DTO; + +import com.czlis.liswork.pojo.HistoryResult; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class HistoryResultDTO { + private List one; + private List two; + private List three; + private List four; + private List five; + private List six; + private List seven; + private List eight; + private List nine; +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java index 9fe8793..d816e8a 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java @@ -20,5 +20,9 @@ public class HistoryResult { private String nl; private String yqdl; private String brdh; + private String brxm; + private String result_flag; + private String yljg; + } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index 83b5ae5..30f29e6 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.czlis.common.utils.file.ImageUtils; import com.czlis.common.utils.uuid.UUID; import com.czlis.interfaceCommon.utils.ReportUtil; import com.czlis.liswork.mapper.LisWorkPageInfoMapper; +import com.czlis.liswork.pojo.DTO.HistoryResultDTO; import com.czlis.liswork.pojo.HistoryResult; import com.czlis.liswork.service.LisWorkPageInfoService; import com.czlis.interfaceCommon.utils.CommonUtil; @@ -78,28 +79,74 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { map.put("yqdl", hisResultThisList.get(0).getYqdl()); map.put("brdh",hisResultThisList.get(0).getBrdh()); List hisResultList = lisWorkPageInfoMapper.getHisResult(map); - for (HistoryResult historyResult : hisResultThisList) { - List collect = hisResultList.stream().filter(historyResult1 -> - historyResult1.getXmdh().equals(historyResult.getXmdh()) && !historyResult1.getJyrq().equals(historyResult.getJyrq())).collect(Collectors.toList()); - if(!collect.isEmpty()) hisResultThisList.addAll(collect); - } - //排序 - hisResultThisList.sort(new Comparator() { +// for (HistoryResult historyResult : hisResultThisList) { +// List collect = hisResultList.stream().filter(historyResult1 -> +// historyResult1.getXmdh().equals(historyResult.getXmdh()) && !historyResult1.getJyrq().equals(historyResult.getJyrq())).collect(Collectors.toList()); +// if(!collect.isEmpty()) hisResultThisList.addAll(collect); +// } + //排序,先按时间排序，再按项目代号排序 + hisResultList.sort(new Comparator() { @Override public int compare(HistoryResult o1, HistoryResult o2) { - String xmdh = o1.getXmdh(); - String xmdh2 = o2.getXmdh(); - int i = xmdh.compareTo(xmdh2); - if(i == 0) { - Date jyrq1 = o1.getJyrq(); - Date jyrq2 = o2.getJyrq(); - return jyrq1.compareTo(jyrq2); + Date jyrq1 = o1.getJyrq(); + Date jyrq2 = o2.getJyrq(); + int i1 = jyrq2.compareTo(jyrq1); + if(i1 == 0){ + String xmdh = o1.getXmdh(); + String xmdh2 = o2.getXmdh(); + return xmdh.compareTo(xmdh2); }else{ - return i; + return i1; } } }); - return new Result("0","获取成功！",hisResultThisList); + Date jyrqTemp = null; + int i = 0; + HistoryResultDTO historyResultDTO = new HistoryResultDTO(); + List jyrqList = new ArrayList<>(); + for (HistoryResult historyResult : hisResultList) { + Date jyrq1 = historyResult.getJyrq(); + int compare = DateUtil.compare(jyrq1, jyrqTemp); + if(compare != 0){ + jyrqList.add(jyrq1); + } + jyrqTemp = jyrq1; + } + for (Date jyrqDate : jyrqList) { + i++; + List historySingleResultList = hisResultList.stream().filter(historyResult -> historyResult.getJyrq().equals(jyrqDate)).collect(Collectors.toList()); + switch (i){ + case 1: + historyResultDTO.setOne(historySingleResultList); + break; + case 2: + historyResultDTO.setTwo(historySingleResultList); + break; + case 3: + historyResultDTO.setThree(historySingleResultList); + break; + case 4: + historyResultDTO.setFour(historySingleResultList); + break; + case 5: + historyResultDTO.setFive(historySingleResultList); + break; + case 6: + historyResultDTO.setSix(historySingleResultList); + break; + case 7: + historyResultDTO.setSeven(historySingleResultList); + break; + case 8: + historyResultDTO.setEight(historySingleResultList); + break; + case 9: + historyResultDTO.setNine(historySingleResultList); + break; + } + + } + return new Result("0","获取成功！",historyResultDTO); } /** diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index 410f5b7..5277054 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -364,7 +364,7 @@ public class LisWorkServiceImpl implements LisWorkService { * @return 上一次结果 */ - private List getlastresult(LabPat labPat,List labResultall){ + public List getlastresult(LabPat labPat,List labResultall){ Date jyrq=labPat.getJyrq(); String yq=labPat.getYq(); String ybh=labPat.getYbh(); diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml index d004f5e..24ae6ce 100644 --- a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -31,7 +31,8 @@ lab_pat.yq, lab_pat.ybh, lab_instr.yqmc, - lab_instr.yljg,(select bz from com_dict where zdlb='HOS' and zddh=lab_instr.yljg) as gjmc + lab_instr.yljg,(select bz from com_dict where zdlb='HOS' and zddh=lab_instr.yljg) as gjmc, + lab_pat.brdh FROM lab_pat, lab_instr WHERE ( lab_pat.yq = lab_instr.yq ) @@ -84,7 +85,7 @@