diff --git a/lis-common/src/main/java/com/czlis/common/constant/HttpStatus.java b/lis-common/src/main/java/com/czlis/common/constant/HttpStatus.java index 2e4298e..945c807 100644 --- a/lis-common/src/main/java/com/czlis/common/constant/HttpStatus.java +++ b/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; } diff --git a/lis-common/src/main/java/com/czlis/common/utils/file/MimeTypeUtils.java b/lis-common/src/main/java/com/czlis/common/utils/file/MimeTypeUtils.java index dd656dc..256e868 100644 --- a/lis-common/src/main/java/com/czlis/common/utils/file/MimeTypeUtils.java +++ b/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", // 压缩文件 diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java index 77bfdfe..a5a52e4 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java +++ b/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); } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java index 88b106f..bbe22e7 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java +++ b/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); diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java index 9a13425..a1b562e 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java +++ b/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); diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java index 7ace47a..c304020 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java +++ b/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); diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java index 01aa8a1..335b289 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java @@ -31,29 +31,33 @@ public class LisWorkController extends BaseController { private LabPatService labPatService; @Autowired private LabResultService labResultService; + /** * 可操作仪器查询 + * * @return */ @ApiOperation("可操作仪器查询") @GetMapping("/instrdlist") - public Result getInstrdList(){ + public Result getInstrdList() { return lisWorkService.getInstrdList(getUserId()); } /** * 切换仪器，查询仪器参数 + * * @param yq * @return */ @ApiOperation("切换仪器，查询仪器参数") @GetMapping("/instrdconfig") - public Result getInstrdConfig(String yq){ - return lisWorkService.getInstrdConfig(yq); + public Result getInstrdConfig(String yq) { + return lisWorkService.getInstrdConfig(yq); } /** * 获取样本列表 + * * @param jyrq * @param yq * @param days @@ -61,17 +65,18 @@ public class LisWorkController extends BaseController { */ @ApiOperation("获取样本列表") @GetMapping("/samplelist") - // public Result getSampleList(Date jyrq,String yq,Long days){ - // return lisWorkService.getSampleList(jyrq,yq,days); - // } - public TableDataInfo getsamplelist(Date jyrq,String yq,Long days){ + // public Result getSampleList(Date jyrq,String yq,Long days){ + // return lisWorkService.getSampleList(jyrq,yq,days); + // } + public TableDataInfo getsamplelist(Date jyrq, String yq, Long days) { startPage(); - List labPatList = labPatService.getSampleList(jyrq,yq,days); + List labPatList = labPatService.getSampleList(jyrq, yq, days); return getDataTable(labPatList); } /** * 获取普通样本信息 + * * @param jyrq * @param yq * @param ybh @@ -79,13 +84,14 @@ public class LisWorkController extends BaseController { */ @ApiOperation("获取普通样本信息") @GetMapping("/sampleinfo") - public Result sampleInfo(Date jyrq,String yq,String ybh){ + public Result sampleInfo(Date jyrq, String yq, String ybh) { - return labPatService.getLabPat(jyrq,yq,ybh); + return labPatService.getLabPat(jyrq, yq, ybh); } /** * 获取微生物样本信息 + * * @param jyrq * @param yq * @param ybh @@ -93,26 +99,29 @@ public class LisWorkController extends BaseController { */ @ApiOperation("获取微生物样本信息") @GetMapping("/sampleMedInfo") - public Result sampleMedInfo(Date jyrq,String yq,String ybh){ - return lisWorkService.sampleMedInfo(jyrq,yq,ybh); + public Result sampleMedInfo(Date jyrq, String yq, String ybh) { + return lisWorkService.sampleMedInfo(jyrq, yq, ybh); } @ApiOperation("工号密码验证") @GetMapping("/checkuserid") - public Result checkUser(String yhdh,String mm){ - return lisWorkService.checkUser(yhdh,mm); + public Result checkUser(String yhdh, String mm) { + return lisWorkService.checkUser(yhdh, mm); } + @ApiOperation("获取检验结果") @GetMapping("/resultinfo") - public Result getresultinfo(LabResult labResult){ - Date jyrq=labResult.getJyrq(); - String yq=labResult.getYq(); - String ybh=labResult.getYbh(); - log.info("jyrq,{}",jyrq.toString()); - return labResultService.getresultinfo(jyrq,yq,ybh); + public Result getresultinfo(LabResult labResult) { + Date jyrq = labResult.getJyrq(); + String yq = labResult.getYq(); + String ybh = labResult.getYbh(); + log.info("jyrq,{}", jyrq.toString()); + return labResultService.getresultinfo(jyrq, yq, ybh); } + + @ApiOperation("删除检验结果") @PostMapping("/deleteresult") - public Result deleteresult(@RequestBody List labResultlist){ - return labResultService.delLabResultList(labResultlist); + public Result deleteresult(@RequestBody List labResultlist) { + return labResultService.delLabResultList(labResultlist); } } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java index 5579bf9..c14822a 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java +++ b/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 样本号 diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java index c3783bd..c2db882 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java +++ b/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 @@ -34,31 +35,37 @@ public class MZCXController extends BaseController { */ @ApiOperation("获取申请单信息") @GetMapping("/querySQD") - public Result querySQD(String brdh,String stime,String etime,String klx,String zt){ - return mzcxService.querySQD(brdh,stime,etime,klx,zt); + 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(){ + public Result queryPatList() { return mzcxService.queryPatList(); } + /** * 打印条码 + * * @param sqh * @return */ @Anonymous @GetMapping("/printBarcode") - public Result printSQD(String sqh){ + public Result printSQD(String sqh) { return mzcxService.printSQD(sqh); } + @PostMapping("/printBarcode") - public Result printAll(@RequestBody List sqhs){ + public Result printAll(@RequestBody List sqhs) { return mzcxService.printAll(sqhs); } + @ApiOperation("打印回单") @Anonymous @PostMapping("/printBackpaper") - public Result printBackpaper(@RequestBody List sqhs){ + public Result printBackpaper(@RequestBody List sqhs) { return mzcxService.printBackpaper(sqhs); } } diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java b/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java index be07fa2..353364f 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java +++ b/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 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 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); + } + /** * 打印报告单 diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java b/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java index 4e06ec3..2ac4392 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java +++ b/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 getReportsList(Web_getReportsList getReportsList); List getResultMed(Web_getResultMed getResultMed); + List getLisResult(Web_result webResult); + + List getFSResult(Web_fs_printReport webFsPrintReport); } diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_fs_printReport.java b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_fs_printReport.java new file mode 100644 index 0000000..97d7af2 --- /dev/null +++ b/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; +} diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java index bcd6608..fd292a4 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java +++ b/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; } diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_result.java b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_result.java new file mode 100644 index 0000000..214585a --- /dev/null +++ b/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; +} diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java b/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java index 794ada3..1f486c8 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java +++ b/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 getPatList(Web_getReportsList webGetReportsList); + Result getPatList(Web_getReportsList webGetReportsList); List 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); } diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java b/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java index b32b65e..a6fe2fe 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java +++ b/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 getPatList(Web_getReportsList webGetReportsList) { - return zybgcxMapper.getReportsList(webGetReportsList); + public Result getPatList(Web_getReportsList webGetReportsList) { + List 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 lisResultList = zybgcxMapper.getLisResult(webResult); + return new Result("0","查询成功！",lisResultList); + + } + + @Override + public Result getFSResult(Web_fs_printReport webFsPrintReport) { + List webFsPrintReportList = zybgcxMapper.getFSResult(webFsPrintReport); + return new Result("0","获取数据成功！",webFsPrintReportList); + } + } diff --git a/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml b/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml index ded298f..3dc1cdf 100644 --- a/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml +++ b/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"> - - select * from web_getReportsList - - - - select * from web_getresultmed - + + + +