feat(all): 修改vo路径

ruoyi-admin/pom.xml

@@ -25,11 +25,11 @@
         </dependency>
 
         <!-- spring-boot-devtools -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-devtools</artifactId>-->
+<!--            <optional>true</optional> &lt;!&ndash; 表示依赖不会传递 &ndash;&gt;-->
+<!--        </dependency>-->
 
         <!-- swagger3-->
         <dependency>

ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppBjCaController.java

@@ -1,5 +1,8 @@
 package com.neuhis.his.app.controller;
 
+import cn.hutool.core.codec.Base64;
+import com.neuhis.his.domain.vo.bjca.BjCaResult;
+import com.neuhis.his.domain.vo.bjca.CaStartVo;
 import com.neuhis.his.service.IBjCaService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.Api;
@@ -24,10 +27,29 @@ import javax.annotation.Resource;
 public class AppBjCaController {
     @Resource
     private IBjCaService bjCaService;
+    /**
+     * startAutoSign启动自动签名获取的签名数据，[签名任务id]
+     */
+    private String autoSignSignDataId = "SD_4c6ec5f6-22e3-4fae-b2aa-681e5beacf1e";
 
     @GetMapping("/startAutoSign")
-    @ApiOperation(value = "启动自动签名", notes = "启动自动签名")
+    @ApiOperation(value = "步骤A：启动自动签名", notes = "步骤1、启动自动签名，获取签名二维码，让医师使用【协同签名】进行签名")
     public AjaxResult bjcaAuto() {
-        return AjaxResult.success(bjCaService.startAutoSign());
+        autoSignSignDataId = bjCaService.startAutoSign();
+        return AjaxResult.success(autoSignSignDataId);
+    }
+
+    @GetMapping("/autoSign")
+    @ApiOperation(value = "步骤B：对原始数据进行签名获取签名证书", notes = "步骤2、对原始数据进行签名获取签名证书、密文")
+    public AjaxResult autoSign() {
+        BjCaResult<CaStartVo>  caStartVo =  bjCaService.autoSign(autoSignSignDataId, Base64.encode("aaaaa"));
+        return AjaxResult.success(caStartVo);
+    }
+
+    @GetMapping("/createAndGetTssInfo")
+    @ApiOperation(value = "步骤C：产生时间戳", notes = "步骤3、产生时间戳")
+    public AjaxResult createAndGetTssInfo() {
+        String caStartVo =  bjCaService.createAndGetTssInfo( Base64.encode("aaaaa"));
+        return AjaxResult.success(caStartVo);
     }
 }

ruoyi-admin/src/main/java/com/neuhis/his/common/GlobalConstants.java

@@ -1,7 +1,5 @@
 package com.neuhis.his.common;
 
