feat(all): 修改service路径

ruoyi-admin/pom.xml

@@ -119,14 +119,6 @@
             <artifactId>gson</artifactId>
             <version>2.11.0</version>
         </dependency>
-
-
-        <!-- sql性能分析插件 -->
-        <dependency>
-            <groupId>p6spy</groupId>
-            <artifactId>p6spy</artifactId>
-            <version>3.9.1</version>
-        </dependency>
     </dependencies>
 
     <build>

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

@@ -3,6 +3,8 @@ package com.neuhis.his.app.controller;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONUtil;
+import com.neuhis.his.service.his.IComDictionaryService;
+import com.neuhis.his.service.his.IPhaComBaseinfoService;
 import com.neuhis.quartz.task.common.JobService;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -20,7 +22,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Map;

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

@@ -1,29 +1,13 @@
 package com.neuhis.his.app.controller;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.IdcardUtil;
-import cn.hutool.json.JSONUtil;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.neuhis.his.common.ComDictionaryTypeEnum;
-import com.neuhis.his.domain.entity.ComEmployee;
-import com.neuhis.his.domain.entity.ComPatientinfo;
-import com.neuhis.his.domain.vo.EmployeeVO;
-import com.neuhis.his.domain.vo.FeeConfirmVO;
-import com.neuhis.his.domain.vo.JZComPatientInfoVO;
-import com.neuhis.his.service.IComDictionaryService;
-import com.neuhis.his.service.IComEmployeeService;
-import com.neuhis.his.service.IComPatientinfoService;
+import com.neuhis.his.service.his.IComDictionaryService;
+import com.neuhis.his.service.his.IComPatientinfoService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 /**
  * 存储过程Controller
  *

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

@@ -1,26 +0,0 @@
-package com.neuhis.his.common.config;
-
-import com.alibaba.fastjson.JSONObject;
-import com.p6spy.engine.spy.appender.MessageFormattingStrategy;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * P6Spy有内置的SQL输出格式，如上配置文件。这里我们使用自定义SQL日志打印
- *
- * @author dazer
- * @date 2025/3/5 14:46
- **/
-public class P6SPYConfig implements MessageFormattingStrategy {
-    @Override
-    public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) {
-        Map<String, Object> message = new LinkedHashMap<>(8);
-        String newPrepared = prepared.replace("   ", "").replace("\n", " ");
-        message.put("prepared", newPrepared);
-        String newSql = sql.replace("   ", "").replace("\n", " ");
-        message.put("sql", newSql);
-        return JSONObject.toJSONString(message, true);
-    }
-
-}

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

@@ -5,9 +5,7 @@ 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.ComPatientinfo;
-import com.neuhis.his.service.IComEmployeeService;
-import com.neuhis.his.service.IComPatientinfoService;
+import com.neuhis.his.service.his.IComEmployeeService;
 import com.neuhis.utils.IdcardUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -5,7 +5,7 @@ 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.service.IComPatientinfoService;
+import com.neuhis.his.service.his.IComPatientinfoService;
 import com.neuhis.utils.IdcardUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -0,0 +1,608 @@
