From e4c39eca1d10285d84ff25be724ad9a33a7ba261 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Sun, 1 Mar 2026 15:20:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=86=85=E5=BC=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czlis/system/Lis_springbootTest.java | 11 +++ .../czlis/mzcx/controller/MZCXController.java | 3 - .../controller/ReqInputLisWorkController.java | 49 ++++++++++ .../mzcx/controller/RptgetRuleController.java | 4 +- .../mzcx/controller/XmFeeController.java | 3 +- .../mzcx/mapper/FeeitemVsClassMapper.java | 2 +- .../com/czlis/mzcx/mapper/MZCXMapper.java | 2 +- .../mzcx/mapper/ReqInputLisWorkMapper.java | 12 +++ .../com/czlis/mzcx/mapper/XmFeeMapper.java | 2 +- .../pojo/{ => dto}/LabFeeitemVsClassDTO.java | 2 +- .../mzcx/pojo/{ => dto}/LabRptgetRuleDTO.java | 2 +- .../czlis/mzcx/pojo/{ => dto}/MzcxSqdDTO.java | 2 +- .../mzcx/pojo/{ => dto}/OutPatListDTO.java | 2 +- .../mzcx/pojo/dto/ReqInputLisWorkDTO.java | 18 ++++ .../czlis/mzcx/pojo/{ => dto}/XmFeeDTO.java | 2 +- .../czlis/mzcx/pojo/vo/ReqInputLisWorkVO.java | 27 ++++++ .../com/czlis/mzcx/service/MZCXService.java | 1 - .../mzcx/service/ReqInputLisWorkService.java | 16 ++++ .../czlis/mzcx/service/RptgetRuleService.java | 2 +- .../com/czlis/mzcx/service/XmFeeService.java | 2 +- .../impl/FeeitemVsClassServiceImpl.java | 3 +- .../mzcx/service/impl/MZCXServiceImpl.java | 2 +- .../impl/ReqInputLisWorkServiceImpl.java | 91 +++++++++++++++++++ .../service/impl/RptgetRuleServiceImpl.java | 4 +- .../mzcx/service/impl/XmFeeServiceImpl.java | 5 +- .../resources/mapper/FeeitemVsClassMapper.xml | 2 +- mzcx/src/main/resources/mapper/MZCXMapper.xml | 4 +- .../mapper/ReqInputLisWorkMapper.xml | 63 +++++++++++++ .../src/main/resources/mapper/XmFeeMapper.xml | 2 +- 29 files changed, 307 insertions(+), 33 deletions(-) create mode 100644 mzcx/src/main/java/com/czlis/mzcx/controller/ReqInputLisWorkController.java create mode 100644 mzcx/src/main/java/com/czlis/mzcx/mapper/ReqInputLisWorkMapper.java rename mzcx/src/main/java/com/czlis/mzcx/pojo/{ => dto}/LabFeeitemVsClassDTO.java (93%) rename mzcx/src/main/java/com/czlis/mzcx/pojo/{ => dto}/LabRptgetRuleDTO.java (92%) rename mzcx/src/main/java/com/czlis/mzcx/pojo/{ => dto}/MzcxSqdDTO.java (97%) rename mzcx/src/main/java/com/czlis/mzcx/pojo/{ => dto}/OutPatListDTO.java (90%) create mode 100644 mzcx/src/main/java/com/czlis/mzcx/pojo/dto/ReqInputLisWorkDTO.java rename mzcx/src/main/java/com/czlis/mzcx/pojo/{ => dto}/XmFeeDTO.java (97%) create mode 100644 mzcx/src/main/java/com/czlis/mzcx/pojo/vo/ReqInputLisWorkVO.java create mode 100644 mzcx/src/main/java/com/czlis/mzcx/service/ReqInputLisWorkService.java create mode 100644 mzcx/src/main/java/com/czlis/mzcx/service/impl/ReqInputLisWorkServiceImpl.java create mode 100644 mzcx/src/main/resources/mapper/ReqInputLisWorkMapper.xml diff --git a/lis-system/src/test/java/com/czlis/system/Lis_springbootTest.java b/lis-system/src/test/java/com/czlis/system/Lis_springbootTest.java index acf5342..8e293aa 100644 --- a/lis-system/src/test/java/com/czlis/system/Lis_springbootTest.java +++ b/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"); + + } + 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 e300340..d696f19 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/ReqInputLisWorkController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/ReqInputLisWorkController.java new file mode 100644 index 0000000..3bc1a85 --- /dev/null +++ b/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(); + } + + +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java index 2f4b2bf..5f29e7c 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java index 6501c2f..18f3943 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java index dd183d9..b2ced88 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/MZCXMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/MZCXMapper.java index 901e216..964c1bd 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/mapper/MZCXMapper.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/ReqInputLisWorkMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/ReqInputLisWorkMapper.java new file mode 100644 index 0000000..bb2905e --- /dev/null +++ b/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> queryPatList(ReqInputLisWorkDTO reqInputLisWorkDTO); + List queryXmInfoList(); +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java index e2c4fd0..39f05ba 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClassDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/dto/LabFeeitemVsClassDTO.java similarity index 93% rename from mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClassDTO.java rename to mzcx/src/main/java/com/czlis/mzcx/pojo/dto/LabFeeitemVsClassDTO.java index b7a70af..69a4ece 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClassDTO.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/dto/LabRptgetRuleDTO.java similarity index 92% rename from mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java rename to mzcx/src/main/java/com/czlis/mzcx/pojo/dto/LabRptgetRuleDTO.java index 1176cd0..ad6265c 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/MzcxSqdDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/dto/MzcxSqdDTO.java similarity index 97% rename from mzcx/src/main/java/com/czlis/mzcx/pojo/MzcxSqdDTO.java rename to mzcx/src/main/java/com/czlis/mzcx/pojo/dto/MzcxSqdDTO.java index b1880c8..c0486c3 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/pojo/MzcxSqdDTO.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/OutPatListDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/dto/OutPatListDTO.java similarity index 90% rename from mzcx/src/main/java/com/czlis/mzcx/pojo/OutPatListDTO.java rename to mzcx/src/main/java/com/czlis/mzcx/pojo/dto/OutPatListDTO.java index 5aff3bf..b7bac81 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/pojo/OutPatListDTO.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/dto/ReqInputLisWorkDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/dto/ReqInputLisWorkDTO.java new file mode 100644 index 0000000..6b7d2ee --- /dev/null +++ b/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; +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/dto/XmFeeDTO.java similarity index 97% rename from mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeDTO.java rename to mzcx/src/main/java/com/czlis/mzcx/pojo/dto/XmFeeDTO.java index 40f921f..47a6057 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeDTO.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/vo/ReqInputLisWorkVO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/vo/ReqInputLisWorkVO.java new file mode 100644 index 0000000..e3a186e --- /dev/null +++ b/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; +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/MZCXService.java b/mzcx/src/main/java/com/czlis/mzcx/service/MZCXService.java index e418dd7..2268cda 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/MZCXService.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/ReqInputLisWorkService.java b/mzcx/src/main/java/com/czlis/mzcx/service/ReqInputLisWorkService.java new file mode 100644 index 0000000..afe410c --- /dev/null +++ b/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(); +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/RptgetRuleService.java b/mzcx/src/main/java/com/czlis/mzcx/service/RptgetRuleService.java index bb55bc1..3c59d9f 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/RptgetRuleService.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java b/mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java index 0dc6813..68a4e6d 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java index 94c93da..41feb1e 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java index f56f7ab..ba99842 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/ReqInputLisWorkServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/ReqInputLisWorkServiceImpl.java new file mode 100644 index 0000000..612e0ed --- /dev/null +++ b/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 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> 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 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); + } +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java index 2ca3c22..c5563d3 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java +++ b/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; diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/XmFeeServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/XmFeeServiceImpl.java index c357dbc..0e0da95 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/XmFeeServiceImpl.java +++ b/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; diff --git a/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml b/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml index 6e7b4f2..7a500b3 100644 --- a/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml +++ b/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"> - select a.*,b.sfxmmc from lab_feeitem_vs_class a,xm_fee b a.sfxmdh = b.sfxmdh diff --git a/mzcx/src/main/resources/mapper/MZCXMapper.xml b/mzcx/src/main/resources/mapper/MZCXMapper.xml index d1664c9..f29ef2d 100644 --- a/mzcx/src/main/resources/mapper/MZCXMapper.xml +++ b/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"> - - + + + + + + + \ No newline at end of file diff --git a/mzcx/src/main/resources/mapper/XmFeeMapper.xml b/mzcx/src/main/resources/mapper/XmFeeMapper.xml index 113cd9d..f6234c5 100644 --- a/mzcx/src/main/resources/mapper/XmFeeMapper.xml +++ b/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"> - select xm_Fee.*, lab_feeitemclass.sflbmc, lab_feeitemclass.bkcolor,