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 3d6181b..2943707 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java @@ -1,9 +1,40 @@ package com.czlis.mzcx.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; +/** + * 门诊采血 + */ +@Api(tags = "门诊采血") @RestController @RequestMapping("/mzcx") public class MZCXController { + + /** + * 获取申请单信息 + * @param brdh + * @param stime + * @param etime + * @param klx + * @return + */ + @ApiOperation("获取申请单信息") + @PostMapping("/querySQD") + public TableDataInfo querySQD(@RequestBody String brdh,String stime,String etime,String klx){ + return null; + } + + /** + * 打印条码 + * @param sqh + * @return + */ + @GetMapping("/printBarcode") + public Result printSQD(String sqh){ + return null; + } } 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 c447703..d1f6bd9 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java @@ -45,8 +45,10 @@ public class ZybgcxController extends BaseController { * @return */ @PostMapping("/MedList") - public Result getResultMed(@RequestBody Web_getResultMed webGetResultMed){ - return null; + public TableDataInfo getResultMed(@RequestBody Web_getResultMed webGetResultMed){ + startPage(); + List resultMedList = zybgcxService.getResultMed(webGetResultMed); + return getDataTable(resultMedList); } 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 2763851..4e06ec3 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java @@ -1,9 +1,11 @@ package com.czlis.zybgcx.mapper; import com.czlis.zybgcx.pojo.Web_getReportsList; +import com.czlis.zybgcx.pojo.Web_getResultMed; import java.util.List; public interface ZybgcxMapper { List getReportsList(Web_getReportsList getReportsList); + List getResultMed(Web_getResultMed getResultMed); } 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 d220739..793db9c 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java @@ -1,9 +1,12 @@ package com.czlis.zybgcx.service; import com.czlis.zybgcx.pojo.Web_getReportsList; +import com.czlis.zybgcx.pojo.Web_getResultMed; import java.util.List; public interface ZybgcxService { List getPatList(Web_getReportsList webGetReportsList); + List getResultMed(Web_getResultMed webGetResultMed); + } 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 f8161fd..42a1ad2 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 @@ -2,6 +2,7 @@ package com.czlis.zybgcx.service.impl; import com.czlis.zybgcx.mapper.ZybgcxMapper; import com.czlis.zybgcx.pojo.Web_getReportsList; +import com.czlis.zybgcx.pojo.Web_getResultMed; import com.czlis.zybgcx.service.ZybgcxService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -28,5 +29,15 @@ public class ZybgcxServcieImpl implements ZybgcxService { return zybgcxMapper.getReportsList(webGetReportsList); } + /** + * 获取微生物报告 + * @param webGetResultMed + * @return + */ + @Override + public List getResultMed(Web_getResultMed webGetResultMed) { + return zybgcxMapper.getResultMed(webGetResultMed); + } + } diff --git a/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml b/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml index de00733..ded298f 100644 --- a/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml +++ b/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml @@ -8,13 +8,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select * from web_getReportsList + + select * from web_getresultmed + + + +