+package com.neuhis.his.domain.entity.winlis;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 常规检验结果对象 las_rt_result
+ * 
+ * @author ruoyi
+ * @date 2025-03-05
+ */
+public class LasRtResult extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 检验日期 */
+    private String testdate;
+
+    /** 仪器ID */
+    private String machineid;
+
+    /** 样本号 */
+    private String sampleid;
+
+    /** 项目编码 */
+    private String itemid;
+
+    /** 项目标准编码 */
+    @Excel(name = "项目标准编码")
+    private String loincid;
+
+    /** 英文编码 */
+    @Excel(name = "英文编码")
+    private String engname;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String itemname;
+
+    /** 打印顺序 */
+    @Excel(name = "打印顺序")
+    private Long printseq;
+
+    /** 条码号 */
+    @Excel(name = "条码号")
+    private String barcode;
+
+    /** 测试时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "测试时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date testtime;
+
+    /** 报告结果 */
+    @Excel(name = "报告结果")
+    private String reportvalue;
+
+    /** 重做结果 */
+    @Excel(name = "重做结果")
+    private String rerunvalue;
+
+    /** 描述结果 */
+    @Excel(name = "描述结果")
+    private String descvalue;
+
+    /** 结果列表 */
+    @Excel(name = "结果列表")
+    private String resultlist;
+
+    /** 原始结果 */
+    @Excel(name = "原始结果")
+    private String orgvalue;
+
+    /** 结果来源(见位标识表达) */
+    @Excel(name = "结果来源(见位标识表达)")
+    private String valuesrc;
+
+    /** 复查标识(1:复查,0:原始) */
+    @Excel(name = "复查标识(1:复查,0:原始)")
+    private String rerunflag;
+
+    /** 参考范围 */
+    @Excel(name = "参考范围")
+    private String rangeinfo;
+
+    /** 检验单位 */
+    @Excel(name = "检验单位")
+    private String unit;
+
+    /** 结果标识:高低,正常等. */
+    @Excel(name = "结果标识:高低,正常等.")
+    private String resultflag;
+
+    /** 患者ID */
+    @Excel(name = "患者ID")
+    private String patientid;
+
+    /** 患者类型 */
+    @Excel(name = "患者类型")
+    private String patienttype;
+
+    /** 样本类型 */
+    @Excel(name = "样本类型")
+    private String sampletype;
+
+    /** 测试仪器ID */
+    @Excel(name = "测试仪器ID")
+    private String testmachineid;
+
+    /** 架号位置号 */
+    @Excel(name = "架号位置号")
+    private String rackcup;
+
+    /** 收费项目编码 */
+    @Excel(name = "收费项目编码")
+    private String hisitemid;
+
+    /** 项目打印行数(默认为1) */
+    @Excel(name = "项目打印行数(默认为1)")
+    private Long printrow;
+
+    /** 危急值处理标识(1:已发送,2:已忽略,3:已反馈,4:已完成,5:已发现,空:未处理) */
+    @Excel(name = "危急值处理标识(1:已发送,2:已忽略,3:已反馈,4:已完成,5:已发现,空:未处理)")
+    private String alertflag;
+
+    /** 危急值范围 */
+    @Excel(name = "危急值范围")
+    private String rangelimit;
+
+    /** 检验中状态(对原始数据解析内容) */
+    @Excel(name = "检验中状态(对原始数据解析内容)")
+    private String checkstate;
+
+    /** 结果传输时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "结果传输时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date commtime;
+
+    /** 检验方法 */
+    @Excel(name = "检验方法")
+    private String method;
+
+    /** Cutoff值(酶标) */
+    @Excel(name = "Cutoff值(酶标)")
+    private String cutoff;
+
+    /** SCO值(酶标) */
+    @Excel(name = "SCO值(酶标)")
+    private String sco;
+
+    /** OD值(酶标) */
+    @Excel(name = "OD值(酶标)")
+    private String odvalue;
+
+    /** 备用结果列 */
+    @Excel(name = "备用结果列")
+    private String memovalue;
+
+    /** 结果属性 */
+    @Excel(name = "结果属性")
+    private String valuepro;
+
+    /** 自动审核标记（流水线）(0:未做审核,1:审核通过,2:审核未通过) */
+    @Excel(name = "自动审核标记", readConverterExp = "流=水线")
+    private String autoconfirmsign;
+
+    /** 自动审核信息（流水线） */
+    @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)
+            .append("testdate", getTestdate())
+            .append("machineid", getMachineid())
+            .append("sampleid", getSampleid())
+            .append("itemid", getItemid())
+            .append("loincid", getLoincid())
+            .append("engname", getEngname())
+            .append("itemname", getItemname())
+            .append("printseq", getPrintseq())
+            .append("barcode", getBarcode())
+            .append("testtime", getTesttime())
+            .append("reportvalue", getReportvalue())
+            .append("rerunvalue", getRerunvalue())
+            .append("descvalue", getDescvalue())
+            .append("resultlist", getResultlist())
+            .append("orgvalue", getOrgvalue())
+            .append("valuesrc", getValuesrc())
+            .append("rerunflag", getRerunflag())
+            .append("rangeinfo", getRangeinfo())
+            .append("unit", getUnit())
+            .append("resultflag", getResultflag())
+            .append("patientid", getPatientid())
+            .append("patienttype", getPatienttype())
+            .append("sampletype", getSampletype())
+            .append("testmachineid", getTestmachineid())
+            .append("rackcup", getRackcup())
+            .append("hisitemid", getHisitemid())
+            .append("printrow", getPrintrow())
+            .append("alertflag", getAlertflag())
+            .append("rangelimit", getRangelimit())
+            .append("checkstate", getCheckstate())
+            .append("commtime", getCommtime())
+            .append("method", getMethod())
+            .append("cutoff", getCutoff())
+            .append("sco", getSco())
+            .append("odvalue", getOdvalue())
+            .append("memovalue", getMemovalue())
+            .append("valuepro", getValuepro())
+            .append("autoconfirmsign", getAutoconfirmsign())
+            .append("autoconfirminfo", getAutoconfirminfo())
+            .toString();
+    }
+}

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

