AI创建折点字典

# Conflicts:
#	sql/lis8.0/updatedb_lis8.0.sql

lis-common/pom.xml

@@ -143,6 +143,11 @@
             <version>1.6.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

lis-common/src/main/java/com/czlis/common/annotation/Async.java

@@ -0,0 +1,14 @@
+package com.czlis.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 异步任务注解
+ */
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Async {
+
+
+}

lis-common/src/main/java/com/czlis/common/asyncmanager/AsyncManager.java

@@ -1,4 +1,4 @@
-package com.czlis.system.manager;
+package com.czlis.common.asyncmanager;
 
 import com.czlis.common.utils.Threads;
 import com.czlis.common.utils.spring.SpringUtils;

lis-common/src/main/java/com/czlis/common/asyncmanager/ShutdownManager.java

@@ -1,4 +1,4 @@
-package com.czlis.system.manager;
+package com.czlis.common.asyncmanager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

lis-common/src/main/java/com/czlis/common/config/RuoYiConfig.java

@@ -11,6 +11,19 @@ import org.springframework.stereotype.Component;
 @Component
 @ConfigurationProperties(prefix = "czlis")
 public class RuoYiConfig {
+    /**
+     * 公司联系方式
+     */
+    private  String phone;
+
+    /**
+     * 公司邮箱
+     */
+    private  String email;
+    /**
+     * 公司名称
+     */
+    private  String compay;
     /**
      * 项目名称
      */
@@ -41,11 +54,68 @@ public class RuoYiConfig {
      */
     private static String captchaType;
 
+    /**
+     * 接口类型
+     */
+    private static String interfaceType;
+
+    /**
+     * 接口地址
+     */
+    private static String interfaceUrl;
+
+    /**
+     * 门诊条码打印机名称
+     */
+    private static String mzPrintName;
+
+    public  String getCompay() {
+        return compay;
+    }
+
+    public  void setCompay(String compay) {
+        this.compay = compay;
+    }
+
+    public  String getEmail() {
+        return email;
+    }
+
+    public  void setEmail(String email) {
+        this.email = email;
+    }
+
+    public  String getPhone() {
+        return phone;
+    }
+
+    public  void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+
+    public static String getInterfaceUrl() {
+        return interfaceUrl;
+    }
+
+    public void setInterfaceUrl(String interfaceUrl) {
+        RuoYiConfig.interfaceUrl = interfaceUrl;
+    }
+
+    public static String getInterfaceType() {
+        return interfaceType;
+    }
+
+    public void setInterfaceType(String interfaceType) {
+        RuoYiConfig.interfaceType = interfaceType;
+    }
+
     public String getName() {
         return name;
     }
 
     public void setName(String name) {
+
         this.name = name;
     }
 
@@ -116,4 +186,12 @@ public class RuoYiConfig {
     public static String getUploadPath() {
         return getProfile() + "/upload";
     }
+
+    public static String getMzPrintName() {
+        return mzPrintName;
+    }
+
+    public void setMzPrintName(String mzPrintName) {
+        RuoYiConfig.mzPrintName = mzPrintName;
+    }
 }

lis-common/src/main/java/com/czlis/common/constant/CacheConstants.java

@@ -46,4 +46,12 @@ public class CacheConstants
      * lis字典缓存
      */
     public static final String COM_DICT_KEY = "com_dict:";
+    /**
+     * lis设置缓存
+     */
+    public static final String COM_OPT_KEY = "com_opt:";
+    /**
+     * lis插件更新缓存
+     */
+    public static final String SYS_EXE_BAK_KEY="sys_exe_bak:";
 }

lis-common/src/main/java/com/czlis/common/core/controller/BaseController.java

@@ -5,8 +5,6 @@ import java.util.Date;
 import java.util.List;
 
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 import com.github.pagehelper.PageHelper;
@@ -179,4 +177,7 @@ public class BaseController {
     public String getUsername() {
         return getLoginUser().getUsername();
     }
+
+
+
 }

lis-common/src/main/java/com/czlis/common/core/domain/Result.java

@@ -1,29 +1,72 @@
 package com.czlis.common.core.domain;
 
 
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSON;
+import com.czlis.common.utils.JsonParamUtils;
+import com.czlis.common.utils.ServletUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Map;
 
 /**
  * 出参格式
  * {"code":"","message":""}
  */
+@Slf4j
 @Data
 @NoArgsConstructor
 public class Result {
+    @ApiModelProperty(value = "响应码", example = "0", notes = "接口返回的状态码")
     private String code;
-    private String message;
+    @ApiModelProperty(value = "响应消息", example = "操作成功", notes = "接口返回的提示信息")
+    private String msg;
     private Object data;
+    @ApiModelProperty(value = "下一步请求URL", notes = "后续需要请求的接口地址")
+    private String url;
 
+    @ApiModelProperty(value = "下一步请求方法", example = "GET", notes = "GET/POST/PUT/DELETE等")
+    private String method;
+
+    @ApiModelProperty(value = "下一步请求参数", notes = "后续请求需要携带的参数")
+    private Object params;
+
+    @ApiModelProperty(value = "问题ID", example = "1001", notes = "关键业务标识ID")
+    private Integer problemId;
     public Result(String resultCode, String message) {
         super();
        this.code = resultCode;
-       this.message = message;
+       this.msg = message;
     }
 
     public Result(String resultCode, String message, Object data) {
         this.code = resultCode;
-        this.message = message;
+        this.msg = message;
         this.data = data;
     }
+    public Result(String resultCode, String message,Integer problemId) {
+        this.code = resultCode;
+        this.msg = message;
+        Integer problemId0=problemId;
+        HttpServletRequest request =ServletUtils.getRequest();
+        this.url = request.getContextPath() + request.getServletPath();
+        this.method = request.getMethod();
+        if("GET".equals(this.method)){
+            this.params = ServletUtils.getParamMap(request);
+        }else {
+            try {
+                this.data = JsonParamUtils.getJsonParams(request);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        this.problemId=problemId0;
+    }
+
 }

lis-common/src/main/java/com/czlis/common/core/domain/ResultT.java

@@ -0,0 +1,89 @@
+package com.czlis.common.core.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 泛型返回类（继承原Result，无侵入改造）
+ * 新代码使用此类，旧代码继续用Result
+ */
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true) // 继承父类的equals/hashCode
+@ApiModel(value = "ResultT<T>", description = "泛型统一返回结果封装类")
+public class ResultT<T> extends Result {
+    @ApiModelProperty(value = "响应数据", notes = "接口返回的业务数据，类型由泛型T指定，可能为null")
+    @SuppressWarnings("unchecked")
+    public T getData() {
+        // 父类的data是Object，强转为泛型T（添加注解抑制警告）
+        return (T) super.getData();
+    }
+
+    // ========== 构造方法（适配泛型） ==========
+    public ResultT(String resultCode, String message) {
+        super(resultCode, message);
+    }
+
+    /**
+     * 泛型数据构造方法（核心）
+     */
+    public ResultT(String resultCode, String message, T data) {
+        super(resultCode, message); // 调用父类构造
+        super.setData(data);
+    }
+
+    /**
+     * 带problemId的构造方法（适配父类逻辑）
+     */
+    public ResultT(String resultCode, String message, Integer problemId) {
+        super(resultCode, message, problemId); // 调用父类带problemId的构造
+    }
+
+    // ========== 静态工具方法（新代码使用） ==========
+    public static <T> ResultT<T> success(T data) {
+        return new ResultT<>("0", "操作成功", data);
+    }
+
+    public static <T> ResultT<T> success(String message, T data) {
+        return new ResultT<>("0", message, data);
+    }
+
+    public static <T> ResultT<T> success() {
+        return new ResultT<>("0", "操作成功");
+    }
+    public static <T> ResultT<T> msgbox(String message) {
+        return new ResultT<>("1", message);
+    }
+    public static <T> ResultT<T> error() {
+        return new ResultT<>("-1", "操作失败");
+    }
+    public static <T> ResultT<T> error(String message) {
+        return new ResultT<>("-1", message);
+    }
+
+    public static <T> ResultT<T> reback(String message, Integer problemId) {
+        return new ResultT<>("5", message, problemId);
+    }
+    @SuppressWarnings("unchecked")
+    public static <T> ResultT<T> fromResult(Result oldResult, Class<T> clazz) {
+        ResultT<T> resultT = new ResultT<>();
+        resultT.setCode(oldResult.getCode());
+        resultT.setMsg(oldResult.getMsg());
+        resultT.setUrl(oldResult.getUrl());
+        resultT.setMethod(oldResult.getMethod());
+        resultT.setParams(oldResult.getParams());
+        resultT.setProblemId(oldResult.getProblemId());
+
+        // 调用父类setData(Object)，无冲突
+        Object oldData = oldResult.getData();
+        if (oldData != null && !clazz.isInstance(oldData)) {
+            throw new IllegalArgumentException("数据类型不匹配！期望：" + clazz.getName() + "，实际：" + oldData.getClass().getName());
+        }
+        resultT.setData(oldData); // 复用父类setData，无冲突
+
+        return resultT;
+    }
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/ComDict.java

@@ -1,19 +0,0 @@
-package com.czlis.common.core.domain.entity;
-
-import com.czlis.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ComDict extends BaseEntity {
-    private String zdlb;
-    private String zddh;
-    private String zdmc;
-    private String zjf;
-    private String zdbz;
-    private String yljg;
-    private String bz;
-}

lis-common/src/main/java/com/czlis/common/core/domain/entity/LabReqmain.java

@@ -1,75 +0,0 @@
-package com.czlis.common.core.domain.entity;
-
-import com.czlis.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
-public class LabReqmain extends BaseEntity {
-    private String sqh;
-    private String ksdh;
-    private String sqys;
-    private Date sqsj;
-    private String jsys;
-    private Date jssj;
-    private String zt;
-    private String jjzt;
-    private String brly;
-    private String brdh;
-    private String brxm;
-    private String brxb;
-    private Date brsr;
-    private String bz1;
-    private String bz2;
-    private String bz3;
-    private String jzbz;
-    private String txm;
-    private String ch;
-    private String yblx;
-    private String zxys;
-    private Date zxsj;
-    private String bgddh;
-    private BigDecimal costs;
-    private Integer nl;
-    private String nldw;
-    private String zd;
-    private Date cysj;
-    private Date cksj;
-    private String yljg;
-    private String kh;
-    private String klx;
-    private Date jzsj;
-    private String jymd;
-    private String sfzh;
-    private String phone;
-    private String phone1;
-    private Date confirmtime;
-    private String confirmer;
-    private String cyr;
-    private String addr;
-    private String fb;
-    private String bbsjr;
-    private Date bbsjsj;
-    //@TableField(exist = false)
-    private String czid;
-   // @TableField(exist = false)
-    private String czmc;
-   // @TableField(exist = false)
-    private String jzjlid;
-  //  @TableField(exist = false)
-    private String hzdh;
-  //  @TableField(exist = false)
-    private String zxks;
-  //  @TableField(exist = false)
-    private String hosid;
-    private String lstd;
-    private String jcptbz;
-    private String slzq;
-    private Date sjsj;
-}

lis-common/src/main/java/com/czlis/common/core/domain/entity/LocalConfigParam.java

@@ -0,0 +1,38 @@
+package com.czlis.common.core.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 本地选项设置,定位到客户电脑的配置信息,代替cooke职能,避免清除,同时实现可配置化本地默认值
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LocalConfigParam {
+    /**
+     * 默认上一次的登录用户
+     */
+    private String default_yhdh;
+    /**
+     * 默认上一次医疗机构
+     */
+    private String default_yljg;
+    /**
+     * 默认仪器
+     */
+    private String default_instr;
+    /**
+     * 进入系统后自动进入标本录入作业
+     */
+    private String  sys_autowork;
+    /**
+     *进入系统后自动进入病区查询模式
+     */
+    private String sys_deptquerymode;
+    /**
+     *进入系统后自动进入体检查询模式
+     */
+    private String sys_tjque;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/SysLoginParam.java

@@ -0,0 +1,44 @@
+package com.czlis.common.core.domain.entity;
+
+import com.czlis.common.core.domain.entity.lis.LabInputcol;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 登录系统产生的临床性全局参数
+ * 除登录用户属性本身基本参数外的都放到此处存放
+ * 支持动态变更,该登录用户的所有会话都共享此处变量
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysLoginParam {
+    //1.全局参数
+    /**
+     * 登录的医疗机构
+     */
+    private String loginYLJG;
+    /**
+     * 默认仪器
+     */
+    private String defaultInstr;
+    /**
+     * 客户端唯一标识
+     */
+    private String localid;
+    //2.标本录入场景
+    /**
+     * 记忆当前仪器,自动记忆参数在当前仪器与记忆仪器不同时,清除自动记忆临床参数
+     */
+    private String current_instrid;
+    /**保存自动记忆的字段实时值**/
+    private List<LabInputcol> current_labInputcol;
+    //单独处理临时自动记忆字段
+    private String current_hdys_sybh;
+    private String current_hdys_eybh;
+    private String current_yhdh_sybh;
+    private String current_yhdh_eybh;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/SysOperLog.java

@@ -1,4 +1,4 @@
-package com.czlis.system.domain;
+package com.czlis.common.core.domain.entity;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

lis-common/src/main/java/com/czlis/common/core/domain/entity/SysUser.java

@@ -89,6 +89,97 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    private String userType;
+    private String vshisuser;
+    private String vshisuser1;
+    private String vshisuser2;
+    private String yljg;
+    private String sn;
+    private String snid;
+    private String signCert;
+    private String sn_pin;
+    private SysLoginParam sysLoginParam;
+
+    public SysLoginParam getSysLoginParam() {
+        return sysLoginParam;
+    }
+
+    public void setSysLoginParam(SysLoginParam sysLoginParam) {
+        this.sysLoginParam = sysLoginParam;
+    }
+
+    public String getVshisuser() {
+        return vshisuser;
+    }
+
+    public void setVshisuser(String vshisuser) {
+        this.vshisuser = vshisuser;
+    }
+
+    public String getVshisuser1() {
+        return vshisuser1;
+    }
+
+    public void setVshisuser1(String vshisuser1) {
+        this.vshisuser1 = vshisuser1;
+    }
+
+    public String getVshisuser2() {
+        return vshisuser2;
+    }
+
+    public void setVshisuser2(String vshisuser2) {
+        this.vshisuser2 = vshisuser2;
+    }
+
+    public String getYljg() {
+        return yljg;
+    }
+
+    public void setYljg(String yljg) {
+        this.yljg = yljg;
+    }
+
+    public String getSn() {
+        return sn;
+    }
+
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    public String getSnid() {
+        return snid;
+    }
+
+    public void setSnid(String snid) {
+        this.snid = snid;
+    }
+
+    public String getSignCert() {
+        return signCert;
+    }
+
+    public void setSignCert(String signCert) {
+        this.signCert = signCert;
+    }
+
+    public String getSn_pin() {
+        return sn_pin;
+    }
+
+    public void setSn_pin(String sn_pin) {
+        this.sn_pin = sn_pin;
+    }
+
     public SysUser()
     {
 
@@ -319,6 +410,14 @@ public class SysUser extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .append("dept", getDept())
+            .append("vshisuser",getVshisuser())
+            .append("vshisuser1",getVshisuser1())
+            .append("vshisuser2",getVshisuser1())
+            .append("yljg",getYljg())
+            .append("sn",getSn())
+            .append("snid",getSnid())
+            .append("signCert",getSignCert())
+            .append("sn_pin",getSn_pin())
                 .toString();
     }
 }

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/BactMedium.java

@@ -0,0 +1,23 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BactMedium {
+
+  private String mediumno;
+  private String mediumname;
+  private String conidtions;
+  private String culturehour;
+  private String watchinterval;
+  private String comments;
+  private String inputcode;
+  private Integer seq;
+
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/BactMediumgroupdet.java

@@ -0,0 +1,18 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BactMediumgroupdet {
+
+  private String mediumgroupno;
+  private String mediumno;
+  private Integer seq;
+
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComConfigDict.java

@@ -0,0 +1,31 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ComConfigDict {
+
+  private Long configId;
+  private String configType;
+  private String configCode;
+  private String configName;
+  private String configOptiontype;
+  private String configDefvalue;
+  private Long configSort;
+  private String status;
+  private String createBy;
+  private Date createTime;
+  private String updateBy;
+  private Date updateTime;
+  private String remark;
+  private String yq;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComDict.java

@@ -0,0 +1,33 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.czlis.common.annotation.Excel;
+import com.czlis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ComDict {
+    @Excel(name = "字典类别")
+    private String zdlb;
+    @Excel(name = "编码")
+    private String zddh;
+    @Excel(name = "名称")
+    private String zdmc;
+    @Excel(name = "简拼")
+    private String zjf;
+    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+    private String zdbz;
+    @Excel(name = "机构编码")
+    private String yljg;
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String bz;
+    @Excel(name = "作废标识", readConverterExp = "1=是,0=否")
+    private String userflag;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLocalconfig.java

@@ -0,0 +1,24 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ComLocalconfig {
+
+  private Long sid;
+  private String smac;
+  private String sip;
+  private String sname;
+  private String configvalue;
+  private String create_by;
+  private Date create_time;
+  private String update_by;
+  private Date update_time;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLog.java

@@ -0,0 +1,26 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ComLog {
+
+  private String yq;
+  private Date rzdt;
+  private String rzbz;
+  private String yhdh;
+  private String rznr;
+  private String dnmc;
+  private String bz;
+  private Date jyrq;
+  private String ybh;
+
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComOpt.java

@@ -0,0 +1,17 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComOpt {
+    private String yq;
+    private String xxdh;
+    private String xxlb;
+    private String xxqz;
+    private String bz;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComOptTemplate.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.czlis.common.core.domain.Result;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComOptTemplate {
+    private String opttype;
+    private String comtype;
+    private String optcode;
+    private String optdefault;
+    private Integer optSort;
+    private String scope;
+    private String bz;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComPat.java

@@ -0,0 +1,36 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComPat {
+  private String brdh;
+  private String mzh;
+  private String zyh;
+  private String sfzh;
+  private String brxm;
+  private String xb;
+  private String brly;
+  private String fb;
+  private Date sr;
+  private String ksdh;
+  private String bq;
+  private String ch;
+  private String aboxx;
+  private String rhxx;
+  private Date ryrq;
+  private String jzdz;
+  private String xxdh;
+  private String jbdh;
+  private String bsbr;
+  private String xxzt;
+  private String sjys;
+  private String zd;
+  private String yljg;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComReportDict.java

@@ -0,0 +1,30 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import java.util.Date;
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ComReportDict {
+
+  private Long reportBgdh;
+  private String reportType;
+  private String reportCode;
+  private String reportName;
+  private String reportOptiontype;
+  private String reportDefvalue;
+  private Long reportSort;
+  private String status;
+  private String createBy;
+  private Date createTime;
+  private String updateBy;
+  private Date updateTime;
+  private String remark;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComReportInstr.java

@@ -0,0 +1,33 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ComReportInstr {
+
+  private Long reportId;
+  private String reportYq;
+  private Long reportBgdh;
+  private String reportSize;
+  private String reportType;
+  private Integer reportRows;
+  private Integer reportMinrows;
+  private Integer reportMaxrows;
+  private String reportItems;
+  private Long reportSort;
+  private String status;
+  private String createBy;
+  private Date createTime;
+  private String updateBy;
+  private Date updateTime;
+  private String remark;
+  private String reportName;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComSeq.java

@@ -0,0 +1,18 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComSeq {
+
+  private String seqid;
+  private long maxno;
+  private String bz;
+
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsParameter.java

@@ -0,0 +1,33 @@
+package com.czlis.common.core.domain.entity.lis;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComStatsParameter {
+
+  private Long paramId;
+  private String statsCode;
+  private String paramType;
+  private String paramCode;
+  private String paramName;
+  private String paramOptiontype;
+  private String paramDefvalue;
+  private String paramSql;
+  private String paramHide;
+  private String precondition;
+  private Long paramSequence;
+  private Long paramSort;
+  private String status;
+  private String createBy;
+  private Date createTime;
+  private String updateBy;
+  private Date updateTime;
+  private String remark;
+  private Long paramWidth;
+  private String paramZct;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsTemplate.java

@@ -0,0 +1,29 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComStatsTemplate {
+
+  private Long statsId;
+  private String statsType;
+  private String statsCode;
+  private String statsName;
+  private String statsTitle;
+  private String statsSql;
+  private String statsGraph;
+  private Long statsSort;
+  private String status;
+  private String createBy;
+  private Date createTime;
+  private String updateBy;
+  private Date updateTime;
+  private String remark;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComUsr.java

@@ -0,0 +1,24 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComUsr {
+    private String yhdh;
+    private String yhxm;
+    private String vshisuser;
+    private String vshisuser1;
+    private String yljg;
+    private String yhjs;
+    private String vshisuser2;
+    private String mm;
+    private String sn;
+    private String snid;
+    private String signCert;
+    private String sn_pin;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComUsrBlob.java

@@ -0,0 +1,12 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComUsrBlob {
+        private byte[] dzqm;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComUsrpower.java

@@ -0,0 +1,15 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComUsrpower {
+    private String yhdh;
+    private String yq;
+    private String xtdh;
+    private String yhqx;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabCheckrules.java

@@ -0,0 +1,23 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabCheckrules {
+
+  private Integer ruleid;
+  private String rptunitid;
+  private String checkrules;
+  private String checktype;
+  private String logflag;
+  private String logcontent;
+  private String ruledisplay;
+  private String actions;
+  private String autocheck;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabChk.java

@@ -0,0 +1,16 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabChk {
+  private String yq;
+  private Integer xh;
+  private String hdnr;
+  private String tsxx;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabFeeitemClass.java

@@ -0,0 +1,29 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabFeeitemClass {
+    private String sflbdh;
+    private String sflbmc;
+    private String sflbjc;
+    private Integer bkcolor;
+    private Integer bglqdh;
+    private String yblx;
+    private String txmlb;
+    private String sampletips;
+    private String printcnt;
+    private Integer barcodecopy;
+    private String lisgroup1;
+    private String lisgroup2;
+    private String lisgroup3;
+    private String kn;
+    private String xpy;
+    private String tubeConvert;
+    private String sfxmdm;
+    private String sfxmdh;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabFeeitemVsClass.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabFeeitemVsClass {
+    @NotBlank(message = "sflbdh不能为空")
+    private String sflbdh;
+    @NotBlank(message = "xh不能为空")
+    private Integer xh;
+    @NotBlank(message = "sfxmdh不能为空")
+    private String sfxmdh;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabGermsheetNew.java

@@ -0,0 +1,29 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabGermsheetNew {
+
+  private Integer gsid;
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date jyrq;
+  private String yq;
+  private String ybh;
+  private String mediumno;
+  private Date sheetdate;
+  private String sheetuser;
+  private String medium;
+  private String condtions;
+  private String smear;
+  private String dyeing;
+  private String colonyresult;
+  private String colonynum;
+  private String otherresult;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabGraph.java

@@ -0,0 +1,22 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.sql.Blob;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabGraph {
+    private String yq;
+    private Date jyrq;
+    private String ybh;
+    private String txmc;
+    private String txlb;
+    private byte[] txnr;
+    private String bz1;
+    private String bz2;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabGraphUnit.java

@@ -0,0 +1,21 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabGraphUnit {
+    private String yq;
+    private String txmc;
+    private BigDecimal x;
+    private BigDecimal y;
+    private BigDecimal wd;
+    private BigDecimal hg;
+    private BigDecimal numbz;
+    private String strbz;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputcol.java

@@ -0,0 +1,24 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabInputcol {
+
+  private String yq;
+  private String zdmc;
+  private String zdts;
+  private String mrts;
+  private String kybj;
+  private String zdjy;
+  private String mrz;
+  private String kj;
+  private Integer xh;
+  private String zdlb;
+  private String dict;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdl.java

@@ -0,0 +1,21 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabInputmdl {
+    private String yq;
+    private String mbmc;
+    private Integer srbh;
+    private String zdsr;
+    private Integer qsybh;
+    private Integer jsybh;
+    private String yblx;
+    private String oldMbmc;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java

@@ -0,0 +1,18 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabInputmdlDetail {
+    private String yq;
+    private String mbmc;
+    private Integer xh;
+    private String xmdh;
+    private String mrz;
+    private String xmmc;
+    private String oldMbmc;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInstr.java

@@ -0,0 +1,55 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabInstr {
+    private String yq;
+    private String yqmc;
+    private String yqdl;
+    private Integer jbs;
+    private String csbg;
+    private String dnmc;
+    private Integer bgdh;
+    private String bgtt;
+    private String zcm;
+    private Integer zzdx;
+    private String zzfx;
+    private BigDecimal zzcd;
+    private BigDecimal zzkd;
+    private BigDecimal sjl;
+    private BigDecimal zjl;
+    private BigDecimal yjl;
+    private BigDecimal xjl;
+    private Integer qtzzdx;
+    private String qtzzfx;
+    private BigDecimal qtsjl;
+    private BigDecimal qtzjl;
+    private BigDecimal qtyjl;
+    private BigDecimal qtxjl;
+    private Integer myhs;
+    private String pcdyms;
+    private Integer txjg;
+    private String sdtfx1;
+    private String sdtfx2;
+    private String posflag;
+    private String weakflag;
+    private String upflag;
+    private String lowflag;
+    private String errflag;
+    private String yqxh;
+    private String lisgroup;
+    private Integer myhs1;
+    private Integer userpt2cnt;
+    private String instrid;
+    private String wjzflag;
+    private String backgpmd;
+    private String yljg;
+    private String useflag;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInstrgroupdetail.java

@@ -0,0 +1,18 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabInstrgroupdetail {
+
+  private String fzdh;
+  private String yq;
+  private Integer seq;
+  private String yljg;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInstrgroupmain.java

@@ -0,0 +1,20 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabInstrgroupmain {
+
+  private String fzdh;
+  private String fzmc;
+  private String bz;
+  private String tj_flag;
+  private String yljg;
+  private String yq;
+  private Integer seq;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInstrvsreqclass.java

@@ -0,0 +1,16 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabInstrvsreqclass {
+    private String yq;
+    private String bgddh;
+    private Integer seq;
+    private String brly;
+    private String bk;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabIntersendList.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabIntersendList {
+    private String guid;
+    private String sendtype;
+    private String senddata;
+    private String userid;
+    private Date createdate;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabOldGraph.java

@@ -0,0 +1,34 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabOldGraph {
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private Integer hglen1;
+    private Integer hglen2;
+    private Integer hglen3;
+    private Integer hglen4;
+    private Integer hglen5;
+    private String hg1;
+    private String hg2;
+    private String hg3;
+    private String hg4;
+    private String hg5;
+    private Integer ln1;
+    private Integer ln2;
+    private Integer ln3;
+    private Integer ln4;
+    private Integer ln5;
+    private String scatter;
+    private Integer lp;
+    private String bk1;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPat.java

@@ -1,7 +1,8 @@
-package com.czlis.common.core.domain.entity;
+package com.czlis.common.core.domain.entity.lis;
 
 
 import com.czlis.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,6 +13,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class LabPat extends BaseEntity {
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyrq;
     private String yq;
     private String ybh;
@@ -53,8 +55,6 @@ public class LabPat extends BaseEntity {
     private String instrid;
     private String jzbz;
     private String sbbr;
-   // private String qrr;
-   // private Date qrsj;
     private String alarmflag;
     private String alarmconfirm;
     private Date alarmconfirmdt;
@@ -69,10 +69,16 @@ public class LabPat extends BaseEntity {
     private String zjlx;
     private String upload;
     private String wyh;
-
-
-
-
-
-
+    private Integer shcs;
+    private String lstd;
+    private String slzq;
+    private String checker;
+    private String autojgbz;
+    private String faultman;
+    private String fault;
+    private String faults;
+    private Date faultdt;
+    private String sn_tss;
+    private String sn_result;
+    private String cp_pyzq;
 }

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPatBk.java

@@ -0,0 +1,50 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import com.czlis.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabPatBk  {
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date jyrq;
+  private String yq;
+  private String ybh;
+  private String yblx;
+  private String fb;
+  private String ksdh;
+  private String sjys;
+  private String hdys;
+  private String yhdh;
+  private String brdh;
+  private String brxm;
+  private String brxb;
+  private String brly;
+  private String ch;
+  private Integer nl;
+  private String nldw;
+  private String sqh;
+  private Date sqsj;
+  private Date dysj;
+  private String dybz;
+  private String jgbz;
+  private String bbbz;
+  private String zd;
+  private String bz;
+  private String bz1;
+  private String zjf;
+  private Date cyrq;
+  private String bq;
+  private String czybh;
+  private String cjbw;
+  private String jymd;
+
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPatInfo.java

@@ -0,0 +1,21 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabPatInfo {
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String xxlb;
+    private String val1;
+    private String val2;
+    private String val3;
+    private String textinfo;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPatfee.java

@@ -0,0 +1,18 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabPatfee {
+
+  private java.sql.Timestamp jyrq;
+  private String yq;
+  private String ybh;
+  private String sqh;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPatlog.java

@@ -0,0 +1,51 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabPatlog {
+
+  private String wyh;
+  private Date jyrq;
+  private String yq;
+  private String ybh;
+  private Date xgrq;
+  private String xgyhdh;
+  private String yblx;
+  private String fb;
+  private String ksdh;
+  private String sjys;
+  private String hdys;
+  private String yhdh;
+  private String brdh;
+  private String brxm;
+  private String brxb;
+  private String brly;
+  private String ch;
+  private Integer nl;
+  private String nldw;
+  private String sqh;
+  private Date sqsj;
+  private Date dysj;
+  private String dybz;
+  private String jgbz;
+  private String bbbz;
+  private String zd;
+  private String bz;
+  private String bz1;
+  private String zjf;
+  private Date cyrq;
+  private String bq;
+  private String czybh;
+  private Integer shcs;
+  private String ip;
+  private String sendFlag;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPatwarning.java

@@ -0,0 +1,41 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabPatwarning {
+
+  private Date jyrq;
+  private String yq;
+  private String ybh;
+  private String lb;
+  private String bgr;
+  private String btzr;
+  private String tzfs;
+  private Date tzsj;
+  private String bz;
+  private String qrr;
+  private Date qrsj;
+  private String qrr1;
+  private Date qrsj1;
+  private String zt;
+  private String tbr;
+  private Date tbsj;
+  private String fhzt;
+  private String fhyy;
+  private String fhr;
+  private Date fhsj;
+  private String jtr;
+  private String lrr;
+  private Date lrsj;
+  private String phone;
+
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPurpose.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabPurpose {
+    private String yq;
+    private String purno;
+    private String pruna;
+    private Integer itemcnt;
+    private String bk;
+    private BigDecimal price;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRefused.java

@@ -0,0 +1,25 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabRefused {
+
+  private String sqh;
+  private Date refusedtime;
+  private String refuseder;
+  private String ksdh;
+  private String bz;
+  private String refusetext;
+  private String jsr;
+  private Date jssj;
+  private String bz1;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReportinstr.java

@@ -0,0 +1,17 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabReportinstr {
+    private String yq;
+    private Integer xh;
+    private Long bgdh;
+    private String yljg;
+    private String type;
+    private String condition;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReportvsitem.java

@@ -0,0 +1,16 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabReportvsitem {
+
+  private String yq;
+  private String xmdh;
+  private Integer bgdh;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReqdetail.java

@@ -1,4 +1,4 @@
-package com.czlis.common.core.domain.entity;
+package com.czlis.common.core.domain.entity.lis;
 
 import com.czlis.common.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
@@ -28,5 +28,8 @@ public class LabReqdetail extends BaseEntity {
     private Date dtbk1;
     private Date dtbk2;
     private String bz3;
+    private String bz4;
+    private String bz5;
+    private String bz6;
 
 }

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReqmain.java

@@ -0,0 +1,137 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.czlis.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "LabReqmain", description = "申请单表")
+@Data
+public class LabReqmain extends BaseEntity {
+    @ApiModelProperty(value = "条码号")
+    private String sqh;
+    @ApiModelProperty(value = "科室")
+    private String ksdh;
+    @ApiModelProperty(value = "申请医生")
+    private String sqys;
+    @ApiModelProperty(value = "申请时间")
+    private Date sqsj;
+    @ApiModelProperty(value = "接收医生")
+    private String jsys;
+    @ApiModelProperty(value = "接收时间")
+    private Date jssj;
+    @ApiModelProperty(value = "状态")
+    private String zt;
+    @ApiModelProperty(value = "计价")
+    private String jjzt;
+    @ApiModelProperty(value = "病人类型")
+    private String brly;
+    @ApiModelProperty(value = "病人代号")
+    private String brdh;
+    @ApiModelProperty(value = "病人姓名")
+    private String brxm;
+    @ApiModelProperty(value = "性别")
+    private String brxb;
+    @ApiModelProperty(value = "出生日期")
+    private Date brsr;
+    @ApiModelProperty(value = "备注1")
+    private String bz1;
+    @ApiModelProperty(value = "备注2")
+    private String bz2;
+    @ApiModelProperty(value = "剔回原因")
+    private String bz3;
+    @ApiModelProperty(value = "急诊标志")
+    private String jzbz;
+    private String txm;
+    @ApiModelProperty(value = "床号")
+    private String ch;
+    @ApiModelProperty(value = "样本类型")
+    private String yblx;
+    @ApiModelProperty(value = "执行人")
+    private String zxys;
+    @ApiModelProperty(value = "执行时间")
+    private Date zxsj;
+    @ApiModelProperty(value = "申请单类别")
+    private String bgddh;
+    private Double costs;
+    private Integer nl;
+    private String nldw;
+    @ApiModelProperty(value = "诊断")
+    private String zd;
+    @ApiModelProperty(value = "采样时间")
+    private Date cysj;
+    private Date cksj;
+    private String ckzj;
+    private String ckyh;
+    private String djry;
+    private String inputman;
+    private String powerman;
+    private String contactman;
+    private String refsqh;
+    @ApiModelProperty(value = "采样人")
+    private String cyr;
+    @ApiModelProperty(value = "送检人")
+    private String bbsjr;
+    @ApiModelProperty(value = "送检时间")
+    private Date bbsjsj;
+    private String performby;
+    private String sbbr;
+    private String inzt;
+    private String libpos;
+    private Date inlibtime;
+    private String inlibman;
+    private Date outlibtime;
+    private String outlibman;
+    private String refused;
+    @ApiModelProperty(value = "审核时间")
+    private Date confirmtime;
+    @ApiModelProperty(value = "审核人")
+    private String confirmer;
+    private String cybl;
+    private String bbsjbl;
+    @ApiModelProperty(value = "医疗机构")
+    private String yljg;
+    @ApiModelProperty(value = "卡号")
+    private String kh;
+    @ApiModelProperty(value = "卡类型")
+    private String klx;
+    private Date jzsj;
+    @ApiModelProperty(value = "检验目的")
+    private String jymd;
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+    @ApiModelProperty(value = "家属电话")
+    private String phone1;
+    @ApiModelProperty(value = "上机仪器")
+    private String yqdh;
+    @ApiModelProperty(value = "上机时间")
+    private Date sjsj;
+    @ApiModelProperty(value = "地址")
+    private String addr;
+    @ApiModelProperty(value = "绿色通道")
+    private String lstd;
+    private String ssrq;
+    @ApiModelProperty(value = "生理周期")
+    private String slzq;
+    private Date cyblsj;
+    private Date bbsjblsj;
+    @ApiModelProperty(value = "采集量")
+    private String ybrl;
+    @ApiModelProperty(value = "签收机构")
+    private String qsyljg;
+    @ApiModelProperty(value = "采集部位")
+    private String cjbw;
+
+    private Date st;
+    private Date et;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReqpack.java

@@ -0,0 +1,26 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class LabReqpack {
+
+  private String packno;
+  private Integer xh;
+  private String sqh;
+  private String ksdh;
+  private String packuser;
+  private Integer sl;
+  private String zt;
+  private Date packdate;
+  private Date senddate;
+
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReqreportPdffile.java

@@ -0,0 +1,22 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LabReqreportPdffile {
+    private String sqh;
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String filetype;
+    private String bz;
+    private Date filedt;
+    private String bk1;
+    private String BASE64PDF;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabReqsteplog.java

@@ -0,0 +1,25 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class LabReqsteplog {
+
+  private String sqh;
+  private Integer xh;
+  private String zt;
+  private String userid;
+  private Date changedate;
+  private Date logdate;
+  private String comname;
+  private String comip;
+  private String bz;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResult.java

@@ -0,0 +1,52 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import com.czlis.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabResult extends BaseEntity {
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String xmdh;
+    private String wyh;
+    private String csjg;
+    private String od;
+    private String cutoff;
+    private String jgbz;
+    private String bz1;
+    private String bz2;
+    private String yhdh;
+    private Integer instrid;
+    private Date operdt;
+    private String operna;
+    private String refs;
+    private String flag;
+    private String dw;
+    private String result_flag;
+    private String alarm_flag;
+    private String redo_flag;
+    private String sqxmdh;
+    private String redo_text;
+    private String bz3;
+    private String textresult;
+    private String xmmc;
+    private String ygzd;
+    private String ygzq;
+    private Integer xsws;
+    private Integer changeflag;
+    private Integer cp_modify;
+    private String cp_compa;
+    private String cp_lastflag;
+    private Date cp_lastjyrq;
+    private String germclass;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultBk.java

@@ -0,0 +1,29 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabResultBk {
+
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date jyrq;
+  private String yq;
+  private String ybh;
+  private String xmdh;
+  private String csjg;
+  private String od;
+  private String cutoff;
+  private String jgbz;
+  private String bz1;
+  private String bz2;
+  private String yhdh;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultMed.java

@@ -0,0 +1,31 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.czlis.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabResultMed  extends BaseEntity {
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date jyrq;
+  private String yq;
+  private String ybh;
+  private String xmdh;
+  private Integer xh;
+  private String ywdh;
+  private String mic;
+  private String rad;
+  private String csjg;
+  private String jgbz;
+  private String bz;
+  private String txtresult;
+  private String ckz;
+  private String cp_bz;
+  private String ywmc;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultRe.java

@@ -0,0 +1,27 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabResultRe {
+    private String wyh;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyrq;
+    private String yq;
+    private String ybh;
+    private String xmdh;
+    private String csjg;
+    private String od;
+    private String cutoff;
+    private String jgbz;
+    private String bz1;
+    private String bz2;
+    private String yhdh;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultlog.java

@@ -0,0 +1,31 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabResultlog {
+
+  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 jgbz;
+  private String bz1;
+  private String bz2;
+  private String yhdh;
+  private Date xgrq;
+  private String xgyhdh;
+
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultwarning.java

@@ -0,0 +1,24 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabResultwarning {
+
+  private Date jyrq;
+  private String yq;
+  private String ybh;
+  private String xmdh;
+  private String csjg;
+  private String jgbz;
+  private String bz;
+
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRule.java

@@ -0,0 +1,18 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LabRptgetRule {
+    @ApiModelProperty("报告领取规则代码")
+    private Integer bglqdh;
+    @ApiModelProperty("报告领取规则名称")
+    private String bglqmc;
+    @ApiModelProperty("备注")
+    private String bz;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabRptgetRuleDetail.java

@@ -0,0 +1,30 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LabRptgetRuleDetail {
+    @ApiModelProperty("报告领取规则代码")
+    private Integer bglqdh;
+    @ApiModelProperty("序号")
+    private Integer xh;
+    @ApiModelProperty("开始时间")
+    private String kssj;
+    @ApiModelProperty("结束时间")
+    private String jssj;
+    @ApiModelProperty("所需小时数")
+    private Integer bgxss;
+    @ApiModelProperty("报告领取说明")
+    private String bglqsm;
+    @ApiModelProperty("备注")
+    private String bz;
+    @ApiModelProperty("起始日期")
+    private String weekday;
+    @ApiModelProperty("截止日期")
+    private String weekday1;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabTatctrl.java

@@ -0,0 +1,18 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabTatctrl {
+    private Integer ruleid;
+    private String ruletype;
+    private String refcode;
+    private String jzbz;
+    private String yblx;
+    private Integer min1;
+    private Integer min2;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LisPatlog.java

@@ -0,0 +1,48 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LisPatlog {
+
+  private String wyh;
+  private Date jyrq;
+  private String yq;
+  private String ybh;
+  private Date xgrq;
+  private String xgyhdh;
+  private String yblx;
+  private String fb;
+  private String ksdh;
+  private String sjys;
+  private String hdys;
+  private String yhdh;
+  private String brdh;
+  private String brxm;
+  private String brxb;
+  private String brly;
+  private String ch;
+  private Integer nl;
+  private String nldw;
+  private String sqh;
+  private Date sqsj;
+  private Date dysj;
+  private String dybz;
+  private String jgbz;
+  private String bbbz;
+  private String zd;
+  private String bz;
+  private String bz1;
+  private String zjf;
+  private Date cyrq;
+  private String bq;
+  private String czybh;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcBatchno.java

@@ -0,0 +1,31 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QcBatchno {
+    private String yq;
+    private String zkpph;
+    private String zkph;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startda;
+    private String conc;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date expiredt;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endda;
+    private String useflag;
+    private String qcsrc;
+    private String standsrc;
+    private String bk;
+    private String batchno;
+    private String zkpphold;
+    private String zkphold;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcFrmsmpl.java

@@ -0,0 +1,16 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QcFrmsmpl {
+    private String yq;
+    private String ybh;
+    private String zkph;
+    private Integer cs;
+    private String batchno;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcModifylog.java

@@ -0,0 +1,22 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QcModifylog {
+  private Integer id;
+  private String yq;
+  private Date zkrq;
+  private Integer zkph;
+  private Integer zkcs;
+  private Date changedt;
+  private String changeman;
+  private String changetype;
+  private String changetxt;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcRules.java

@@ -0,0 +1,15 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QcRules {
+    private String yq;
+    private String xmdh;
+    private String rules;
+    private String bz;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcSample.java

@@ -0,0 +1,46 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QcSample {
+    @ApiModelProperty(value = "仪器")
+    private String yq;
+    @ApiModelProperty(value = "项目代码")
+    private String xmdh;
+    @ApiModelProperty(value = "质控号")
+    private String zkph;
+    @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ksrq;
+    @ApiModelProperty(value = "批号")
+    private String zkpph;
+    private String ld;
+    private BigDecimal cv;
+    private BigDecimal sd;
+    private BigDecimal zkbz;
+    private String bc;
+    private String ff;
+    private String sjph;
+    private String sm;
+    private String bz1;
+    private Date endrq;
+    private String standsrc;
+    private Date outdt;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date stopdate;
+    private String qcsrc;
+    private Integer qc_sampleid;
+    private Date expiredt;
+    private BigDecimal qccv;
+    private String xmmc;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcVal.java

@@ -0,0 +1,55 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QcVal {
+  private Long qc_valid;
+  @ApiModelProperty(value = "仪器")
+  private String yq;
+  @ApiModelProperty(value = "质控日期")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date zkrq;
+  @ApiModelProperty(value = "项目代码")
+  private String xmdh;
+  @ApiModelProperty(value = "质控号")
+  private String zkph;
+  @ApiModelProperty(value = "批号")
+  private String zkpph;
+  private Integer cs;
+  private String instrybh;
+  private BigDecimal zkjg;
+  private String yhdh;
+  private String bz;
+  private String resultid;
+  private String outreason;
+  private String outtransman;
+  private Date inputdt;
+  private String nouse;
+  private Date modidt;
+  private String modiusr;
+  private String outflag;
+  private String outtxt;
+  private String bz1;
+  private String isconfirm;
+  private Date confirmdt;
+  private String confirmuser;
+  private String nodraw;
+  private String nocalc;
+  private String ifuse;
+  private BigDecimal usrdata;
+  private String sjcs;
+  private String sjph;
+  private String outresult;
+  private BigDecimal skjg;
+  private String zkjgS;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/SysExeBak.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysExeBak {
+  private String filepath;
+  private String filena;
+  private Date bakdt1;
+  private Date bakdt2;
+  private byte[] bakdata1;
+  private byte[] bakdata2;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmAlarmdetail.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmAlarmdetail {
+
+  private String yq;
+  private String xmdh;
+  private Integer seq;
+  private String samplecondition;
+  private String resultcondition;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmAlarmdetailNew.java

@@ -0,0 +1,15 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmAlarmdetailNew {
+    private Integer xmid;
+    private Integer seq;
+    private String samplecondition;
+    private String resultcondition;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmBase.java

@@ -0,0 +1,25 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmBase {
+    private String xmdh;
+    private String xmmc;
+    private String xmlb;
+    private String xmz;
+    private String dw;
+    private BigDecimal cksx;
+    private BigDecimal ckxx;
+    private String dyckz;
+    private Integer dyxh;
+    private String jsgs;
+    private String lcyy;
+    private String bz;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmCalc.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmCalc {
+
+  private String yq;
+  private String jsxm;
+  private String xmdh;
+  private String jsgs;
+  private String bz;
+
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmComp.java

@@ -0,0 +1,20 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmComp {
+    private String yq;
+    private String zhmc;
+    private String zhlx;
+    private String xmdh;
+    private String bz;
+    private Integer seq;
+    private String zhmcold;
+    private String zhlxold;
+    private String xmdhold;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmDouble.java

@@ -0,0 +1,33 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmDouble {
+    private Integer xmid;
+    private String xmdh;
+    private String csms;
+    private String xmxz;
+    private String csbc;
+    private String ckbc;
+    private String ydfs;
+    private String zbpl;
+    private String zbsj;
+    private String kbms;
+    private BigDecimal negxx;
+    private BigDecimal negsx;
+    private BigDecimal posxx;
+    private BigDecimal possx;
+    private BigDecimal shq;
+    private BigDecimal xhq;
+    private String yxgs;
+    private String mrmb;
+    private String mrsjph;
+    private String yq;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFee.java

@@ -0,0 +1,38 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmFee {
+    private String sfxmdh;
+    private String sfxmmc;
+    private String xmlb;
+    private BigDecimal dj;
+    private String zjf;
+    @ApiModelProperty("备注")
+    private String bz;
+    @ApiModelProperty("报告领取规则代码")
+    private Integer bglqdh;
+    @ApiModelProperty("规格")
+    private String spec;
+    private String yljg;
+    private String lisgroup;
+    private String attention;
+    private String indication;
+    private String affect;
+    private Integer bgts;
+    private String yblx;
+    private String dept;
+    private String lisgroup1;
+    private String lisgroup2;
+    private String lisgroup3;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFeeInstr.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class XmFeeInstr {
+    @NonNull
+    private String yq;
+    @NonNull
+    private String sfxmdh;
+    private String mrz;
+    private Integer xh;
+    private String sfxmmc;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFeeVs.java

@@ -0,0 +1,13 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class XmFeeVs {
+    private String sfxmdh;
+    private Integer vscount;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFeeVsFee.java

@@ -0,0 +1,14 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmFeeVsFee {
+    private String sfxmdh;
+    private String vssfxmdh;
+    private Integer seq;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFilter.java

@@ -0,0 +1,14 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class XmFilter {
+    private String yq;
+    private String lgph;
+    private String bc;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmHisreq.java

@@ -0,0 +1,30 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmHisreq {
+    private String sqxmdh;
+    private String sqxmmc;
+    private String xmlb;
+    private BigDecimal dj;
+    private String zjf;
+    private Integer bgts;
+    private String capstd;
+    private String yblx;
+    private BigDecimal cysl;
+    private String djlb;
+    private String jyyq;
+    private String rqyq;
+    private String zysx;
+    private String bz;
+    private String refclinic;
+    private Date lastrefresh;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfo.java

@@ -0,0 +1,66 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmInfo {
+
+  private String yq;
+  private String xmdh;
+  private String xmmc;
+  private String zhbdh;
+  private String bgdh;
+  private Double cksx;
+  private Double ckxx;
+  private String dyckz;
+  private String dylx;
+  private Integer dyxh;
+  private String zjf;
+  private String xmlb;
+  private Double xs;
+  private Integer xsws;
+  private String mrz;
+  private Double jg;
+  private Double cb;
+  private String dw;
+  private String jsxm;
+  private String jsgs;
+  private String zkxm;
+  private Double sjx;
+  private Double xjx;
+  private String ygxb;
+  private String ygnl;
+  private String ygbb;
+  private String lcyy;
+  private String jgbz;
+  private Integer jgjg;
+  private Double jgz;
+  private String csff;
+  private String yymc;
+  private Integer fzdyxh;
+  private String clinicref;
+  private Double llimit;
+  private Double hlimit;
+  private Double xsbs;
+  private Double redoxx;
+  private Double redosx;
+  private String qcuselog;
+  private String qcusepos;
+  private String itemclass;
+  private String whocode;
+  private String germflag;
+  private Double qccv;
+  private String qcvs;
+  private String knowledge;
+  private String ygzq;
+  private String ygzd;
+  private String uflag;
+  private String val2;
+  private Integer id;
+  private String val1;
+  private String germclass;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java

@@ -0,0 +1,77 @@
+package com.czlis.common.core.domain.entity.lis;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmInfoNew {
+    private Integer xmid;
+    private String yq;
+    private String xmdh;
+    private String xmmc;
+    private String zhbdh;
+    private String bgdh;
+    private BigDecimal cksx;
+    private BigDecimal ckxx;
+    private String dyckz;
+    private String dylx;
+    private Integer dyxh;
+    private String zjf;
+    private String xmlb;
+    private BigDecimal xs;
+    private Integer xsws;
+    private String mrz;
+    private BigDecimal jg;
+    private BigDecimal cb;
+    private String dw;
+    private String jsgs;
+    private String zkxm;
+    private BigDecimal sjx;
+    private BigDecimal xjx;
+    private String ygxb;
+    private String ygnl;
+    private String ygbb;
+    private String lcyy;
+    private String jgbz;
+    private Integer jgjg;
+    private BigDecimal jgz;
+    private String csff;
+    private String yymc;
+    private Integer fzdyxh;
+    private String clinicref;
+    private Float llimit;
+    private Float hlimit;
+    private BigDecimal xsbs;
+    private BigDecimal redoxx;
+    private BigDecimal redosx;
+    private String qcuselog;
+    private String qcusepos;
+    private String itemclass;
+    private String whocode;
+    private String germflag;
+    private BigDecimal qccv;
+    private String qcvs;
+    private String knowledge;
+    private String ygzq;
+    private String ygzd;
+    private String xmgl;
+    private String yqdl;
+    private String uflag;
+    private String val1;
+    private String val2;
+    private String val3;
+    private String val4;
+    private String val5;
+    private String isWsw;
+    private String inputcode;
+    private String jsxm;
+
+    private String queryDylx;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java

@@ -0,0 +1,30 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmInfoVs {
+    private Integer vsid;
+    private String yq;
+    private Integer xmid;
+    private String dylx;
+    private Integer dyxh;
+    private String uflag;
+    private BigDecimal xs;
+    private Integer xsws;
+    private Integer fzdyxh;
+    private String zkxm;
+    private String qccv;
+    private String qcvs;
+    private String cksx;
+    private String ckxx;
+    private String dyckz;
+    private String xmmc;
+    private String xmdh;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInter.java

@@ -0,0 +1,16 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmInter {
+    private String yq;
+    private String tdh;
+    private String xmdh;
+    private Integer xmid;
+
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmKnowledge.java

@@ -0,0 +1,30 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmKnowledge {
+    private String xmid;
+    private String xmdh;
+    private String xmmc;
+    private String xmlb;
+    private String xmz;
+    private String dw;
+    private BigDecimal cksx;
+    private BigDecimal ckxx;
+    private String dyckz;
+    private Integer dyxh;
+    private String jsgs;
+    private String lcyy;
+    private String bz;
+    private String zjf;
+    private String xsbz;
+
+    private String inputData;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmLot.java

@@ -0,0 +1,18 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class XmLot {
+    private String yq;
+    private String sjph;
+    private String sjcs;
+    private Date yxq;
+    private String csff;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmMed.java

@@ -0,0 +1,37 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmMed {
+    private String ywdh;
+    private String ywmc;
+    private String yf;
+    private String zjf;
+    private Integer seq;
+    private String bz;
+    private String xyfz;
+    private BigDecimal nymic;
+    private BigDecimal zjmic;
+    private String yfiv;
+    private String yfim;
+    private String yydh;
+    private String multimic;
+    private String nyfz;
+    private String medno;
+    private BigDecimal zjkb;
+    private BigDecimal nykb;
+    private BigDecimal zjetest;
+    private BigDecimal nyetest;
+    private String ikb;
+    private String whonet_kb;
+    private String whonet_mic;
+    private String whonet_etest;
+    private String whonet;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmMedDetail.java

@@ -0,0 +1,31 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmMedDetail {
+
+  private String yq;
+  private String xmdh;
+  private String ywzmc;
+  private String ywdh;
+  private Double mic1;
+  private Double mic2;
+  private Double rad1;
+  private Double rad2;
+  private String mrz;
+  private Integer xh;
+  private String bz;
+  private String micref;
+  private String radref;
+  private String sddfalg;
+
+
+
+}