科内开单

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java

@@ -429,10 +429,10 @@ public class LisWorkUtils extends LisWorkconfirm {
         //2:数据合法性校验
         String jgbz = labPat.getJgbz();
         if (!"2".equals(jgbz)) return new Result("-1", "报告未审核,不需解除！");
-        String unconfirmlog = commonUtil.getComOptValue(yq, "unconfirmlog");
+//        String unconfirmlog = commonUtil.getComOptValue(yq, "unconfirmlog");
-        if ("1".equals(unconfirmlog)) {
+//        if ("1".equals(unconfirmlog)) {
-            return new Result("-1", "请填写解除审核原因！");
+//            return new Result("-1", "请填写解除审核原因！");
-        }
+//        }
 
         //调用his报告接口，完成报告同时调用外部接口任务
         SetReport setReport = new SetReport();
@@ -497,7 +497,6 @@ public class LisWorkUtils extends LisWorkconfirm {
         if (sqh != null) {
             setlabReqsteplog(sqh, LabReqmainConstants.START, yhdh);
         }
-        if (!"取消成功!".equals(msg)) return new Result("3", msg);
         return new Result("0", msg);
     }
 

lis-system/src/test/java/com/czlis/system/Lis_springbootTest.java

@@ -2,6 +2,7 @@ package com.czlis.system;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.date.DateUtil;
+import com.czlis.interfaceCommon.utils.CommonUtil;
 import com.czlis.interfaceCommon.utils.ReportUtil;
 import com.lowagie.text.Document;
 import com.lowagie.text.pdf.*;
@@ -117,6 +118,16 @@ public class Lis_springbootTest {
         reportUtil.getReportpic(DateUtil.parse("2025-08-20","yyyy-MM-dd"),"33","11");
     }
 
+    @Autowired
+    CommonUtil commonUtil;
+
+    @Test
+    public void test03(){
+        Date currentTime = commonUtil.getCurrentTime();
+        String formatDate = DateUtil.format(currentTime, "yymmdd");
+
+    }
+
 
 
 

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

@@ -1,13 +1,10 @@
 package com.czlis.mzcx.controller;
 
-import com.czlis.common.annotation.Anonymous;
 import com.czlis.common.annotation.Log;
 import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
-import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.common.enums.BusinessType;
 import com.czlis.interfaceCommon.constants.SysLogConstants;
-import com.czlis.mzcx.pojo.MzcxSqdDTO;
 import com.czlis.mzcx.service.MZCXService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -0,0 +1,49 @@
+package com.czlis.mzcx.controller;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.ComPat;
+import com.czlis.common.core.domain.entity.lis.LabReqmain;
+import com.czlis.mzcx.pojo.dto.ReqInputLisWorkDTO;
+import com.czlis.mzcx.service.ReqInputLisWorkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "科内开单")
+@RestController
+@RequestMapping("/reqInput")
+public class ReqInputLisWorkController {
+
+    @Autowired
+    private ReqInputLisWorkService reqInputLisWorkService;
+
+    @ApiOperation("查询病人信息")
+    @GetMapping("/queryPatInfo")
+    public Result getPatientInfo(ComPat comPat){
+        return reqInputLisWorkService.getPatientInfo(comPat);
+    }
+
+    @ApiOperation("查询病人列表")
+    @PostMapping("/queryPatList")
+    public Result queryPatList(@RequestBody ReqInputLisWorkDTO reqInputLisWorkDTO){
+        return reqInputLisWorkService.queryPatList(reqInputLisWorkDTO);
+    }
+
+    @ApiOperation("保存病人信息")
+    @PostMapping("/saveReqInfo")
+    public Result saveReqInfo(@RequestBody LabReqmain labReqmain){
+        return reqInputLisWorkService.saveReqInfo(labReqmain);
+    }
+
+
+    @ApiOperation("获取项目信息")
+    @GetMapping("/queryXmInfoList")
+    public Result queryXmInfoList(){
+        return reqInputLisWorkService.queryXmInfoList();
+    }
+
+
+}

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

@@ -1,14 +1,12 @@
 package com.czlis.mzcx.controller;
 
-import com.czlis.common.annotation.Anonymous;
 import com.czlis.common.annotation.Log;
 import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
