Merge remote-tracking branch 'lis8.0/master'

liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java

@@ -32,7 +32,6 @@ public class ReportItemController extends BaseController {
 
     @ApiOperation("查询检验项目列表")
     @GetMapping("/query")
-    @Anonymous
     public TableDataInfo query(XmInfoNew xmInfoNew) {
         startPage();
        List<XmInfoNew> xmInfoNewList = reportItemService.query(xmInfoNew);
@@ -42,7 +41,6 @@ public class ReportItemController extends BaseController {
 
     @ApiOperation("查询检验项目明细")
     @GetMapping("/queryDetail")
-    @Anonymous
     public Result queryDetail(String xmid,String yq,String xmdh){
         XmInfoNewDTO xmInfoNewDTO = reportItemService.queryDetail(xmid,yq,xmdh);
         return new Result("0","查询成功！",xmInfoNewDTO);

liswork/src/main/java/com/czlis/liswork/pojo/DTO/HistoryResultDTO.java

@@ -20,4 +20,5 @@ public class HistoryResultDTO {
     private List<HistoryResult> seven;
     private List<HistoryResult> eight;
     private List<HistoryResult> nine;
+    private List<HistoryResult> first;
 }

liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java

@@ -23,6 +23,8 @@ public class HistoryResult {
     private String brxm;
     private String result_flag;
     private String yljg;
+    private String cksx;
+    private String ckxx;
 
 
 }

liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java

@@ -103,6 +103,8 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
         Date jyrqTemp = null;
         int i = 0;
         HistoryResultDTO historyResultDTO = new HistoryResultDTO();
+        //本次结果
+        historyResultDTO.setFirst(hisResultThisList);
         List<Date> jyrqList = new ArrayList<>();
         for (HistoryResult historyResult : hisResultList) {
             Date jyrq1 = historyResult.getJyrq();

liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml

@@ -85,6 +85,7 @@
     <select id="getHisResult" resultType="com.czlis.liswork.pojo.HistoryResult">
         select b.jyrq,c.xmdh, c.xmmc,b.csjg,b.ybh,b.yq,d.yqdl,a.brdh,
                (case a.brxb when '1' then '男' when '2' then '女' end) as brxb ,
+               c.cksx,c.ckxx,
                a.nl+a.nldw as nl,a.brxm as brxm,b.result_flag,(select top 1 zdmc from com_dict where zdlb = 'HOS' and zddh = a.yljg) as yljg
         from lab_pat a, lab_result b,xm_info c,lab_instr d
         where a.jyrq = b.jyrq and a.yq = b.yq and a.ybh = b.ybh and a.jgbz = '2'