feat(all): Winlis新增：las_sap_cadata生成内容

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

@@ -33,8 +33,10 @@ public class AppBjCaController {
     private IWinLisService winLisService;
     /**
      * startAutoSign启动自动签名获取的签名数据，[签名任务id]
+     * 使用过的任务id: SD_4c6ec5f6-22e3-4fae-b2aa-681e5beacf1e
+     * 使用过的任务id: SD_892d8817-4a96-445c-a5c1-2eb9f334fecc
      */
-    private String autoSignSignDataId = "SD_892d8817-4a96-445c-a5c1-2eb9f334fecc";
+    private String autoSignSignDataId = "SD_4c6ec5f6-22e3-4fae-b2aa-681e5beacf1e";
 
     @GetMapping("/startAutoSign")
     @ApiOperation(value = "步骤A：启动自动签名", notes = "步骤1、启动自动签名，获取签名二维码，让医师使用【协同签名】进行签名")

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

@@ -0,0 +1,157 @@
+package com.neuhis.his.domain.entity.winlis;
+
+import java.util.Date;
+
+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;
+
+/**
+ * CA签名信息
+  对通过数字签名完成的数据进行保存对象 las_sap_cadata
+ * 
+ * @author ruoyi
+ * @date 2025-03-07
+ */
+public class LasSapCadata extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 签名时间 */
+    private Date catime;
+
+    /** 检验日期 */
+    private String testdate;
+
+    /** 仪器ID */
+    private String machineid;
+
+    /** 样本号 */
+    private String sampleid;
+
+    /** 条码号 */
+    @Excel(name = "条码号")
+    private String barcode;
+
+    /** 原始数据 */
+    @Excel(name = "原始数据")
+    private String srcdata;
+
+    /** CA数据 */
+    @Excel(name = "CA数据")
+    private String caclobdata;
+
+    /** CA原始数据 */
+    @Excel(name = "CA原始数据")
+    private String srcclobdata;
+
+    /** CAID */
+    @Excel(name = "CAID")
+    private String caid;
+
+    public void setCatime(Date catime) 
+    {
+        this.catime = catime;
+    }
+
+    public Date getCatime() 
+    {
+        return catime;
+    }
+
+    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 setBarcode(String barcode) 
+    {
+        this.barcode = barcode;
+    }
+
+    public String getBarcode() 
+    {
+        return barcode;
+    }
+
+    public void setSrcdata(String srcdata) 
+    {
+        this.srcdata = srcdata;
+    }
+
+    public String getSrcdata() 
+    {
+        return srcdata;
+    }
+
+    public void setCaclobdata(String caclobdata) 
+    {
+        this.caclobdata = caclobdata;
+    }
+
+    public String getCaclobdata() 
+    {
+        return caclobdata;
+    }
+
+    public void setSrcclobdata(String srcclobdata) 
+    {
+        this.srcclobdata = srcclobdata;
+    }
+
+    public String getSrcclobdata() 
+    {
+        return srcclobdata;
+    }
+
+    public void setCaid(String caid) 
+    {
+        this.caid = caid;
+    }
+
+    public String getCaid() 
+    {
+        return caid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("catime", getCatime())
+            .append("testdate", getTestdate())
+            .append("machineid", getMachineid())
+            .append("sampleid", getSampleid())
+            .append("barcode", getBarcode())
+            .append("srcdata", getSrcdata())
+            .append("caclobdata", getCaclobdata())
+            .append("srcclobdata", getSrcclobdata())
+            .append("caid", getCaid())
+            .toString();
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.ComControlargument;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.ComDepartment;
 

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.ComPatientinfo;
 import com.neuhis.his.domain.entity.HisSqlLogHis;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.DawnCodeInfo;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinComExamorder;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinComUndruginfo;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.dto.ComUndrugZtFeeGroupItem;
 import com.neuhis.his.domain.entity.his.FinComUndrugztinfo;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinIpbFeeinfo;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinIpbItemlist;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinIpbMedicinelist;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinIprBabyinfo;
 import org.apache.ibatis.annotations.Param;

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinOpbAccount;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinOpbAccountlist;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinOpbAccountrecord;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinOpbFeedetail;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinOpbInvoiceinfo;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinOprRegister;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.FinOprSchema;
 

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MdcDiPath;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetCasDiagnose;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetComIcd10;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetComOperationLocal;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetIpmBooked;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetIpmExecdrug;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetIpmExecundrug;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetIpmOrder;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetMrsBase;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetNuiCancelitem;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetNuiExerecord;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetOpsApply;
 

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetOpsOperationitem;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetOrdeApplyType;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetOrdeBigexampart;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetOrdeExampart;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetOrdiOrder;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetOrdoOrder;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.MetOrdtUndrugterm;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.NsrNisRecordDetail;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.NsrStandardCode;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.PdaBloodCircuit;
 import org.apache.ibatis.annotations.Param;

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.PdaPsrRecord;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.PhaComApplyout;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.mapper;
+package com.neuhis.his.mapper.his;
 
 import com.neuhis.his.domain.entity.his.PhaComBaseinfo;
 

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

@@ -0,0 +1,77 @@
+package com.neuhis.his.mapper.winlis;
+
+import com.neuhis.his.domain.entity.winlis.LasSapCadata;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * CA签名信息
+  对通过数字签名完成的数据进行保存Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-03-07
+ */
+public interface LasSapCadataMapper 
+{
+    /**
+     * 查询CA签名信息
+  对通过数字签名完成的数据进行保存
+     * 
+     * @param catime CA签名信息
+  对通过数字签名完成的数据进行保存主键
+     * @return CA签名信息
+  对通过数字签名完成的数据进行保存
+     */
+    public LasSapCadata selectLasSapCadataByCatime(Date catime);
+
+    /**
+     * 查询CA签名信息
+  对通过数字签名完成的数据进行保存列表
+     * 
+     * @param lasSapCadata CA签名信息
+  对通过数字签名完成的数据进行保存
+     * @return CA签名信息
+  对通过数字签名完成的数据进行保存集合
+     */
+    public List<LasSapCadata> selectLasSapCadataList(LasSapCadata lasSapCadata);
+
+    /**
+     * 新增CA签名信息
+  对通过数字签名完成的数据进行保存
+     * 
+     * @param lasSapCadata CA签名信息
+  对通过数字签名完成的数据进行保存
+     * @return 结果
+     */
+    public int insertLasSapCadata(LasSapCadata lasSapCadata);
+
+    /**
+     * 修改CA签名信息
+  对通过数字签名完成的数据进行保存
+     * 
+     * @param lasSapCadata CA签名信息
+  对通过数字签名完成的数据进行保存
+     * @return 结果
+     */
+    public int updateLasSapCadata(LasSapCadata lasSapCadata);
+
+    /**
+     * 删除CA签名信息
+  对通过数字签名完成的数据进行保存
+     * 
+     * @param catime CA签名信息
+  对通过数字签名完成的数据进行保存主键
+     * @return 结果
+     */
+    public int deleteLasSapCadataByCatime(Date catime);
+
+    /**
+     * 批量删除CA签名信息
+  对通过数字签名完成的数据进行保存
+     * 
+     * @param catimes 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteLasSapCadataByCatimes(String[] catimes);
+}

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/HisSqlLogHisServiceImpl.java

@@ -8,7 +8,7 @@ import com.neuhis.his.common.GlobalConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.neuhis.his.mapper.HisSqlLogHisMapper;
+import com.neuhis.his.mapper.his.HisSqlLogHisMapper;
 import com.neuhis.his.domain.entity.HisSqlLogHis;
 import com.neuhis.his.service.IHisSqlLogHisService;
 import com.ruoyi.common.core.text.Convert;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComControlargumentServiceImpl.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.neuhis.his.mapper.ComControlargumentMapper;
+import com.neuhis.his.mapper.his.ComControlargumentMapper;
 import com.neuhis.his.domain.entity.his.ComControlargument;
 import com.neuhis.his.service.his.IComControlargumentService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDepartmentServiceImpl.java

@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.his.ComDepartment;
-import com.neuhis.his.mapper.ComDepartmentMapper;
+import com.neuhis.his.mapper.his.ComDepartmentMapper;
 import com.neuhis.his.service.his.IComDepartmentService;
 import org.springframework.transaction.annotation.Transactional;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDictionaryServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 import com.neuhis.his.domain.entity.his.ComDictionary;
-import com.neuhis.his.mapper.ComDictionaryMapper;
+import com.neuhis.his.mapper.his.ComDictionaryMapper;
 import com.neuhis.his.service.his.IComDictionaryService;
 import org.springframework.transaction.annotation.Transactional;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComEmployeeServiceImpl.java

@@ -8,7 +8,7 @@ import com.neuhis.his.common.GlobalConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.neuhis.his.mapper.ComEmployeeMapper;
+import com.neuhis.his.mapper.his.ComEmployeeMapper;
 import com.neuhis.his.domain.entity.his.ComEmployee;
 import com.neuhis.his.service.his.IComEmployeeService;
 import org.springframework.transaction.annotation.Transactional;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.neuhis.his.service.impl.his;
 
 import cn.hutool.json.JSONUtil;
 import com.neuhis.his.domain.entity.his.*;
+import com.neuhis.his.mapper.his.*;
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
@@ -9,7 +10,6 @@ import com.neuhis.utils.RedisUtils;
 import com.neuhis.his.common.GlobalConstants;
 import com.neuhis.his.domain.entity.*;
 import com.neuhis.his.domain.entity.items.PVisit;
-import com.neuhis.his.mapper.*;
 import com.neuhis.his.service.IBizHandleRecordService;
 import com.neuhis.his.service.his.IFinOpbAccountService;
 import com.neuhis.his.service.his.IMdcDiPathService;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/DawnCodeInfoServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.DawnCodeInfo;
-import com.neuhis.his.mapper.DawnCodeInfoMapper;
+import com.neuhis.his.mapper.his.DawnCodeInfoMapper;
 import com.neuhis.his.service.his.IDawnCodeInfoService;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComExamorderServiceImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.FinComExamorderMapper;
+import com.neuhis.his.mapper.his.FinComExamorderMapper;
 import com.neuhis.his.domain.entity.his.FinComExamorder;
 import com.neuhis.his.service.his.IFinComExamorderService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndruginfoServiceImpl.java

@@ -8,7 +8,7 @@ import com.neuhis.his.common.GlobalConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.neuhis.his.mapper.FinComUndruginfoMapper;
+import com.neuhis.his.mapper.his.FinComUndruginfoMapper;
 import com.neuhis.his.domain.entity.his.FinComUndruginfo;
 import com.neuhis.his.service.his.IFinComUndruginfoService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndrugztinfoServiceImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.FinComUndrugztinfo;
-import com.neuhis.his.mapper.FinComUndrugztinfoMapper;
+import com.neuhis.his.mapper.his.FinComUndrugztinfoMapper;
 import com.neuhis.his.service.his.IFinComUndrugztinfoService;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbFeeinfoServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.FinIpbFeeinfo;
-import com.neuhis.his.mapper.FinIpbFeeinfoMapper;
+import com.neuhis.his.mapper.his.FinIpbFeeinfoMapper;
 import com.neuhis.his.service.his.IFinIpbFeeinfoService;
 
 @Service

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbItemlistServiceImpl.java

@@ -7,7 +7,7 @@ import com.neuhis.his.common.GlobalConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.neuhis.his.mapper.FinIpbItemlistMapper;
+import com.neuhis.his.mapper.his.FinIpbItemlistMapper;
 import com.neuhis.his.domain.entity.his.FinIpbItemlist;
 import com.neuhis.his.service.his.IFinIpbItemlistService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbMedicinelistServiceImpl.java

@@ -7,7 +7,7 @@ import com.neuhis.his.common.GlobalConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.neuhis.his.mapper.FinIpbMedicinelistMapper;
+import com.neuhis.his.mapper.his.FinIpbMedicinelistMapper;
 import com.neuhis.his.domain.entity.his.FinIpbMedicinelist;
 import com.neuhis.his.service.his.IFinIpbMedicinelistService;
 import org.springframework.transaction.annotation.Transactional;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprBabyinfoServiceImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.FinIprBabyinfoMapper;
+import com.neuhis.his.mapper.his.FinIprBabyinfoMapper;
 import com.neuhis.his.domain.entity.his.FinIprBabyinfo;
 import com.neuhis.his.service.his.IFinIprBabyinfoService;
 @Service

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprInmaininfoServiceImpl.java

@@ -4,12 +4,12 @@ import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import com.neuhis.utils.RedisUtils;
 import com.neuhis.his.common.GlobalConstants;
-import com.neuhis.his.mapper.ComPatientinfoMapper;
+import com.neuhis.his.mapper.his.ComPatientinfoMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.his.FinIprInmaininfo;
-import com.neuhis.his.mapper.FinIprInmaininfoMapper;
+import com.neuhis.his.mapper.his.FinIprInmaininfoMapper;
 import com.neuhis.his.service.his.IFinIprInmaininfoService;
 
 import java.util.Date;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountServiceImpl.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.neuhis.his.mapper.FinOpbAccountMapper;
+import com.neuhis.his.mapper.his.FinOpbAccountMapper;
 import com.neuhis.his.domain.entity.his.FinOpbAccount;
 import com.neuhis.his.service.his.IFinOpbAccountService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountlistServiceImpl.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.neuhis.his.mapper.FinOpbAccountlistMapper;
+import com.neuhis.his.mapper.his.FinOpbAccountlistMapper;
 import com.neuhis.his.domain.entity.his.FinOpbAccountlist;
 import com.neuhis.his.service.his.IFinOpbAccountlistService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountrecordServiceImpl.java

@@ -5,7 +5,7 @@ import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.his.FinOpbAccountrecord;
-import com.neuhis.his.mapper.FinOpbAccountrecordMapper;
+import com.neuhis.his.mapper.his.FinOpbAccountrecordMapper;
 import com.neuhis.his.service.his.IFinOpbAccountrecordService;
 import org.springframework.transaction.annotation.Transactional;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbFeedetailServiceImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 import com.neuhis.his.domain.entity.his.FinOpbFeedetail;
-import com.neuhis.his.mapper.FinOpbFeedetailMapper;
+import com.neuhis.his.mapper.his.FinOpbFeedetailMapper;
 import com.neuhis.his.service.his.IFinOpbFeedetailService;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbInvoiceinfoServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.FinOpbInvoiceinfo;
-import com.neuhis.his.mapper.FinOpbInvoiceinfoMapper;
+import com.neuhis.his.mapper.his.FinOpbInvoiceinfoMapper;
 import com.neuhis.his.service.FinOpbInvoiceinfoService;
 
 @Service

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprRegisterServiceImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 import com.neuhis.his.domain.entity.his.FinOprRegister;
-import com.neuhis.his.mapper.FinOprRegisterMapper;
+import com.neuhis.his.mapper.his.FinOprRegisterMapper;
 import com.neuhis.his.service.his.IFinOprRegisterService;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprSchemaServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.FinOprSchema;
-import com.neuhis.his.mapper.FinOprSchemaMapper;
+import com.neuhis.his.mapper.his.FinOprSchemaMapper;
 import com.neuhis.his.service.his.IFinOprSchemaService;
 
 @DataSource(value = DataSourceType.SLAVE)

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MdcDiPathServiceImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.MdcDiPathMapper;
+import com.neuhis.his.mapper.his.MdcDiPathMapper;
 import com.neuhis.his.domain.entity.his.MdcDiPath;
 import com.neuhis.his.service.his.IMdcDiPathService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetCasDiagnoseServiceImpl.java

@@ -5,7 +5,7 @@ import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.his.MetCasDiagnose;
-import com.neuhis.his.mapper.MetCasDiagnoseMapper;
+import com.neuhis.his.mapper.his.MetCasDiagnoseMapper;
 import com.neuhis.his.service.his.IMetCasDiagnoseService;
 
 @Service

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComIcd10ServiceImpl.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.MetComIcd10;
-import com.neuhis.his.mapper.MetComIcd10Mapper;
+import com.neuhis.his.mapper.his.MetComIcd10Mapper;
 import com.neuhis.his.service.his.IMetComIcd10Service;
 
 @Service

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComOperationLocalServiceImpl.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.MetComOperationLocal;
-import com.neuhis.his.mapper.MetComOperationLocalMapper;
+import com.neuhis.his.mapper.his.MetComOperationLocalMapper;
 import com.neuhis.his.service.his.IMetComOperationLocalService;
 @Service
 public class MetComOperationLocalServiceImpl implements IMetComOperationLocalService {

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmBookedServiceImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.MetIpmBookedMapper;
+import com.neuhis.his.mapper.his.MetIpmBookedMapper;
 import com.neuhis.his.domain.entity.his.MetIpmBooked;
 import com.neuhis.his.service.his.IMetIpmBookedService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecdrugServiceImpl.java

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.his.MetIpmExecdrug;
-import com.neuhis.his.mapper.MetIpmExecdrugMapper;
+import com.neuhis.his.mapper.his.MetIpmExecdrugMapper;
 import com.neuhis.his.service.his.IMetIpmExecdrugService;
 
 @Service

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecundrugServiceImpl.java

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.his.MetIpmExecundrug;
-import com.neuhis.his.mapper.MetIpmExecundrugMapper;
+import com.neuhis.his.mapper.his.MetIpmExecundrugMapper;
 import com.neuhis.his.service.his.IMetIpmExecundrugService;
 import org.springframework.transaction.annotation.Transactional;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmOrderServiceImpl.java

@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.his.MetIpmOrder;
-import com.neuhis.his.mapper.MetIpmOrderMapper;
+import com.neuhis.his.mapper.his.MetIpmOrderMapper;
 import com.neuhis.his.service.his.IMetIpmOrderService;
 
 @DataSource(value = DataSourceType.SLAVE)

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetMrsBaseServiceImpl.java

@@ -5,7 +5,7 @@ import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.his.MetMrsBase;
-import com.neuhis.his.mapper.MetMrsBaseMapper;
+import com.neuhis.his.mapper.his.MetMrsBaseMapper;
 import com.neuhis.his.service.his.IMetMrsBaseService;
 
 @Service

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiCancelitemServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.MetNuiCancelitemMapper;
+import com.neuhis.his.mapper.his.MetNuiCancelitemMapper;
 import com.neuhis.his.domain.entity.his.MetNuiCancelitem;
 
 @DataSource(value = DataSourceType.SLAVE)

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiExerecordServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.MetNuiExerecord;
-import com.neuhis.his.mapper.MetNuiExerecordMapper;
+import com.neuhis.his.mapper.his.MetNuiExerecordMapper;
 import com.neuhis.his.service.his.IMetNuiExerecordService;
 
 @DataSource(value = DataSourceType.SLAVE)

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsApplyServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.MetOpsApply;
-import com.neuhis.his.mapper.MetOpsApplyMapper;
+import com.neuhis.his.mapper.his.MetOpsApplyMapper;
 import com.neuhis.his.service.his.IMetOpsApplyService;
 @DataSource(value = DataSourceType.SLAVE)
 @Service

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsArrangeServiceImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.MetOpsArrangeMapper;
+import com.neuhis.his.mapper.his.MetOpsArrangeMapper;
 import com.neuhis.his.domain.entity.his.MetOpsArrange;
 import com.neuhis.his.service.his.IMetOpsArrangeService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsOperationitemServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.MetOpsOperationitem;
-import com.neuhis.his.mapper.MetOpsOperationitemMapper;
+import com.neuhis.his.mapper.his.MetOpsOperationitemMapper;
 import com.neuhis.his.service.his.IMetOpsOperationitemService;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeApplyTypeServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.MetOrdeApplyType;
-import com.neuhis.his.mapper.MetOrdeApplyTypeMapper;
+import com.neuhis.his.mapper.his.MetOrdeApplyTypeMapper;
 import com.neuhis.his.service.his.IMetOrdeApplyTypeService;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeBigexampartServiceImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.MetOrdeBigexampartMapper;
+import com.neuhis.his.mapper.his.MetOrdeBigexampartMapper;
 import com.neuhis.his.domain.entity.his.MetOrdeBigexampart;
 
 import java.util.List;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeExampartServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.MetOrdeExampart;
-import com.neuhis.his.mapper.MetOrdeExampartMapper;
+import com.neuhis.his.mapper.his.MetOrdeExampartMapper;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdiOrderServiceImpl.java

@@ -7,7 +7,7 @@ import com.neuhis.his.common.GlobalConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.neuhis.his.mapper.MetOrdiOrderMapper;
+import com.neuhis.his.mapper.his.MetOrdiOrderMapper;
 import com.neuhis.his.domain.entity.his.MetOrdiOrder;
 import com.neuhis.his.service.his.IMetOrdiOrderService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdoOrderServiceImpl.java

@@ -8,7 +8,7 @@ import com.neuhis.his.common.GlobalConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.neuhis.his.mapper.MetOrdoOrderMapper;
+import com.neuhis.his.mapper.his.MetOrdoOrderMapper;
 import com.neuhis.his.domain.entity.his.MetOrdoOrder;
 import com.neuhis.his.service.his.IMetOrdoOrderService;
 import org.springframework.transaction.annotation.Transactional;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdtUndrugtermServiceImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.MetOrdtUndrugtermMapper;
+import com.neuhis.his.mapper.his.MetOrdtUndrugtermMapper;
 import com.neuhis.his.domain.entity.his.MetOrdtUndrugterm;
 import com.neuhis.his.service.his.IMetOrdtUndrugtermService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrNisRecordDetailServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.NsrNisRecordDetail;
-import com.neuhis.his.mapper.NsrNisRecordDetailMapper;
+import com.neuhis.his.mapper.his.NsrNisRecordDetailMapper;
 import com.neuhis.his.service.his.INsrNisRecordDetailService;
 import org.springframework.transaction.annotation.Transactional;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrStandardCodeServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.NsrStandardCode;
-import com.neuhis.his.mapper.NsrStandardCodeMapper;
+import com.neuhis.his.mapper.his.NsrStandardCodeMapper;
 import com.neuhis.his.service.his.INsrStandardCodeService;
 import org.springframework.transaction.annotation.Transactional;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaBloodCircuitServiceImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.PdaBloodCircuitMapper;
+import com.neuhis.his.mapper.his.PdaBloodCircuitMapper;
 import com.neuhis.his.domain.entity.his.PdaBloodCircuit;
 import com.neuhis.his.service.his.IPdaBloodCircuitService;
 

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRatingRecordServiceImpl.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.enums.DataSourceType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.neuhis.his.mapper.PdaPsrRatingRecordMapper;
+import com.neuhis.his.mapper.his.PdaPsrRatingRecordMapper;
 import com.neuhis.his.domain.entity.HisPdaPsrRatingRecord;
 import com.neuhis.his.service.his.IPdaPsrRatingRecordService;
 import com.ruoyi.common.core.text.Convert;

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRecordServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.his.PdaPsrRecord;
-import com.neuhis.his.mapper.PdaPsrRecordMapper;
+import com.neuhis.his.mapper.his.PdaPsrRecordMapper;
 import com.neuhis.his.service.his.IPdaPsrRecordService;
 
 @DataSource(value = DataSourceType.SLAVE)

ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComApplyoutServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.neuhis.his.mapper.PhaComApplyoutMapper;
+import com.neuhis.his.mapper.his.PhaComApplyoutMapper;
 import com.neuhis.his.domain.entity.his.PhaComApplyout;
 import org.springframework.transaction.annotation.Transactional;