diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemClass.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabFeeitemClass.java
similarity index 93%
rename from mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemClass.java
rename to lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabFeeitemClass.java
index 13263f8..ee43d19 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemClass.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabFeeitemClass.java
@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClass.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabFeeitemVsClass.java
similarity index 89%
rename from mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClass.java
rename to lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabFeeitemVsClass.java
index 1d347f8..27813d4 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClass.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabFeeitemVsClass.java
@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRule.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRule.java
similarity index 83%
rename from mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRule.java
rename to lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRule.java
index c6ad32d..7996439 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRule.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRule.java
@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDetail.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRuleDetail.java
similarity index 89%
rename from mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDetail.java
rename to lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRuleDetail.java
index 07801b2..37bf026 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDetail.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRuleDetail.java
@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFee.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFee.java
similarity index 91%
rename from mzcx/src/main/java/com/czlis/mzcx/pojo/XmFee.java
rename to lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFee.java
index 5f35270..be7799c 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFee.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFee.java
@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeVs.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFeeVs.java
similarity index 81%
rename from mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeVs.java
rename to lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFeeVs.java
index 2765845..897e907 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeVs.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFeeVs.java
@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeVsFee.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFeeVsFee.java
similarity index 83%
rename from mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeVsFee.java
rename to lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFeeVsFee.java
index e6d03f6..6f73500 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeVsFee.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFeeVsFee.java
@@ -1,4 +1,4 @@
-package com.czlis.mzcx.pojo;
+package com.czlis.common.core.domain.entity.lis;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/lis-system/pom.xml b/lis-system/pom.xml
index dca6f9f..7371405 100644
--- a/lis-system/pom.xml
+++ b/lis-system/pom.xml
@@ -151,7 +151,16 @@
- ./config/
+
+ ./config/
+ lis-common-8.0.0.jar
+ lis-interfaceCommon-8.0.0.jar
+ lis-quartz-8.0.0.jar
+ liswork-8.0.0.jar
+ mzcx-8.0.0.jar
+ zybgcx-8.0.0.jar
+ zycx-8.0.0.jar
+
${project.build.directory}
@@ -171,6 +180,20 @@
${project.build.directory}/lib/
+ com.czlis
+
+
+
+
+
+ copy-custom-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}
+ com.czlis
diff --git a/mzcx/pom.xml b/mzcx/pom.xml
index 79dd450..0397c59 100644
--- a/mzcx/pom.xml
+++ b/mzcx/pom.xml
@@ -20,6 +20,11 @@
com.czlis
lis-interfaceCommon
+
+ junit
+ junit
+ test
+
diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java
index eb2bb24..4c63d9c 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java
@@ -3,7 +3,7 @@ package com.czlis.mzcx.controller;
import com.czlis.common.core.controller.BaseController;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.page.TableDataInfo;
-import com.czlis.mzcx.pojo.LabFeeitemClass;
+import com.czlis.common.core.domain.entity.lis.LabFeeitemClass;
import com.czlis.mzcx.service.FeeitemClassService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java
index 097e46b..08895b2 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java
@@ -3,7 +3,7 @@ package com.czlis.mzcx.controller;
import com.czlis.common.core.controller.BaseController;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.page.TableDataInfo;
-import com.czlis.mzcx.pojo.LabFeeitemVsClass;
+import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass;
import com.czlis.mzcx.service.FeeitemVsClassService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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 317cb94..665b21e 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java
@@ -3,9 +3,9 @@ package com.czlis.mzcx.controller;
import com.czlis.common.core.controller.BaseController;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.page.TableDataInfo;
-import com.czlis.mzcx.pojo.LabRptgetRule;
+import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
import com.czlis.mzcx.pojo.LabRptgetRuleDTO;
-import com.czlis.mzcx.pojo.LabRptgetRuleDetail;
+import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;
import com.czlis.mzcx.service.RptgetRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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 4fb0918..30fca77 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java
@@ -3,7 +3,7 @@ package com.czlis.mzcx.controller;
import com.czlis.common.core.controller.BaseController;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.page.TableDataInfo;
-import com.czlis.mzcx.pojo.XmFee;
+import com.czlis.common.core.domain.entity.lis.XmFee;
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/FeeitemClassMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemClassMapper.java
index 36f47f9..8757f7f 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemClassMapper.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemClassMapper.java
@@ -1,6 +1,6 @@
package com.czlis.mzcx.mapper;
-import com.czlis.mzcx.pojo.LabFeeitemClass;
+import com.czlis.common.core.domain.entity.lis.LabFeeitemClass;
import java.util.List;
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 dd7478d..1983231 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java
@@ -1,6 +1,6 @@
package com.czlis.mzcx.mapper;
-import com.czlis.mzcx.pojo.LabFeeitemVsClass;
+import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass;
import java.util.List;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java
index 3e63145..8545ad4 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java
@@ -1,7 +1,7 @@
package com.czlis.mzcx.mapper;
-import com.czlis.mzcx.pojo.LabRptgetRule;
-import com.czlis.mzcx.pojo.LabRptgetRuleDetail;
+import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
+import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;
import java.util.List;
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 b56fc4c..d6cbc34 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java
@@ -1,6 +1,6 @@
package com.czlis.mzcx.mapper;
-import com.czlis.mzcx.pojo.XmFee;
+import com.czlis.common.core.domain.entity.lis.XmFee;
import java.util.List;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java
index 731a1d8..1176cd0 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/pojo/LabRptgetRuleDTO.java
@@ -1,5 +1,7 @@
package com.czlis.mzcx.pojo;
+import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
+import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemClassService.java b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemClassService.java
index df0e6fa..3cbb30b 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemClassService.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemClassService.java
@@ -1,7 +1,7 @@
package com.czlis.mzcx.service;
import com.czlis.common.core.domain.Result;
-import com.czlis.mzcx.pojo.LabFeeitemClass;
+import com.czlis.common.core.domain.entity.lis.LabFeeitemClass;
import java.util.List;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java
index f3332a8..96587b5 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java
@@ -1,7 +1,7 @@
package com.czlis.mzcx.service;
import com.czlis.common.core.domain.Result;
-import com.czlis.mzcx.pojo.LabFeeitemVsClass;
+import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass;
import java.util.List;
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 a09aeca..bb55bc1 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/service/RptgetRuleService.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/service/RptgetRuleService.java
@@ -1,9 +1,9 @@
package com.czlis.mzcx.service;
import com.czlis.common.core.domain.Result;
-import com.czlis.mzcx.pojo.LabRptgetRule;
+import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
import com.czlis.mzcx.pojo.LabRptgetRuleDTO;
-import com.czlis.mzcx.pojo.LabRptgetRuleDetail;
+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 f36798e..d6d30cb 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java
@@ -1,7 +1,7 @@
package com.czlis.mzcx.service;
import com.czlis.common.core.domain.Result;
-import com.czlis.mzcx.pojo.XmFee;
+import com.czlis.common.core.domain.entity.lis.XmFee;
import java.util.List;
diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemClassServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemClassServiceImpl.java
index 629934c..b5dbee6 100644
--- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemClassServiceImpl.java
+++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemClassServiceImpl.java
@@ -2,14 +2,13 @@ package com.czlis.mzcx.service.impl;
import com.czlis.common.core.domain.Result;
import com.czlis.mzcx.mapper.FeeitemClassMapper;
-import com.czlis.mzcx.pojo.LabFeeitemClass;
+import com.czlis.common.core.domain.entity.lis.LabFeeitemClass;
import com.czlis.mzcx.service.FeeitemClassService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Collections;
import java.util.List;
@Service
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 7e9093d..fde7c5e 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
@@ -2,14 +2,13 @@ package com.czlis.mzcx.service.impl;
import com.czlis.common.core.domain.Result;
import com.czlis.mzcx.mapper.FeeitemVsClassMapper;
-import com.czlis.mzcx.pojo.LabFeeitemVsClass;
+import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass;
import com.czlis.mzcx.service.FeeitemVsClassService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.validation.constraints.NotBlank;
import java.util.List;
@Service
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 1e49da7..9069814 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
@@ -2,9 +2,9 @@ package com.czlis.mzcx.service.impl;
import com.czlis.common.core.domain.Result;
import com.czlis.mzcx.mapper.RptgetRuleMapper;
-import com.czlis.mzcx.pojo.LabRptgetRule;
+import com.czlis.common.core.domain.entity.lis.LabRptgetRule;
import com.czlis.mzcx.pojo.LabRptgetRuleDTO;
-import com.czlis.mzcx.pojo.LabRptgetRuleDetail;
+import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail;
import com.czlis.mzcx.service.RptgetRuleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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 6b1f1f8..d0db777 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
@@ -2,7 +2,7 @@ package com.czlis.mzcx.service.impl;
import com.czlis.common.core.domain.Result;
import com.czlis.mzcx.mapper.XmFeeMapper;
-import com.czlis.mzcx.pojo.XmFee;
+import com.czlis.common.core.domain.entity.lis.XmFee;
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/FeeitemClassMapper.xml b/mzcx/src/main/resources/mapper/FeeitemClassMapper.xml
index a661a4b..652c759 100644
--- a/mzcx/src/main/resources/mapper/FeeitemClassMapper.xml
+++ b/mzcx/src/main/resources/mapper/FeeitemClassMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-