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

lis-common/src/main/java/com/czlis/common/constant/HttpStatus.java

@@ -10,7 +10,7 @@ public class HttpStatus
     /**
      * 操作成功
      */
-    public static final int SUCCESS = 0;
+    public static final int SUCCESS = 200;
 
     /**
      * 对象创建成功
@@ -50,12 +50,12 @@ public class HttpStatus
     /**
      * 未授权
      */
-    public static final int UNAUTHORIZED = -1;
+    public static final int UNAUTHORIZED = 401;
 
     /**
      * 访问受限，授权过期
      */
-    public static final int FORBIDDEN = -1;
+    public static final int FORBIDDEN = 403;
 
     /**
      * 资源，服务未找到
@@ -80,7 +80,7 @@ public class HttpStatus
     /**
      * 系统内部错误
      */
-    public static final int ERROR = -1;
+    public static final int ERROR = 500;
 
     /**
      * 接口未实现
@@ -90,5 +90,5 @@ public class HttpStatus
     /**
      * 系统警告消息
      */
-    public static final int WARN = -1;
+    public static final int WARN = 601;
 }

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

@@ -28,7 +28,7 @@ public class MimeTypeUtils
 
     public static final String[] DEFAULT_ALLOWED_EXTENSION = {
             // 图片
-            "bmp", "gif", "jpg", "jpeg", "png",
+            "bmp", "gif", "jpg", "jpeg", "png","exe",
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件

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

@@ -49,7 +49,7 @@ public class DictController extends BaseController {
     @ApiOperation("查询字典列表(不分页)")
     @GetMapping("/getComDicts")
     public Result getComDicts(String zdlb) {
-        //log.info("调用查询字典列表不分页,{}",zdlb);
+        log.info("调用查询字典列表不分页,{}",zdlb);
         return comDictService.getComDicts(zdlb);
     }
 

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

@@ -58,6 +58,7 @@ public class ReportItemController extends BaseController {
         return reportItemService.addvs(xmInfoVs);
     }
 
+    @ApiOperation("删除仪器项目对照")
     @DeleteMapping("/delvs")
     public Result deleteXmInfoVs(Integer vsid){
         return reportItemService.deleteXmInfoVs(vsid);

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

@@ -39,11 +39,13 @@ public class XmBaseController extends BaseController {
         return xmBaseService.add(xmBase);
     }
 
+    @ApiOperation("删除报告项目")
     @DeleteMapping("/del")
     public Result delete(@RequestBody String xmdh){
         return xmBaseService.delete(xmdh);
     }
 
+    @ApiOperation("修改报告项目")
     @PostMapping("/update")
     public Result update(@RequestBody @NotBlank(message = "参数不能为空！") XmBase xmBase){
         return xmBaseService.update(xmBase);

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

@@ -38,11 +38,13 @@ public class XmFeeInstrController extends BaseController {
         return xmFeeInstrService.add(xmFeeInstr);
     }
 
+    @ApiOperation("修改仪器收费项目对照")
     @PostMapping("/update")
     public Result update(XmFeeInstr xmFeeInstr){
         return xmFeeInstrService.update(xmFeeInstr);
     }
 
+    @ApiOperation("删除仪器收费项目对照")
     @DeleteMapping("/del")
     public Result delete(@NotBlank(message = "yq参数不能为空！") String yq,@NotBlank(message = "sfxmdh参数不能为空！") String sfxmdh){
         return xmFeeInstrService.delete(yq,sfxmdh);

liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java

@@ -31,8 +31,10 @@ public class LisWorkController extends BaseController {
     private LabPatService labPatService;
     @Autowired
     private LabResultService labResultService;
+
     /**
      * 可操作仪器查询
+     *
      * @return
      */
     @ApiOperation("可操作仪器查询")
@@ -43,6 +45,7 @@ public class LisWorkController extends BaseController {
 
     /**
      * 切换仪器，查询仪器参数
+     *
      * @param yq
      * @return
      */
@@ -54,6 +57,7 @@ public class LisWorkController extends BaseController {
 
     /**
      * 获取样本列表
+     *
      * @param jyrq
      * @param yq
      * @param days
@@ -72,6 +76,7 @@ public class LisWorkController extends BaseController {
 
     /**
      * 获取普通样本信息
+     *
      * @param jyrq
      * @param yq
      * @param ybh
@@ -86,6 +91,7 @@ public class LisWorkController extends BaseController {
 
     /**
      * 获取微生物样本信息
+     *
      * @param jyrq
      * @param yq
      * @param ybh
@@ -103,6 +109,7 @@ public class LisWorkController extends BaseController {
         return lisWorkService.checkUser(yhdh, mm);
     }
 
+    @ApiOperation("获取检验结果")
     @GetMapping("/resultinfo")
     public Result getresultinfo(LabResult labResult) {
         Date jyrq = labResult.getJyrq();
@@ -111,6 +118,8 @@ public class LisWorkController extends BaseController {
         log.info("jyrq,{}", jyrq.toString());
         return labResultService.getresultinfo(jyrq, yq, ybh);
     }
+
+    @ApiOperation("删除检验结果")
     @PostMapping("/deleteresult")
     public Result deleteresult(@RequestBody List<LabResult> labResultlist) {
         return labResultService.delLabResultList(labResultlist);

liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java

@@ -41,7 +41,7 @@ public class LisWorkOperController extends BaseController {
     }
 
     /**
-     * 修改病人信息
+     * 审核报告
      * @param jyrq 检验日期
      * @param yq  仪器
      * @param ybh 样本号

mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java

@@ -26,6 +26,7 @@ public class MZCXController extends BaseController {
 
     /**
      * 获取申请单信息
+     *
      * @param brdh
      * @param stime
      * @param etime
@@ -37,12 +38,16 @@ public class MZCXController extends BaseController {
     public Result querySQD(String brdh, String stime, String etime, String klx, String zt) {
         return mzcxService.querySQD(brdh, stime, etime, klx, zt);
     }
+
+    @ApiOperation("查询病人信息列表")
     @GetMapping("/queryPatList")
     public Result queryPatList() {
         return mzcxService.queryPatList();
     }
+
     /**
      * 打印条码
+     *
      * @param sqh
      * @return
      */
@@ -51,11 +56,13 @@ public class MZCXController extends BaseController {
     public Result printSQD(String sqh) {
         return mzcxService.printSQD(sqh);
     }
+
     @PostMapping("/printBarcode")
     public Result printAll(@RequestBody List<String> sqhs) {
         return mzcxService.printAll(sqhs);
     }
 
+    @ApiOperation("打印回单")
     @Anonymous
     @PostMapping("/printBackpaper")
     public Result printBackpaper(@RequestBody List<String> sqhs) {

zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java

@@ -4,8 +4,10 @@ import com.czlis.common.annotation.Anonymous;
 import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.zybgcx.pojo.Web_fs_printReport;
 import com.czlis.zybgcx.pojo.Web_getReportsList;
 import com.czlis.zybgcx.pojo.Web_getResultMed;
+import com.czlis.zybgcx.pojo.Web_result;
 import com.czlis.zybgcx.service.ZybgcxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,16 +31,15 @@ public class ZybgcxController extends BaseController {
     private ZybgcxService zybgcxService;
 
     /**
-     * 获取报告信息
+     * 获取报告信息列表
      * @param webGetReportsList
      * @return
      */
-    @ApiOperation("获取报告信息")
+    @ApiOperation("获取报告信息列表")
     @PostMapping("/ReportList")
-    public TableDataInfo getPatReportList(@RequestBody Web_getReportsList webGetReportsList){
-        startPage();
-        List<Web_getReportsList> patList = zybgcxService.getPatList(webGetReportsList);
-        return getDataTable(patList);
+    @Anonymous
+    public Result getPatReportList(@RequestBody Web_getReportsList webGetReportsList){
+        return zybgcxService.getPatList(webGetReportsList);
     }
 
     /**
@@ -47,12 +49,34 @@ public class ZybgcxController extends BaseController {
      */
     @ApiOperation("获取微生物报告单信息")
     @PostMapping("/MedList")
+    @Anonymous
     public TableDataInfo getResultMed(@RequestBody Web_getResultMed webGetResultMed){
         startPage();
         List<Web_getResultMed> resultMedList = zybgcxService.getResultMed(webGetResultMed);
         return getDataTable(resultMedList);
     }
 
+    @Anonymous
+    @ApiOperation("获取pdf报告")
+    @GetMapping("/pdf")
+    public Result getPDFReportOne(Date jyrq,String yq,String ybh){
+        return zybgcxService.getPDFReportOne(jyrq,yq,ybh);
+    }
+
+    @Anonymous
+    @ApiOperation("获取普通报告结果")
+    @PostMapping("/result")
+    public Result getLisResult(@RequestBody Web_result webResult){
+        return zybgcxService.getLisResult(webResult);
+    }
+
+    @ApiOperation("获取历史检验结果")
+    @Anonymous
+    @PostMapping("/fsresult")
+    public Result getFSResult(@RequestBody Web_fs_printReport webFsPrintReport){
+        return zybgcxService.getFSResult(webFsPrintReport);
+    }
+
 
     /**
      * 打印报告单

zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java

@@ -1,11 +1,16 @@
 package com.czlis.zybgcx.mapper;
 
+import com.czlis.zybgcx.pojo.Web_fs_printReport;
 import com.czlis.zybgcx.pojo.Web_getReportsList;
 import com.czlis.zybgcx.pojo.Web_getResultMed;
+import com.czlis.zybgcx.pojo.Web_result;
 
 import java.util.List;
 
 public interface ZybgcxMapper {
     List<Web_getReportsList> getReportsList(Web_getReportsList getReportsList);
     List<Web_getResultMed> getResultMed(Web_getResultMed getResultMed);
+    List<Web_result> getLisResult(Web_result webResult);
+
+    List<Web_fs_printReport> getFSResult(Web_fs_printReport webFsPrintReport);
 }

zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_fs_printReport.java

@@ -0,0 +1,50 @@
+package com.czlis.zybgcx.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.sql.Blob;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Web_fs_printReport {
+    private String yljg;
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String brxm;
+    private String brdh;
+    private String ch;
+    private String jymd;
+    private String zd;
+    private Date sqsj;
+    private Date cyrq;
+    private Date lastdt;
+    private Date confirmdt;
+    private String confirmer;
+    private String sqh;
+    private String bgdh;
+    private String xmdh;
+    private String csjg;
+    private String refs;
+    private String dw;
+    private String result_flag;
+    private String yqmc;
+    private String yqdl;
+    private String xmmc;
+    private String nl;
+    private String ksname;
+    private String brlyname;
+    private String brxbname;
+    private String yblxname;
+    private String sjysname;
+    private Integer dyxh;
+    private String flag;
+    private String lastuser;
+    private Blob confirmerpic;
+    private Blob lastpic;
+    private String bz;
+}

zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java

@@ -34,5 +34,8 @@ public class Web_getReportsList {
     private String yqmc;
     private String yqdl;
     private String sqdh;
+    private String jymd;
+    private String st;
+    private String et;
 
 }

zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_result.java

@@ -0,0 +1,37 @@
+package com.czlis.zybgcx.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Web_result {
+    private String wyh;
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String xmdh;
+    private String csjg;
+    private String od;
+    private String cutoff;
+    private String bz1;
+    private String bz2;
+    private String yhdh;
+    private String textresult;
+    private Integer instrid;
+    private Date operdt;
+    private String operna;
+    private String refs;
+    private String flag;
+    private String dw;
+    private String jgbz;
+    private String alarm_flag;
+    private String redo_flag;
+    private String sqxmdh;
+    private String xmmc;
+    private Integer dyxh;
+}

zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java

@@ -1,14 +1,23 @@
 package com.czlis.zybgcx.service;
 
 import com.czlis.common.core.domain.Result;
+import com.czlis.zybgcx.pojo.Web_fs_printReport;
 import com.czlis.zybgcx.pojo.Web_getReportsList;
 import com.czlis.zybgcx.pojo.Web_getResultMed;
+import com.czlis.zybgcx.pojo.Web_result;
 
+import java.util.Date;
 import java.util.List;
 
 public interface ZybgcxService {
-    List<Web_getReportsList> getPatList(Web_getReportsList webGetReportsList);
+    Result getPatList(Web_getReportsList webGetReportsList);
     List<Web_getResultMed> getResultMed(Web_getResultMed webGetResultMed);
 
     Result printReport(String bgdh);
+
+    Result getPDFReportOne(Date jyrq, String yq, String ybh);
+
+    Result getLisResult(Web_result webResult);
+
+    Result getFSResult(Web_fs_printReport webFsPrintReport);
 }

zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java

@@ -10,8 +10,10 @@ import com.czlis.common.core.domain.entity.lis.LabReqreportPdffile;
 import com.czlis.interfaceCommon.utils.CommonUtil;
 import com.czlis.interfaceCommon.utils.ReportUtil;
 import com.czlis.zybgcx.mapper.ZybgcxMapper;
+import com.czlis.zybgcx.pojo.Web_fs_printReport;
 import com.czlis.zybgcx.pojo.Web_getReportsList;
 import com.czlis.zybgcx.pojo.Web_getResultMed;
+import com.czlis.zybgcx.pojo.Web_result;
 import com.czlis.zybgcx.service.ZybgcxService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +22,7 @@ import org.springframework.stereotype.Service;
 import javax.print.PrintException;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -38,8 +41,9 @@ public class ZybgcxServcieImpl implements ZybgcxService {
      * @return
      */
     @Override
-    public List<Web_getReportsList> getPatList(Web_getReportsList webGetReportsList) {
-        return zybgcxMapper.getReportsList(webGetReportsList);
+    public Result getPatList(Web_getReportsList webGetReportsList) {
+        List<Web_getReportsList> reportsList = zybgcxMapper.getReportsList(webGetReportsList);
+        return new Result("0","查询成功！",reportsList);
     }
 
     /**
@@ -81,5 +85,25 @@ public class ZybgcxServcieImpl implements ZybgcxService {
         return new Result("0","打印成功！");
     }
 
+    @Override
+    public Result getPDFReportOne(Date jyrq, String yq, String ybh) {
+        LabReqreportPdffile labReqreportPdffileOne = commonUtil.getLabReqreportPdffileOne(jyrq, yq, ybh);
+        return new Result("0","获取数据成功",labReqreportPdffileOne);
+
+    }
+
+    @Override
+    public Result getLisResult(Web_result webResult) {
+        List<Web_result> lisResultList = zybgcxMapper.getLisResult(webResult);
+        return new Result("0","查询成功！",lisResultList);
+
+    }
+
+    @Override
+    public Result getFSResult(Web_fs_printReport webFsPrintReport) {
+        List<Web_fs_printReport> webFsPrintReportList = zybgcxMapper.getFSResult(webFsPrintReport);
+        return new Result("0","获取数据成功！",webFsPrintReportList);
+    }
+
 
 }

zybgcx/src/main/resources/mapper/ZybgcxMapper.xml

@@ -4,31 +4,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.czlis.zybgcx.mapper.ZybgcxMapper">
 
-	<sql id="selectWebGetReportListVo">
-        select * from web_getReportsList
-    </sql>
-
-    <sql id="selectWebGetResultMedListVo">
-        select * from web_getresultmed
-    </sql>
 
     <select id="getReportsList" resultType="com.czlis.zybgcx.pojo.Web_getReportsList">
-        <include refid="selectWebGetReportListVo"></include>
-        <where>
-            <if test="jyrq != null"> AND jyrq &gt;= CONVERT(varchar(100), #{jyrq}, 120)</if>
+        <![CDATA[select * from web_getReportsList where jyrq >= CONVERT(varchar(100), #{st}, 120) and jyrq <= CONVERT(varchar(100), #{et}, 120) and brlyname = '住院']]>
         <if test="brxm != null and brxm != ''"> AND brxm like '%'+#{brxm}+'%'</if>
         <if test="brdh != null and brdh != ''"> AND brdh like '%'+#{brdh}+'%'</if>
         <if test="sqh != null and sqh != ''"> AND sqh like '%'+#{sqh}+'%'</if>
-        </where>
+        <if test="dybz != null and dybz != ''"> AND dybz = #{dybz}</if>
+        <if test="ksdh !=null and ksdh != ''"> and ksdh = #{ksdh}</if>
+        <if test="alarmflag != null and alarmflag = '1'"> <![CDATA[AND alarmflag <> '0']]></if>
     </select>
 
     <select id="getResultMed" resultType="com.czlis.zybgcx.pojo.Web_getResultMed">
-        <include refid="selectWebGetResultMedListVo"></include>
-        <where>
-            <if test="jyrq != null"> AND jyrq &gt;= CONVERT(varchar(100), #{jyrq}, 120)</if>
-            <if test="xmmc != null and xmmc != ''"> AND xmmc like '%'+#{xmmc}+'%'</if>
-            <if test="brdh != null and brdh != ''"> AND brdh like '%'+#{brdh}+'%'</if>
-        </where>
+        select * from web_getresultmed where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
+        <if test="xmdh != null and xmdh != ''"> and xmdh = #{xmdh}</if>
+    </select>
+
+    <select id="getLisResult" resultType="com.czlis.zybgcx.pojo.Web_result">
+        select * from web_result where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
+        <if test="xmdh != null and xmdh != ''"> and xmdh = #{xmdh}</if>
+    </select>
+
+    <select id="getFSResult" resultType="com.czlis.zybgcx.pojo.Web_fs_printReport">
+        select * from web_fs_printReport where brdh = #{brdh}
+        <if test="xmdh != null and xmdh != ''"> and xmdh = #{xmdh}</if>
+        <if test="bgdh != null and bgdh != ''"> and bgdh = #{bgdh}</if>
+        order by bgdh
     </select>