-import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
 import com.czlis.common.enums.BusinessType;
 import com.czlis.interfaceCommon.constants.SysLogConstants;
-import com.czlis.mzcx.pojo.LabRptgetRuleDTO;
+import com.czlis.mzcx.pojo.dto.LabRptgetRuleDTO;
 import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;
 import com.czlis.mzcx.service.RptgetRuleService;
 import io.swagger.annotations.Api;

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

@@ -1,6 +1,5 @@
 package com.czlis.mzcx.controller;
 
-import com.czlis.common.annotation.Anonymous;
 import com.czlis.common.annotation.Log;
 import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
@@ -8,7 +7,7 @@ import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.common.core.domain.entity.lis.XmFee;
 import com.czlis.common.enums.BusinessType;
 import com.czlis.interfaceCommon.constants.SysLogConstants;
-import com.czlis.mzcx.pojo.XmFeeDTO;
+import com.czlis.mzcx.pojo.dto.XmFeeDTO;
 import com.czlis.mzcx.service.XmFeeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java

@@ -2,7 +2,7 @@ package com.czlis.mzcx.mapper;
 
 import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass;
 import com.czlis.common.core.domain.entity.lis.XmFee;
-import com.czlis.mzcx.pojo.LabFeeitemVsClassDTO;
+import com.czlis.mzcx.pojo.dto.LabFeeitemVsClassDTO;
 
 import java.util.List;
 

mzcx/src/main/java/com/czlis/mzcx/mapper/MZCXMapper.java

@@ -1,6 +1,6 @@
 package com.czlis.mzcx.mapper;
 
-import com.czlis.mzcx.pojo.MzcxSqdDTO;
+import com.czlis.mzcx.pojo.dto.MzcxSqdDTO;
 
 import java.util.List;
 import java.util.Map;

mzcx/src/main/java/com/czlis/mzcx/mapper/ReqInputLisWorkMapper.java

@@ -0,0 +1,12 @@
+package com.czlis.mzcx.mapper;
+
+import com.czlis.mzcx.pojo.dto.ReqInputLisWorkDTO;
+import com.czlis.mzcx.pojo.vo.ReqInputLisWorkVO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ReqInputLisWorkMapper {
+    List<Map<String,Object>> queryPatList(ReqInputLisWorkDTO reqInputLisWorkDTO);
+    List<ReqInputLisWorkVO> queryXmInfoList();
+}

mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java

@@ -1,7 +1,7 @@
 package com.czlis.mzcx.mapper;
 
 import com.czlis.common.core.domain.entity.lis.XmFee;
-import com.czlis.mzcx.pojo.XmFeeDTO;
+import com.czlis.mzcx.pojo.dto.XmFeeDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mzcx/src/main/java/com/czlis/mzcx/pojo/dto/LabFeeitemVsClassDTO.java

@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.mzcx.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

mzcx/src/main/java/com/czlis/mzcx/pojo/dto/LabRptgetRuleDTO.java

@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.mzcx.pojo.dto;
 
 import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
 import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;

mzcx/src/main/java/com/czlis/mzcx/pojo/dto/MzcxSqdDTO.java

@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.mzcx.pojo.dto;
 
 
 import lombok.AllArgsConstructor;

mzcx/src/main/java/com/czlis/mzcx/pojo/dto/OutPatListDTO.java

@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.mzcx.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

mzcx/src/main/java/com/czlis/mzcx/pojo/dto/ReqInputLisWorkDTO.java

@@ -0,0 +1,18 @@
+package com.czlis.mzcx.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReqInputLisWorkDTO {
+    private String sqh;
+    private String brxm;
+    private String zt;
+    private Date begdate;
+    private Date enddate;
+}

mzcx/src/main/java/com/czlis/mzcx/pojo/dto/XmFeeDTO.java

@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.mzcx.pojo.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

mzcx/src/main/java/com/czlis/mzcx/pojo/vo/ReqInputLisWorkVO.java