-import com.neuhis.his.domain.entity.FinIpbMedicinelist;
-
 public class GlobalConstants {
 
     //推送状态缓存

ruoyi-admin/src/main/java/com/neuhis/his/controller/BizApiController.java

@@ -2,7 +2,6 @@ package com.neuhis.his.controller;
 
 import java.util.List;
 
-import com.p6spy.engine.spy.P6ModuleManager;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

ruoyi-admin/src/main/java/com/neuhis/his/controller/ComEmployeeController.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
-import com.neuhis.his.domain.entity.ComEmployee;
+import com.neuhis.his.domain.entity.his.ComEmployee;
 import com.neuhis.his.service.his.IComEmployeeService;
 import com.neuhis.utils.IdcardUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;

ruoyi-admin/src/main/java/com/neuhis/his/controller/ComPatientinfoController.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
-import com.neuhis.his.domain.entity.ComPatientinfo;
+import com.neuhis.his.domain.entity.his.ComPatientinfo;
 import com.neuhis.his.service.his.IComPatientinfoService;
 import com.neuhis.utils.IdcardUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;

ruoyi-admin/src/main/java/com/neuhis/his/domain/BizApi.java

@@ -2,6 +2,7 @@ package com.neuhis.his.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.enums.DataSourceType;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -71,7 +72,10 @@ public class BizApi extends BaseEntity
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date operDate;
 
-    // Robin 2024-7-3
+    /**
+     * Robin 2024-7-3
+     * {@link DataSourceType}
+     */
     private String Db;
 
     /** 是否业务主表 */

ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/ProdureParam.java

@@ -1,5 +1,10 @@
 package com.neuhis.his.domain.dto;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
 public class ProdureParam {
 
     private  ProdureParamTypeEnum paramTypeEnum;
@@ -8,30 +13,6 @@ public class ProdureParam {
 
     private String paramValue;
 
-    public ProdureParamTypeEnum getParamTypeEnum() {
-        return paramTypeEnum;
-    }
-
-    public void setParamTypeEnum(ProdureParamTypeEnum paramTypeEnum) {
-        this.paramTypeEnum = paramTypeEnum;
-    }
-
-    public String getParamType() {
-        return paramType;
-    }
-
-    public void setParamType(String paramType) {
-        this.paramType = paramType;
-    }
-
-    public String getParamValue() {
-        return paramValue;
-    }
-
-    public void setParamValue(String paramValue) {
-        this.paramValue = paramValue;
-    }
-
     public ProdureParam(ProdureParamTypeEnum paramTypeEnum, String paramType,String paramValue){
         this.paramTypeEnum=paramTypeEnum;
         this.paramType=paramType;

ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/Response.java

@@ -1,21 +1,11 @@
 package com.neuhis.his.domain.dto;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
 public class Response {
-    public String getResult() {
-        return result;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
 
     public String result;
     public String desc;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComControlargument.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComDepartment.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComDictionary.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComEmployee.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComPatientinfo.java

@@ -1,5 +1,6 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
+import com.neuhis.his.domain.entity.SearchEntity;
 import com.neuhis.his.domain.entity.items.PVisit;
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/DawnCodeInfo.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComExamorder.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 /**
  * 需填写检查申请单医嘱配置表

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComUndruginfo.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComUndrugztinfo.java

@@ -1,11 +1,9 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
-import com.neuhis.his.domain.dto.ComUndrugZtFeeGroupItem;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 @Data
 public class FinComUndrugztinfo {

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbFeeinfo.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbItemlist.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbMedicinelist.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIprBabyinfo.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIprInmaininfo.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccount.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccountlist.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccountrecord.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbFeedetail.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbInvoiceinfo.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOprRegister.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOprSchema.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MdcDiPath.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetCasDiagnose.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetComIcd10.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetComOperationLocal.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmBooked.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmExecdrug.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmExecundrug.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmOrder.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetMrsBase.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetNuiCancelitem.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetNuiExerecord.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsApply.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsArrange.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsOperationitem.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeApplyType.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeBigexampart.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeExampart.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdiOrder.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdoOrder.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdtUndrugterm.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import lombok.Data;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/NsrNisRecordDetail.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/NsrStandardCode.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 /**
  * Nis病历一体化编码

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PdaBloodCircuit.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PdaPsrRecord.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.util.Date;
 

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PhaComApplyout.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PhaComBaseinfo.java

@@ -1,4 +1,4 @@
-package com.neuhis.his.domain.entity;
+package com.neuhis.his.domain.entity.his;
 
 import java.math.BigDecimal;
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/items/PVisit.java

@@ -1,10 +1,9 @@
 package com.neuhis.his.domain.entity.items;
 
 import com.ruoyi.common.utils.DateUtils;
-import com.neuhis.his.domain.entity.FinIprInmaininfo;
-import com.neuhis.his.domain.entity.FinOprRegister;
+import com.neuhis.his.domain.entity.his.FinIprInmaininfo;
+import com.neuhis.his.domain.entity.his.FinOprRegister;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.Date;
 import java.util.Objects;

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasRtResult.java

@@ -2,6 +2,8 @@ package com.neuhis.his.domain.entity.winlis;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-03-05
  */
+@Setter
+@Getter
 public class LasRtResult extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -171,396 +175,6 @@ public class LasRtResult extends BaseEntity
     @Excel(name = "自动审核信息", readConverterExp = "流=水线")
     private String autoconfirminfo;
 
-    public void setTestdate(String testdate) 
-    {
-        this.testdate = testdate;
-    }
-
-    public String getTestdate() 
-    {
-        return testdate;
-    }
-
-    public void setMachineid(String machineid) 
-    {
-        this.machineid = machineid;
-    }
-
-    public String getMachineid() 
-    {
-        return machineid;
-    }
-
-    public void setSampleid(String sampleid) 
-    {
-        this.sampleid = sampleid;
-    }
-
-    public String getSampleid() 
-    {
-        return sampleid;
-    }
-
-    public void setItemid(String itemid) 
-    {
-        this.itemid = itemid;
-    }
-
-    public String getItemid() 
-    {
-        return itemid;
-    }
-
-    public void setLoincid(String loincid) 
-    {
-        this.loincid = loincid;
-    }
-
-    public String getLoincid() 
-    {
-        return loincid;
-    }
-
-    public void setEngname(String engname) 
-    {
-        this.engname = engname;
-    }
-
-    public String getEngname() 
-    {
-        return engname;
-    }
-
-    public void setItemname(String itemname) 
-    {
-        this.itemname = itemname;
-    }
-
-    public String getItemname() 
-    {
-        return itemname;
-    }
-
-    public void setPrintseq(Long printseq) 
-    {
-        this.printseq = printseq;
-    }
-
-    public Long getPrintseq() 
-    {
-        return printseq;
-    }
-
-    public void setBarcode(String barcode) 
-    {
-        this.barcode = barcode;
-    }
-
-    public String getBarcode() 
-    {
-        return barcode;
-    }
-
-    public void setTesttime(Date testtime) 
-    {
-        this.testtime = testtime;
-    }
-
-    public Date getTesttime() 
-    {
-        return testtime;
-    }
-
-    public void setReportvalue(String reportvalue) 
-    {
-        this.reportvalue = reportvalue;
-    }
-
-    public String getReportvalue() 
-    {
-        return reportvalue;
-    }
-
-    public void setRerunvalue(String rerunvalue) 
-    {
-        this.rerunvalue = rerunvalue;
-    }
-
-    public String getRerunvalue() 
-    {
-        return rerunvalue;
-    }
-
-    public void setDescvalue(String descvalue) 
-    {
-        this.descvalue = descvalue;
-    }
-
-    public String getDescvalue() 
-    {
-        return descvalue;
-    }
-
-    public void setResultlist(String resultlist) 
-    {
-        this.resultlist = resultlist;
-    }
-
-    public String getResultlist() 
-    {
-        return resultlist;
-    }
-
-    public void setOrgvalue(String orgvalue) 
-    {
-        this.orgvalue = orgvalue;
-    }
-
-    public String getOrgvalue() 
-    {
-        return orgvalue;
-    }
-
-    public void setValuesrc(String valuesrc) 
-    {
-        this.valuesrc = valuesrc;
-    }
-
-    public String getValuesrc() 
-    {
-        return valuesrc;
-    }
-
-    public void setRerunflag(String rerunflag) 
-    {
-        this.rerunflag = rerunflag;
-    }
-
-    public String getRerunflag() 
-    {
-        return rerunflag;
-    }
-
-    public void setRangeinfo(String rangeinfo) 
-    {
-        this.rangeinfo = rangeinfo;
-    }
-
-    public String getRangeinfo() 
-    {
-        return rangeinfo;
-    }
-
-    public void setUnit(String unit) 
-    {
-        this.unit = unit;
-    }
-
-    public String getUnit() 
-    {
-        return unit;
-    }
-
-    public void setResultflag(String resultflag) 
-    {
-        this.resultflag = resultflag;
-    }
-
-    public String getResultflag() 
-    {
-        return resultflag;
-    }
-
-    public void setPatientid(String patientid) 
-    {
-        this.patientid = patientid;
-    }
-
-    public String getPatientid() 
-    {
-        return patientid;
-    }
-
-    public void setPatienttype(String patienttype) 
-    {
-        this.patienttype = patienttype;
-    }
-
-    public String getPatienttype() 
-    {
-        return patienttype;
-    }
-
-    public void setSampletype(String sampletype) 
-    {
-        this.sampletype = sampletype;
-    }
-
-    public String getSampletype() 
-    {
-        return sampletype;
-    }
-
-    public void setTestmachineid(String testmachineid) 
-    {
-        this.testmachineid = testmachineid;
-    }
-
-    public String getTestmachineid() 
-    {
-        return testmachineid;
-    }
-
-    public void setRackcup(String rackcup) 
-    {
-        this.rackcup = rackcup;
-    }
-
-    public String getRackcup() 
-    {
-        return rackcup;
-    }
-
-    public void setHisitemid(String hisitemid) 
-    {
-        this.hisitemid = hisitemid;
-    }
-
-    public String getHisitemid() 
-    {
-        return hisitemid;
-    }
-
-    public void setPrintrow(Long printrow) 
-    {
-        this.printrow = printrow;
-    }
-
-    public Long getPrintrow() 
-    {
-        return printrow;
-    }
-
-    public void setAlertflag(String alertflag) 
-    {
-        this.alertflag = alertflag;
-    }
-
-    public String getAlertflag() 
-    {
-        return alertflag;
-    }
-
-    public void setRangelimit(String rangelimit) 
-    {
-        this.rangelimit = rangelimit;
-    }
-
-    public String getRangelimit() 
-    {
-        return rangelimit;
-    }
-
-    public void setCheckstate(String checkstate) 
-    {
-        this.checkstate = checkstate;
-    }
-
-    public String getCheckstate() 
-    {
-        return checkstate;
-    }
-
-    public void setCommtime(Date commtime) 
-    {
-        this.commtime = commtime;
-    }
-
-    public Date getCommtime() 
-    {
-        return commtime;
-    }
-
-    public void setMethod(String method) 
-    {
-        this.method = method;
-    }
-
-    public String getMethod() 
-    {
-        return method;
-    }
-
-    public void setCutoff(String cutoff) 
-    {
-        this.cutoff = cutoff;
-    }
-
-    public String getCutoff() 
-    {
-        return cutoff;
-    }
-
-    public void setSco(String sco) 
-    {
-        this.sco = sco;
-    }
-
-    public String getSco() 
-    {
-        return sco;
-    }
-
-    public void setOdvalue(String odvalue) 
-    {
-        this.odvalue = odvalue;
-    }
-
-    public String getOdvalue() 
-    {
-        return odvalue;
-    }
-
-    public void setMemovalue(String memovalue) 
-    {
-        this.memovalue = memovalue;
-    }
-
-    public String getMemovalue() 
-    {
-        return memovalue;
-    }
-
-    public void setValuepro(String valuepro) 
-    {
-        this.valuepro = valuepro;
-    }
-
-    public String getValuepro() 
-    {
-        return valuepro;
-    }
-
-    public void setAutoconfirmsign(String autoconfirmsign) 
-    {
-        this.autoconfirmsign = autoconfirmsign;
-    }
-
-    public String getAutoconfirmsign() 
-    {
-        return autoconfirmsign;
-    }
-
-    public void setAutoconfirminfo(String autoconfirminfo) 
-    {
-        this.autoconfirminfo = autoconfirminfo;
-    }
-
-    public String getAutoconfirminfo() 
-    {
-        return autoconfirminfo;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapSamplereg.java

@@ -5,17 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 样本核收过程：
-    1、样本基本信息插入此中
-    2、项目核收信息插入LAS_COM_SAMPLEITEM中
-    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
-对象 las_sap_samplereg
+ * 常规检验登记表 las_sap_samplereg
  * 
  * @author ruoyi
  * @date 2025-03-05

ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaCreateAndGetTssInfoVo.java

@@ -0,0 +1,21 @@
+package com.neuhis.his.domain.vo.bjca;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * 产生时间戳(createAndGetTssInfo)
+ *
+ * @author dazer
+ * @date 2025/3/5 17:32
+ **/
+@Getter
+@Setter
+@NoArgsConstructor
+public class CaCreateAndGetTssInfoVo {
+    /**
+     * 时间戳
+     */
+    private String tsResp;
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaStartAutoSignVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 import java.io.Serializable;
 
 /**
- * 描述信息
+ * 开始自动签名返回参数
  *
  * @author dazer
  * @date 2025/3/4 15:44
@@ -20,4 +20,25 @@ public class CaStartAutoSignVo implements Serializable {
      * 待签任务 ID
      */
     private String signDataId;
+    /**
+     * qrCode的json字符串，去除转移后的JSON字符串生成的二维码，可以直接使用：【协同签名】扫描
+     */
+    private String qrCode;
+    /**
+     * qrCode的对象形式
+     */
+    private QrCodeVo qrCodeVo;
+
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    public static class QrCodeVo {
+        /**
+         * 二维码地址：类似：https://coss-dev.isignet.cn:18759/coss/mobile/v1/getServiceInfo
+         */
+        private String sUrl;
+        private String id;
+        private String o;
+        private String cv;
+    }
 }

ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaStartVo.java

@@ -0,0 +1,31 @@
+package com.neuhis.his.domain.vo.bjca;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 自动签名返回参数
+ *
+ * @author dazer
+ * @date 2025/3/5 17:32
+ **/
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CaStartVo {
+    /**
+     * 签名任务id,StartAutoSign的返回参数，形如：SD_18eb25f8-3d15-4971-a60c-730c1480d837
+     */
+    private String signDataId;
+    /**
+     * 签名结果，形如：MEYCIQDvcy6/WHJ+8QS1S1Ja1Q9FBa6gtnboxwndyQpHBBbcaQIhAMeZjymkozFKm1MaD2xq/ L4JhW3gO5XTmGL6SO0MzZw
+     */
+    private String signResult;
+    /**
+     * 证书，形如：MIIDAzCCAqagAwIBAgISXXXXXXXXXXXu4j9CUZ/w0w==
+     */
+    private String signCert;
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/winlis/LasSapSampleregVo.java

@@ -0,0 +1,23 @@
+package com.neuhis.his.domain.vo.winlis;
+
+import com.neuhis.his.domain.entity.winlis.LasRtResult;
+import com.neuhis.his.domain.entity.winlis.LasSapSamplereg;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 常规检验登记表Vo
+ *
+ * @author dazer
+ * @date 2025/3/5 19:21
+ **/
+@Getter
+@Setter
+@NoArgsConstructor
+public class LasSapSampleregVo extends LasSapSamplereg {
+    private List<LasRtResult> rtResultList = new ArrayList<>();
+}

ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComControlargumentMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.ComControlargument;
+import com.neuhis.his.domain.entity.his.ComControlargument;
 
 public interface ComControlargumentMapper {
     int deleteByPrimaryKey(String controlCode);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDepartmentMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.ComDepartment;
+import com.neuhis.his.domain.entity.his.ComDepartment;
 
 public interface ComDepartmentMapper {
     int deleteByPrimaryKey(String deptCode);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDictionaryMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.ComDictionary;
+import com.neuhis.his.domain.entity.his.ComDictionary;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComEmployeeMapper.java

@@ -2,7 +2,7 @@ package com.neuhis.his.mapper;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
-import com.neuhis.his.domain.entity.ComEmployee;
+import com.neuhis.his.domain.entity.his.ComEmployee;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComPatientinfoMapper.java

@@ -1,8 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.neuhis.his.domain.entity.ComPatientinfo;
+import com.neuhis.his.domain.entity.his.ComPatientinfo;
 import com.neuhis.his.domain.entity.HisSqlLogHis;
 
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/DawnCodeInfoMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.DawnCodeInfo;
+import com.neuhis.his.domain.entity.his.DawnCodeInfo;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComExamorderMapper.java

@@ -1,7 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinComExamorder;
-import com.neuhis.his.domain.entity.FinIpbItemlist;
+import com.neuhis.his.domain.entity.his.FinComExamorder;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndruginfoMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinComUndruginfo;
+import com.neuhis.his.domain.entity.his.FinComUndruginfo;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndrugztinfoMapper.java

@@ -1,7 +1,7 @@
 package com.neuhis.his.mapper;
 
 import com.neuhis.his.domain.dto.ComUndrugZtFeeGroupItem;
-import com.neuhis.his.domain.entity.FinComUndrugztinfo;
+import com.neuhis.his.domain.entity.his.FinComUndrugztinfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbFeeinfoMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinIpbFeeinfo;
+import com.neuhis.his.domain.entity.his.FinIpbFeeinfo;
 import org.apache.ibatis.annotations.Param;
 
 public interface FinIpbFeeinfoMapper {

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbItemlistMapper.java

@@ -1,7 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinIpbItemlist;
-import com.neuhis.his.domain.entity.FinOpbFeedetail;
+import com.neuhis.his.domain.entity.his.FinIpbItemlist;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbMedicinelistMapper.java

@@ -1,7 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinIpbMedicinelist;
-import com.neuhis.his.domain.entity.FinOpbFeedetail;
+import com.neuhis.his.domain.entity.his.FinIpbMedicinelist;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprBabyinfoMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinIprBabyinfo;
+import com.neuhis.his.domain.entity.his.FinIprBabyinfo;
 import org.apache.ibatis.annotations.Param;
 
 public interface FinIprBabyinfoMapper {

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprInmaininfoMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinIprInmaininfo;import java.util.List;
+import com.neuhis.his.domain.entity.his.FinIprInmaininfo;import java.util.List;
 
 public interface FinIprInmaininfoMapper {
     int deleteByPrimaryKey(String inpatientNo);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinOpbAccount;
+import com.neuhis.his.domain.entity.his.FinOpbAccount;
 
 public interface FinOpbAccountMapper {
     int deleteByPrimaryKey(String accountNo);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountlistMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinOpbAccountlist;
+import com.neuhis.his.domain.entity.his.FinOpbAccountlist;
 
 public interface FinOpbAccountlistMapper {
     int insert(FinOpbAccountlist record);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountrecordMapper.java

@@ -1,7 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.ComPatientinfo;
-import com.neuhis.his.domain.entity.FinOpbAccountrecord;
+import com.neuhis.his.domain.entity.his.FinOpbAccountrecord;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbFeedetailMapper.java

@@ -1,8 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.ComPatientinfo;
-import com.neuhis.his.domain.entity.FinOpbFeedetail;
-import com.neuhis.his.domain.entity.PushMessageRecorShf;
+import com.neuhis.his.domain.entity.his.FinOpbFeedetail;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbInvoiceinfoMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinOpbInvoiceinfo;
+import com.neuhis.his.domain.entity.his.FinOpbInvoiceinfo;
 import org.apache.ibatis.annotations.Param;
 
 public interface FinOpbInvoiceinfoMapper {

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprRegisterMapper.java

@@ -1,7 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinIprInmaininfo;
-import com.neuhis.his.domain.entity.FinOprRegister;
+import com.neuhis.his.domain.entity.his.FinOprRegister;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprSchemaMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.FinOprSchema;
+import com.neuhis.his.domain.entity.his.FinOprSchema;
 
 public interface FinOprSchemaMapper {
     int deleteByPrimaryKey(String id);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MdcDiPathMapper.java

@@ -1,8 +1,7 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MdcDiPath;
+import com.neuhis.his.domain.entity.his.MdcDiPath;
 
-import javax.validation.constraints.AssertTrue;
 import java.util.List;
 
 public interface MdcDiPathMapper {

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetCasDiagnoseMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetCasDiagnose;
+import com.neuhis.his.domain.entity.his.MetCasDiagnose;
 import org.apache.ibatis.annotations.Param;
 
 public interface MetCasDiagnoseMapper {

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComIcd10Mapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetComIcd10;
+import com.neuhis.his.domain.entity.his.MetComIcd10;
 
 public interface MetComIcd10Mapper {
     int deleteByPrimaryKey(String sequenceNo);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComOperationLocalMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetComOperationLocal;
+import com.neuhis.his.domain.entity.his.MetComOperationLocal;
 
 public interface MetComOperationLocalMapper {
     int insert(MetComOperationLocal record);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmBookedMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetIpmBooked;
+import com.neuhis.his.domain.entity.his.MetIpmBooked;
 
 public interface MetIpmBookedMapper {
     int deleteByPrimaryKey(String bookedSqn);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecdrugMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetIpmExecdrug;
+import com.neuhis.his.domain.entity.his.MetIpmExecdrug;
 
 public interface MetIpmExecdrugMapper {
     int deleteByPrimaryKey(String execSqn);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecundrugMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetIpmExecundrug;
+import com.neuhis.his.domain.entity.his.MetIpmExecundrug;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmOrderMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetIpmOrder;
+import com.neuhis.his.domain.entity.his.MetIpmOrder;
 
 public interface MetIpmOrderMapper {
     int deleteByPrimaryKey(String moOrder);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetMrsBaseMapper.java

@@ -1,9 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.neuhis.his.domain.entity.ComPatientinfo;
-import com.neuhis.his.domain.entity.MetMrsBase;
+import com.neuhis.his.domain.entity.his.MetMrsBase;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiCancelitemMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetNuiCancelitem;
+import com.neuhis.his.domain.entity.his.MetNuiCancelitem;
 
 public interface MetNuiCancelitemMapper {
     int deleteByPrimaryKey(String applyNo);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiExerecordMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetNuiExerecord;
+import com.neuhis.his.domain.entity.his.MetNuiExerecord;
 import org.apache.ibatis.annotations.Param;
 
 public interface MetNuiExerecordMapper {

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsApplyMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetOpsApply;
+import com.neuhis.his.domain.entity.his.MetOpsApply;
 
 public interface MetOpsApplyMapper {
     int deleteByPrimaryKey(String operationno);

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsArrangeMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetOpsArrange;
+import com.neuhis.his.domain.entity.his.MetOpsArrange;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsOperationitemMapper.java

@@ -1,7 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetOpsArrange;
-import com.neuhis.his.domain.entity.MetOpsOperationitem;
+import com.neuhis.his.domain.entity.his.MetOpsOperationitem;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeApplyTypeMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetOrdeApplyType;
+import com.neuhis.his.domain.entity.his.MetOrdeApplyType;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeBigexampartMapper.java

@@ -1,6 +1,6 @@
 package com.neuhis.his.mapper;
 
-import com.neuhis.his.domain.entity.MetOrdeBigexampart;
+import com.neuhis.his.domain.entity.his.MetOrdeBigexampart;
 
 import java.util.List;