@@ -0,0 +1,431 @@
+package com.neuhis.his.domain.entity.winlis;
+
+import java.util.Date;
+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
+ * 
+ * @author ruoyi
+ * @date 2025-03-05
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class LasSapSamplereg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 检验日期 */
+    private String testdate;
+
+    /** 仪器ID */
+    private String machineid;
+
+    /** 样本号 */
+    private String sampleid;
+
+    /** 条码号 */
+    @Excel(name = "条码号")
+    private String barcode;
+
+    /** 患者类别 */
+    @Excel(name = "患者类别")
+    private String patienttype;
+
+    /** 患者编码 */
+    @Excel(name = "患者编码")
+    private String patientid;
+
+    /** 患者流水号 */
+    @Excel(name = "患者流水号")
+    private String patientseq;
+
+    /** 患者姓名 */
+    @Excel(name = "患者姓名")
+    private String patientname;
+
+    /** 患者性别
+ */
+    @Excel(name = "患者性别")
+    private String patientsex;
+
+    /** 患者年龄 */
+    @Excel(name = "患者年龄")
+    private String patientage;
+
+    /** 年龄单位 */
+    @Excel(name = "年龄单位")
+    private String patientageunit;
+
+    /** 患者电话 */
+    @Excel(name = "患者电话")
+    private String patienttel;
+
+    /** 患者床位号 */
+    @Excel(name = "患者床位号")
+    private String patientbedno;
+
+    /** 患者身份证 */
+    @Excel(name = "患者身份证")
+    private String patientidenno;
+
+    /** 患者民族 */
+    @Excel(name = "患者民族")
+    private String patientrace;
+
+    /** 患者居住地 */
+    @Excel(name = "患者居住地")
+    private String patientsite;
+
+    /** 执行单号 */
+    @Excel(name = "执行单号")
+    private String execsqn;
+
+    /** 急诊标识   0普通  1加急  2抢救 3即复 */
+    @Excel(name = "急诊标识   0普通  1加急  2抢救 3即复")
+    private String emc;
+
+    /** 收费项目编码(15,171,F0001) */
+    @Excel(name = "收费项目编码(15,171,F0001)")
+    private String hisitemidlist;
+
+    /** 收费项目名称列表 */
+    @Excel(name = "收费项目名称列表")
+    private String hisitemnamelist;
+
+    /** 收费项目价格 */
+    @Excel(name = "收费项目价格")
+    private Long hisitemprice;
+
+    /** 开立医生编码 */
+    @Excel(name = "开立医生编码")
+    private String doctorid;
+
+    /** 开立医生姓名 */
+    @Excel(name = "开立医生姓名")
+    private String doctorname;
+
+    /** 开立科室编码 */
+    @Excel(name = "开立科室编码")
+    private String deptid;
+
+    /** 开立科室名称 */
+    @Excel(name = "开立科室名称")
+    private String deptname;
+
+    /** 开立时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "开立时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date ordertime;
+
+    /** 执行科室编码 */
+    @Excel(name = "执行科室编码")
+    private String execdeptid;
+
+    /** 执行科室名称 */
+    @Excel(name = "执行科室名称")
+    private String execdeptname;
+
+    /** 患者病区编码 */
+    @Excel(name = "患者病区编码")
+    private String wardid;
+
+    /** 患者病区名称 */
+    @Excel(name = "患者病区名称")
+    private String wardname;
+
+    /** 样本类型 */
+    @Excel(name = "样本类型")
+    private String sampletype;
+
+    /** 24小时尿量 */
+    @Excel(name = "24小时尿量")
+    private String urineqty;
+
+    /** 标本状态 */
+    @Excel(name = "标本状态")
+    private String samplestate;
+
+    /** 标本采集部位 */
+    @Excel(name = "标本采集部位")
+    private String sampleposition;
+
+    /** 医生诊断 */
+    @Excel(name = "医生诊断")
+    private String diagnosis;
+
+    /** 核准标识.0:未核准,1:核准,2:取消核准,3:待查.4.初审.5:封存 */
+    @Excel(name = "核准标识.0:未核准,1:核准,2:取消核准,3:待查.4.初审.5:封存")
+    private String confirmstate;
+
+    /** 打印标识:0:未打印,1:已打印 */
+    @Excel(name = "打印标识:0:未打印,1:已打印")
+    private String printstate;
+
+    /** 危急值状态:0:否,1:是 */
+    @Excel(name = "危急值状态:0:否,1:是")
+    private String alertstate;
+
+    /** 1  患者信息来源.2  费用状态
+.3  是否为智能核准(自动核准)
+.4  信息发送标识(可以考虑为短信平台提供).
+5  双向系统复查标识.6  条码是否人工组合.7  外部系统数据已处理标识 */
+    @Excel(name = "1  患者信息来源.2  费用状态 .3  是否为智能核准(自动核准) .4  信息发送标识(可以考虑为短信平台提供). 5  双向系统复查标识.6  条码是否人工组合.7  外部系统数据已处理标识")
+    private String state;
+
+    /** 检验类型 */
+    @Excel(name = "检验类型")
+    private String testtype;
+
+    /** 小组编码 */
+    @Excel(name = "小组编码")
+    private String groupid;
+
+    /** 条码打印人编码 */
+    @Excel(name = "条码打印人编码")
+    private String nurseid;
+
+    /** 条码打印人名称 */
+    @Excel(name = "条码打印人名称")
+    private String nursename;
+
+    /** 采样时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "采样时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date sampletime;
+
+    /** 送检员编码 */
+    @Excel(name = "送检员编码")
+    private String senderid;
+
+    /** 送检员名称 */
+    @Excel(name = "送检员名称")
+    private String sendername;
+
+    /** 送检员接收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "送检员接收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date sendtime;
+
+    /** 送检单编码 */
+    @Excel(name = "送检单编码")
+    private String sendformid;
+
+    /** 检验科接收人编码 */
+    @Excel(name = "检验科接收人编码")
+    private String inceptorid;
+
+    /** 检验科接收人姓名 */
+    @Excel(name = "检验科接收人姓名")
+    private String inceptorname;
+
+    /** 检验科接收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "检验科接收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date incepttime;
+
+    /** 标本核收者编码 */
+    @Excel(name = "标本核收者编码")
+    private String accepterid;
+
+    /** 标本核收者名称 */
+    @Excel(name = "标本核收者名称")
+    private String acceptername;
+
+    /** 标本核收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "标本核收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date accepttime;
+
+    /** 标本核准者编码 */
+    @Excel(name = "标本核准者编码")
+    private String approverid;
+
+    /** 标本核准者姓名 */
+    @Excel(name = "标本核准者姓名")
+    private String approvername;
+
+    /** 标本核准时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "标本核准时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approvetime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String memo;
+
+    /** 样本位置信息 */
+    @Excel(name = "样本位置信息")
+    private String rackcup;
+
+    /** 检验单打印时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "检验单打印时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date printedtime;
+
+    /** 检验单打印者编码 */
+    @Excel(name = "检验单打印者编码")
+    private String printerid;
+
+    /** 检验单打印者姓名 */
+    @Excel(name = "检验单打印者姓名")
+    private String printername;
+
+    /** 测试时间(后台更新) */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "测试时间(后台更新)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date checktime;
+
+    /** 结果时间(后台更新) */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "结果时间(后台更新)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date resulttime;
+
+    /** 医院编码(名称) */
+    @Excel(name = "医院编码(名称)")
+    private String hospitalid;
+
+    /** 第二样本号 */
+    @Excel(name = "第二样本号")
+    private String sampleid2;
+
+    /** LIS备注信息 */
+    @Excel(name = "LIS备注信息")
+    private String lismemo;
+
+    /** 出生日期(YYYY-MM-DD) */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "出生日期(YYYY-MM-DD)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthday;
+
+    /** 高级患者信息(唐氏相关信息) */
+    @Excel(name = "高级患者信息(唐氏相关信息)")
+    private String extrainfo;
+
+    /** 应测项目数量 */
+    @Excel(name = "应测项目数量")
+    private Long planitemcount;
+
+    /** 实测项目数量 */
+    @Excel(name = "实测项目数量")
+    private Long actualitemcount;
+
+    /** 已经测试项目数量 */
+    @Excel(name = "已经测试项目数量")
+    private Long testeditemcount;
+
+    /** 是否高危患者 */
+    @Excel(name = "是否高危患者")
+    private String ishighrisk;
+
+    /** 是否药物临床试验(0:否,1:是) */
+    @Excel(name = "是否药物临床试验(0:否,1:是)")
+    private String isgcp;
+
+    /** 原始条码 */
+    @Excel(name = "原始条码")
+    private String barcode2;
+
+    /** 条码打印时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "条码打印时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date barprinttime;
+
+    /** 归档时间(初审时间) */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "归档时间(初审时间)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date documenttime;
+
+    /** 归档人ID */
+    @Excel(name = "归档人ID")
+    private String documentid;
+
+    /** 归档人姓名 */
+    @Excel(name = "归档人姓名")
+    private String documentname;
+
+    /** 预计报告时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "预计报告时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reporttime;
+
+    /** 采样人名称 */
+    @Excel(name = "采样人名称")
+    private String samplegetname;
+
+    /** 采样人编码 */
+    @Excel(name = "采样人编码")
+    private String samplegetid;
+
+    /** 位标识2 */
+    @Excel(name = "位标识2")
+    private String state2;
+
+    /** LSP检验单上传 */
+    @Excel(name = "LSP检验单上传")
+    private String lsptestform;
+
+    /** 执行单号2 */
+    @Excel(name = "执行单号2")
+    private String execsqn2;
+
+    /** 诊断编码 */
+    @Excel(name = "诊断编码")
+    private String diagnosisid;
+
+    /** 患者编码2 */
+    @Excel(name = "患者编码2")
+    private String patientid2;
+
+    /** 患者编码3 */
+    @Excel(name = "患者编码3")
+    private String patientid3;
+
+    /** 患者更多信息 */
+    @Excel(name = "患者更多信息")
+    private String patientinfo;
+
+    /** 自动审核信息（流水线） */
+    @Excel(name = "自动审核信息", readConverterExp = "流=水线")
+    private String autoconfirminfo;
+
+    /** 条码备注 */
+    @Excel(name = "条码备注")
+    private String barcodememo;
+
+    /** 第三方体检读取结果标识,las_com_sqllocal表中增加本地sql */
+    @Excel(name = "第三方体检读取结果标识,las_com_sqllocal表中增加本地sql")
+    private String tjflag;
+
+    /** 生理周期 */
+    @Excel(name = "生理周期")
+    private String menstrualcycle;
+
+    /** 译文信息 */
+    @Excel(name = "译文信息")
+    private String translationinfo;
+
+    /** 混样单号 */
+    @Excel(name = "混样单号")
+    private String mixcode;
+
+    /** 护照号 */
+    @Excel(name = "护照号")
+    private String passportno;
+
+    /** 患者英文姓名 */
+    @Excel(name = "患者英文姓名")
+    private String patientnameen;
+}

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