@@ -0,0 +1,27 @@
+package com.czlis.mzcx.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReqInputLisWorkVO {
+    private String sflbmc;
+    private String sfxmdh;
+    private String sfxmmc;
+    private String bz;
+    private BigDecimal dj;
+    private String spec;
+    private String zjf;
+    private String sflbdh;
+    private String sflbjc;
+    private String bkcolor;
+    private String bglqdh;
+    private String yblx;
+    private String sampletips;
+    private String xh;
+}

mzcx/src/main/java/com/czlis/mzcx/service/MZCXService.java

@@ -1,7 +1,6 @@
 package com.czlis.mzcx.service;
 
 import com.czlis.common.core.domain.Result;
-import com.czlis.mzcx.pojo.MzcxSqdDTO;
 
 import java.util.List;
 

mzcx/src/main/java/com/czlis/mzcx/service/ReqInputLisWorkService.java

@@ -0,0 +1,16 @@
+package com.czlis.mzcx.service;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.ComPat;
+import com.czlis.common.core.domain.entity.lis.LabReqmain;
+import com.czlis.mzcx.pojo.dto.ReqInputLisWorkDTO;
+
+public interface ReqInputLisWorkService {
+    Result getPatientInfo(ComPat comPat);
+
+    Result queryPatList(ReqInputLisWorkDTO reqInputLisWorkDTO);
+
+    Result saveReqInfo(LabReqmain labReqmain);
+
+    Result queryXmInfoList();
+}

mzcx/src/main/java/com/czlis/mzcx/service/RptgetRuleService.java

@@ -2,7 +2,7 @@ package com.czlis.mzcx.service;
 
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
-import com.czlis.mzcx.pojo.LabRptgetRuleDTO;
+import com.czlis.mzcx.pojo.dto.LabRptgetRuleDTO;
 import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;
 
 import java.util.List;

mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java

@@ -2,7 +2,7 @@ package com.czlis.mzcx.service;
 
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.XmFee;
-import com.czlis.mzcx.pojo.XmFeeDTO;
+import com.czlis.mzcx.pojo.dto.XmFeeDTO;
 
 import java.util.List;
 

mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java

@@ -4,14 +4,13 @@ import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.XmFee;
 import com.czlis.mzcx.mapper.FeeitemVsClassMapper;
 import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass;
-import com.czlis.mzcx.pojo.LabFeeitemVsClassDTO;
+import com.czlis.mzcx.pojo.dto.LabFeeitemVsClassDTO;
 import com.czlis.mzcx.service.FeeitemVsClassService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java

@@ -16,7 +16,7 @@ import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
 import com.czlis.interfaceCommon.utils.LisUtil;
 import com.czlis.interfaceCommon.utils.ReportUtil;
 import com.czlis.mzcx.mapper.MZCXMapper;
-import com.czlis.mzcx.pojo.OutPatListDTO;
+import com.czlis.mzcx.pojo.dto.OutPatListDTO;
 import com.czlis.mzcx.service.MZCXService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

mzcx/src/main/java/com/czlis/mzcx/service/impl/ReqInputLisWorkServiceImpl.java

