diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppBjCaController.java b/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppBjCaController.java index f237b0f49..e06b86630 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppBjCaController.java +++ b/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、启动自动签名，获取签名二维码，让医师使用【协同签名】进行签名") diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapCadata.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapCadata.java new file mode 100644 index 000000000..e361a903a --- /dev/null +++ b/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(); + } +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComControlargumentMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComControlargumentMapper.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComControlargumentMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComControlargumentMapper.java index 8c640d0d8..34bd9f3c0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComControlargumentMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDepartmentMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComDepartmentMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDepartmentMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComDepartmentMapper.java index e273904d3..c79ff0b4b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDepartmentMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDictionaryMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComDictionaryMapper.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDictionaryMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComDictionaryMapper.java index 2b2eaff84..5a06af91c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDictionaryMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComEmployeeMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComEmployeeMapper.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComEmployeeMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComEmployeeMapper.java index eaaf52a4c..91d558f42 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComEmployeeMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComPatientinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComPatientinfoMapper.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComPatientinfoMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/ComPatientinfoMapper.java index ae3ec0a3e..1c96d1fd3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComPatientinfoMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/DawnCodeInfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/DawnCodeInfoMapper.java similarity index 87% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/DawnCodeInfoMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/DawnCodeInfoMapper.java index 40f60b8a2..f57ead7bd 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/DawnCodeInfoMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComExamorderMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinComExamorderMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComExamorderMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinComExamorderMapper.java index fd01294e8..1200b5858 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComExamorderMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndruginfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinComUndruginfoMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndruginfoMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinComUndruginfoMapper.java index d57f49e9a..6912d758e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndruginfoMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndrugztinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinComUndrugztinfoMapper.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndrugztinfoMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinComUndrugztinfoMapper.java index cf467b719..ff1e6cbe4 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndrugztinfoMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbFeeinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIpbFeeinfoMapper.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbFeeinfoMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIpbFeeinfoMapper.java index 24914f03f..ceb5442a9 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbFeeinfoMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbItemlistMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIpbItemlistMapper.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbItemlistMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIpbItemlistMapper.java index 21ad2f294..b14a80871 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbItemlistMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbMedicinelistMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIpbMedicinelistMapper.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbMedicinelistMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIpbMedicinelistMapper.java index 1cc0c6681..1f041a21f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbMedicinelistMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprBabyinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIprBabyinfoMapper.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprBabyinfoMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIprBabyinfoMapper.java index 737259f31..1832fc510 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprBabyinfoMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprInmaininfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIprInmaininfoMapper.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprInmaininfoMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinIprInmaininfoMapper.java index 87053e95f..00891c07a 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprInmaininfoMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbAccountMapper.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbAccountMapper.java index 2480b2a4d..3f9fec655 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountlistMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbAccountlistMapper.java similarity index 84% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountlistMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbAccountlistMapper.java index 0fa567d4f..2b19fd925 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountlistMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountrecordMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbAccountrecordMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountrecordMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbAccountrecordMapper.java index a1dc5b6bd..055b4f751 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountrecordMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbFeedetailMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbFeedetailMapper.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbFeedetailMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbFeedetailMapper.java index 7b297e3a2..108789576 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbFeedetailMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbInvoiceinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbInvoiceinfoMapper.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbInvoiceinfoMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOpbInvoiceinfoMapper.java index 873740d0b..930b07a0b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbInvoiceinfoMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprRegisterMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOprRegisterMapper.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprRegisterMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOprRegisterMapper.java index 97b9995d1..2ed1bd195 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprRegisterMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprSchemaMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOprSchemaMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprSchemaMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/FinOprSchemaMapper.java index 9d0ae9ffb..996c5a47b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprSchemaMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/HisSqlLogHisMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/HisSqlLogHisMapper.java similarity index 97% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/HisSqlLogHisMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/HisSqlLogHisMapper.java index e0ef93f30..946782f6a 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/HisSqlLogHisMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MdcDiPathMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MdcDiPathMapper.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MdcDiPathMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MdcDiPathMapper.java index 1936e1671..fb24e3787 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MdcDiPathMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetCasDiagnoseMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetCasDiagnoseMapper.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetCasDiagnoseMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetCasDiagnoseMapper.java index 4bb3ef348..f63c78018 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetCasDiagnoseMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComIcd10Mapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetComIcd10Mapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComIcd10Mapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetComIcd10Mapper.java index 929f21a02..05ae825b6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComIcd10Mapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComOperationLocalMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetComOperationLocalMapper.java similarity index 85% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComOperationLocalMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetComOperationLocalMapper.java index 4e8f16f48..adf9b1758 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComOperationLocalMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmBookedMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetIpmBookedMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmBookedMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetIpmBookedMapper.java index 5d23a839c..068f1a7fb 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmBookedMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecdrugMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetIpmExecdrugMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecdrugMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetIpmExecdrugMapper.java index 863c4eac5..4efdc5287 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecdrugMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecundrugMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetIpmExecundrugMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecundrugMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetIpmExecundrugMapper.java index 47d94dca6..bcf13814e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecundrugMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmOrderMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetIpmOrderMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmOrderMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetIpmOrderMapper.java index d94344693..5c0528d4e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmOrderMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetMrsBaseMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetMrsBaseMapper.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetMrsBaseMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetMrsBaseMapper.java index cc8b01e8a..da8a9f290 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetMrsBaseMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiCancelitemMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetNuiCancelitemMapper.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiCancelitemMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetNuiCancelitemMapper.java index 57500962e..0669c2981 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiCancelitemMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiExerecordMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetNuiExerecordMapper.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiExerecordMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetNuiExerecordMapper.java index fce3a147e..7abaf137b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiExerecordMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsApplyMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOpsApplyMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsApplyMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOpsApplyMapper.java index 13558ed7d..eab0e8d26 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsApplyMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsArrangeMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOpsArrangeMapper.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsArrangeMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOpsArrangeMapper.java index b52c53aa8..f300d39fe 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsArrangeMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsOperationitemMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOpsOperationitemMapper.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsOperationitemMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOpsOperationitemMapper.java index 0086d56a2..f8ab7371b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsOperationitemMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeApplyTypeMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdeApplyTypeMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeApplyTypeMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdeApplyTypeMapper.java index 3c650a069..b447720ac 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeApplyTypeMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeBigexampartMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdeBigexampartMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeBigexampartMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdeBigexampartMapper.java index c0fb00c75..6c4ac5d69 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeBigexampartMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeExampartMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdeExampartMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeExampartMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdeExampartMapper.java index f572dfdcd..504092fab 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeExampartMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdiOrderMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdiOrderMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdiOrderMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdiOrderMapper.java index 8b97ef642..f1c495d98 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdiOrderMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdoOrderMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdoOrderMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdoOrderMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdoOrderMapper.java index 328e02f76..bae002cb9 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdoOrderMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdtUndrugtermMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdtUndrugtermMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdtUndrugtermMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/MetOrdtUndrugtermMapper.java index 16e496a15..68e2c36b0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdtUndrugtermMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrNisRecordDetailMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/NsrNisRecordDetailMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrNisRecordDetailMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/NsrNisRecordDetailMapper.java index 70944ff7c..9816c06bd 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrNisRecordDetailMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrStandardCodeMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/NsrStandardCodeMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrStandardCodeMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/NsrStandardCodeMapper.java index a33882b50..aaad3fb3d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrStandardCodeMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaBloodCircuitMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PdaBloodCircuitMapper.java similarity index 90% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaBloodCircuitMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PdaBloodCircuitMapper.java index 0e0af53d5..12287611c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaBloodCircuitMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRatingRecordMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PdaPsrRatingRecordMapper.java similarity index 97% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRatingRecordMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PdaPsrRatingRecordMapper.java index fe9f4023b..6bd5e10b8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRatingRecordMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRecordMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PdaPsrRecordMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRecordMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PdaPsrRecordMapper.java index e5e38bf05..8260529f4 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRecordMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComApplyoutMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PhaComApplyoutMapper.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComApplyoutMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PhaComApplyoutMapper.java index a7805319c..35dfc1faa 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComApplyoutMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComBaseinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PhaComBaseinfoMapper.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComBaseinfoMapper.java rename to ruoyi-admin/src/main/java/com/neuhis/his/mapper/his/PhaComBaseinfoMapper.java index 6eeb70177..96750c885 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComBaseinfoMapper.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapCadataMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapCadataMapper.java new file mode 100644 index 000000000..1415e3e95 --- /dev/null +++ b/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 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); +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/HisSqlLogHisServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/HisSqlLogHisServiceImpl.java index 5a4e9108a..fcbebf032 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/HisSqlLogHisServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComControlargumentServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComControlargumentServiceImpl.java index 9d7c7220d..c3045d9e9 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComControlargumentServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDepartmentServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDepartmentServiceImpl.java index 2b81c13e2..6015c2042 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDepartmentServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDictionaryServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDictionaryServiceImpl.java index 02b20f8c4..049e375dc 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDictionaryServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComEmployeeServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComEmployeeServiceImpl.java index 027e5d230..70d8a7543 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComEmployeeServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoServiceImpl.java index 1f7ac99eb..3d9f5a7e8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/DawnCodeInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/DawnCodeInfoServiceImpl.java index 9b4db2b90..3b46e8867 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/DawnCodeInfoServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComExamorderServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComExamorderServiceImpl.java index aa826a113..5a9e9cc7e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComExamorderServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndruginfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndruginfoServiceImpl.java index 3b4b17c62..feb34390c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndruginfoServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndrugztinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndrugztinfoServiceImpl.java index 806bedc6c..82aa94392 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndrugztinfoServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbFeeinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbFeeinfoServiceImpl.java index e95167c77..0c8d7e25d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbFeeinfoServiceImpl.java +++ b/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 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbItemlistServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbItemlistServiceImpl.java index b1e0c8cb8..dc6e5e7dd 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbItemlistServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbMedicinelistServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbMedicinelistServiceImpl.java index dfe5b43a4..94dc3d530 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbMedicinelistServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprBabyinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprBabyinfoServiceImpl.java index a22c914e2..9022e90b3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprBabyinfoServiceImpl.java +++ b/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 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprInmaininfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprInmaininfoServiceImpl.java index 9215b7928..4b3728076 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprInmaininfoServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountServiceImpl.java index bd3b81325..b477b28d4 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountlistServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountlistServiceImpl.java index 7a5339670..9bd4c6fa5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountlistServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountrecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountrecordServiceImpl.java index 224791b43..299db6ecc 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountrecordServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbFeedetailServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbFeedetailServiceImpl.java index 1800332dc..096b4ab21 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbFeedetailServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbInvoiceinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbInvoiceinfoServiceImpl.java index d5d440c94..7b5e9e513 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbInvoiceinfoServiceImpl.java +++ b/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 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprRegisterServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprRegisterServiceImpl.java index 4cb249b8c..bd6ad99e6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprRegisterServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprSchemaServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprSchemaServiceImpl.java index f6a9adec4..04b84ec16 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprSchemaServiceImpl.java +++ b/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) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MdcDiPathServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MdcDiPathServiceImpl.java index 38ea03ee5..ea6457d0c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MdcDiPathServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetCasDiagnoseServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetCasDiagnoseServiceImpl.java index 5045cd934..73205af2b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetCasDiagnoseServiceImpl.java +++ b/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 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComIcd10ServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComIcd10ServiceImpl.java index 298174088..df1c28bbf 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComIcd10ServiceImpl.java +++ b/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 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComOperationLocalServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComOperationLocalServiceImpl.java index fd43d4080..53c349384 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComOperationLocalServiceImpl.java +++ b/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 { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmBookedServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmBookedServiceImpl.java index f1d33185c..8c7371752 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmBookedServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecdrugServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecdrugServiceImpl.java index 53347cec6..b92828b82 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecdrugServiceImpl.java +++ b/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 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecundrugServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecundrugServiceImpl.java index 05ad3fe82..c3000dfad 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecundrugServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmOrderServiceImpl.java index 0ca00bf6d..989aaf607 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmOrderServiceImpl.java +++ b/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) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetMrsBaseServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetMrsBaseServiceImpl.java index 3382c6a95..cfb06acaf 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetMrsBaseServiceImpl.java +++ b/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 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiCancelitemServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiCancelitemServiceImpl.java index df6af431e..1cd4106c6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiCancelitemServiceImpl.java +++ b/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) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiExerecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiExerecordServiceImpl.java index bcccd0c89..26a3c274b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiExerecordServiceImpl.java +++ b/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) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsApplyServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsApplyServiceImpl.java index 16bd0bfbb..f2694d29c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsApplyServiceImpl.java +++ b/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 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsArrangeServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsArrangeServiceImpl.java index e621f8001..ea2a73a83 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsArrangeServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsOperationitemServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsOperationitemServiceImpl.java index 1e47ead35..087cb2c0e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsOperationitemServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeApplyTypeServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeApplyTypeServiceImpl.java index 75d9971c6..51a1aa97f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeApplyTypeServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeBigexampartServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeBigexampartServiceImpl.java index 520de1b57..a549a0f5d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeBigexampartServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeExampartServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeExampartServiceImpl.java index caca4752c..33c8c1fe3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeExampartServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdiOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdiOrderServiceImpl.java index e196758b1..a4e829d8e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdiOrderServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdoOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdoOrderServiceImpl.java index d8d921419..0ac66497f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdoOrderServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdtUndrugtermServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdtUndrugtermServiceImpl.java index 0a1eaefea..86b38afad 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdtUndrugtermServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrNisRecordDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrNisRecordDetailServiceImpl.java index 165faee4b..8f0145101 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrNisRecordDetailServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrStandardCodeServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrStandardCodeServiceImpl.java index ff278020d..a8e674b20 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrStandardCodeServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaBloodCircuitServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaBloodCircuitServiceImpl.java index 96e74cbb9..0900e0bc0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaBloodCircuitServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRatingRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRatingRecordServiceImpl.java index 4e23947ec..a1bea6507 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRatingRecordServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRecordServiceImpl.java index 77f8d3b51..0da38116e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRecordServiceImpl.java +++ b/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) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComApplyoutServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComApplyoutServiceImpl.java index 23b07270e..fef961f6d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComApplyoutServiceImpl.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComBaseinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComBaseinfoServiceImpl.java index 6ab535e68..b0aa27267 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComBaseinfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComBaseinfoServiceImpl.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.PhaComBaseinfo; -import com.neuhis.his.mapper.PhaComBaseinfoMapper; +import com.neuhis.his.mapper.his.PhaComBaseinfoMapper; import com.neuhis.his.service.his.IPhaComBaseinfoService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasSapSampleregServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasSapSampleregServiceImpl.java index a0cb3a62b..b66216cf4 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasSapSampleregServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasSapSampleregServiceImpl.java @@ -79,13 +79,9 @@ public class LasSapSampleregServiceImpl implements ILasSapSampleregService } /** - * -列表 - * + * * @param lasSapSamplereg 常规检验登记表 - * @return 常规检验登记表 - */ @Override public List selectLasSapSampleregList(LasSapSamplereg lasSapSamplereg) diff --git a/ruoyi-admin/src/main/resources/mapper/his/AccreditMapper.xml b/ruoyi-admin/src/main/resources/mapper/AccreditMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/AccreditMapper.xml rename to ruoyi-admin/src/main/resources/mapper/AccreditMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizApiFieldMappingMapper.xml b/ruoyi-admin/src/main/resources/mapper/BizApiFieldMappingMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizApiFieldMappingMapper.xml rename to ruoyi-admin/src/main/resources/mapper/BizApiFieldMappingMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizApiFieldMappingMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/BizApiFieldMappingMapperExtend.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizApiFieldMappingMapperExtend.xml rename to ruoyi-admin/src/main/resources/mapper/BizApiFieldMappingMapperExtend.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizApiMapper.xml b/ruoyi-admin/src/main/resources/mapper/BizApiMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizApiMapper.xml rename to ruoyi-admin/src/main/resources/mapper/BizApiMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizDictMapper.xml b/ruoyi-admin/src/main/resources/mapper/BizDictMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizDictMapper.xml rename to ruoyi-admin/src/main/resources/mapper/BizDictMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizElecAppMapper.xml b/ruoyi-admin/src/main/resources/mapper/BizElecAppMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizElecAppMapper.xml rename to ruoyi-admin/src/main/resources/mapper/BizElecAppMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizHandleRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/BizHandleRecordMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizHandleRecordMapper.xml rename to ruoyi-admin/src/main/resources/mapper/BizHandleRecordMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizHandleRecordMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/BizHandleRecordMapperExtend.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizHandleRecordMapperExtend.xml rename to ruoyi-admin/src/main/resources/mapper/BizHandleRecordMapperExtend.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizJobSwitchMapper.xml b/ruoyi-admin/src/main/resources/mapper/BizJobSwitchMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizJobSwitchMapper.xml rename to ruoyi-admin/src/main/resources/mapper/BizJobSwitchMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizProcedureMapper.xml b/ruoyi-admin/src/main/resources/mapper/BizProcedureMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizProcedureMapper.xml rename to ruoyi-admin/src/main/resources/mapper/BizProcedureMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/BizProcedureMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/BizProcedureMapperExtend.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/BizProcedureMapperExtend.xml rename to ruoyi-admin/src/main/resources/mapper/BizProcedureMapperExtend.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/Db1DataMapper.xml b/ruoyi-admin/src/main/resources/mapper/Db1DataMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/Db1DataMapper.xml rename to ruoyi-admin/src/main/resources/mapper/Db1DataMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/Db2DataMapper.xml b/ruoyi-admin/src/main/resources/mapper/Db2DataMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/Db2DataMapper.xml rename to ruoyi-admin/src/main/resources/mapper/Db2DataMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/Db3DataMapper.xml b/ruoyi-admin/src/main/resources/mapper/Db3DataMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/Db3DataMapper.xml rename to ruoyi-admin/src/main/resources/mapper/Db3DataMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/Hl7MessageRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/Hl7MessageRecordMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/Hl7MessageRecordMapper.xml rename to ruoyi-admin/src/main/resources/mapper/Hl7MessageRecordMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/Hl7MessageRecordMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/Hl7MessageRecordMapperExtend.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/Hl7MessageRecordMapperExtend.xml rename to ruoyi-admin/src/main/resources/mapper/Hl7MessageRecordMapperExtend.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/Hl7MessageRecordMysqlMapper.xml b/ruoyi-admin/src/main/resources/mapper/Hl7MessageRecordMysqlMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/Hl7MessageRecordMysqlMapper.xml rename to ruoyi-admin/src/main/resources/mapper/Hl7MessageRecordMysqlMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/Hl7MessageRecordMysqlMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/Hl7MessageRecordMysqlMapperExtend.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/Hl7MessageRecordMysqlMapperExtend.xml rename to ruoyi-admin/src/main/resources/mapper/Hl7MessageRecordMysqlMapperExtend.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/LogHl7PushRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/LogHl7PushRecordMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/LogHl7PushRecordMapper.xml rename to ruoyi-admin/src/main/resources/mapper/LogHl7PushRecordMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/LogPushRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/LogPushRecordMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/LogPushRecordMapper.xml rename to ruoyi-admin/src/main/resources/mapper/LogPushRecordMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/LogShfPushRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/LogShfPushRecordMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/LogShfPushRecordMapper.xml rename to ruoyi-admin/src/main/resources/mapper/LogShfPushRecordMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/OracleSlaveDataMapper.xml b/ruoyi-admin/src/main/resources/mapper/OracleSlaveDataMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/OracleSlaveDataMapper.xml rename to ruoyi-admin/src/main/resources/mapper/OracleSlaveDataMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/OracleSysMapper.xml b/ruoyi-admin/src/main/resources/mapper/OracleSysMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/OracleSysMapper.xml rename to ruoyi-admin/src/main/resources/mapper/OracleSysMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/PushMessageRecorShfMapper.xml b/ruoyi-admin/src/main/resources/mapper/PushMessageRecorShfMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/PushMessageRecorShfMapper.xml rename to ruoyi-admin/src/main/resources/mapper/PushMessageRecorShfMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/PushMessageRecorShfMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/PushMessageRecorShfMapperExtend.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/PushMessageRecorShfMapperExtend.xml rename to ruoyi-admin/src/main/resources/mapper/PushMessageRecorShfMapperExtend.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/VpComPatientinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/VpComPatientinfoMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/VpComPatientinfoMapper.xml rename to ruoyi-admin/src/main/resources/mapper/VpComPatientinfoMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/VpMessageRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/VpMessageRecordMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/his/VpMessageRecordMapper.xml rename to ruoyi-admin/src/main/resources/mapper/VpMessageRecordMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComControlargumentMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/ComControlargumentMapper.xml index fda85bebb..14c72486c 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComControlargumentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComControlargumentMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapper.xml index 4f44082c2..572808380 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapperExtend.xml index 705f19d9d..67f2e2c0c 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapperExtend.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapper.xml index 533073500..ea689f253 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapperExtend.xml index a9cec9cf4..decd84e93 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapper.xml index 5d8f99799..ec000ddad 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapperExtend.xml index 8ef3e520c..2fa32030a 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapperExtend.xml @@ -1,6 +1,6 @@ - + @@ -72,7 +72,7 @@ and a.OPER_DATE =]]> to_date(TO_CHAR(#{operDate},'yyyy-MM-dd hh24:mi:ss'),'yyyy-MM-dd hh24:mi:ss') order by OPER_DATE asc - select a.SQL_ID,a.SQL_TEXT, a.LAST_ACTIVE_TIME, a.PARSING_SCHEMA_NAME, diff --git a/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapper.xml index 8f84ec15a..98942708d 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapperExtend.xml index cf60c2f35..fad47ce73 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapper.xml index c4691c7ca..7c9760a08 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapperExtend.xml index efa7e45c1..413fcc4da 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIpbFeeinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIpbFeeinfoMapper.xml index af28dfdde..9e0ae3336 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIpbFeeinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIpbFeeinfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapper.xml index 5ea00604b..561871e1b 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapperExtend.xml index b3c8668c4..81c1d0998 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIprBabyinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIprBabyinfoMapper.xml index e4874b633..993d32aa0 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIprBabyinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIprBabyinfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapper.xml index a747b198c..8546b4593 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapperExtend.xml index 1d80a9ebc..edfd667f0 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountlistMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountlistMapper.xml index abde88f9c..739dcc8cf 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountlistMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountlistMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapper.xml index 0bd7adec0..01194fd61 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapperExtend.xml index 370ac1eb1..f000ce3d8 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapper.xml index 00da5f63b..2b4fb641d 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapperExtend.xml index e01761a9f..20c89364b 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapperExtend.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapper.xml index 1278e5ebc..f60f28018 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapperExtend.xml index e05e57e00..74148cb6a 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapper.xml index dda055b01..15569e929 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapperExtend.xml index bb08e2085..5d5be53a4 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapper.xml index 588963b5b..c1cc878ea 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapperExtend.xml index 92c0b49ca..600d0dbd8 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetNuiCancelitemMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetNuiCancelitemMapper.xml index ab2882b61..fb312ff0a 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetNuiCancelitemMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetNuiCancelitemMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapper.xml index f26e5e17d..8f2727d70 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapperExtend.xml index 6cd1af60e..6c53e5e3e 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapperExtend.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOpsApplyMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOpsApplyMapper.xml index e89700e82..3db5ce872 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOpsApplyMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOpsApplyMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapper.xml index 8cba90483..80c89b601 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapperExtend.xml index 2b4d66d26..f02ad37bb 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapper.xml index 8b3a94e03..773a40d27 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapperExtend.xml index e964ee33b..4a3e5dc45 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapper.xml index a7eaaa0aa..da06868a2 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapperExtend.xml index 489025c90..0eb50b2c8 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapper.xml index ae5e5b99b..ec62ff168 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapperExtend.xml index 04986184e..9f8d608a1 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapperExtend.xml @@ -1,6 +1,6 @@ - + select diff --git a/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRatingRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRatingRecordMapper.xml index a32cfd99b..fc8c7f0ef 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRatingRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRatingRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRecordMapper.xml index edcaf5732..b8efd90fb 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRecordMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/PhaComApplyoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/PhaComApplyoutMapper.xml index ad303a0f9..cc6681660 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/PhaComApplyoutMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/PhaComApplyoutMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapper.xml index 2f68315bf..ca4dddad8 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapperExtend.xml index 239e4549e..092e770b4 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapperExtend.xml @@ -1,6 +1,6 @@ - + + + + and barcode = #{barcode} + and srcdata = #{srcdata} + and caclobdata = #{caclobdata} + and srcclobdata = #{srcclobdata} + and caid = #{caid} + + + + + + + insert into las_sap_cadata + + testdate, + machineid, + sampleid, + barcode, + srcdata, + caclobdata, + srcclobdata, + caid, + + + #{testdate}, + #{machineid}, + #{sampleid}, + #{barcode}, + #{srcdata}, + #{caclobdata}, + #{srcclobdata}, + #{caid}, + + + + + update las_sap_cadata + + testdate = #{testdate}, + machineid = #{machineid}, + sampleid = #{sampleid}, + barcode = #{barcode}, + srcdata = #{srcdata}, + caclobdata = #{caclobdata}, + srcclobdata = #{srcclobdata}, + caid = #{caid}, + + where catime = #{catime} + + + + delete from las_sap_cadata where catime = #{catime} + + + + delete from las_sap_cadata where catime in + + #{catime} + + + + \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java index 727dd2259..c531f39e2 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java @@ -77,6 +77,7 @@ public class GenUtils column.setJavaType(GenConstants.TYPE_LONG); } } + //如果是：Oralce BLOB类型、MySQL ，需要转成byte[], todo DAZER007 // 插入字段（默认所有字段都需要插入） column.setIsInsert(GenConstants.REQUIRE);