@@ -0,0 +1,62 @@
+package com.neuhis.his.mapper.winlis;
+
+import com.neuhis.his.domain.entity.winlis.LasRtResult;
+
+import java.util.List;
+
+/**
+ * 常规检验结果Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-03-05
+ */
+public interface LasRtResultMapper 
+{
+    /**
+     * 查询常规检验结果
+     * 
+     * @param testdate 常规检验结果主键
+     * @return 常规检验结果
+     */
+    public LasRtResult selectLasRtResultByTestdate(String testdate);
+
+    /**
+     * 查询常规检验结果列表
+     * 
+     * @param lasRtResult 常规检验结果
+     * @return 常规检验结果集合
+     */
+    public List<LasRtResult> selectLasRtResultList(LasRtResult lasRtResult);
+
+    /**
+     * 新增常规检验结果
+     * 
+     * @param lasRtResult 常规检验结果
+     * @return 结果
+     */
+    public int insertLasRtResult(LasRtResult lasRtResult);
+
+    /**
+     * 修改常规检验结果
+     * 
+     * @param lasRtResult 常规检验结果
+     * @return 结果
+     */
+    public int updateLasRtResult(LasRtResult lasRtResult);
+
+    /**
+     * 删除常规检验结果
+     * 
+     * @param testdate 常规检验结果主键
+     * @return 结果
+     */
+    public int deleteLasRtResultByTestdate(String testdate);
+
+    /**
+     * 批量删除常规检验结果
+     * 
+     * @param testdates 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteLasRtResultByTestdates(String[] testdates);
+}

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

@@ -0,0 +1,118 @@
+package com.neuhis.his.mapper.winlis;
+
+import com.neuhis.his.domain.entity.winlis.LasSapSamplereg;
+
+import java.util.List;
+
+/**
+ * 样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-03-05
+ */
+public interface LasSapSampleregMapper 
+{
+    /**
+     * 查询样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+
+     * 
+     * @param testdate 样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+主键
+     * @return 样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+
+     */
+    public LasSapSamplereg selectLasSapSampleregByTestdate(String testdate);
+
+    /**
+     * 查询样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+列表
+     * 
+     * @param lasSapSamplereg 样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+
+     * @return 样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+集合
+     */
+    public List<LasSapSamplereg> selectLasSapSampleregList(LasSapSamplereg lasSapSamplereg);
+
+    /**
+     * 新增样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+
+     * 
+     * @param lasSapSamplereg 样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+
+     * @return 结果
+     */
+    public int insertLasSapSamplereg(LasSapSamplereg lasSapSamplereg);
+
+    /**
+     * 修改样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+
+     * 
+     * @param lasSapSamplereg 样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+
+     * @return 结果
+     */
+    public int updateLasSapSamplereg(LasSapSamplereg lasSapSamplereg);
+
+    /**
+     * 删除样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+
+     * 
+     * @param testdate 样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+主键
+     * @return 结果
+     */
+    public int deleteLasSapSampleregByTestdate(String testdate);
+
+    /**
+     * 批量删除样本核收过程：
+    1、样本基本信息插入此中
+    2、项目核收信息插入LAS_COM_SAMPLEITEM中
+    3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入)
+
+     * 
+     * @param testdates 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteLasSapSampleregByTestdates(String[] testdates);
+}

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

@@ -1,10 +0,0 @@
-package com.neuhis.his.service;
-
-import com.neuhis.his.domain.entity.ComPatientinfo;
-
-import java.util.List;
-
-public interface IComPatientinfoMixService {
-
-    boolean updateSexComPatientinfo();
-}

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.ComControlargument;
 public interface IComControlargumentService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.ComDepartment;
 public interface IComDepartmentService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.common.ComDictionaryTypeEnum;
 import com.neuhis.his.domain.entity.ComDictionary;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.ComEmployee;
 

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

@@ -0,0 +1,6 @@
+package com.neuhis.his.service.his;
+
+public interface IComPatientinfoMixService {
+
+    boolean updateSexComPatientinfo();
+}

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.*;
 

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.FinIpbFeeinfo;
 public interface IFinIpbFeeinfoService {

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.FinIpbMedicinelist;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.FinIprBabyinfo;
 public interface IFinIprBabyinfoService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.FinIprInmaininfo;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.FinOpbAccount;
 public interface IFinOpbAccountService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.FinOpbAccountlist;
 public interface IFinOpbAccountlistService {

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

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

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

@@ -1,7 +1,6 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.FinOpbFeedetail;
-import com.neuhis.his.domain.entity.Hl7MessageRecord;
 
 import java.util.List;
 

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

@@ -1,6 +1,5 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
-import com.neuhis.his.domain.entity.FinOpbFeedetail;
 import com.neuhis.his.domain.entity.FinOprRegister;
 
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.FinOprSchema;
 public interface IFinOprSchemaService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.FinIprInmaininfo;
 import com.neuhis.his.domain.entity.FinOprRegister;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetCasDiagnose;
 public interface IMetCasDiagnoseService {

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetComOperationLocal;
 public interface IMetComOperationLocalService {

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetIpmExecdrug;
 public interface IMetIpmExecdrugService {

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetIpmOrder;
 public interface IMetIpmOrderService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetMrsBase;
 public interface IMetMrsBaseService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetNuiCancelitem;
 public interface IMetNuiCancelitemService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetNuiExerecord;
 import io.lettuce.core.dynamic.annotation.Param;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetOpsApply;
 public interface IMetOpsApplyService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetOpsArrange;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetOpsOperationitem;
 

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetOrdiOrder;
 public interface IMetOrdiOrderService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.MetOrdoOrder;
 public interface IMetOrdoOrderService {

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

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

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

@@ -1,6 +1,5 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
-import com.neuhis.his.domain.entity.ComEmployee;
 import com.neuhis.his.domain.entity.NsrNisRecordDetail;
 
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.NsrStandardCode;
 public interface INsrStandardCodeService {

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

@@ -1,7 +1,6 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.PdaBloodCircuit;
-import io.lettuce.core.dynamic.annotation.Param;
 
 public interface IPdaBloodCircuitService {
 

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

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

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.PdaPsrRecord;
 public interface IPdaPsrRecordService {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service;
+package com.neuhis.his.service.his;
 
 import com.neuhis.his.domain.entity.PhaComApplyout;
 public interface IPhaComApplyoutService {

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

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

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

@@ -5,6 +5,7 @@ import java.util.*;
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.extra.pinyin.PinyinUtil;
+import com.neuhis.his.service.his.*;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.mapper.ComControlargumentMapper;
 import com.neuhis.his.domain.entity.ComControlargument;
-import com.neuhis.his.service.IComControlargumentService;
+import com.neuhis.his.service.his.IComControlargumentService;
 
 @Service
 @DataSource(value = DataSourceType.SLAVE)

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.ComDepartment;
 import com.neuhis.his.mapper.ComDepartmentMapper;
-import com.neuhis.his.service.IComDepartmentService;
+import com.neuhis.his.service.his.IComDepartmentService;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -14,7 +14,7 @@ import javax.annotation.Resource;
 
 import com.neuhis.his.domain.entity.ComDictionary;
 import com.neuhis.his.mapper.ComDictionaryMapper;
-import com.neuhis.his.service.IComDictionaryService;
+import com.neuhis.his.service.his.IComDictionaryService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.mapper.ComEmployeeMapper;
 import com.neuhis.his.domain.entity.ComEmployee;
-import com.neuhis.his.service.IComEmployeeService;
+import com.neuhis.his.service.his.IComEmployeeService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;

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

@@ -1,24 +1,16 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.neuhis.his.domain.entity.*;
-import com.neuhis.his.mapper.ComPatientinfoMapper;
-import com.neuhis.his.mapper.FinIprInmaininfoMapper;
-import com.neuhis.his.mapper.MetMrsBaseMapper;
 import com.neuhis.his.service.IBizHandleRecordService;
-import com.neuhis.his.service.IComPatientinfoMixService;
-import com.neuhis.his.service.IComPatientinfoService;
+import com.neuhis.his.service.his.IComPatientinfoMixService;
+import com.neuhis.his.service.his.IComPatientinfoService;
 import com.neuhis.utils.IdcardUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.Comparator;
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.common.annotation.DataSource;
@@ -10,14 +10,14 @@ 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.IFinOpbAccountService;
-import com.neuhis.his.service.IMdcDiPathService;
+import com.neuhis.his.service.his.IFinOpbAccountService;
+import com.neuhis.his.service.his.IMdcDiPathService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
-import com.neuhis.his.service.IComPatientinfoService;
+import com.neuhis.his.service.his.IComPatientinfoService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.DawnCodeInfo;
 import com.neuhis.his.mapper.DawnCodeInfoMapper;
-import com.neuhis.his.service.IDawnCodeInfoService;
+import com.neuhis.his.service.his.IDawnCodeInfoService;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.mapper.FinComExamorderMapper;
 import com.neuhis.his.domain.entity.FinComExamorder;
-import com.neuhis.his.service.IFinComExamorderService;
+import com.neuhis.his.service.his.IFinComExamorderService;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.mapper.FinComUndruginfoMapper;
 import com.neuhis.his.domain.entity.FinComUndruginfo;
-import com.neuhis.his.service.IFinComUndruginfoService;
+import com.neuhis.his.service.his.IFinComUndruginfoService;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.FinComUndrugztinfo;
 import com.neuhis.his.mapper.FinComUndrugztinfoMapper;
-import com.neuhis.his.service.IFinComUndrugztinfoService;
+import com.neuhis.his.service.his.IFinComUndrugztinfoService;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,8 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.FinIpbFeeinfo;
 import com.neuhis.his.mapper.FinIpbFeeinfoMapper;
-import com.neuhis.his.service.IFinIpbFeeinfoService;
-import org.springframework.transaction.annotation.Transactional;
+import com.neuhis.his.service.his.IFinIpbFeeinfoService;
 
 @Service
 @DataSource(value = DataSourceType.SLAVE)

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.mapper.FinIpbItemlistMapper;
 import com.neuhis.his.domain.entity.FinIpbItemlist;
-import com.neuhis.his.service.IFinIpbItemlistService;
+import com.neuhis.his.service.his.IFinIpbItemlistService;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.mapper.FinIpbMedicinelistMapper;
 import com.neuhis.his.domain.entity.FinIpbMedicinelist;
-import com.neuhis.his.service.IFinIpbMedicinelistService;
+import com.neuhis.his.service.his.IFinIpbMedicinelistService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.mapper.FinIprBabyinfoMapper;
 import com.neuhis.his.domain.entity.FinIprBabyinfo;
-import com.neuhis.his.service.IFinIprBabyinfoService;
+import com.neuhis.his.service.his.IFinIprBabyinfoService;
 @Service
 @DataSource(value = DataSourceType.SLAVE)
 @Slf4j

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.FinIprInmaininfo;
 import com.neuhis.his.mapper.FinIprInmaininfoMapper;
-import com.neuhis.his.service.IFinIprInmaininfoService;
+import com.neuhis.his.service.his.IFinIprInmaininfoService;
 
 import java.util.Date;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.mapper.FinOpbAccountMapper;
 import com.neuhis.his.domain.entity.FinOpbAccount;
-import com.neuhis.his.service.IFinOpbAccountService;
+import com.neuhis.his.service.his.IFinOpbAccountService;
 
 @DataSource(value = DataSourceType.SLAVE)
 @Service

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.mapper.FinOpbAccountlistMapper;
 import com.neuhis.his.domain.entity.FinOpbAccountlist;
-import com.neuhis.his.service.IFinOpbAccountlistService;
+import com.neuhis.his.service.his.IFinOpbAccountlistService;
 
 @DataSource(value = DataSourceType.SLAVE)
 @Service

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

@@ -1,13 +1,12 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
-import com.neuhis.his.domain.entity.ComPatientinfo;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.FinOpbAccountrecord;
 import com.neuhis.his.mapper.FinOpbAccountrecordMapper;
-import com.neuhis.his.service.IFinOpbAccountrecordService;
+import com.neuhis.his.service.his.IFinOpbAccountrecordService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;

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

@@ -1,20 +1,15 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
-import cn.hutool.core.codec.Base64;
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
-import com.neuhis.his.domain.entity.Hl7MessageRecord;
-import com.neuhis.utils.InvoiceUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 import com.neuhis.his.domain.entity.FinOpbFeedetail;
 import com.neuhis.his.mapper.FinOpbFeedetailMapper;
-import com.neuhis.his.service.IFinOpbFeedetailService;
-import org.springframework.transaction.annotation.Transactional;
+import com.neuhis.his.service.his.IFinOpbFeedetailService;
 
-import java.rmi.RemoteException;
 import java.util.List;
 
 @Service

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.neuhis.his.domain.entity.FinOpbInvoiceinfo;
 import com.neuhis.his.mapper.FinOpbInvoiceinfoMapper;
 import com.neuhis.his.service.FinOpbInvoiceinfoService;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @DataSource(value = DataSourceType.SLAVE)

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -10,7 +10,7 @@ import javax.annotation.Resource;
 
 import com.neuhis.his.domain.entity.FinOprRegister;
 import com.neuhis.his.mapper.FinOprRegisterMapper;
-import com.neuhis.his.service.IFinOprRegisterService;
+import com.neuhis.his.service.his.IFinOprRegisterService;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.FinOprSchema;
 import com.neuhis.his.mapper.FinOprSchemaMapper;
-import com.neuhis.his.service.IFinOprSchemaService;
+import com.neuhis.his.service.his.IFinOprSchemaService;
 
 @DataSource(value = DataSourceType.SLAVE)
 @Service

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.mapper.MdcDiPathMapper;
 import com.neuhis.his.domain.entity.MdcDiPath;
-import com.neuhis.his.service.IMdcDiPathService;
+import com.neuhis.his.service.his.IMdcDiPathService;
 
 import java.util.List;
 

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

@@ -1,13 +1,12 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.MetCasDiagnose;
 import com.neuhis.his.mapper.MetCasDiagnoseMapper;
-import com.neuhis.his.service.IMetCasDiagnoseService;
+import com.neuhis.his.service.his.IMetCasDiagnoseService;
 
 @Service
 @DataSource(value = DataSourceType.SLAVE)

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import org.springframework.stereotype.Service;
 
@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.MetComIcd10;
 import com.neuhis.his.mapper.MetComIcd10Mapper;
-import com.neuhis.his.service.IMetComIcd10Service;
+import com.neuhis.his.service.his.IMetComIcd10Service;
 
 @Service
 public class MetComIcd10ServiceImpl implements IMetComIcd10Service {

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import org.springframework.stereotype.Service;
 
@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.MetComOperationLocal;
 import com.neuhis.his.mapper.MetComOperationLocalMapper;
-import com.neuhis.his.service.IMetComOperationLocalService;
+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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,8 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.mapper.MetIpmBookedMapper;
 import com.neuhis.his.domain.entity.MetIpmBooked;
-import com.neuhis.his.service.IMetIpmBookedService;
-import org.springframework.transaction.annotation.Transactional;
+import com.neuhis.his.service.his.IMetIpmBookedService;
 
 @Service
 @DataSource(value = DataSourceType.SLAVE)

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -7,8 +7,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.MetIpmExecdrug;
 import com.neuhis.his.mapper.MetIpmExecdrugMapper;
-import com.neuhis.his.service.IMetIpmExecdrugService;
-import org.springframework.transaction.annotation.Transactional;
+import com.neuhis.his.service.his.IMetIpmExecdrugService;
 
 @Service
 @DataSource(value = DataSourceType.SLAVE)

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.MetIpmExecundrug;
 import com.neuhis.his.mapper.MetIpmExecundrugMapper;
-import com.neuhis.his.service.IMetIpmExecundrugService;
+import com.neuhis.his.service.his.IMetIpmExecundrugService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.MetIpmOrder;
 import com.neuhis.his.mapper.MetIpmOrderMapper;
-import com.neuhis.his.service.IMetIpmOrderService;
+import com.neuhis.his.service.his.IMetIpmOrderService;
 
 @DataSource(value = DataSourceType.SLAVE)
 @Service

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.domain.entity.MetMrsBase;
 import com.neuhis.his.mapper.MetMrsBaseMapper;
-import com.neuhis.his.service.IMetMrsBaseService;
+import com.neuhis.his.service.his.IMetMrsBaseService;
 
 @Service
 @DataSource(value = DataSourceType.SLAVE)

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

@@ -1,8 +1,8 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
-import com.neuhis.his.service.IMetNuiCancelitemService;
+import com.neuhis.his.service.his.IMetNuiCancelitemService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.MetNuiExerecord;
 import com.neuhis.his.mapper.MetNuiExerecordMapper;
-import com.neuhis.his.service.IMetNuiExerecordService;
+import com.neuhis.his.service.his.IMetNuiExerecordService;
 
 @DataSource(value = DataSourceType.SLAVE)
 @Service

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.MetOpsApply;
 import com.neuhis.his.mapper.MetOpsApplyMapper;
-import com.neuhis.his.service.IMetOpsApplyService;
+import com.neuhis.his.service.his.IMetOpsApplyService;
 @DataSource(value = DataSourceType.SLAVE)
 @Service
 @Slf4j

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.mapper.MetOpsArrangeMapper;
 import com.neuhis.his.domain.entity.MetOpsArrange;
-import com.neuhis.his.service.IMetOpsArrangeService;
+import com.neuhis.his.service.his.IMetOpsArrangeService;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.MetOpsOperationitem;
 import com.neuhis.his.mapper.MetOpsOperationitemMapper;
-import com.neuhis.his.service.IMetOpsOperationitemService;
+import com.neuhis.his.service.his.IMetOpsOperationitemService;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.neuhis.his.domain.entity.MetOrdeApplyType;
 import com.neuhis.his.mapper.MetOrdeApplyTypeMapper;
-import com.neuhis.his.service.IMetOrdeApplyTypeService;
+import com.neuhis.his.service.his.IMetOrdeApplyTypeService;
 
 import java.util.List;
 

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

@@ -1,9 +1,9 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
-import com.neuhis.his.service.IMetOrdeBigexampartService;
+import com.neuhis.his.service.his.IMetOrdeBigexampartService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -1,9 +1,9 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
-import com.neuhis.his.service.IMetOrdeExampartService;
+import com.neuhis.his.service.his.IMetOrdeExampartService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -1,4 +1,4 @@
-package com.neuhis.his.service.impl;
+package com.neuhis.his.service.impl.his;
 
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.neuhis.his.mapper.MetOrdiOrderMapper;
 import com.neuhis.his.domain.entity.MetOrdiOrder;
-import com.neuhis.his.service.IMetOrdiOrderService;
+import com.neuhis.his.service.his.IMetOrdiOrderService;
 
 @Service
 @DataSource(value = DataSourceType.SLAVE)