@@ -0,0 +1,91 @@
+package com.czlis.mzcx.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.ComPat;
+import com.czlis.common.core.domain.entity.lis.LabReqmain;
+import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
+import com.czlis.interfaceCommon.pojo.inter.DayMessage;
+import com.czlis.interfaceCommon.utils.CommonUtil;
+import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
+import com.czlis.mzcx.mapper.ReqInputLisWorkMapper;
+import com.czlis.mzcx.pojo.dto.ReqInputLisWorkDTO;
+import com.czlis.mzcx.pojo.vo.ReqInputLisWorkVO;
+import com.czlis.mzcx.service.ReqInputLisWorkService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class ReqInputLisWorkServiceImpl implements ReqInputLisWorkService {
+
+    @Autowired
+    ReqInputLisWorkMapper reqInputLisWorkMapper;
+    @Autowired
+    private CommonUtil commonUtil;
+    @Autowired
+    LisInterfaceUtil lisInterfaceUtil;
+
+    @Override
+    public Result getPatientInfo(ComPat comPat) {
+
+        //调用接口
+        DayMessage dayMessage = new DayMessage();
+        dayMessage.setMsgid("222");
+        dayMessage.setMsg(comPat.getBrdh());
+        lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE,dayMessage);
+
+        List<ComPat> comPatList = commonUtil.getComPat(comPat.getBrdh(), comPat.getYljg());
+        if (comPatList.size() > 0) {
+            return new Result("0","获取数据成功！",comPatList.get(0));
+        } else {
+            return new Result("-1","获取数据失败！");
+        }
+    }
+
+    @Override
+    public Result queryPatList(ReqInputLisWorkDTO reqInputLisWorkDTO) {
+        Date begdate = reqInputLisWorkDTO.getBegdate();
+        Date enddate = reqInputLisWorkDTO.getEnddate();
+        if(begdate == null || enddate == null) return new Result("-1","开始时间和结束时间不能为空！");
+        //开始时间和结束时间不能间隔一个月
+        if(Math.abs(begdate.getTime() - enddate.getTime()) > 30L * 24 * 60 * 60 * 1000) return new Result("-1","开始时间和结束时间不能超过一个月！");
+        List<Map<String, Object>> mapList = reqInputLisWorkMapper.queryPatList(reqInputLisWorkDTO);
+        return new Result("0","查询数据成功！",mapList);
+    }
+
+    @Override
+    public Result saveReqInfo(LabReqmain labReqmain) {
+        String brxm = labReqmain.getBrxm();
+        if(brxm == null || "".equals(brxm)) return new Result("-1","病人姓名不能为空！");
+        return null;
+    }
+
+    @Override
+    public Result queryXmInfoList() {
+        List<ReqInputLisWorkVO> reqInputLisWorkVOList = reqInputLisWorkMapper.queryXmInfoList();
+        return new Result("0","获取数据成功！",reqInputLisWorkVOList);
+    }
+
+
+    /**
+     * 生成申请号
+     * @return
+     */
+    public String createSQH(){
+        Date currentTime = commonUtil.getCurrentTime();
+        String formatDate = DateUtil.format(currentTime, "yyyyMMdd");
+        long year = Long.parseLong(formatDate.substring(2, 4));
+        long month = Long.parseLong(formatDate.substring(4, 6));
+        long day = Long.parseLong(formatDate.substring(6, 8));
+        Long mzseq = commonUtil.getNextSeq("MZSEQ");
+        long head = year + Long.parseLong(String.format("%03d", month*31 + day));
+        String format = String.format("%04d", mzseq);
+        return "6" + head + format.substring(format.length()-4);
+    }
+}

mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java

@@ -1,11 +1,9 @@
 package com.czlis.mzcx.service.impl;
 
-import com.czlis.common.annotation.Log;
 import com.czlis.common.core.domain.Result;
-import com.czlis.common.enums.BusinessType;
 import com.czlis.mzcx.mapper.RptgetRuleMapper;
 import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
-import com.czlis.mzcx.pojo.LabRptgetRuleDTO;
+import com.czlis.mzcx.pojo.dto.LabRptgetRuleDTO;
 import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;
 import com.czlis.mzcx.service.RptgetRuleService;
 import lombok.extern.slf4j.Slf4j;

mzcx/src/main/java/com/czlis/mzcx/service/impl/XmFeeServiceImpl.java

@@ -1,12 +1,9 @@
 package com.czlis.mzcx.service.impl;
 
-import com.czlis.common.annotation.Anonymous;
-import com.czlis.common.annotation.Log;
 import com.czlis.common.core.domain.Result;
-import com.czlis.common.enums.BusinessType;
 import com.czlis.mzcx.mapper.XmFeeMapper;
 import com.czlis.common.core.domain.entity.lis.XmFee;
-import com.czlis.mzcx.pojo.XmFeeDTO;
+import com.czlis.mzcx.pojo.dto.XmFeeDTO;
 import com.czlis.mzcx.service.XmFeeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.czlis.mzcx.mapper.FeeitemVsClassMapper">
 
-	<select id="query" resultType="com.czlis.mzcx.pojo.LabFeeitemVsClassDTO">
+	<select id="query" resultType="com.czlis.mzcx.pojo.dto.LabFeeitemVsClassDTO">
         select a.*,b.sfxmmc from lab_feeitem_vs_class a,xm_fee b
         <where>
             a.sfxmdh = b.sfxmdh

