Merge remote-tracking branch 'origin/master'

lis-common/src/main/java/com/czlis/common/utils/file/ImageUtils.java

@@ -151,7 +151,7 @@ public class ImageUtils
             bos.flush();
         }
 
-        System.out.println("图片已生成到static目录：" + targetFile.getAbsolutePath());
+        log.info("图片已生成到static目录：" + targetFile.getAbsolutePath());
         return targetFile;
     }
 

lis-system/src/main/java/com/czlis/system/web/controller/system/SysLoginController.java

@@ -11,6 +11,8 @@ import com.czlis.system.service.ISysMenuService;
 import com.czlis.system.web.service.SysLoginService;
 import com.czlis.system.web.service.SysPermissionService;
 import com.czlis.interfaceCommon.service.TokenService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +27,7 @@ import java.util.Set;
  *
  * @author admin
  */
+@Api(tags = "登录验证")
 @RestController
 public class SysLoginController {
     @Autowired
@@ -45,6 +48,7 @@ public class SysLoginController {
      * @param loginBody 登录信息
      * @return 结果
      */
+    @ApiOperation("登录")
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody) {
         AjaxResult ajax = AjaxResult.success();

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.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
 import com.czlis.liswork.service.LisWorkPageInfoService;
 import io.swagger.annotations.Api;
@@ -14,7 +15,7 @@ import java.util.Date;
 @Api(tags = "主界面-获取检验tab页面信息")
 @RestController
 @RequestMapping("/lisworkpageinfo")
-public class LisWorkPageInfoController {
+public class LisWorkPageInfoController extends BaseController {
 
     @Autowired
     private LisWorkPageInfoService lisWorkPageInfoService;
@@ -39,22 +40,40 @@ public class LisWorkPageInfoController {
 
     @ApiOperation("获取其他仪器结果")
     @GetMapping("/otherinstr")
-    public Result getOtherinstr(Date jyrq,String yq,String ybh){
+    public Result getOtherinstr(Date jyrq, String yq, String ybh){
         return lisWorkPageInfoService.getOtherinstr(jyrq,yq,ybh);
     }
 
+    @ApiOperation("获取其他仪器结果明细")
+    @GetMapping("/otherinstrdetail")
+    public Result getOtherinstrDetail(String brdh,String yq,Date jyrq){
+        return lisWorkPageInfoService.getOtherinstrDetail(brdh,yq,jyrq);
+    }
+
     @ApiOperation("获取收费信息")
     @GetMapping("/reqdetail")
     public Result getReqdetail(Date jyrq,String yq,String ybh){
         return lisWorkPageInfoService.getReqdetail(jyrq,yq,ybh);
     }
 
+    @ApiOperation("获取收费信息报告明细")
+    @GetMapping("/reqdetailmx")
+    public Result getReqdetailMX(String yq,String sqxmdh){
+        return lisWorkPageInfoService.getReqdetailMX(yq,sqxmdh);
+    }
+
     @ApiOperation("获取标本流转信息")
     @GetMapping("/reqinfo")
     public Result getReqInfo(Date jyrq,String yq,String ybh){
         return lisWorkPageInfoService.getReqInfo(jyrq,yq,ybh);
     }
 
+    @ApiOperation("获取组合项目模板")
+    @GetMapping("/inputmdl")
+    public Result getInputmdl(String yq){
+        return lisWorkPageInfoService.getInputmdl(yq);
+    }
+
 
 
 

liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java

@@ -1,10 +1,8 @@
 package com.czlis.liswork.mapper;
 
 import cn.hutool.core.date.DateTime;
-import com.czlis.common.core.domain.entity.lis.LabGraph;
+import com.czlis.common.core.domain.entity.lis.*;
-import com.czlis.common.core.domain.entity.lis.LabGraphUnit;
+import com.czlis.liswork.pojo.HistoryResult;
-import com.czlis.common.core.domain.entity.lis.LabOldGraph;
-import com.czlis.common.core.domain.entity.lis.LabResultRe;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -19,4 +17,12 @@ public interface LisWorkPageInfoMapper {
     List<Map<String,Object>> getReqdetail(String sqh);
     List<Map<String, Object>> getOtherinstr(@Param("dayStart") Date dayStart,@Param("dayEnd") DateTime dayEnd,@Param("brdh") String brdh,@Param("brxm") String brxm);
     List<Map<String, Object>> getReqInfo(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
+
+    List<Map<String, Object>> getOtherinstrDetail(@Param("brdh") String brdh, @Param("yq") String yq,@Param("jyrq") Date jyrq);
+
+    List<HistoryResult> getHisResult(Map<String,Object> map);
+
+    List<Map<String,Object>> getbgxm(@Param("yq") String yq,@Param("sqxmdh") String sqxmdh);
+
+    List<LabInputmdl> getInputmdl(String yq);
 }

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

@@ -0,0 +1,24 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class HistoryResult {
+    private Date jyrq;
+    private String xmdh;
+    private String xmmc;
+    private String csjg;
+    private String ybh;
+    private String yq;
+    private String brxb;
+    private String nl;
+    private String yqdl;
+    private String brdh;
+
+}

liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java

@@ -11,4 +11,10 @@ public interface LisWorkPageInfoService {
     Result getReqdetail(Date jyrq, String yq, String ybh);
     Result getOtherinstr(Date jyrq, String yq, String ybh);
     Result getReqInfo(Date jyrq, String yq, String ybh);
+
+    Result getOtherinstrDetail(String brdh, String yq, Date jyrq);
+
+    Result getReqdetailMX(String yq, String sqxmdh);
+
+    Result getInputmdl(String yq);
 }

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

@@ -1,21 +1,25 @@
 package com.czlis.liswork.service.impl;
 
+import cn.hutool.core.codec.Base64;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.czlis.common.core.domain.Result;
-import com.czlis.common.core.domain.entity.lis.LabPat;
+import com.czlis.common.core.domain.entity.lis.*;
+import com.czlis.common.utils.file.FileUtils;
+import com.czlis.common.utils.file.ImageUtils;
+import com.czlis.interfaceCommon.utils.ReportUtil;
 import com.czlis.liswork.mapper.LisWorkPageInfoMapper;
-import com.czlis.common.core.domain.entity.lis.LabGraph;
+import com.czlis.liswork.pojo.HistoryResult;
-import com.czlis.common.core.domain.entity.lis.LabGraphUnit;
-import com.czlis.common.core.domain.entity.lis.LabOldGraph;
-import com.czlis.common.core.domain.entity.lis.LabResultRe;
 import com.czlis.liswork.service.LisWorkPageInfoService;
 import com.czlis.interfaceCommon.utils.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -25,18 +29,23 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
     LisWorkPageInfoMapper lisWorkPageInfoMapper;
     @Autowired
     CommonUtil commonUtil;
+    @Autowired
+    ReportUtil reportUtil;
 
     @Override
     public Result resultGraph(Date jyrq, String yq, String ybh) {
-        List<LabGraph> labGraphList = lisWorkPageInfoMapper.getLabGraphList(jyrq,yq,ybh);
+        //List<LabGraph> labGraphList = lisWorkPageInfoMapper.getLabGraphList(jyrq,yq,ybh);
-        List<LabGraphUnit> labGraphUnitList = lisWorkPageInfoMapper.getLabGraphUnitList(yq,"");
+//        List<LabGraphUnit> labGraphUnitList = lisWorkPageInfoMapper.getLabGraphUnitList(yq,"");
-        List<LabOldGraph> labOldGraphList = lisWorkPageInfoMapper.getLabOldGraphList(jyrq, yq, ybh);
+//        List<LabOldGraph> labOldGraphList = lisWorkPageInfoMapper.getLabOldGraphList(jyrq, yq, ybh);
-        List<Map<String,Object>> queryList = new ArrayList<>();
+        List<String> queryList = new ArrayList<>();
-        Map<String,Object> map = new HashMap<>();
+        String[] picPath = reportUtil.getReportpic(jyrq, yq, ybh);
-        map.put("labGraphList",labGraphList);
+        for (int i = 0; i < picPath.length; i++) {
-        map.put("labGraphUnitList",labGraphUnitList);
+            String staticpath= ImageUtils.getStaticPath()+ File.separator;
-        map.put("labOldGraphList",labOldGraphList);
+            String picFilePath =staticpath +"graphs"+File.separator + StrUtil.splitToArray(picPath[i], "graphs/")[1];
-        queryList.add(map);
+            File file = new File(picFilePath);
+            queryList.add(Base64.encode(file));
+            FileUtils.deleteFile(picFilePath);
+        }
         return new Result("0","获取数据成功！",queryList);
     }
 
@@ -48,9 +57,49 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
 
     @Override
     public Result getHistory(Date jyrq, String yq, String ybh) {
-        return null;
+        Map<String,Object> map = new HashMap<>();
+        map.put("jyrq",jyrq);
+        map.put("yq",yq);
+        map.put("ybh",ybh);
+        //本次结果
+        List<HistoryResult> hisResultThisList = lisWorkPageInfoMapper.getHisResult(map);
+        if(hisResultThisList.size()<=0) return new Result("-1","没有找到对应的结果信息！");
+        //其他结果
+        map.clear();
+        map.put("yqdl", hisResultThisList.get(0).getYqdl());
+        map.put("brdh",hisResultThisList.get(0).getBrdh());
+        List<HistoryResult> hisResultList = lisWorkPageInfoMapper.getHisResult(map);
+        for (HistoryResult historyResult : hisResultThisList) {
+            List<HistoryResult> 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<HistoryResult>() {
+            @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);
+                }else{
+                    return i;
+                }
+            }
+        });
+        return new Result("0","获取成功！",hisResultThisList);
     }
 
+    /**
+     * 获取收费信息
+     * @param jyrq
+     * @param yq
+     * @param ybh
+     * @return
+     */
     @Override
     public Result getReqdetail(Date jyrq, String yq, String ybh) {
         LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh);
@@ -79,5 +128,29 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
         return new Result("0","获取标本流转数据成功！",reqInfoList);
     }
 
+    @Override
+    public Result getOtherinstrDetail(String brdh, String yq, Date jyrq) {
+        List<Map<String,Object>> otherinstrDetailList = lisWorkPageInfoMapper.getOtherinstrDetail(brdh,yq,jyrq);
+        return new Result("0","查询成功！",otherinstrDetailList);
+    }
+
+    /**
+     * 申请项目明细
+     * @param yq
+     * @param sqxmdh
+     * @return
+     */
+    @Override
+    public Result getReqdetailMX(String yq, String sqxmdh) {
+        List<Map<String, Object>> bgxmList = lisWorkPageInfoMapper.getbgxm(yq, sqxmdh);
+        return new Result("0","获取数据成功！",bgxmList);
+    }
+
+    @Override
+    public Result getInputmdl(String yq) {
+        List<LabInputmdl> labInputmdlList =  lisWorkPageInfoMapper.getInputmdl(yq);
+        return new Result("0","获取数据成功！",labInputmdlList);
+    }
+
 
 }

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

@@ -63,4 +63,52 @@
         WHERE lab_reqmain.sqh = lab_pat.sqh and lab_pat.jyrq = #{jyrq} and lab_pat.yq = #{yq} and lab_pat.ybh = #{ybh}
 
     </select>
+
+    <select id="getOtherinstrDetail" resultType="map">
+        select b.jyrq,c.xmmc,b.csjg,b.ybh,b.yq,
+               (case a.brxb when '1' then '男' when '2' then '女' end) as brxb ,
+               a.nl+a.nldw as nl
+        from lab_pat a, lab_result b,xm_info c
+        where a.jyrq = b.jyrq and a.yq = b.yq and a.ybh = b.ybh and a.jgbz = '2'
+        and c.yq = b.yq and c.xmdh = b.xmdh and a.jyrq = #{jyrq} and a.yq = #{yq} and a.brdh = #{brdh}
+    </select>
+
+    <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 ,
+               a.nl+a.nldw as nl
+        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'
+        and c.yq = b.yq and c.xmdh = b.xmdh and d.yq = a.yq and a.jyrq > getdate() - 360
+        <if test="yqdl != null and yqdl != ''"> and d.yqdl = #{yqdl}</if>
+        <if test="brdh != null and brdh != ''"> and a.brdh = #{brdh}</if>
+        <if test="jyrq != null "> and a.jyrq = #{jyrq}</if>
+        <if test="yq != null and yq != ''"> and a.yq = #{yq}</if>
+        <if test="ybh != null and ybh != ''"> and a.ybh = #{ybh}</if>
+    </select>
+
+    <select id="getbgxm" resultType="map">
+        <![CDATA[
+        SELECT  distinct xm_reqitem_vs_reportitem.sqxmdh,
+        xm_reqitem_vs_reportitem.yq,
+        xm_reqitem_vs_reportitem.xmdh,
+        xm_reqitem_vs_reportitem.tdh,
+        xm_reqitem_vs_reportitem.mrz,xm_info.dyxh,xm_info.xmmc
+        FROM xm_reqitem_vs_reportitem,xm_info
+        WHERE ( xm_reqitem_vs_reportitem.sqxmdh = #{sqxmdh} ) AND   (isnull(xm_reqitem_vs_reportitem.def,'')<>'1') and
+        ( xm_reqitem_vs_reportitem.yq = #{yq} )    and xm_reqitem_vs_reportitem.yq=xm_info.yq and xm_reqitem_vs_reportitem.xmdh=xm_info.xmdh
+        ]]>
+    </select>
+
+    <select id="getInputmdl">
+        SELECT  lab_inputmdl.mbmc ,
+                lab_inputmdl.srbh ,
+                lab_inputmdl.zdsr ,
+                lab_inputmdl.qsybh ,
+                lab_inputmdl.jsybh ,
+                lab_inputmdl.yblx
+        FROM lab_inputmdl
+        WHERE ( lab_inputmdl.yq = #{yq} )
+    </select>
+
 </mapper>