mzcx/src/main/resources/mapper/MZCXMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.czlis.mzcx.mapper.MZCXMapper">
 
-	<select id="querySQD" resultType="com.czlis.mzcx.pojo.MzcxSqdDTO">
+	<select id="querySQD" resultType="com.czlis.mzcx.pojo.dto.MzcxSqdDTO">
         <![CDATA[
         SELECT
         lab_reqdetail.xh,
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="querySQD1" resultType="com.czlis.mzcx.pojo.MzcxSqdDTO">
+    <select id="querySQD1" resultType="com.czlis.mzcx.pojo.dto.MzcxSqdDTO">
         <![CDATA[
         SELECT
             lab_reqdetail.xh,

mzcx/src/main/resources/mapper/ReqInputLisWorkMapper.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.czlis.mzcx.mapper.ReqInputLisWorkMapper">
+    <select id="queryPatList" resultType="map">
+        <![CDATA[
+        SELECT DISTINCT lab_reqmain.ksdh,
+                        lab_reqmain.sqys,
+                        lab_reqmain.brdh,
+                        lab_reqmain.brxm,
+                        lab_reqmain.brxb,
+                        lab_reqmain.nl,
+                        lab_reqmain.nldw,
+                        lab_reqmain.brly,
+                        lab_reqmain.yblx,
+                        lab_reqmain.sqsj,
+                        lab_reqmain.djry,
+                        lab_reqmain.bz1,
+                        lab_reqmain.bz2,
+                        lab_reqmain.zt,
+                        lab_reqmain.sqh,
+                        lab_reqmain.bgddh,
+                        lab_feeitemclass.bkcolor,
+                        lab_reqmain.zxsj,
+                        lab_reqmain.zxys,
+                        lab_reqmain.jymd,lab_reqmain.yljg,lab_reqmain.brsr
+        FROM lab_reqmain LEFT OUTER JOIN lab_feeitemclass
+                                         on lab_reqmain.bgddh = lab_feeitemclass.sflbdh
+        WHERE  lab_reqmain.sqsj >= #{begdate}  AND  lab_reqmain.sqsj <= #{enddate} and lab_reqmain.brly<>'101'
+]]>
+        <if test="brxm != null and brxm !=''">and lab_reqmain.brxm like '%'+#{brxm}+'%'</if>
+        <if test="sqh != null and sqh !=''">and lab_reqmain.sqh = #{sqh}</if>
+        <if test="zt != null and zt !=''">and lab_reqmain.zt =  rtrim(ltrim(#{zt}))</if>
+    </select>
+
+    <select id="queryXmInfoList" resultType="com.czlis.mzcx.pojo.vo.ReqInputLisWorkVO">
+        <![CDATA[
+        SELECT lab_feeitemclass.sflbmc,
+               lab_feeitem_vs_class.sfxmdh,
+               xm_fee.sfxmmc,
+               xm_fee.bz,
+               xm_fee.dj,
+               xm_fee.spec,
+               xm_fee.zjf,
+               lab_feeitemclass.sflbdh,
+               lab_feeitemclass.sflbjc,
+               lab_feeitemclass.bkcolor,
+               lab_feeitemclass.bglqdh,
+               lab_feeitemclass.yblx,
+               lab_feeitemclass.sampletips,
+               lab_feeitem_vs_class.xh
+        FROM lab_feeitem_vs_class INNER JOIN
+             lab_feeitemclass ON
+                 lab_feeitem_vs_class.sflbdh = lab_feeitemclass.sflbdh INNER JOIN
+             xm_fee ON lab_feeitem_vs_class.sfxmdh = xm_fee.sfxmdh where lab_feeitemclass.sflbdh<>'0'
+]]>
+
+
+    </select>
+
+</mapper>

mzcx/src/main/resources/mapper/XmFeeMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.czlis.mzcx.mapper.XmFeeMapper">
-    <select id="query" resultType="com.czlis.mzcx.pojo.XmFeeDTO">
+    <select id="query" resultType="com.czlis.mzcx.pojo.dto.XmFeeDTO">
         select xm_Fee.*,
                lab_feeitemclass.sflbmc,
                lab_feeitemclass.bkcolor,