diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index d1e594f22..7b3dbc4e6 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -25,11 +25,11 @@ - - org.springframework.boot - spring-boot-devtools - true - + + + + + 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 3fe3cc7b8..37ae34bcd 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 @@ -1,5 +1,8 @@ package com.neuhis.his.app.controller; +import cn.hutool.core.codec.Base64; +import com.neuhis.his.domain.vo.bjca.BjCaResult; +import com.neuhis.his.domain.vo.bjca.CaStartVo; import com.neuhis.his.service.IBjCaService; import com.ruoyi.common.core.domain.AjaxResult; import io.swagger.annotations.Api; @@ -24,10 +27,29 @@ import javax.annotation.Resource; public class AppBjCaController { @Resource private IBjCaService bjCaService; + /** + * startAutoSign启动自动签名获取的签名数据，[签名任务id] + */ + private String autoSignSignDataId = "SD_4c6ec5f6-22e3-4fae-b2aa-681e5beacf1e"; @GetMapping("/startAutoSign") - @ApiOperation(value = "启动自动签名", notes = "启动自动签名") + @ApiOperation(value = "步骤A：启动自动签名", notes = "步骤1、启动自动签名，获取签名二维码，让医师使用【协同签名】进行签名") public AjaxResult bjcaAuto() { - return AjaxResult.success(bjCaService.startAutoSign()); + autoSignSignDataId = bjCaService.startAutoSign(); + return AjaxResult.success(autoSignSignDataId); + } + + @GetMapping("/autoSign") + @ApiOperation(value = "步骤B：对原始数据进行签名获取签名证书", notes = "步骤2、对原始数据进行签名获取签名证书、密文") + public AjaxResult autoSign() { + BjCaResult caStartVo = bjCaService.autoSign(autoSignSignDataId, Base64.encode("aaaaa")); + return AjaxResult.success(caStartVo); + } + + @GetMapping("/createAndGetTssInfo") + @ApiOperation(value = "步骤C：产生时间戳", notes = "步骤3、产生时间戳") + public AjaxResult createAndGetTssInfo() { + String caStartVo = bjCaService.createAndGetTssInfo( Base64.encode("aaaaa")); + return AjaxResult.success(caStartVo); } } diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/common/GlobalConstants.java b/ruoyi-admin/src/main/java/com/neuhis/his/common/GlobalConstants.java index fdf1c8452..02f2e41d1 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/common/GlobalConstants.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/common/GlobalConstants.java @@ -1,7 +1,5 @@ package com.neuhis.his.common; -import com.neuhis.his.domain.entity.FinIpbMedicinelist; - public class GlobalConstants { //推送状态缓存 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/controller/BizApiController.java b/ruoyi-admin/src/main/java/com/neuhis/his/controller/BizApiController.java index e2ac8fe73..bc8abeef7 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/controller/BizApiController.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/controller/BizApiController.java @@ -2,7 +2,6 @@ package com.neuhis.his.controller; import java.util.List; -import com.p6spy.engine.spy.P6ModuleManager; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComEmployeeController.java b/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComEmployeeController.java index 6fa33cb15..e637e70b7 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComEmployeeController.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComEmployeeController.java @@ -4,7 +4,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.StringUtils; -import com.neuhis.his.domain.entity.ComEmployee; +import com.neuhis.his.domain.entity.his.ComEmployee; import com.neuhis.his.service.his.IComEmployeeService; import com.neuhis.utils.IdcardUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComPatientinfoController.java b/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComPatientinfoController.java index d458db146..3d6951c14 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComPatientinfoController.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComPatientinfoController.java @@ -4,7 +4,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.StringUtils; -import com.neuhis.his.domain.entity.ComPatientinfo; +import com.neuhis.his.domain.entity.his.ComPatientinfo; import com.neuhis.his.service.his.IComPatientinfoService; import com.neuhis.utils.IdcardUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/BizApi.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/BizApi.java index e2ac1da42..fe3cf5023 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/BizApi.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/BizApi.java @@ -2,6 +2,7 @@ package com.neuhis.his.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.enums.DataSourceType; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -71,7 +72,10 @@ public class BizApi extends BaseEntity @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd") private Date operDate; - // Robin 2024-7-3 + /** + * Robin 2024-7-3 + * {@link DataSourceType} + */ private String Db; /** 是否业务主表 */ diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/ProdureParam.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/ProdureParam.java index 355504dea..9daacd0e1 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/ProdureParam.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/ProdureParam.java @@ -1,5 +1,10 @@ package com.neuhis.his.domain.dto; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter public class ProdureParam { private ProdureParamTypeEnum paramTypeEnum; @@ -8,30 +13,6 @@ public class ProdureParam { private String paramValue; - public ProdureParamTypeEnum getParamTypeEnum() { - return paramTypeEnum; - } - - public void setParamTypeEnum(ProdureParamTypeEnum paramTypeEnum) { - this.paramTypeEnum = paramTypeEnum; - } - - public String getParamType() { - return paramType; - } - - public void setParamType(String paramType) { - this.paramType = paramType; - } - - public String getParamValue() { - return paramValue; - } - - public void setParamValue(String paramValue) { - this.paramValue = paramValue; - } - public ProdureParam(ProdureParamTypeEnum paramTypeEnum, String paramType,String paramValue){ this.paramTypeEnum=paramTypeEnum; this.paramType=paramType; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/Response.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/Response.java index fcd931767..cfdcf370f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/Response.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/Response.java @@ -1,21 +1,11 @@ package com.neuhis.his.domain.dto; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter public class Response { - public String getResult() { - return result; - } - - public void setResult(String result) { - this.result = result; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } public String result; public String desc; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComControlargument.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComControlargument.java similarity index 97% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComControlargument.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComControlargument.java index c8863a432..e4418f9ae 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComControlargument.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComControlargument.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComDepartment.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComDepartment.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComDepartment.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComDepartment.java index b20f41d7b..a3e9262ec 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComDepartment.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComDepartment.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComDictionary.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComDictionary.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComDictionary.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComDictionary.java index 3ac8bfa2e..a66a93b41 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComDictionary.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComDictionary.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComEmployee.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComEmployee.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComEmployee.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComEmployee.java index 8c9426504..11f069cdd 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComEmployee.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComEmployee.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComPatientinfo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComPatientinfo.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComPatientinfo.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComPatientinfo.java index 2a18dee3d..c5783817d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/ComPatientinfo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/ComPatientinfo.java @@ -1,5 +1,6 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; +import com.neuhis.his.domain.entity.SearchEntity; import com.neuhis.his.domain.entity.items.PVisit; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/DawnCodeInfo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/DawnCodeInfo.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/DawnCodeInfo.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/DawnCodeInfo.java index b3e22aca8..9444abc7b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/DawnCodeInfo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/DawnCodeInfo.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinComExamorder.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComExamorder.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinComExamorder.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComExamorder.java index f2a18c54d..6bdf62926 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinComExamorder.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComExamorder.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; /** * 需填写检查申请单医嘱配置表 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinComUndruginfo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComUndruginfo.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinComUndruginfo.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComUndruginfo.java index 778757b00..d28c1b76e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinComUndruginfo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComUndruginfo.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinComUndrugztinfo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComUndrugztinfo.java similarity index 82% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinComUndrugztinfo.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComUndrugztinfo.java index c2a151e22..d68473683 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinComUndrugztinfo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinComUndrugztinfo.java @@ -1,11 +1,9 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; -import com.neuhis.his.domain.dto.ComUndrugZtFeeGroupItem; import lombok.Data; import java.math.BigDecimal; import java.util.Date; -import java.util.List; @Data public class FinComUndrugztinfo { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIpbFeeinfo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbFeeinfo.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIpbFeeinfo.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbFeeinfo.java index bf10f33b3..52eb534c1 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIpbFeeinfo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbFeeinfo.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIpbItemlist.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbItemlist.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIpbItemlist.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbItemlist.java index 43d021486..7de23557e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIpbItemlist.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbItemlist.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIpbMedicinelist.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbMedicinelist.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIpbMedicinelist.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbMedicinelist.java index 69e78c8fe..269f8d708 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIpbMedicinelist.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIpbMedicinelist.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIprBabyinfo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIprBabyinfo.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIprBabyinfo.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIprBabyinfo.java index 54a0a417b..c3614948e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIprBabyinfo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIprBabyinfo.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIprInmaininfo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIprInmaininfo.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIprInmaininfo.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIprInmaininfo.java index 2cd59cdd6..bc3dccf6a 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinIprInmaininfo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinIprInmaininfo.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbAccount.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccount.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbAccount.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccount.java index 9366b53a4..c38c6fa3c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbAccount.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccount.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbAccountlist.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccountlist.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbAccountlist.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccountlist.java index 6dde12c24..2f57e9276 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbAccountlist.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccountlist.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbAccountrecord.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccountrecord.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbAccountrecord.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccountrecord.java index af5cb88c3..1fcc320e1 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbAccountrecord.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbAccountrecord.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbFeedetail.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbFeedetail.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbFeedetail.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbFeedetail.java index 8e378d2eb..4f4406938 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbFeedetail.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbFeedetail.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbInvoiceinfo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbInvoiceinfo.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbInvoiceinfo.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbInvoiceinfo.java index 93c25dafe..8bb280df0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOpbInvoiceinfo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOpbInvoiceinfo.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOprRegister.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOprRegister.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOprRegister.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOprRegister.java index 1b869eec4..fdda289c4 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOprRegister.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOprRegister.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOprSchema.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOprSchema.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOprSchema.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOprSchema.java index f05d77cef..23094b547 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/FinOprSchema.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/FinOprSchema.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MdcDiPath.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MdcDiPath.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MdcDiPath.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MdcDiPath.java index 6b1e23510..c484773f4 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MdcDiPath.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MdcDiPath.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetCasDiagnose.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetCasDiagnose.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetCasDiagnose.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetCasDiagnose.java index 5e3fb2b21..b40593489 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetCasDiagnose.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetCasDiagnose.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetComIcd10.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetComIcd10.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetComIcd10.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetComIcd10.java index 20f7c8a5d..7dd484d73 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetComIcd10.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetComIcd10.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetComOperationLocal.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetComOperationLocal.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetComOperationLocal.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetComOperationLocal.java index 801376b51..a1accea03 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetComOperationLocal.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetComOperationLocal.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmBooked.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmBooked.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmBooked.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmBooked.java index 86af76a5e..fdadec4f4 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmBooked.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmBooked.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmExecdrug.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmExecdrug.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmExecdrug.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmExecdrug.java index 8a583a555..fef237c92 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmExecdrug.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmExecdrug.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmExecundrug.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmExecundrug.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmExecundrug.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmExecundrug.java index af8d71017..ba5da4f8e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmExecundrug.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmExecundrug.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmOrder.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmOrder.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmOrder.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmOrder.java index 4ce9cae85..54c465081 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetIpmOrder.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetIpmOrder.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetMrsBase.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetMrsBase.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetMrsBase.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetMrsBase.java index bf46b7868..2ac0727d3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetMrsBase.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetMrsBase.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetNuiCancelitem.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetNuiCancelitem.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetNuiCancelitem.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetNuiCancelitem.java index bac36a801..b4e0f4fe0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetNuiCancelitem.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetNuiCancelitem.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetNuiExerecord.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetNuiExerecord.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetNuiExerecord.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetNuiExerecord.java index 6615f03e8..defef69f6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetNuiExerecord.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetNuiExerecord.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOpsApply.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsApply.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOpsApply.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsApply.java index 405b3ba26..38f68e083 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOpsApply.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsApply.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOpsArrange.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsArrange.java similarity index 97% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOpsArrange.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsArrange.java index 3d1117671..a1cce9ee9 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOpsArrange.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsArrange.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOpsOperationitem.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsOperationitem.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOpsOperationitem.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsOperationitem.java index e52ed5af4..1618dbf3c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOpsOperationitem.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOpsOperationitem.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdeApplyType.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeApplyType.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdeApplyType.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeApplyType.java index 41d470b25..5aa6b364e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdeApplyType.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeApplyType.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdeBigexampart.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeBigexampart.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdeBigexampart.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeBigexampart.java index 9a19b5995..e22739f61 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdeBigexampart.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeBigexampart.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdeExampart.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeExampart.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdeExampart.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeExampart.java index d7fb1d3d9..49230f718 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdeExampart.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdeExampart.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdiOrder.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdiOrder.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdiOrder.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdiOrder.java index 4bce6016c..974faab4b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdiOrder.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdiOrder.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdoOrder.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdoOrder.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdoOrder.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdoOrder.java index 82c70c89b..2a8a64fa0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdoOrder.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdoOrder.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdtUndrugterm.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdtUndrugterm.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdtUndrugterm.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdtUndrugterm.java index af602f02b..5ba31a464 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/MetOrdtUndrugterm.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/MetOrdtUndrugterm.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/NsrNisRecordDetail.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/NsrNisRecordDetail.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/NsrNisRecordDetail.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/NsrNisRecordDetail.java index 61c3e327a..e1d4cc4a3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/NsrNisRecordDetail.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/NsrNisRecordDetail.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/NsrStandardCode.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/NsrStandardCode.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/NsrStandardCode.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/NsrStandardCode.java index 6788fad93..9e1493625 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/NsrStandardCode.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/NsrStandardCode.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; /** * Nis病历一体化编码 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PdaBloodCircuit.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PdaBloodCircuit.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PdaBloodCircuit.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PdaBloodCircuit.java index f2a1619d6..aeec1fe42 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PdaBloodCircuit.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PdaBloodCircuit.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PdaPsrRecord.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PdaPsrRecord.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PdaPsrRecord.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PdaPsrRecord.java index 8b65abc0a..3ed9f6ea3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PdaPsrRecord.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PdaPsrRecord.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PhaComApplyout.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PhaComApplyout.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PhaComApplyout.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PhaComApplyout.java index c70c15f04..64bd2d138 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PhaComApplyout.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PhaComApplyout.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PhaComBaseinfo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PhaComBaseinfo.java similarity index 99% rename from ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PhaComBaseinfo.java rename to ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PhaComBaseinfo.java index 46cdfdde9..82f4fe225 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/PhaComBaseinfo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/his/PhaComBaseinfo.java @@ -1,4 +1,4 @@ -package com.neuhis.his.domain.entity; +package com.neuhis.his.domain.entity.his; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/items/PVisit.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/items/PVisit.java index c64c1bc42..19d576a49 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/items/PVisit.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/items/PVisit.java @@ -1,10 +1,9 @@ package com.neuhis.his.domain.entity.items; import com.ruoyi.common.utils.DateUtils; -import com.neuhis.his.domain.entity.FinIprInmaininfo; -import com.neuhis.his.domain.entity.FinOprRegister; +import com.neuhis.his.domain.entity.his.FinIprInmaininfo; +import com.neuhis.his.domain.entity.his.FinOprRegister; import lombok.Data; -import org.apache.commons.lang3.StringUtils; import java.util.Date; import java.util.Objects; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasRtResult.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasRtResult.java index 3e25c8162..792a855af 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasRtResult.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasRtResult.java @@ -2,6 +2,8 @@ package com.neuhis.his.domain.entity.winlis; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -13,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-03-05 */ +@Setter +@Getter public class LasRtResult extends BaseEntity { private static final long serialVersionUID = 1L; @@ -171,396 +175,6 @@ public class LasRtResult extends BaseEntity @Excel(name = "自动审核信息", readConverterExp = "流=水线") private String autoconfirminfo; - public void setTestdate(String testdate) - { - this.testdate = testdate; - } - - public String getTestdate() - { - return testdate; - } - - public void setMachineid(String machineid) - { - this.machineid = machineid; - } - - public String getMachineid() - { - return machineid; - } - - public void setSampleid(String sampleid) - { - this.sampleid = sampleid; - } - - public String getSampleid() - { - return sampleid; - } - - public void setItemid(String itemid) - { - this.itemid = itemid; - } - - public String getItemid() - { - return itemid; - } - - public void setLoincid(String loincid) - { - this.loincid = loincid; - } - - public String getLoincid() - { - return loincid; - } - - public void setEngname(String engname) - { - this.engname = engname; - } - - public String getEngname() - { - return engname; - } - - public void setItemname(String itemname) - { - this.itemname = itemname; - } - - public String getItemname() - { - return itemname; - } - - public void setPrintseq(Long printseq) - { - this.printseq = printseq; - } - - public Long getPrintseq() - { - return printseq; - } - - public void setBarcode(String barcode) - { - this.barcode = barcode; - } - - public String getBarcode() - { - return barcode; - } - - public void setTesttime(Date testtime) - { - this.testtime = testtime; - } - - public Date getTesttime() - { - return testtime; - } - - public void setReportvalue(String reportvalue) - { - this.reportvalue = reportvalue; - } - - public String getReportvalue() - { - return reportvalue; - } - - public void setRerunvalue(String rerunvalue) - { - this.rerunvalue = rerunvalue; - } - - public String getRerunvalue() - { - return rerunvalue; - } - - public void setDescvalue(String descvalue) - { - this.descvalue = descvalue; - } - - public String getDescvalue() - { - return descvalue; - } - - public void setResultlist(String resultlist) - { - this.resultlist = resultlist; - } - - public String getResultlist() - { - return resultlist; - } - - public void setOrgvalue(String orgvalue) - { - this.orgvalue = orgvalue; - } - - public String getOrgvalue() - { - return orgvalue; - } - - public void setValuesrc(String valuesrc) - { - this.valuesrc = valuesrc; - } - - public String getValuesrc() - { - return valuesrc; - } - - public void setRerunflag(String rerunflag) - { - this.rerunflag = rerunflag; - } - - public String getRerunflag() - { - return rerunflag; - } - - public void setRangeinfo(String rangeinfo) - { - this.rangeinfo = rangeinfo; - } - - public String getRangeinfo() - { - return rangeinfo; - } - - public void setUnit(String unit) - { - this.unit = unit; - } - - public String getUnit() - { - return unit; - } - - public void setResultflag(String resultflag) - { - this.resultflag = resultflag; - } - - public String getResultflag() - { - return resultflag; - } - - public void setPatientid(String patientid) - { - this.patientid = patientid; - } - - public String getPatientid() - { - return patientid; - } - - public void setPatienttype(String patienttype) - { - this.patienttype = patienttype; - } - - public String getPatienttype() - { - return patienttype; - } - - public void setSampletype(String sampletype) - { - this.sampletype = sampletype; - } - - public String getSampletype() - { - return sampletype; - } - - public void setTestmachineid(String testmachineid) - { - this.testmachineid = testmachineid; - } - - public String getTestmachineid() - { - return testmachineid; - } - - public void setRackcup(String rackcup) - { - this.rackcup = rackcup; - } - - public String getRackcup() - { - return rackcup; - } - - public void setHisitemid(String hisitemid) - { - this.hisitemid = hisitemid; - } - - public String getHisitemid() - { - return hisitemid; - } - - public void setPrintrow(Long printrow) - { - this.printrow = printrow; - } - - public Long getPrintrow() - { - return printrow; - } - - public void setAlertflag(String alertflag) - { - this.alertflag = alertflag; - } - - public String getAlertflag() - { - return alertflag; - } - - public void setRangelimit(String rangelimit) - { - this.rangelimit = rangelimit; - } - - public String getRangelimit() - { - return rangelimit; - } - - public void setCheckstate(String checkstate) - { - this.checkstate = checkstate; - } - - public String getCheckstate() - { - return checkstate; - } - - public void setCommtime(Date commtime) - { - this.commtime = commtime; - } - - public Date getCommtime() - { - return commtime; - } - - public void setMethod(String method) - { - this.method = method; - } - - public String getMethod() - { - return method; - } - - public void setCutoff(String cutoff) - { - this.cutoff = cutoff; - } - - public String getCutoff() - { - return cutoff; - } - - public void setSco(String sco) - { - this.sco = sco; - } - - public String getSco() - { - return sco; - } - - public void setOdvalue(String odvalue) - { - this.odvalue = odvalue; - } - - public String getOdvalue() - { - return odvalue; - } - - public void setMemovalue(String memovalue) - { - this.memovalue = memovalue; - } - - public String getMemovalue() - { - return memovalue; - } - - public void setValuepro(String valuepro) - { - this.valuepro = valuepro; - } - - public String getValuepro() - { - return valuepro; - } - - public void setAutoconfirmsign(String autoconfirmsign) - { - this.autoconfirmsign = autoconfirmsign; - } - - public String getAutoconfirmsign() - { - return autoconfirmsign; - } - - public void setAutoconfirminfo(String autoconfirminfo) - { - this.autoconfirminfo = autoconfirminfo; - } - - public String getAutoconfirminfo() - { - return autoconfirminfo; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapSamplereg.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapSamplereg.java index d8cc6fffe..8d39476f5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapSamplereg.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapSamplereg.java @@ -5,17 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -对象 las_sap_samplereg + * 常规检验登记表 las_sap_samplereg * * @author ruoyi * @date 2025-03-05 diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaCreateAndGetTssInfoVo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaCreateAndGetTssInfoVo.java new file mode 100644 index 000000000..552517e96 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaCreateAndGetTssInfoVo.java @@ -0,0 +1,21 @@ +package com.neuhis.his.domain.vo.bjca; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +/** + * 产生时间戳(createAndGetTssInfo) + * + * @author dazer + * @date 2025/3/5 17:32 + **/ +@Getter +@Setter +@NoArgsConstructor +public class CaCreateAndGetTssInfoVo { + /** + * 时间戳 + */ + private String tsResp; +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaStartAutoSignVo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaStartAutoSignVo.java index 9f5aeb38a..4d88e2e4c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaStartAutoSignVo.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaStartAutoSignVo.java @@ -7,7 +7,7 @@ import lombok.Setter; import java.io.Serializable; /** - * 描述信息 + * 开始自动签名返回参数 * * @author dazer * @date 2025/3/4 15:44 @@ -20,4 +20,25 @@ public class CaStartAutoSignVo implements Serializable { * 待签任务 ID */ private String signDataId; + /** + * qrCode的json字符串，去除转移后的JSON字符串生成的二维码，可以直接使用：【协同签名】扫描 + */ + private String qrCode; + /** + * qrCode的对象形式 + */ + private QrCodeVo qrCodeVo; + + @Getter + @Setter + @NoArgsConstructor + public static class QrCodeVo { + /** + * 二维码地址：类似：https://coss-dev.isignet.cn:18759/coss/mobile/v1/getServiceInfo + */ + private String sUrl; + private String id; + private String o; + private String cv; + } } diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaStartVo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaStartVo.java new file mode 100644 index 000000000..e3b114c03 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/bjca/CaStartVo.java @@ -0,0 +1,31 @@ +package com.neuhis.his.domain.vo.bjca; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +/** + * 自动签名返回参数 + * + * @author dazer + * @date 2025/3/5 17:32 + **/ +@Getter +@Setter +@ToString +@NoArgsConstructor +public class CaStartVo { + /** + * 签名任务id,StartAutoSign的返回参数，形如：SD_18eb25f8-3d15-4971-a60c-730c1480d837 + */ + private String signDataId; + /** + * 签名结果，形如：MEYCIQDvcy6/WHJ+8QS1S1Ja1Q9FBa6gtnboxwndyQpHBBbcaQIhAMeZjymkozFKm1MaD2xq/ L4JhW3gO5XTmGL6SO0MzZw + */ + private String signResult; + /** + * 证书，形如：MIIDAzCCAqagAwIBAgISXXXXXXXXXXXu4j9CUZ/w0w== + */ + private String signCert; +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/winlis/LasSapSampleregVo.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/winlis/LasSapSampleregVo.java new file mode 100644 index 000000000..05bb0452c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/winlis/LasSapSampleregVo.java @@ -0,0 +1,23 @@ +package com.neuhis.his.domain.vo.winlis; + +import com.neuhis.his.domain.entity.winlis.LasRtResult; +import com.neuhis.his.domain.entity.winlis.LasSapSamplereg; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + +/** + * 常规检验登记表Vo + * + * @author dazer + * @date 2025/3/5 19:21 + **/ +@Getter +@Setter +@NoArgsConstructor +public class LasSapSampleregVo extends LasSapSamplereg { + private List rtResultList = new ArrayList<>(); +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComControlargumentMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComControlargumentMapper.java index 03831c7d9..8c640d0d8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComControlargumentMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComControlargumentMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.ComControlargument; +import com.neuhis.his.domain.entity.his.ComControlargument; public interface ComControlargumentMapper { int deleteByPrimaryKey(String controlCode); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDepartmentMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDepartmentMapper.java index fdeefaa77..e273904d3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDepartmentMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDepartmentMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.ComDepartment; +import com.neuhis.his.domain.entity.his.ComDepartment; public interface ComDepartmentMapper { int deleteByPrimaryKey(String deptCode); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDictionaryMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDictionaryMapper.java index 74bbb67e1..2b2eaff84 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDictionaryMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComDictionaryMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.ComDictionary; +import com.neuhis.his.domain.entity.his.ComDictionary; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComEmployeeMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComEmployeeMapper.java index 88ebf443a..eaaf52a4c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComEmployeeMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComEmployeeMapper.java @@ -2,7 +2,7 @@ package com.neuhis.his.mapper; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; -import com.neuhis.his.domain.entity.ComEmployee; +import com.neuhis.his.domain.entity.his.ComEmployee; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComPatientinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComPatientinfoMapper.java index 552aef355..ae3ec0a3e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComPatientinfoMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/ComPatientinfoMapper.java @@ -1,8 +1,6 @@ package com.neuhis.his.mapper; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.enums.DataSourceType; -import com.neuhis.his.domain.entity.ComPatientinfo; +import com.neuhis.his.domain.entity.his.ComPatientinfo; import com.neuhis.his.domain.entity.HisSqlLogHis; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/DawnCodeInfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/DawnCodeInfoMapper.java index 765d72747..40f60b8a2 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/DawnCodeInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/DawnCodeInfoMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.DawnCodeInfo; +import com.neuhis.his.domain.entity.his.DawnCodeInfo; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComExamorderMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComExamorderMapper.java index 2c0582be0..fd01294e8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComExamorderMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComExamorderMapper.java @@ -1,7 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinComExamorder; -import com.neuhis.his.domain.entity.FinIpbItemlist; +import com.neuhis.his.domain.entity.his.FinComExamorder; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndruginfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndruginfoMapper.java index ff3ab043c..d57f49e9a 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndruginfoMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndruginfoMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinComUndruginfo; +import com.neuhis.his.domain.entity.his.FinComUndruginfo; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndrugztinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndrugztinfoMapper.java index c693bc420..cf467b719 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndrugztinfoMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinComUndrugztinfoMapper.java @@ -1,7 +1,7 @@ package com.neuhis.his.mapper; import com.neuhis.his.domain.dto.ComUndrugZtFeeGroupItem; -import com.neuhis.his.domain.entity.FinComUndrugztinfo; +import com.neuhis.his.domain.entity.his.FinComUndrugztinfo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbFeeinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbFeeinfoMapper.java index 3cf2965a6..24914f03f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbFeeinfoMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbFeeinfoMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinIpbFeeinfo; +import com.neuhis.his.domain.entity.his.FinIpbFeeinfo; import org.apache.ibatis.annotations.Param; public interface FinIpbFeeinfoMapper { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbItemlistMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbItemlistMapper.java index b52e9aa32..21ad2f294 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbItemlistMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbItemlistMapper.java @@ -1,7 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinIpbItemlist; -import com.neuhis.his.domain.entity.FinOpbFeedetail; +import com.neuhis.his.domain.entity.his.FinIpbItemlist; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbMedicinelistMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbMedicinelistMapper.java index 6488bc92d..1cc0c6681 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbMedicinelistMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIpbMedicinelistMapper.java @@ -1,7 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinIpbMedicinelist; -import com.neuhis.his.domain.entity.FinOpbFeedetail; +import com.neuhis.his.domain.entity.his.FinIpbMedicinelist; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprBabyinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprBabyinfoMapper.java index 85269857d..737259f31 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprBabyinfoMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprBabyinfoMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinIprBabyinfo; +import com.neuhis.his.domain.entity.his.FinIprBabyinfo; import org.apache.ibatis.annotations.Param; public interface FinIprBabyinfoMapper { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprInmaininfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprInmaininfoMapper.java index a91d49a13..87053e95f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprInmaininfoMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinIprInmaininfoMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinIprInmaininfo;import java.util.List; +import com.neuhis.his.domain.entity.his.FinIprInmaininfo;import java.util.List; public interface FinIprInmaininfoMapper { int deleteByPrimaryKey(String inpatientNo); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountMapper.java index 34cf53f9e..2480b2a4d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinOpbAccount; +import com.neuhis.his.domain.entity.his.FinOpbAccount; public interface FinOpbAccountMapper { int deleteByPrimaryKey(String accountNo); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountlistMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountlistMapper.java index 1c6af40c4..0fa567d4f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountlistMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountlistMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinOpbAccountlist; +import com.neuhis.his.domain.entity.his.FinOpbAccountlist; public interface FinOpbAccountlistMapper { int insert(FinOpbAccountlist record); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountrecordMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountrecordMapper.java index 48badb050..a1dc5b6bd 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountrecordMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbAccountrecordMapper.java @@ -1,7 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.ComPatientinfo; -import com.neuhis.his.domain.entity.FinOpbAccountrecord; +import com.neuhis.his.domain.entity.his.FinOpbAccountrecord; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbFeedetailMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbFeedetailMapper.java index 7ca00691c..7b297e3a2 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbFeedetailMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbFeedetailMapper.java @@ -1,8 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.ComPatientinfo; -import com.neuhis.his.domain.entity.FinOpbFeedetail; -import com.neuhis.his.domain.entity.PushMessageRecorShf; +import com.neuhis.his.domain.entity.his.FinOpbFeedetail; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbInvoiceinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbInvoiceinfoMapper.java index f71538a9d..873740d0b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbInvoiceinfoMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOpbInvoiceinfoMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinOpbInvoiceinfo; +import com.neuhis.his.domain.entity.his.FinOpbInvoiceinfo; import org.apache.ibatis.annotations.Param; public interface FinOpbInvoiceinfoMapper { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprRegisterMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprRegisterMapper.java index d3c972daa..97b9995d1 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprRegisterMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprRegisterMapper.java @@ -1,7 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinIprInmaininfo; -import com.neuhis.his.domain.entity.FinOprRegister; +import com.neuhis.his.domain.entity.his.FinOprRegister; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprSchemaMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprSchemaMapper.java index 13c1fa5b0..9d0ae9ffb 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprSchemaMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/FinOprSchemaMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.FinOprSchema; +import com.neuhis.his.domain.entity.his.FinOprSchema; public interface FinOprSchemaMapper { int deleteByPrimaryKey(String id); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MdcDiPathMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MdcDiPathMapper.java index 550560eb6..1936e1671 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MdcDiPathMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MdcDiPathMapper.java @@ -1,8 +1,7 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MdcDiPath; +import com.neuhis.his.domain.entity.his.MdcDiPath; -import javax.validation.constraints.AssertTrue; import java.util.List; public interface MdcDiPathMapper { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetCasDiagnoseMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetCasDiagnoseMapper.java index 3baebe05c..4bb3ef348 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetCasDiagnoseMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetCasDiagnoseMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetCasDiagnose; +import com.neuhis.his.domain.entity.his.MetCasDiagnose; import org.apache.ibatis.annotations.Param; public interface MetCasDiagnoseMapper { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComIcd10Mapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComIcd10Mapper.java index 172a2151e..929f21a02 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComIcd10Mapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComIcd10Mapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetComIcd10; +import com.neuhis.his.domain.entity.his.MetComIcd10; public interface MetComIcd10Mapper { int deleteByPrimaryKey(String sequenceNo); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComOperationLocalMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComOperationLocalMapper.java index 694789a4a..4e8f16f48 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComOperationLocalMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetComOperationLocalMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetComOperationLocal; +import com.neuhis.his.domain.entity.his.MetComOperationLocal; public interface MetComOperationLocalMapper { int insert(MetComOperationLocal record); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmBookedMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmBookedMapper.java index 7a348c1eb..5d23a839c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmBookedMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmBookedMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetIpmBooked; +import com.neuhis.his.domain.entity.his.MetIpmBooked; public interface MetIpmBookedMapper { int deleteByPrimaryKey(String bookedSqn); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecdrugMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecdrugMapper.java index 2e41fe65e..863c4eac5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecdrugMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecdrugMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetIpmExecdrug; +import com.neuhis.his.domain.entity.his.MetIpmExecdrug; public interface MetIpmExecdrugMapper { int deleteByPrimaryKey(String execSqn); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecundrugMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecundrugMapper.java index b93f000d3..47d94dca6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecundrugMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmExecundrugMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetIpmExecundrug; +import com.neuhis.his.domain.entity.his.MetIpmExecundrug; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmOrderMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmOrderMapper.java index 824b4b0a9..d94344693 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetIpmOrderMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetIpmOrder; +import com.neuhis.his.domain.entity.his.MetIpmOrder; public interface MetIpmOrderMapper { int deleteByPrimaryKey(String moOrder); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetMrsBaseMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetMrsBaseMapper.java index 0ab076ea5..cc8b01e8a 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetMrsBaseMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetMrsBaseMapper.java @@ -1,9 +1,6 @@ package com.neuhis.his.mapper; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.enums.DataSourceType; -import com.neuhis.his.domain.entity.ComPatientinfo; -import com.neuhis.his.domain.entity.MetMrsBase; +import com.neuhis.his.domain.entity.his.MetMrsBase; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiCancelitemMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiCancelitemMapper.java index e4a3464c3..57500962e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiCancelitemMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiCancelitemMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetNuiCancelitem; +import com.neuhis.his.domain.entity.his.MetNuiCancelitem; public interface MetNuiCancelitemMapper { int deleteByPrimaryKey(String applyNo); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiExerecordMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiExerecordMapper.java index b42d801b8..fce3a147e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiExerecordMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetNuiExerecordMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetNuiExerecord; +import com.neuhis.his.domain.entity.his.MetNuiExerecord; import org.apache.ibatis.annotations.Param; public interface MetNuiExerecordMapper { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsApplyMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsApplyMapper.java index dc97151a4..13558ed7d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsApplyMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsApplyMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetOpsApply; +import com.neuhis.his.domain.entity.his.MetOpsApply; public interface MetOpsApplyMapper { int deleteByPrimaryKey(String operationno); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsArrangeMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsArrangeMapper.java index bb7a789ec..b52c53aa8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsArrangeMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsArrangeMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetOpsArrange; +import com.neuhis.his.domain.entity.his.MetOpsArrange; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsOperationitemMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsOperationitemMapper.java index 6b1e2ed2c..0086d56a2 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsOperationitemMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOpsOperationitemMapper.java @@ -1,7 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetOpsArrange; -import com.neuhis.his.domain.entity.MetOpsOperationitem; +import com.neuhis.his.domain.entity.his.MetOpsOperationitem; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeApplyTypeMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeApplyTypeMapper.java index 61725b950..3c650a069 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeApplyTypeMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeApplyTypeMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetOrdeApplyType; +import com.neuhis.his.domain.entity.his.MetOrdeApplyType; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeBigexampartMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeBigexampartMapper.java index 2bdf33817..c0fb00c75 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeBigexampartMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeBigexampartMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetOrdeBigexampart; +import com.neuhis.his.domain.entity.his.MetOrdeBigexampart; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeExampartMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeExampartMapper.java index 46ca6f40f..f572dfdcd 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeExampartMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdeExampartMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetOrdeExampart; +import com.neuhis.his.domain.entity.his.MetOrdeExampart; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdiOrderMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdiOrderMapper.java index e3412b517..8b97ef642 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdiOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdiOrderMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetOrdiOrder; +import com.neuhis.his.domain.entity.his.MetOrdiOrder; public interface MetOrdiOrderMapper { int deleteByPrimaryKey(String moOrder); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdoOrderMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdoOrderMapper.java index 22152a135..328e02f76 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdoOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdoOrderMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetOrdoOrder; +import com.neuhis.his.domain.entity.his.MetOrdoOrder; public interface MetOrdoOrderMapper { int deleteByPrimaryKey(String moOrder); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdtUndrugtermMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdtUndrugtermMapper.java index 58ccd6d1c..16e496a15 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdtUndrugtermMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/MetOrdtUndrugtermMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetOrdtUndrugterm; +import com.neuhis.his.domain.entity.his.MetOrdtUndrugterm; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrNisRecordDetailMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrNisRecordDetailMapper.java index d090a505e..70944ff7c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrNisRecordDetailMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrNisRecordDetailMapper.java @@ -1,7 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.ComEmployee; -import com.neuhis.his.domain.entity.NsrNisRecordDetail; +import com.neuhis.his.domain.entity.his.NsrNisRecordDetail; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrStandardCodeMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrStandardCodeMapper.java index 4ce6ecd31..a33882b50 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrStandardCodeMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/NsrStandardCodeMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.NsrStandardCode; +import com.neuhis.his.domain.entity.his.NsrStandardCode; public interface NsrStandardCodeMapper { int deleteByPrimaryKey(String ncode); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaBloodCircuitMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaBloodCircuitMapper.java index a3ffa640c..0e0af53d5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaBloodCircuitMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaBloodCircuitMapper.java @@ -1,7 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.MetNuiExerecord; -import com.neuhis.his.domain.entity.PdaBloodCircuit; +import com.neuhis.his.domain.entity.his.PdaBloodCircuit; import org.apache.ibatis.annotations.Param; public interface PdaBloodCircuitMapper { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRecordMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRecordMapper.java index 8c93b2b7b..e5e38bf05 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRecordMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PdaPsrRecordMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.PdaPsrRecord; +import com.neuhis.his.domain.entity.his.PdaPsrRecord; public interface PdaPsrRecordMapper { int deleteByPrimaryKey(String id); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComApplyoutMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComApplyoutMapper.java index d51098927..a7805319c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComApplyoutMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComApplyoutMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.PhaComApplyout; +import com.neuhis.his.domain.entity.his.PhaComApplyout; public interface PhaComApplyoutMapper { int deleteByPrimaryKey(Long applyNumber); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComBaseinfoMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComBaseinfoMapper.java index e35bdd2ad..6eeb70177 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComBaseinfoMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/PhaComBaseinfoMapper.java @@ -1,6 +1,6 @@ package com.neuhis.his.mapper; -import com.neuhis.his.domain.entity.PhaComBaseinfo; +import com.neuhis.his.domain.entity.his.PhaComBaseinfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasRtResultMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasRtResultMapper.java index b290289b2..8feafa9c8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasRtResultMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasRtResultMapper.java @@ -18,7 +18,7 @@ public interface LasRtResultMapper * @param testdate 常规检验结果主键 * @return 常规检验结果 */ - public LasRtResult selectLasRtResultByTestdate(String testdate); + List selectLasRtResultByTestdate(String testdate, String barcode, String machineid); /** * 查询常规检验结果列表 @@ -26,37 +26,5 @@ public interface LasRtResultMapper * @param lasRtResult 常规检验结果 * @return 常规检验结果集合 */ - public List selectLasRtResultList(LasRtResult lasRtResult); - - /** - * 新增常规检验结果 - * - * @param lasRtResult 常规检验结果 - * @return 结果 - */ - public int insertLasRtResult(LasRtResult lasRtResult); - - /** - * 修改常规检验结果 - * - * @param lasRtResult 常规检验结果 - * @return 结果 - */ - public int updateLasRtResult(LasRtResult lasRtResult); - - /** - * 删除常规检验结果 - * - * @param testdate 常规检验结果主键 - * @return 结果 - */ - public int deleteLasRtResultByTestdate(String testdate); - - /** - * 批量删除常规检验结果 - * - * @param testdates 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteLasRtResultByTestdates(String[] testdates); + List selectLasRtResultList(LasRtResult lasRtResult); } diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapSampleregMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapSampleregMapper.java index 13831df52..0878f376f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapSampleregMapper.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapSampleregMapper.java @@ -5,10 +5,7 @@ import com.neuhis.his.domain.entity.winlis.LasSapSamplereg; import java.util.List; /** - * 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * 常规检验登记表 Mapper接口 * * @author ruoyi @@ -17,102 +14,22 @@ Mapper接口 public interface LasSapSampleregMapper { /** - * 查询样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * * - * @param testdate 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -主键 - * @return 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - + * @param testdate 常规检验登记表 + * @return 常规检验登记表 */ - public LasSapSamplereg selectLasSapSampleregByTestdate(String testdate); + public LasSapSamplereg selectLasSapSampleregByTestdate(String testdate, String barcode, String machineid); /** - * 查询样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * 列表 * - * @param lasSapSamplereg 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * @param lasSapSamplereg 常规检验登记表 - * @return 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * @return 常规检验登记表 集合 */ public List selectLasSapSampleregList(LasSapSamplereg lasSapSamplereg); - - /** - * 新增样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param lasSapSamplereg 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * @return 结果 - */ - public int insertLasSapSamplereg(LasSapSamplereg lasSapSamplereg); - - /** - * 修改样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param lasSapSamplereg 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * @return 结果 - */ - public int updateLasSapSamplereg(LasSapSamplereg lasSapSamplereg); - - /** - * 删除样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param testdate 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -主键 - * @return 结果 - */ - public int deleteLasSapSampleregByTestdate(String testdate); - - /** - * 批量删除样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param testdates 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteLasSapSampleregByTestdates(String[] testdates); } diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/push/OracleSlaveDataAutoPushService.java b/ruoyi-admin/src/main/java/com/neuhis/his/push/OracleSlaveDataAutoPushService.java index 71c47e3ac..bb6186bbc 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/push/OracleSlaveDataAutoPushService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/push/OracleSlaveDataAutoPushService.java @@ -3,6 +3,7 @@ package com.neuhis.his.push; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.StringUtils; import com.neuhis.his.domain.BizApi; import com.neuhis.his.domain.BizApiFieldMapping; @@ -50,6 +51,10 @@ public class OracleSlaveDataAutoPushService { VpMessageRecordService db2vpMessageRecordService; @Resource(name = "db3") VpMessageRecordService db3vpMessageRecordService; + @Resource(name = "winlis") + VpMessageRecordService dbWinlisVpMessageRecordService; + @Resource(name = "pacs") + VpMessageRecordService dbPacsVpMessageRecordService; private String url; @@ -140,6 +145,10 @@ public class OracleSlaveDataAutoPushService { db2vpMessageRecordService.insertOrUpdateByPrimaryKey(vpMessageRecord); else if ("3".equals(bizApi.getDb())) db3vpMessageRecordService.insertOrUpdateByPrimaryKey(vpMessageRecord); + else if (DataSourceType.WINLIS.name().equals(bizApi.getDb())) + dbWinlisVpMessageRecordService.insertOrUpdateByPrimaryKey(vpMessageRecord); + else if (DataSourceType.PACS.name().equals(bizApi.getDb())) + dbPacsVpMessageRecordService.insertOrUpdateByPrimaryKey(vpMessageRecord); else vpMessageRecordService.insertOrUpdateByPrimaryKey(vpMessageRecord); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/FinOpbInvoiceinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/FinOpbInvoiceinfoService.java index 8ffd234e1..28a97ad30 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/FinOpbInvoiceinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/FinOpbInvoiceinfoService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service; -import com.neuhis.his.domain.entity.FinOpbInvoiceinfo; +import com.neuhis.his.domain.entity.his.FinOpbInvoiceinfo; public interface FinOpbInvoiceinfoService{ int deleteByPrimaryKey(String invoiceNo,String transType,String invoiceSeq); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IBjCaService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/IBjCaService.java index c432a371c..f407aaae0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IBjCaService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/IBjCaService.java @@ -1,5 +1,8 @@ package com.neuhis.his.service; +import com.neuhis.his.domain.vo.bjca.BjCaResult; +import com.neuhis.his.domain.vo.bjca.CaStartVo; + /** * 
  * 北京CA自动签名，用于补历史签名数据
@@ -7,24 +10,27 @@ package com.neuhis.his.service;
  * 接口2 3.4.3.3 自动签名(autoSign)的反参这二个数据存库signResult签名结果，signCert签名证书，
  * 接口3 3.4.7.1 产生时间戳(createAndGetTssInfo)  第三个接口的时间戳结果：入参：oriData，这个是啥字段? 数据原文和自动签名接口里面传的数据原文保持一致就行
  *
+ * + * {"status":89000005,"message":"验证请求签名错误"}: 原因分析：1、真正的签名错误；2、多一个后台不存在的参数； + * {"status":89000001,"message":"请求参数错误","data":{"errCode":89000001,"errMsg":"请求参数错误(请传入数字格式的过期时间)"}}: 原因分析：Data数据没有BASE64编码 * @author dazer * @date 2025/3/3 19:26 **/ public interface IBjCaService { /** * 开启自动签名 - * @return 返回的signDataId + * @return 返回的signDataId, 【签署的任务id】[签名任务id] */ String startAutoSign(); /** * 自动签名 - * @param signDataId startAutoSign开启自动签名接口：返回的signDataId + * @param autoSignSignDataId startAutoSign开启自动签名接口：返回的【签署的任务id】 * @param oriDataBase64 待签数据（必须是 base64编码） */ - void autoSign(String signDataId, String oriDataBase64); + BjCaResult autoSign(String autoSignSignDataId, String oriDataBase64); /** * 产生时间戳 * @param oriDataBase64 待签数据（必须是 base64编码） */ - void createAndGetTssInfo(String oriDataBase64); + String createAndGetTssInfo(String oriDataBase64); } diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComControlargumentService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComControlargumentService.java index 72f494a20..89a7d9a29 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComControlargumentService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComControlargumentService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.ComControlargument; +import com.neuhis.his.domain.entity.his.ComControlargument; public interface IComControlargumentService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDepartmentService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDepartmentService.java index 604d56684..6a9e50a63 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDepartmentService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDepartmentService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.ComDepartment; +import com.neuhis.his.domain.entity.his.ComDepartment; public interface IComDepartmentService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDictionaryService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDictionaryService.java index 864e1d893..51a50d4ff 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDictionaryService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDictionaryService.java @@ -1,7 +1,7 @@ package com.neuhis.his.service.his; import com.neuhis.his.common.ComDictionaryTypeEnum; -import com.neuhis.his.domain.entity.ComDictionary; +import com.neuhis.his.domain.entity.his.ComDictionary; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComEmployeeService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComEmployeeService.java index 0fcb650c0..67673f778 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComEmployeeService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComEmployeeService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.ComEmployee; +import com.neuhis.his.domain.entity.his.ComEmployee; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoService.java index 50c8ac570..912bd756f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoService.java @@ -1,6 +1,9 @@ package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.*; +import com.neuhis.his.domain.entity.his.ComPatientinfo; +import com.neuhis.his.domain.entity.his.FinIprInmaininfo; +import com.neuhis.his.domain.entity.his.FinOprRegister; import java.util.Date; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IDawnCodeInfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IDawnCodeInfoService.java index 855bb8029..0636d6fd2 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IDawnCodeInfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IDawnCodeInfoService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.DawnCodeInfo; +import com.neuhis.his.domain.entity.his.DawnCodeInfo; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComExamorderService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComExamorderService.java index 6079d0a36..4f60feb5e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComExamorderService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComExamorderService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinComExamorder; +import com.neuhis.his.domain.entity.his.FinComExamorder; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndruginfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndruginfoService.java index 1802f771f..940a60a22 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndruginfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndruginfoService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinComUndruginfo; +import com.neuhis.his.domain.entity.his.FinComUndruginfo; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndrugztinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndrugztinfoService.java index 766df6629..5dd8706a9 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndrugztinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndrugztinfoService.java @@ -1,7 +1,7 @@ package com.neuhis.his.service.his; import com.neuhis.his.domain.dto.ComUndrugZtFeeGroupItem; -import com.neuhis.his.domain.entity.FinComUndrugztinfo; +import com.neuhis.his.domain.entity.his.FinComUndrugztinfo; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbFeeinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbFeeinfoService.java index cd62a8e29..131d2b919 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbFeeinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbFeeinfoService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinIpbFeeinfo; +import com.neuhis.his.domain.entity.his.FinIpbFeeinfo; public interface IFinIpbFeeinfoService { int deleteByPrimaryKey(String recipeNo,String feeCode,String executeDeptcode,Short balanceNo); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbItemlistService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbItemlistService.java index 7bb582d43..4d9814b1e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbItemlistService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbItemlistService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinIpbItemlist; +import com.neuhis.his.domain.entity.his.FinIpbItemlist; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbMedicinelistService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbMedicinelistService.java index f0c41aefb..3e9c9ed06 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbMedicinelistService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbMedicinelistService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinIpbMedicinelist; +import com.neuhis.his.domain.entity.his.FinIpbMedicinelist; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprBabyinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprBabyinfoService.java index 87f7fedb1..967eac138 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprBabyinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprBabyinfoService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinIprBabyinfo; +import com.neuhis.his.domain.entity.his.FinIprBabyinfo; public interface IFinIprBabyinfoService { int deleteByPrimaryKey(String inpatientNo,Integer happenNo); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprInmaininfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprInmaininfoService.java index 7c7ec816d..57fb8bbf8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprInmaininfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprInmaininfoService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinIprInmaininfo; +import com.neuhis.his.domain.entity.his.FinIprInmaininfo; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountService.java index 298ad77e3..86e74f1e6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinOpbAccount; +import com.neuhis.his.domain.entity.his.FinOpbAccount; public interface IFinOpbAccountService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountlistService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountlistService.java index 6cbb67b08..d103800cb 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountlistService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountlistService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinOpbAccountlist; +import com.neuhis.his.domain.entity.his.FinOpbAccountlist; public interface IFinOpbAccountlistService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountrecordService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountrecordService.java index b45be9e9c..979194bb7 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountrecordService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountrecordService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinOpbAccountrecord; +import com.neuhis.his.domain.entity.his.FinOpbAccountrecord; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbFeedetailService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbFeedetailService.java index 9776b5098..1a467e585 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbFeedetailService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbFeedetailService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinOpbFeedetail; +import com.neuhis.his.domain.entity.his.FinOpbFeedetail; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprRegisterService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprRegisterService.java index 5c238b6ec..afe48e78c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprRegisterService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprRegisterService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinOprRegister; +import com.neuhis.his.domain.entity.his.FinOprRegister; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprSchemaService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprSchemaService.java index 76f57f907..f225aec39 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprSchemaService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprSchemaService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinOprSchema; +import com.neuhis.his.domain.entity.his.FinOprSchema; public interface IFinOprSchemaService { int deleteByPrimaryKey(String id); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMdcDiPathService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMdcDiPathService.java index b2c98fc3e..5caf630da 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMdcDiPathService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMdcDiPathService.java @@ -1,8 +1,8 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinIprInmaininfo; -import com.neuhis.his.domain.entity.FinOprRegister; -import com.neuhis.his.domain.entity.MdcDiPath; +import com.neuhis.his.domain.entity.his.FinIprInmaininfo; +import com.neuhis.his.domain.entity.his.FinOprRegister; +import com.neuhis.his.domain.entity.his.MdcDiPath; public interface IMdcDiPathService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetCasDiagnoseService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetCasDiagnoseService.java index 91357a9d5..1552fc757 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetCasDiagnoseService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetCasDiagnoseService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetCasDiagnose; +import com.neuhis.his.domain.entity.his.MetCasDiagnose; public interface IMetCasDiagnoseService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComIcd10Service.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComIcd10Service.java index ffb0af0b6..1bcbca8ca 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComIcd10Service.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComIcd10Service.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetComIcd10; +import com.neuhis.his.domain.entity.his.MetComIcd10; public interface IMetComIcd10Service { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComOperationLocalService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComOperationLocalService.java index 2208a8f6d..d246889e0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComOperationLocalService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComOperationLocalService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetComOperationLocal; +import com.neuhis.his.domain.entity.his.MetComOperationLocal; public interface IMetComOperationLocalService { int insert(MetComOperationLocal record); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmBookedService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmBookedService.java index d12012beb..b1804abe7 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmBookedService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmBookedService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetIpmBooked; +import com.neuhis.his.domain.entity.his.MetIpmBooked; public interface IMetIpmBookedService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecdrugService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecdrugService.java index 9cb865320..58d4022b2 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecdrugService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecdrugService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetIpmExecdrug; +import com.neuhis.his.domain.entity.his.MetIpmExecdrug; public interface IMetIpmExecdrugService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecundrugService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecundrugService.java index 7047325e0..d90a35c35 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecundrugService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecundrugService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetIpmExecundrug; +import com.neuhis.his.domain.entity.his.MetIpmExecundrug; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmOrderService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmOrderService.java index 7dc01ded9..e213b4d48 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmOrderService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmOrderService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetIpmOrder; +import com.neuhis.his.domain.entity.his.MetIpmOrder; public interface IMetIpmOrderService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetMrsBaseService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetMrsBaseService.java index 4a05dda72..8ecceaca2 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetMrsBaseService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetMrsBaseService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetMrsBase; +import com.neuhis.his.domain.entity.his.MetMrsBase; public interface IMetMrsBaseService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiCancelitemService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiCancelitemService.java index 3a922a583..b6d1529b0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiCancelitemService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiCancelitemService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetNuiCancelitem; +import com.neuhis.his.domain.entity.his.MetNuiCancelitem; public interface IMetNuiCancelitemService { int deleteByPrimaryKey(String applyNo); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiExerecordService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiExerecordService.java index 9d51d9ad7..75d63634d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiExerecordService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiExerecordService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetNuiExerecord; +import com.neuhis.his.domain.entity.his.MetNuiExerecord; import io.lettuce.core.dynamic.annotation.Param; public interface IMetNuiExerecordService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsApplyService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsApplyService.java index 379325b50..bd0f34921 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsApplyService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsApplyService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetOpsApply; +import com.neuhis.his.domain.entity.his.MetOpsApply; public interface IMetOpsApplyService { int deleteByPrimaryKey(String operationno); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsArrangeService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsArrangeService.java index c48e5c903..bfa69417a 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsArrangeService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsArrangeService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetOpsArrange; +import com.neuhis.his.domain.entity.his.MetOpsArrange; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsOperationitemService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsOperationitemService.java index c95d1c4ad..efa13c785 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsOperationitemService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsOperationitemService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetOpsOperationitem; +import com.neuhis.his.domain.entity.his.MetOpsOperationitem; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeApplyTypeService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeApplyTypeService.java index ab7fb1816..f79b65d88 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeApplyTypeService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeApplyTypeService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetOrdeApplyType; +import com.neuhis.his.domain.entity.his.MetOrdeApplyType; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeBigexampartService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeBigexampartService.java index 308a18d62..080325bd8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeBigexampartService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeBigexampartService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetOrdeBigexampart; +import com.neuhis.his.domain.entity.his.MetOrdeBigexampart; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeExampartService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeExampartService.java index 829587ab5..ed09ee2b3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeExampartService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeExampartService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetOrdeExampart; +import com.neuhis.his.domain.entity.his.MetOrdeExampart; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdiOrderService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdiOrderService.java index 0872b9bd4..399bbd79d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdiOrderService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdiOrderService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetOrdiOrder; +import com.neuhis.his.domain.entity.his.MetOrdiOrder; public interface IMetOrdiOrderService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdoOrderService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdoOrderService.java index d62f46907..56e296be2 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdoOrderService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdoOrderService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetOrdoOrder; +import com.neuhis.his.domain.entity.his.MetOrdoOrder; public interface IMetOrdoOrderService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdtUndrugtermService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdtUndrugtermService.java index f8440421c..b720862a6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdtUndrugtermService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdtUndrugtermService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.MetOrdtUndrugterm; +import com.neuhis.his.domain.entity.his.MetOrdtUndrugterm; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrNisRecordDetailService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrNisRecordDetailService.java index d673f6378..37f1e79cb 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrNisRecordDetailService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrNisRecordDetailService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.NsrNisRecordDetail; +import com.neuhis.his.domain.entity.his.NsrNisRecordDetail; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrStandardCodeService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrStandardCodeService.java index f6bc58466..b8af9b4e2 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrStandardCodeService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrStandardCodeService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.NsrStandardCode; +import com.neuhis.his.domain.entity.his.NsrStandardCode; public interface INsrStandardCodeService { int deleteByPrimaryKey(String ncode); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaBloodCircuitService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaBloodCircuitService.java index 7c4b09631..f251be63f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaBloodCircuitService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaBloodCircuitService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.PdaBloodCircuit; +import com.neuhis.his.domain.entity.his.PdaBloodCircuit; public interface IPdaBloodCircuitService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRecordService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRecordService.java index c6ebd5ae4..9c852d537 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRecordService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRecordService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.PdaPsrRecord; +import com.neuhis.his.domain.entity.his.PdaPsrRecord; public interface IPdaPsrRecordService { int deleteByPrimaryKey(String id); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComApplyoutService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComApplyoutService.java index 6d8039a1f..863793633 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComApplyoutService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComApplyoutService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.PhaComApplyout; +import com.neuhis.his.domain.entity.his.PhaComApplyout; public interface IPhaComApplyoutService { int deleteByPrimaryKey(Long applyNumber); diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComBaseinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComBaseinfoService.java index 6fa630835..d5d0eea00 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComBaseinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComBaseinfoService.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.PhaComBaseinfo; +import com.neuhis.his.domain.entity.his.PhaComBaseinfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BizElecAppServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BizElecAppServiceImpl.java index 8f78dce9b..5dad1c51d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BizElecAppServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BizElecAppServiceImpl.java @@ -5,11 +5,11 @@ import java.util.*; import cn.hutool.core.util.NumberUtil; import cn.hutool.extra.pinyin.PinyinUtil; +import com.neuhis.his.domain.entity.his.*; import com.neuhis.his.service.his.*; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; -import com.neuhis.his.domain.entity.*; import com.neuhis.his.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BjCaServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BjCaServiceImpl.java index 59486f7f2..3f2e0165f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BjCaServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BjCaServiceImpl.java @@ -1,11 +1,16 @@ package com.neuhis.his.service.impl; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.neuhis.his.common.config.BjCaConfig; import com.neuhis.his.domain.vo.bjca.BjCaResult; +import com.neuhis.his.domain.vo.bjca.CaCreateAndGetTssInfoVo; import com.neuhis.his.domain.vo.bjca.CaStartAutoSignVo; +import com.neuhis.his.domain.vo.bjca.CaStartVo; import com.neuhis.his.service.IBjCaService; import com.neuhis.utils.BjcaUtil; +import com.ruoyi.common.utils.StringUtils; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -37,50 +42,72 @@ public class BjCaServiceImpl implements IBjCaService { public String startAutoSign() { Map params = getBjCaCommonParams(); params.put("userId", bjCaConfig.getUserId());//用户 Id，医生的CA系统协同用户iD - params.put("timeRegion", " 86400");//自动签名的过期时间，单位为秒（默认最长 86400秒，即 24 小时，也可以通过管理端系统重新设置） - params.put("requireQrCode", "Y");//是否返回二维码（只能传入 Y、N 两种类型,如果 传 Y，会将二维码图片 base64 编码后返回） - BjCaResult result = postBjCa(bjCaConfig.getServerStartAuthSign(), params); - if (result.isSuccess()) { + params.put("timeRegion", "86400");//自动签名的过期时间，单位为秒（默认最长 86400秒，即 24 小时，也可以通过管理端系统重新设置） + //requireQrCode: 不能穿传参数，否则提示：{"status":89000005,"message":"验证请求签名错误"} + BjCaResult result = postBjCa(bjCaConfig.getServerStartAuthSign(), params, CaStartAutoSignVo.class); + if (result.isSuccess() && result.getData() != null) { + if (StringUtils.isNotEmpty(result.getData().getQrCode())) { + CaStartAutoSignVo.QrCodeVo qrCodeVo = JSON.parseObject(result.getData().getQrCode(), CaStartAutoSignVo.QrCodeVo.class); + log.info("签署的任务id二维码JSON字符串：" + JSON.toJSONString(qrCodeVo)); + result.getData().setQrCodeVo(qrCodeVo); + } return result.getData().getSignDataId(); } return ""; } @Override - public void autoSign(String signDataId, String oriDataBase64) { + public BjCaResult autoSign(String autoSignSignDataId, String oriDataBase64) { + //region 参数校验 + if (StrUtil.isNotEmpty(oriDataBase64) && !Base64.isBase64(oriDataBase64)) { + throw new IllegalArgumentException("原文必须是base64编码"); + } + //endregion + Map params = getBjCaCommonParams(); params.put("userId", bjCaConfig.getUserId());//用户 Id，用户 Id，医生的CA系统协同用户iD - params.put("dataType", "DATA");//原文类型（DATA：原文，HASH：hash 数据WEB_SEAL：网页签章） + params.put("title", "lis签名");//标题（最长不超过100个字符），非必填 + params.put("dataType", "DATA");//原文类型（DATA：原文，HASH：hash 数据，WEB_SEAL： 网页签章） params.put("algo", "SM3withSM2");//签名算法(SM3withSM2) + params.put("description", "lis签名描述");//描述（最长不超过200个字符） params.put("data", oriDataBase64);//待签数据（必须是 base64编码） - params.put("signToken", signDataId);//开启自动签返回的 signDataId - params.put("title", "");//标题（最长不超过100个字符），非必填 - params.put("description", "");//描述（最长不超过200个字符），非必填 - postBjCa(bjCaConfig.getServerAuthSign(), params); + params.put("signToken", autoSignSignDataId);//开启自动签返回的 signDataId + return postBjCa(bjCaConfig.getServerAuthSign(), params, CaStartVo.class); } @Override - public void createAndGetTssInfo(String oriDataBase64) { + public String createAndGetTssInfo(String oriDataBase64) { + //region 参数校验 + if (StrUtil.isNotEmpty(oriDataBase64) && !Base64.isBase64(oriDataBase64)) { + throw new IllegalArgumentException("原文必须是base64编码"); + } + //endregion Map params = getBjCaCommonParams(); - params.put("oriData", "");//数据原文oriData: 数据原文和自动签名接口里面传的数据原文保持一致就行， 待签数据（必须是 base64编码） + params.put("oriData", oriDataBase64);//数据原文oriData: 数据原文和自动签名接口里面传的数据原文保持一致就行， 待签数据（必须是 base64编码） params.put("attachCert", "false");//最终产生的时间戳是否带证书 (true/false) - postBjCa(bjCaConfig.getServerTssInfo(), params); + BjCaResult result = postBjCa(bjCaConfig.getServerTssInfo(), params, CaCreateAndGetTssInfoVo.class); + return result != null && result.isSuccess() ? result.getData().getTsResp() : ""; } - private BjCaResult postBjCa(String url, Map params) { + @SuppressWarnings("all") + private BjCaResult postBjCa(String url, Map params, Class clazz) { String requestJson = ""; - String result = ""; + String resultJson = ""; BjCaResult bjCaResult = new BjCaResult<>(); try { requestJson = BjcaUtil.RequestUtils.generateRequestJson(params, bjCaConfig.getAppSecret()); - result = BjcaUtil.HTTPUtils.post(bjCaConfig.getServerBase() + bjCaConfig.getServerStartAuthSign(), requestJson); - bjCaResult = JSON.parseObject(result, BjCaResult.class); + resultJson = BjcaUtil.HTTPUtils.post(bjCaConfig.getServerBase() + url, requestJson); + bjCaResult = JSON.parseObject(resultJson, BjCaResult.class); + if (bjCaResult.isSuccess()) { + bjCaResult.setData(JSON.parseObject(JSON.toJSONString(bjCaResult.getData()), clazz)); + } } catch (Exception e) { - result = "请求CA报错：" + e.getMessage(); + resultJson = "请求CA报错：" + e.getMessage(); } - log.info("北京CA开始HTTP请求，URL：" + url + "\n," + - " 请求入参：" + requestJson + "\n" + - "响应结果" + result); + log.info("\n" + + "北京CA开始HTTP请求，URL：" + (bjCaConfig.getServerBase()+url) + "\n," + + "请求入参：" + requestJson + "\n" + + "响应结果：" + resultJson); return bjCaResult; } diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/DbPacsVpMessageRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/DbPacsVpMessageRecordServiceImpl.java new file mode 100644 index 000000000..baa0e0190 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/DbPacsVpMessageRecordServiceImpl.java @@ -0,0 +1,61 @@ +package com.neuhis.his.service.impl; + +import com.neuhis.his.domain.entity.VpMessageRecord; +import com.neuhis.his.mapper.VpMessageRecordMapper; +import com.neuhis.his.service.VpMessageRecordService; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +// Robin 2024-7-5 +@Service("pacs") +@DataSource(value = DataSourceType.PACS) +public class DbPacsVpMessageRecordServiceImpl implements VpMessageRecordService { + @Autowired + private VpMessageRecordMapper vpMessageRecordMapper; + + @Override + public int insert(VpMessageRecord record) { + return vpMessageRecordMapper.insert(record); + } + + @Override + public int insertSelective(VpMessageRecord record) { + return vpMessageRecordMapper.insertSelective(record); + } + + @Override + public int deleteByPrimaryKey(String msgId) { + return vpMessageRecordMapper.deleteByPrimaryKey(msgId); + } + + @Override + public VpMessageRecord selectByPrimaryKey(String msgId) { + return vpMessageRecordMapper.selectByPrimaryKey(msgId); + } + + @Override + public int updateByPrimaryKeySelective(VpMessageRecord record) { + return vpMessageRecordMapper.updateByPrimaryKeySelective(record); + } + + @Override + public int updateByPrimaryKey(VpMessageRecord record) { + return vpMessageRecordMapper.updateByPrimaryKey(record); + } + + @Override + public int insertOrUpdateByPrimaryKey(VpMessageRecord record) { + if(record.isInsert()){ + vpMessageRecordMapper.insert(record); + }else{ + vpMessageRecordMapper.updateByPrimaryKey(record); + } + return 1; + } + @Override + public int LogsTimerDel(String tableName, String colName, String days) { + return vpMessageRecordMapper.LogsTimerDel( tableName, colName, days); + } +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/DbWinlisVpMessageRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/DbWinlisVpMessageRecordServiceImpl.java new file mode 100644 index 000000000..f858c627c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/DbWinlisVpMessageRecordServiceImpl.java @@ -0,0 +1,61 @@ +package com.neuhis.his.service.impl; + +import com.neuhis.his.domain.entity.VpMessageRecord; +import com.neuhis.his.mapper.VpMessageRecordMapper; +import com.neuhis.his.service.VpMessageRecordService; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +// Robin 2024-7-5 +@Service("winlis") +@DataSource(value = DataSourceType.WINLIS) +public class DbWinlisVpMessageRecordServiceImpl implements VpMessageRecordService { + @Autowired + private VpMessageRecordMapper vpMessageRecordMapper; + + @Override + public int insert(VpMessageRecord record) { + return vpMessageRecordMapper.insert(record); + } + + @Override + public int insertSelective(VpMessageRecord record) { + return vpMessageRecordMapper.insertSelective(record); + } + + @Override + public int deleteByPrimaryKey(String msgId) { + return vpMessageRecordMapper.deleteByPrimaryKey(msgId); + } + + @Override + public VpMessageRecord selectByPrimaryKey(String msgId) { + return vpMessageRecordMapper.selectByPrimaryKey(msgId); + } + + @Override + public int updateByPrimaryKeySelective(VpMessageRecord record) { + return vpMessageRecordMapper.updateByPrimaryKeySelective(record); + } + + @Override + public int updateByPrimaryKey(VpMessageRecord record) { + return vpMessageRecordMapper.updateByPrimaryKey(record); + } + + @Override + public int insertOrUpdateByPrimaryKey(VpMessageRecord record) { + if(record.isInsert()){ + vpMessageRecordMapper.insert(record); + }else{ + vpMessageRecordMapper.updateByPrimaryKey(record); + } + return 1; + } + @Override + public int LogsTimerDel(String tableName, String colName, String days) { + return vpMessageRecordMapper.LogsTimerDel( tableName, colName, days); + } +} 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 fdc0cf033..9d7c7220d 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 @@ -5,7 +5,7 @@ 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.domain.entity.ComControlargument; +import com.neuhis.his.domain.entity.his.ComControlargument; import com.neuhis.his.service.his.IComControlargumentService; @Service 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 f4893fa13..2b81c13e2 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 @@ -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.domain.entity.ComDepartment; +import com.neuhis.his.domain.entity.his.ComDepartment; import com.neuhis.his.mapper.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 283a752b8..02b20f8c4 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 @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; -import com.neuhis.his.domain.entity.ComDictionary; +import com.neuhis.his.domain.entity.his.ComDictionary; import com.neuhis.his.mapper.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 3765098cd..027e5d230 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 @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.ComEmployeeMapper; -import com.neuhis.his.domain.entity.ComEmployee; +import com.neuhis.his.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/ComPatientinfoMixServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoMixServiceImpl.java index a10fe9425..432980280 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoMixServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoMixServiceImpl.java @@ -2,6 +2,7 @@ package com.neuhis.his.service.impl.his; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; +import com.neuhis.his.domain.entity.his.ComPatientinfo; import com.ruoyi.common.utils.StringUtils; import com.neuhis.his.domain.entity.*; import com.neuhis.his.service.IBizHandleRecordService; 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 0b450cab8..1f7ac99eb 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 @@ -1,6 +1,7 @@ package com.neuhis.his.service.impl.his; import cn.hutool.json.JSONUtil; +import com.neuhis.his.domain.entity.his.*; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.StringUtils; 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 c5cbe7dda..9b4db2b90 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.DawnCodeInfo; +import com.neuhis.his.domain.entity.his.DawnCodeInfo; import com.neuhis.his.mapper.DawnCodeInfoMapper; import com.neuhis.his.service.his.IDawnCodeInfoService; 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 a649f95ba..aa826a113 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 @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.FinComExamorderMapper; -import com.neuhis.his.domain.entity.FinComExamorder; +import com.neuhis.his.domain.entity.his.FinComExamorder; import com.neuhis.his.service.his.IFinComExamorderService; import java.util.List; 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 f092aad7c..3b4b17c62 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 @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.FinComUndruginfoMapper; -import com.neuhis.his.domain.entity.FinComUndruginfo; +import com.neuhis.his.domain.entity.his.FinComUndruginfo; import com.neuhis.his.service.his.IFinComUndruginfoService; import java.util.List; 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 e9b72a0e5..806bedc6c 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 @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.FinComUndrugztinfo; +import com.neuhis.his.domain.entity.his.FinComUndrugztinfo; import com.neuhis.his.mapper.FinComUndrugztinfoMapper; import com.neuhis.his.service.his.IFinComUndrugztinfoService; 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 ecfd08741..e95167c77 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.FinIpbFeeinfo; +import com.neuhis.his.domain.entity.his.FinIpbFeeinfo; import com.neuhis.his.mapper.FinIpbFeeinfoMapper; import com.neuhis.his.service.his.IFinIpbFeeinfoService; 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 fdab1f54f..b1e0c8cb8 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 @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.FinIpbItemlistMapper; -import com.neuhis.his.domain.entity.FinIpbItemlist; +import com.neuhis.his.domain.entity.his.FinIpbItemlist; import com.neuhis.his.service.his.IFinIpbItemlistService; import java.util.List; 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 5ee076a1a..dfe5b43a4 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 @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.FinIpbMedicinelistMapper; -import com.neuhis.his.domain.entity.FinIpbMedicinelist; +import com.neuhis.his.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 77f5d18f0..a22c914e2 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 @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.FinIprBabyinfoMapper; -import com.neuhis.his.domain.entity.FinIprBabyinfo; +import com.neuhis.his.domain.entity.his.FinIprBabyinfo; import com.neuhis.his.service.his.IFinIprBabyinfoService; @Service @DataSource(value = DataSourceType.SLAVE) 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 d7ee93c6b..9215b7928 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 @@ -8,7 +8,7 @@ import com.neuhis.his.mapper.ComPatientinfoMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import com.neuhis.his.domain.entity.FinIprInmaininfo; +import com.neuhis.his.domain.entity.his.FinIprInmaininfo; import com.neuhis.his.mapper.FinIprInmaininfoMapper; import com.neuhis.his.service.his.IFinIprInmaininfoService; 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 8951deefe..bd3b81325 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 @@ -5,7 +5,7 @@ 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.domain.entity.FinOpbAccount; +import com.neuhis.his.domain.entity.his.FinOpbAccount; import com.neuhis.his.service.his.IFinOpbAccountService; @DataSource(value = DataSourceType.SLAVE) 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 891c4adca..7a5339670 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 @@ -5,7 +5,7 @@ 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.domain.entity.FinOpbAccountlist; +import com.neuhis.his.domain.entity.his.FinOpbAccountlist; import com.neuhis.his.service.his.IFinOpbAccountlistService; @DataSource(value = DataSourceType.SLAVE) 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 2aa64c093..224791b43 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 @@ -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.domain.entity.FinOpbAccountrecord; +import com.neuhis.his.domain.entity.his.FinOpbAccountrecord; import com.neuhis.his.mapper.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 94ee04a26..1800332dc 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 @@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import com.neuhis.his.domain.entity.FinOpbFeedetail; +import com.neuhis.his.domain.entity.his.FinOpbFeedetail; import com.neuhis.his.mapper.FinOpbFeedetailMapper; import com.neuhis.his.service.his.IFinOpbFeedetailService; 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 2cc1b18db..d5d440c94 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.FinOpbInvoiceinfo; +import com.neuhis.his.domain.entity.his.FinOpbInvoiceinfo; import com.neuhis.his.mapper.FinOpbInvoiceinfoMapper; import com.neuhis.his.service.FinOpbInvoiceinfoService; 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 f2b01d3bd..4cb249b8c 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 @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import com.neuhis.his.domain.entity.FinOprRegister; +import com.neuhis.his.domain.entity.his.FinOprRegister; import com.neuhis.his.mapper.FinOprRegisterMapper; import com.neuhis.his.service.his.IFinOprRegisterService; 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 00531ea45..f6a9adec4 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.FinOprSchema; +import com.neuhis.his.domain.entity.his.FinOprSchema; import com.neuhis.his.mapper.FinOprSchemaMapper; import com.neuhis.his.service.his.IFinOprSchemaService; 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 80d20f52b..38ea03ee5 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 @@ -3,14 +3,14 @@ package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.StringUtils; -import com.neuhis.his.domain.entity.FinIprInmaininfo; -import com.neuhis.his.domain.entity.FinOprRegister; +import com.neuhis.his.domain.entity.his.FinIprInmaininfo; +import com.neuhis.his.domain.entity.his.FinOprRegister; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MdcDiPathMapper; -import com.neuhis.his.domain.entity.MdcDiPath; +import com.neuhis.his.domain.entity.his.MdcDiPath; import com.neuhis.his.service.his.IMdcDiPathService; import java.util.List; 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 f0ef0edd7..5045cd934 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 @@ -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.domain.entity.MetCasDiagnose; +import com.neuhis.his.domain.entity.his.MetCasDiagnose; import com.neuhis.his.mapper.MetCasDiagnoseMapper; import com.neuhis.his.service.his.IMetCasDiagnoseService; 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 38b94b85b..298174088 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 @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.MetComIcd10; +import com.neuhis.his.domain.entity.his.MetComIcd10; import com.neuhis.his.mapper.MetComIcd10Mapper; import com.neuhis.his.service.his.IMetComIcd10Service; 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 2759f1b6f..fd43d4080 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 @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.MetComOperationLocal; +import com.neuhis.his.domain.entity.his.MetComOperationLocal; import com.neuhis.his.mapper.MetComOperationLocalMapper; import com.neuhis.his.service.his.IMetComOperationLocalService; @Service 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 6b4e47fae..f1d33185c 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 @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MetIpmBookedMapper; -import com.neuhis.his.domain.entity.MetIpmBooked; +import com.neuhis.his.domain.entity.his.MetIpmBooked; import com.neuhis.his.service.his.IMetIpmBookedService; @Service 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 0032598a9..53347cec6 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 @@ -5,7 +5,7 @@ import com.ruoyi.common.enums.DataSourceType; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import com.neuhis.his.domain.entity.MetIpmExecdrug; +import com.neuhis.his.domain.entity.his.MetIpmExecdrug; import com.neuhis.his.mapper.MetIpmExecdrugMapper; import com.neuhis.his.service.his.IMetIpmExecdrugService; 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 4ddd2b6e8..05ad3fe82 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 @@ -5,7 +5,7 @@ import com.ruoyi.common.enums.DataSourceType; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import com.neuhis.his.domain.entity.MetIpmExecundrug; +import com.neuhis.his.domain.entity.his.MetIpmExecundrug; import com.neuhis.his.mapper.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 390811dc7..0ca00bf6d 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 @@ -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.domain.entity.MetIpmOrder; +import com.neuhis.his.domain.entity.his.MetIpmOrder; import com.neuhis.his.mapper.MetIpmOrderMapper; import com.neuhis.his.service.his.IMetIpmOrderService; 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 ce902b21a..3382c6a95 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 @@ -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.domain.entity.MetMrsBase; +import com.neuhis.his.domain.entity.his.MetMrsBase; import com.neuhis.his.mapper.MetMrsBaseMapper; import com.neuhis.his.service.his.IMetMrsBaseService; 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 dbc4814ae..df6af431e 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 @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MetNuiCancelitemMapper; -import com.neuhis.his.domain.entity.MetNuiCancelitem; +import com.neuhis.his.domain.entity.his.MetNuiCancelitem; @DataSource(value = DataSourceType.SLAVE) @Service 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 019f68988..bcccd0c89 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.MetNuiExerecord; +import com.neuhis.his.domain.entity.his.MetNuiExerecord; import com.neuhis.his.mapper.MetNuiExerecordMapper; import com.neuhis.his.service.his.IMetNuiExerecordService; 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 022845667..16bd0bfbb 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.MetOpsApply; +import com.neuhis.his.domain.entity.his.MetOpsApply; import com.neuhis.his.mapper.MetOpsApplyMapper; import com.neuhis.his.service.his.IMetOpsApplyService; @DataSource(value = DataSourceType.SLAVE) 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 5f5ebb9f9..e621f8001 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 @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MetOpsArrangeMapper; -import com.neuhis.his.domain.entity.MetOpsArrange; +import com.neuhis.his.domain.entity.his.MetOpsArrange; import com.neuhis.his.service.his.IMetOpsArrangeService; import java.util.List; 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 3763a3ff3..1e47ead35 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.MetOpsOperationitem; +import com.neuhis.his.domain.entity.his.MetOpsOperationitem; import com.neuhis.his.mapper.MetOpsOperationitemMapper; import com.neuhis.his.service.his.IMetOpsOperationitemService; 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 4167eede5..75d9971c6 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.MetOrdeApplyType; +import com.neuhis.his.domain.entity.his.MetOrdeApplyType; import com.neuhis.his.mapper.MetOrdeApplyTypeMapper; import com.neuhis.his.service.his.IMetOrdeApplyTypeService; 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 a9acf18da..520de1b57 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 @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MetOrdeBigexampartMapper; -import com.neuhis.his.domain.entity.MetOrdeBigexampart; +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 6bd23b5bd..caca4752c 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 @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.MetOrdeExampart; +import com.neuhis.his.domain.entity.his.MetOrdeExampart; import com.neuhis.his.mapper.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 a6561a192..e196758b1 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 @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.MetOrdiOrderMapper; -import com.neuhis.his.domain.entity.MetOrdiOrder; +import com.neuhis.his.domain.entity.his.MetOrdiOrder; import com.neuhis.his.service.his.IMetOrdiOrderService; @Service 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 69ab062ab..d8d921419 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 @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.MetOrdoOrderMapper; -import com.neuhis.his.domain.entity.MetOrdoOrder; +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 3dc692ba6..0a1eaefea 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 @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MetOrdtUndrugtermMapper; -import com.neuhis.his.domain.entity.MetOrdtUndrugterm; +import com.neuhis.his.domain.entity.his.MetOrdtUndrugterm; import com.neuhis.his.service.his.IMetOrdtUndrugtermService; import java.util.List; 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 dbc9e7b4e..165faee4b 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 @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.NsrNisRecordDetail; +import com.neuhis.his.domain.entity.his.NsrNisRecordDetail; import com.neuhis.his.mapper.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 44ef9da3d..ff278020d 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.NsrStandardCode; +import com.neuhis.his.domain.entity.his.NsrStandardCode; import com.neuhis.his.mapper.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 b76dc60a6..96e74cbb9 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 @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.PdaBloodCircuitMapper; -import com.neuhis.his.domain.entity.PdaBloodCircuit; +import com.neuhis.his.domain.entity.his.PdaBloodCircuit; import com.neuhis.his.service.his.IPdaBloodCircuitService; @DataSource(value = DataSourceType.SLAVE) 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 b7957749f..77f8d3b51 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 @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.neuhis.his.domain.entity.PdaPsrRecord; +import com.neuhis.his.domain.entity.his.PdaPsrRecord; import com.neuhis.his.mapper.PdaPsrRecordMapper; import com.neuhis.his.service.his.IPdaPsrRecordService; 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 043b9106d..23b07270e 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 @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.PhaComApplyoutMapper; -import com.neuhis.his.domain.entity.PhaComApplyout; +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 73b8419c3..6ab535e68 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 @@ -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.domain.entity.PhaComBaseinfo; +import com.neuhis.his.domain.entity.his.PhaComBaseinfo; import com.neuhis.his.mapper.PhaComBaseinfoMapper; import com.neuhis.his.service.his.IPhaComBaseinfoService; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasRtResultServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasRtResultServiceImpl.java deleted file mode 100644 index d1325e34a..000000000 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasRtResultServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.neuhis.his.service.impl.winlis; - -import java.util.List; - -import com.neuhis.his.domain.entity.winlis.LasRtResult; -import com.neuhis.his.mapper.winlis.LasRtResultMapper; -import com.neuhis.his.service.winlis.ILasRtResultService; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.enums.DataSourceType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; - -/** - * 常规检验结果Service业务层处理 - * - * @author ruoyi - * @date 2025-03-05 - */ -@Service -@DataSource(value = DataSourceType.WINLIS) -public class LasRtResultServiceImpl implements ILasRtResultService -{ - @Autowired - private LasRtResultMapper lasRtResultMapper; - - /** - * 查询常规检验结果 - * - * @param testdate 常规检验结果主键 - * @return 常规检验结果 - */ - @Override - public LasRtResult selectLasRtResultByTestdate(String testdate) - { - return lasRtResultMapper.selectLasRtResultByTestdate(testdate); - } - - /** - * 查询常规检验结果列表 - * - * @param lasRtResult 常规检验结果 - * @return 常规检验结果 - */ - @Override - public List selectLasRtResultList(LasRtResult lasRtResult) - { - return lasRtResultMapper.selectLasRtResultList(lasRtResult); - } - - /** - * 新增常规检验结果 - * - * @param lasRtResult 常规检验结果 - * @return 结果 - */ - @Override - public int insertLasRtResult(LasRtResult lasRtResult) - { - return lasRtResultMapper.insertLasRtResult(lasRtResult); - } - - /** - * 修改常规检验结果 - * - * @param lasRtResult 常规检验结果 - * @return 结果 - */ - @Override - public int updateLasRtResult(LasRtResult lasRtResult) - { - return lasRtResultMapper.updateLasRtResult(lasRtResult); - } - - /** - * 批量删除常规检验结果 - * - * @param testdates 需要删除的常规检验结果主键 - * @return 结果 - */ - @Override - public int deleteLasRtResultByTestdates(String testdates) - { - return lasRtResultMapper.deleteLasRtResultByTestdates(Convert.toStrArray(testdates)); - } - - /** - * 删除常规检验结果信息 - * - * @param testdate 常规检验结果主键 - * @return 结果 - */ - @Override - public int deleteLasRtResultByTestdate(String testdate) - { - return lasRtResultMapper.deleteLasRtResultByTestdate(testdate); - } -} 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 7a1548675..0301abdaf 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 @@ -2,20 +2,20 @@ package com.neuhis.his.service.impl.winlis; import java.util.List; +import cn.hutool.core.bean.BeanUtil; +import com.neuhis.his.domain.entity.winlis.LasRtResult; import com.neuhis.his.domain.entity.winlis.LasSapSamplereg; +import com.neuhis.his.domain.vo.winlis.LasSapSampleregVo; +import com.neuhis.his.mapper.winlis.LasRtResultMapper; import com.neuhis.his.mapper.winlis.LasSapSampleregMapper; import com.neuhis.his.service.winlis.ILasSapSampleregService; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; /** - * 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * 常规检验登记表 Service业务层处理 * * @author ruoyi @@ -27,47 +27,47 @@ public class LasSapSampleregServiceImpl implements ILasSapSampleregService { @Autowired private LasSapSampleregMapper lasSapSampleregMapper; + @Autowired + private LasRtResultMapper lasRtResultMapper; + /** - * 查询样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * * - * @param testdate 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * @param testdate 常规检验登记表 主键 - * @return 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * @return 常规检验登记表 */ @Override - public LasSapSamplereg selectLasSapSampleregByTestdate(String testdate) + public LasSapSamplereg selectLasSapSampleregByTestdate(String testdate, String barcode, String machineid) { - return lasSapSampleregMapper.selectLasSapSampleregByTestdate(testdate); + return lasSapSampleregMapper.selectLasSapSampleregByTestdate(testdate, barcode, machineid); + } + + @Override + public LasSapSampleregVo selectLasSapSampleregVo(String testdate, String barcode, String machineid) { + //region 查询1：条码信息 + LasSapSampleregVo vo = new LasSapSampleregVo(); + LasSapSamplereg entity = lasSapSampleregMapper.selectLasSapSampleregByTestdate(testdate, barcode, machineid); + BeanUtil.copyProperties(entity, vo); + //endregion + + //region 查询2：检验结果信息 + List rtResults = lasRtResultMapper.selectLasRtResultByTestdate(testdate, barcode, machineid); + vo.setRtResultList(rtResults); + //endregion + return vo; } /** - * 查询样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * 列表 * - * @param lasSapSamplereg 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * @param lasSapSamplereg 常规检验登记表 - * @return 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * @return 常规检验登记表 */ @Override @@ -75,84 +75,4 @@ public class LasSapSampleregServiceImpl implements ILasSapSampleregService { return lasSapSampleregMapper.selectLasSapSampleregList(lasSapSamplereg); } - - /** - * 新增样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param lasSapSamplereg 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * @return 结果 - */ - @Override - public int insertLasSapSamplereg(LasSapSamplereg lasSapSamplereg) - { - return lasSapSampleregMapper.insertLasSapSamplereg(lasSapSamplereg); - } - - /** - * 修改样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param lasSapSamplereg 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * @return 结果 - */ - @Override - public int updateLasSapSamplereg(LasSapSamplereg lasSapSamplereg) - { - return lasSapSampleregMapper.updateLasSapSamplereg(lasSapSamplereg); - } - - /** - * 批量删除样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param testdates 需要删除的样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -主键 - * @return 结果 - */ - @Override - public int deleteLasSapSampleregByTestdates(String testdates) - { - return lasSapSampleregMapper.deleteLasSapSampleregByTestdates(Convert.toStrArray(testdates)); - } - - /** - * 删除样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -信息 - * - * @param testdate 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -主键 - * @return 结果 - */ - @Override - public int deleteLasSapSampleregByTestdate(String testdate) - { - return lasSapSampleregMapper.deleteLasSapSampleregByTestdate(testdate); - } } diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/WinLisServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/WinLisServiceImpl.java index 0750a8cd6..4c1dfe87d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/WinLisServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/WinLisServiceImpl.java @@ -1,8 +1,11 @@ package com.neuhis.his.service.impl.winlis; +import com.neuhis.his.domain.vo.winlis.LasSapSampleregVo; +import com.neuhis.his.service.winlis.ILasSapSampleregService; import com.neuhis.his.service.winlis.IWinLisService; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -14,9 +17,59 @@ import org.springframework.stereotype.Service; @Service @DataSource(value = DataSourceType.WINLIS) public class WinLisServiceImpl implements IWinLisService { + @Autowired + private ILasSapSampleregService lasSapSampleregService; @Override public String getLisCaOriginText(String testdate, String barcode, String machineid) { - String srcData1 = "#REG:TESTDATE:20250228" + //reg.testdate + LasSapSampleregVo regVo = lasSapSampleregService.selectLasSapSampleregVo(testdate, barcode, machineid); + if (regVo == null) { + return ""; + } + String srcItem = "ITEMID:IL-6" + + ",ITEMNAME:白介素6" + + ",REPORTVALUE:5" + + ",ORGVALUE:" + + ",DESCVALUE:" + + ",CUTOFF:" + + ",ODVALUE:" + + ",SCO:" + + ",MEMOVALUE:" + + ",ALERTEXPLAIN:" + //ALERTEXPLAIN 不存在 + ",ALERTFLAG:5" + + ",AUTOCONFIRMINFO:" + + ",AUTOCONFIRMSIGN:" + + ",BARCODE:1010449586" + + ",Calfomula:" + + ",CHECKSTATE:" + + ",COMMTIME:2025-02-28 14:42:49" + + ",CONFIRMTIME:" +//CONFIRMTIME 不存在 + ",DOTNUM:-1" +//DOTNUM 不存在 + ",ENGNAME:bjs6" + + ",EXECSQN:" +//las_sap_samplereg#EXECSQN + ",TESTDATE:20250228" + + ",MACHINEID:WSW_caris200" + + ",HISITEMID:F00000019999" + + ",LOINCID:IL-6" + + ",SAMPLEID:9999" + + ",PRINTSEQ:10000" + + ",TESTTIME:2025-02-28 14:42:49" + + ",RERUNVALUE:" + + ",RESULTLIST:5" + + ",VALUESRC:" + + ",RERUNFLAG:" + + ",RANGEINFO:0--7" + + ",UNIT:pg/ml" + + ",RESULTFLAG:Normal" + + ",PATIENTID:" + + ",PATIENTTYPE:其他" + + ",SAMPLETYPE:血清" + + ",TESTMACHINEID:" + + ",RACKCUP:" + + ",PRINTROW:1" + + ",RANGELIMIT:" + + ",METHOD: "; + + String srcRegData = "#REG:TESTDATE:20250228" + //reg.testdate "|MACHINEID:WSW_caris200" +//reg.machineid "|SAMPLEID:9999" +//reg.sampleid "|BARCODE:1010449586" +//reg.barcode @@ -127,52 +180,8 @@ public class WinLisServiceImpl implements IWinLisService { "|MorphologyDesc4:" +//MorphologyDesc4 没有字段 "|#RESULT:ITEMID:IL-6,ITEMNAME:白介素6,REPORTVALUE:5,ORGVALUE:,DESCVALUE:,CUTOFF:,ODVALUE:,SCO:,MEMOVALUE:,ALERTEXPLAIN:,ALERTFLAG:5,AUTOCONFIRMINFO:,AUTOCONFIRMSIGN:,BARCODE:1010449586,Calfomula:,CHECKSTATE:,COMMTIME:2025-02-28 14:42:49,CONFIRMTIME:,DOTNUM:-1,ENGNAME:bjs6,EXECSQN:,TESTDATE:20250228,MACHINEID:WSW_caris200,HISITEMID:F00000019999,LOINCID:IL-6,SAMPLEID:9999,PRINTSEQ:10000,TESTTIME:2025-02-28 14:42:49,RERUNVALUE:,RESULTLIST:5,VALUESRC:,RERUNFLAG:,RANGEINFO:0--7,UNIT:pg/ml,RESULTFLAG:Normal,PATIENTID:,PATIENTTYPE:其他,SAMPLETYPE:血清,TESTMACHINEID:,RACKCUP:,PRINTROW:1,RANGELIMIT:,METHOD:" + "|#APPROVER:PERSONID:003142" +//approverid - "|PERSONNAME:雷杨犇" +//approvername - "|CACARDID:610524199604101228"; //身份证号码， select t.cacardid from las_rol_person t where t.personid = '003142' - - String srcData2 = "ITEMID:IL-6" + - ",ITEMNAME:白介素6" + - ",REPORTVALUE:5" + - ",ORGVALUE:" + - ",DESCVALUE:" + - ",CUTOFF:" + - ",ODVALUE:" + - ",SCO:" + - ",MEMOVALUE:" + - ",ALERTEXPLAIN:" + //ALERTEXPLAIN 不存在 - ",ALERTFLAG:5" + - ",AUTOCONFIRMINFO:" + - ",AUTOCONFIRMSIGN:" + - ",BARCODE:1010449586" + - ",Calfomula:" + - ",CHECKSTATE:" + - ",COMMTIME:2025-02-28 14:42:49" + - ",CONFIRMTIME:" +//CONFIRMTIME 不存在 - ",DOTNUM:-1" +//DOTNUM 不存在 - ",ENGNAME:bjs6" + - ",EXECSQN:" +//las_sap_samplereg#EXECSQN - ",TESTDATE:20250228" + - ",MACHINEID:WSW_caris200" + - ",HISITEMID:F00000019999" + - ",LOINCID:IL-6" + - ",SAMPLEID:9999" + - ",PRINTSEQ:10000" + - ",TESTTIME:2025-02-28 14:42:49" + - ",RERUNVALUE:" + - ",RESULTLIST:5" + - ",VALUESRC:" + - ",RERUNFLAG:" + - ",RANGEINFO:0--7" + - ",UNIT:pg/ml" + - ",RESULTFLAG:Normal" + - ",PATIENTID:" + - ",PATIENTTYPE:其他" + - ",SAMPLETYPE:血清" + - ",TESTMACHINEID:" + - ",RACKCUP:" + - ",PRINTROW:1" + - ",RANGELIMIT:" + - ",METHOD: "; + "|PERSONNAME:" + regVo.getApprovername() +//approvername + "|CACARDID:" + ""; //身份证号码， select t.cacardid from las_rol_person t where t.personid = '003142' return ""; } } diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasRtResultService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasRtResultService.java deleted file mode 100644 index 58d794bb5..000000000 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasRtResultService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.neuhis.his.service.winlis; - -import com.neuhis.his.domain.entity.winlis.LasRtResult; - -import java.util.List; - -/** - * 常规检验结果Service接口 - * - * @author ruoyi - * @date 2025-03-05 - */ -public interface ILasRtResultService -{ - /** - * 查询常规检验结果 - * - * @param testdate 常规检验结果主键 - * @return 常规检验结果 - */ - public LasRtResult selectLasRtResultByTestdate(String testdate); - - /** - * 查询常规检验结果列表 - * - * @param lasRtResult 常规检验结果 - * @return 常规检验结果集合 - */ - public List selectLasRtResultList(LasRtResult lasRtResult); - - /** - * 新增常规检验结果 - * - * @param lasRtResult 常规检验结果 - * @return 结果 - */ - public int insertLasRtResult(LasRtResult lasRtResult); - - /** - * 修改常规检验结果 - * - * @param lasRtResult 常规检验结果 - * @return 结果 - */ - public int updateLasRtResult(LasRtResult lasRtResult); - - /** - * 批量删除常规检验结果 - * - * @param testdates 需要删除的常规检验结果主键集合 - * @return 结果 - */ - public int deleteLasRtResultByTestdates(String testdates); - - /** - * 删除常规检验结果信息 - * - * @param testdate 常规检验结果主键 - * @return 结果 - */ - public int deleteLasRtResultByTestdate(String testdate); -} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasSapSampleregService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasSapSampleregService.java index 21ea4cf87..75d2d6229 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasSapSampleregService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasSapSampleregService.java @@ -1,14 +1,12 @@ package com.neuhis.his.service.winlis; import com.neuhis.his.domain.entity.winlis.LasSapSamplereg; +import com.neuhis.his.domain.vo.winlis.LasSapSampleregVo; import java.util.List; /** - * 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * 常规检验登记表 Service接口 * * @author ruoyi @@ -17,106 +15,28 @@ Service接口 public interface ILasSapSampleregService { /** - * 查询样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * * - * @param testdate 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * @param testdate 常规检验登记表 主键 - * @return 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + * @return 常规检验登记表 */ - public LasSapSamplereg selectLasSapSampleregByTestdate(String testdate); + LasSapSamplereg selectLasSapSampleregByTestdate(String testdate, String barcode, String machineid); /** - * 查询样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -列表 - * - * @param lasSapSamplereg 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * @return 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -集合 + * 返回一个试管检验条码信息和检验结果明细信息 + * @param testdate 检验时间 + * @param barcode 条码 + * @param machineid 机器 */ - public List selectLasSapSampleregList(LasSapSamplereg lasSapSamplereg); + LasSapSampleregVo selectLasSapSampleregVo(String testdate, String barcode, String machineid); /** - * 新增样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param lasSapSamplereg 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * @return 结果 + * + * @param lasSapSamplereg 常规检验登记表 + * @return 常规检验登记表 */ - public int insertLasSapSamplereg(LasSapSamplereg lasSapSamplereg); - - /** - * 修改样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param lasSapSamplereg 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * @return 结果 - */ - public int updateLasSapSamplereg(LasSapSamplereg lasSapSamplereg); - - /** - * 批量删除样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) - - * - * @param testdates 需要删除的样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -主键集合 - * @return 结果 - */ - public int deleteLasSapSampleregByTestdates(String testdates); - - /** - * 删除样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -信息 - * - * @param testdate 样本核收过程： - 1、样本基本信息插入此中 - 2、项目核收信息插入LAS_COM_SAMPLEITEM中 - 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) -主键 - * @return 结果 - */ - public int deleteLasSapSampleregByTestdate(String testdate); + List selectLasSapSampleregList(LasSapSamplereg lasSapSamplereg); } diff --git a/ruoyi-admin/src/main/java/com/neuhis/utils/InvoiceUtil.java b/ruoyi-admin/src/main/java/com/neuhis/utils/InvoiceUtil.java index 6bb4b3626..5ee2646d5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/utils/InvoiceUtil.java +++ b/ruoyi-admin/src/main/java/com/neuhis/utils/InvoiceUtil.java @@ -1,7 +1,7 @@ package com.neuhis.utils; -import com.neuhis.his.domain.entity.FinOpbFeedetail; -import com.neuhis.his.domain.entity.FinOprRegister; +import com.neuhis.his.domain.entity.his.FinOpbFeedetail; +import com.neuhis.his.domain.entity.his.FinOprRegister; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComControlargumentMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/ComControlargumentMapper.xml index 6a64aa350..fda85bebb 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComControlargumentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComControlargumentMapper.xml @@ -1,7 +1,7 @@ - + @@ -30,7 +30,7 @@ delete from COM_CONTROLARGUMENT where CONTROL_CODE = #{controlCode,jdbcType=VARCHAR} - + insert into COM_CONTROLARGUMENT (CONTROL_CODE, CONTROL_NAME, CONTROL_VALUE, VISIBLE_FLAG, OPER_CODE, OPER_DATE, @@ -39,7 +39,7 @@ #{visibleFlag,jdbcType=VARCHAR}, #{operCode,jdbcType=VARCHAR}, #{operDate,jdbcType=TIMESTAMP}, #{kind,jdbcType=VARCHAR}, #{hosCode,jdbcType=VARCHAR}) - + insert into COM_CONTROLARGUMENT @@ -95,7 +95,7 @@ - + update COM_CONTROLARGUMENT @@ -123,7 +123,7 @@ where CONTROL_CODE = #{controlCode,jdbcType=VARCHAR} - + update COM_CONTROLARGUMENT set CONTROL_NAME = #{controlName,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapper.xml index 71987f032..4f44082c2 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComDepartmentMapper.xml @@ -1,7 +1,7 @@ - + @@ -52,7 +52,7 @@ delete from COM_DEPARTMENT where DEPT_CODE = #{deptCode,jdbcType=VARCHAR} - + insert into COM_DEPARTMENT (DEPT_CODE, DEPT_NAME, SPELL_CODE, WB_CODE, DEPT_ENAME, DEPT_TYPE, @@ -75,7 +75,7 @@ #{mainDeptname,jdbcType=VARCHAR}, #{bedNum,jdbcType=DECIMAL}, #{brachCode,jdbcType=VARCHAR}, #{gbCode,jdbcType=VARCHAR}) - + insert into COM_DEPARTMENT @@ -251,7 +251,7 @@ - + update COM_DEPARTMENT @@ -339,7 +339,7 @@ where DEPT_CODE = #{deptCode,jdbcType=VARCHAR} - + update COM_DEPARTMENT set DEPT_NAME = #{deptName,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapper.xml index 9a8153825..533073500 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapper.xml @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ where "TYPE" = #{type,jdbcType=VARCHAR} and CODE = #{code,jdbcType=VARCHAR} - + insert into COM_DICTIONARY ("TYPE", CODE, "NAME", MARK, SPELL_CODE, WB_CODE, @@ -54,7 +54,7 @@ #{currentCode,jdbcType=VARCHAR}, #{kindId,jdbcType=VARCHAR}, #{isCommon,jdbcType=VARCHAR} ) - + insert into COM_DICTIONARY @@ -152,7 +152,7 @@ - + update COM_DICTIONARY @@ -199,7 +199,7 @@ where "TYPE" = #{type,jdbcType=VARCHAR} and CODE = #{code,jdbcType=VARCHAR} - + update LCHIS.COM_DICTIONARY set "NAME" = #{name,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapperExtend.xml index 1698ad116..a9cec9cf4 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComDictionaryMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.COM_DICTIONARY diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComEmployeeMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/ComEmployeeMapper.xml index 970b1aa30..53ec0b77c 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComEmployeeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComEmployeeMapper.xml @@ -1,7 +1,7 @@ - + @@ -115,7 +115,7 @@ delete from COM_EMPLOYEE where EMPL_CODE = #{emplCode,jdbcType=VARCHAR} - + insert into COM_EMPLOYEE (EMPL_CODE, SALARY_ID, EMPL_NAME, SPELL_CODE, WB_CODE, SEX_CODE, @@ -174,7 +174,7 @@ #{jobtitleTime,jdbcType=VARCHAR}, #{emplDesc,jdbcType=VARCHAR}, #{subspecialtyCode,jdbcType=VARCHAR}, #{subspecialtyName,jdbcType=VARCHAR}, #{isvirtual,jdbcType=VARCHAR}) - + insert into COM_EMPLOYEE @@ -674,7 +674,7 @@ - + update COM_EMPLOYEE @@ -924,7 +924,7 @@ where EMPL_CODE = #{emplCode,jdbcType=VARCHAR} - + update COM_EMPLOYEE set SALARY_ID = #{salaryId,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComEmployeeMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/ComEmployeeMapperExtend.xml index 785729bf8..8f721c16e 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComEmployeeMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComEmployeeMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.COM_EMPLOYEE diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapper.xml index fcd95f0e6..5d8f99799 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -106,7 +106,7 @@ delete from COM_PATIENTINFO where CARD_NO = #{cardNo,jdbcType=VARCHAR} - + insert into COM_PATIENTINFO (CARD_NO, IC_CARDNO, "NAME", SPELL_CODE, WB_CODE, BIRTHDAY, @@ -161,7 +161,7 @@ #{contycode,jdbcType=VARCHAR}, #{mpi,jdbcType=VARCHAR}, #{hisGuid,jdbcType=VARCHAR}, #{tempcard,jdbcType=VARCHAR}) - + insert into COM_PATIENTINFO @@ -625,7 +625,7 @@ - + update lchis.COM_PATIENTINFO @@ -857,7 +857,7 @@ where CARD_NO = #{cardNo,jdbcType=VARCHAR} - + update lchis.COM_PATIENTINFO set IC_CARDNO = #{icCardno,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapperExtend.xml index 74113badc..8ef3e520c 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/ComPatientinfoMapperExtend.xml @@ -4,7 +4,7 @@ - select from LCHIS.COM_PATIENTINFO @@ -24,7 +24,7 @@ - select from LCHIS.COM_PATIENTINFO @@ -41,7 +41,7 @@ - select a.CARD_NO, a.IC_CARDNO, a.NAME, a.SPELL_CODE, a.WB_CODE, a.BIRTHDAY, a.SEX_CODE, a.IDENNO, a.BLOOD_CODE,a.PROF_CODE, a.WORK_HOME, a.WORK_TEL, a.WORK_ZIP, a.HOME, a.HOME_TEL, a.HOME_ZIP, a.DISTRICT, a.NATION_CODE, a.LINKMAN_NAME, a.LINKMAN_TEL, a.LINKMAN_ADD, a.RELA_CODE, a.MARI, a.COUN_CODE, a.PAYKIND_CODE, a.PAYKIND_NAME, a.PACT_CODE, a.PACT_NAME, @@ -64,7 +64,7 @@ - select from lchis.COM_PATIENTINFO a diff --git a/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapper.xml index b6c1789f7..8f84ec15a 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -33,7 +33,7 @@ OPER_DATE, IS_COMMON, KIND_ID, PARENT_CODE, CURRENT_CODE, CONS_ENAME, SYNC_FLAG, DIST_CODE - + insert into DAWN_TST.DAWN_CODE_INFO (CONS_INFO_ID, CONS_TYPE_ID, CONS_INFO_PARENT_ID, CONS_INFO_CODE, CONS_INFO_NAME, SORT_NO, @@ -52,7 +52,7 @@ #{consEname,jdbcType=VARCHAR}, #{syncFlag,jdbcType=VARCHAR}, #{distCode,jdbcType=VARCHAR} ) - + insert into DAWN_TST.DAWN_CODE_INFO diff --git a/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapperExtend.xml index 0a09a4841..cf60c2f35 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/DawnCodeInfoMapperExtend.xml @@ -1,7 +1,7 @@ - select from DAWN_TST.DAWN_CODE_INFO diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinComExamorderMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinComExamorderMapper.xml index 736084f79..4242226da 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinComExamorderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinComExamorderMapper.xml @@ -1,7 +1,7 @@ - + @@ -26,14 +26,14 @@ delete from LCHIS.FIN_COM_EXAMORDER where ID = #{id,jdbcType=VARCHAR} - + insert into LCHIS.FIN_COM_EXAMORDER (ID, ITEMTYPE, ITEMCODE, ISVAILD, LINKATTENTION) values (#{id,jdbcType=VARCHAR}, #{itemtype,jdbcType=VARCHAR}, #{itemcode,jdbcType=VARCHAR}, #{isvaild,jdbcType=VARCHAR}, #{linkattention,jdbcType=VARCHAR}) - + insert into LCHIS.FIN_COM_EXAMORDER @@ -71,7 +71,7 @@ - + update LCHIS.FIN_COM_EXAMORDER @@ -90,7 +90,7 @@ where ID = #{id,jdbcType=VARCHAR} - + update LCHIS.FIN_COM_EXAMORDER set ITEMTYPE = #{itemtype,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinComExamorderMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinComExamorderMapperExtend.xml index f37a25e49..2b33b589f 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinComExamorderMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinComExamorderMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.FIN_COM_EXAMORDER diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapper.xml index d5d81d805..c4691c7ca 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -96,7 +96,7 @@ delete from FIN_COM_UNDRUGINFO where ITEM_CODE = #{itemCode,jdbcType=VARCHAR} - + insert into FIN_COM_UNDRUGINFO (ITEM_CODE, ITEM_NAME, SYS_CLASS, FEE_CODE, INPUT_CODE, SPELL_CODE, @@ -145,7 +145,7 @@ #{agerange,jdbcType=VARCHAR}, #{sexrange,jdbcType=VARCHAR}, #{tips,jdbcType=VARCHAR} ) - + insert into FIN_COM_UNDRUGINFO @@ -549,7 +549,7 @@ - + update FIN_COM_UNDRUGINFO @@ -751,7 +751,7 @@ where ITEM_CODE = #{itemCode,jdbcType=VARCHAR} - + update FIN_COM_UNDRUGINFO set ITEM_NAME = #{itemName,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapperExtend.xml index b8b5df1c4..efa7e45c1 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinComUndruginfoMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.FIN_COM_UNDRUGINFO a diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinComUndrugztinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinComUndrugztinfoMapper.xml index 9aa7ec9d3..ae38b1f91 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinComUndrugztinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinComUndrugztinfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -18,7 +18,7 @@ - @@ -41,7 +41,7 @@ where PACKAGE_CODE = #{packageCode,jdbcType=VARCHAR} and ITEM_CODE = #{itemCode,jdbcType=VARCHAR} - + insert into LCHIS.FIN_COM_UNDRUGZTINFO (PACKAGE_CODE, ITEM_CODE, SORT_ID, OPER_CODE, OPER_DATE, SPELL_CODE, @@ -54,7 +54,7 @@ #{qty,jdbcType=DECIMAL}, #{packageName,jdbcType=VARCHAR}, #{itemName,jdbcType=VARCHAR}, #{inputCodeNew,jdbcType=VARCHAR}) - + insert into LCHIS.FIN_COM_UNDRUGZTINFO @@ -140,7 +140,7 @@ - + update LCHIS.FIN_COM_UNDRUGZTINFO @@ -181,7 +181,7 @@ where PACKAGE_CODE = #{packageCode,jdbcType=VARCHAR} and ITEM_CODE = #{itemCode,jdbcType=VARCHAR} - + update LCHIS.FIN_COM_UNDRUGZTINFO set SORT_ID = #{sortId,jdbcType=DECIMAL}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinComUndrugztinfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinComUndrugztinfoMapperExtend.xml index 4f9e8761a..1c8e5fbcd 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinComUndrugztinfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinComUndrugztinfoMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.FIN_COM_UNDRUGZTINFO diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIpbFeeinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIpbFeeinfoMapper.xml index f82378290..af28dfdde 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIpbFeeinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIpbFeeinfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -71,7 +71,7 @@ and EXECUTE_DEPTCODE = #{executeDeptcode,jdbcType=VARCHAR} and BALANCE_NO = #{balanceNo,jdbcType=DECIMAL} - + insert into LCHIS.FIN_IPB_FEEINFO (RECIPE_NO, FEE_CODE, EXECUTE_DEPTCODE, BALANCE_NO, TRANS_TYPE, INPATIENT_NO, @@ -102,7 +102,7 @@ #{groupCode,jdbcType=VARCHAR}, #{subspecialtyCode,jdbcType=VARCHAR}, #{subspecialtyName,jdbcType=VARCHAR} ) - + insert into LCHIS.FIN_IPB_FEEINFO @@ -344,7 +344,7 @@ - + update LCHIS.FIN_IPB_FEEINFO @@ -459,7 +459,7 @@ and EXECUTE_DEPTCODE = #{executeDeptcode,jdbcType=VARCHAR} and BALANCE_NO = #{balanceNo,jdbcType=DECIMAL} - + update LCHIS.FIN_IPB_FEEINFO set TRANS_TYPE = #{transType,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapper.xml index dbdcfc76e..5ea00604b 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapper.xml @@ -1,7 +1,7 @@ - + @@ -106,7 +106,7 @@ and TRANS_TYPE = #{transType,jdbcType=VARCHAR} and SEQUENCE_NO = #{sequenceNo,jdbcType=DECIMAL} - + insert into LCHIS.FIN_IPB_ITEMLIST (RECIPE_NO, TRANS_TYPE, SEQUENCE_NO, INPATIENT_NO, "NAME", PAYKIND_CODE, @@ -159,7 +159,7 @@ #{docSubspecialtyCode,jdbcType=VARCHAR}, #{docSubspecialtyName,jdbcType=VARCHAR} ) - + insert into LCHIS.FIN_IPB_ITEMLIST @@ -593,7 +593,7 @@ - + update LCHIS.FIN_IPB_ITEMLIST @@ -806,7 +806,7 @@ and TRANS_TYPE = #{transType,jdbcType=VARCHAR} and SEQUENCE_NO = #{sequenceNo,jdbcType=DECIMAL} - + update LCHIS.FIN_IPB_ITEMLIST set INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapperExtend.xml index bca5af2d5..b3c8668c4 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIpbItemlistMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.FIN_IPB_ITEMLIST @@ -18,7 +18,7 @@ - + - select from LCHIS.FIN_IPB_MEDICINELIST a diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIprBabyinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIprBabyinfoMapper.xml index 861808dde..e4874b633 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIprBabyinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIprBabyinfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -64,7 +64,7 @@ where INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR} and HAPPEN_NO = #{happenNo,jdbcType=DECIMAL} - + insert into LCHIS.FIN_IPR_BABYINFO (INPATIENT_NO, HAPPEN_NO, "NAME", SEX_CODE, BIRTHDAY, HEIGHT, @@ -93,7 +93,7 @@ #{status,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, #{birthAddress,jdbcType=VARCHAR} ) - + insert into LCHIS.FIN_IPR_BABYINFO @@ -317,7 +317,7 @@ - + update LCHIS.FIN_IPR_BABYINFO @@ -427,7 +427,7 @@ where INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR} and HAPPEN_NO = #{happenNo,jdbcType=DECIMAL} - + update LCHIS.FIN_IPR_BABYINFO set "NAME" = #{name,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapper.xml index db18a3a1c..a747b198c 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -171,7 +171,7 @@ delete from lchis.FIN_IPR_INMAININFO where INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR} - + insert into lchis.FIN_IPR_INMAININFO (INPATIENT_NO, MEDICAL_TYPE, PATIENT_NO, CARD_NO, MCARD_NO, "NAME", @@ -264,7 +264,7 @@ #{subspecialtyCode,jdbcType=VARCHAR}, #{subspecialtyName,jdbcType=VARCHAR}, #{nisflag,jdbcType=VARCHAR} ) - + insert into lchis.FIN_IPR_INMAININFO @@ -1064,7 +1064,7 @@ - + update lchis.FIN_IPR_INMAININFO @@ -1464,7 +1464,7 @@ where INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR} - + update lchis.FIN_IPR_INMAININFO set MEDICAL_TYPE = #{medicalType,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapperExtend.xml index 9b8c582c1..1d80a9ebc 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinIprInmaininfoMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.FIN_IPR_INMAININFO @@ -18,7 +18,7 @@ order by IN_DATE desc - + update LCHIS.FIN_IPR_INMAININFO t set t.tot_cost = t.tot_cost + #{totCost,jdbcType=DECIMAL}, t.own_cost = t.own_cost + #{ownCost,jdbcType=DECIMAL}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountMapper.xml index 57febce53..12f98ebfa 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountMapper.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ delete from FIN_OPB_ACCOUNT where ACCOUNT_NO = #{accountNo,jdbcType=VARCHAR} - + insert into FIN_OPB_ACCOUNT (ACCOUNT_NO, CARD_NO, "STATE", VACANCY, "PASSWORD", DAYLIMIT, @@ -43,7 +43,7 @@ #{isEmpower,jdbcType=VARCHAR}, #{accountType,jdbcType=VARCHAR}, #{moneyalter,jdbcType=DECIMAL}, #{validtime,jdbcType=TIMESTAMP}) - + insert into FIN_OPB_ACCOUNT @@ -111,7 +111,7 @@ - + update FIN_OPB_ACCOUNT @@ -145,7 +145,7 @@ where ACCOUNT_NO = #{accountNo,jdbcType=VARCHAR} - + update FIN_OPB_ACCOUNT set CARD_NO = #{cardNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountlistMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountlistMapper.xml index bb5580fc4..abde88f9c 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountlistMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountlistMapper.xml @@ -1,7 +1,7 @@ - + @@ -15,7 +15,7 @@ IDENNO, "NAME", SHUL, MAINCARDNO, FLAG, MERGE_OPER - + insert into FIN_OPB_ACCOUNTLIST (IDENNO, "NAME", SHUL, MAINCARDNO, FLAG, MERGE_OPER @@ -24,7 +24,7 @@ #{maincardno,jdbcType=VARCHAR}, #{flag,jdbcType=VARCHAR}, #{mergeOper,jdbcType=VARCHAR} ) - + insert into FIN_OPB_ACCOUNTLIST diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapper.xml index 799862912..0bd7adec0 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapper.xml @@ -1,7 +1,7 @@ - + @@ -40,7 +40,7 @@ delete from FIN_OPB_ACCOUNTRECORD where SEQUENCE_NO = #{sequenceNo,jdbcType=VARCHAR} - + insert into FIN_OPB_ACCOUNTRECORD (SEQUENCE_NO, CARD_NO, ACCOUNT_NO, OPERTYPE, MONEY, DEPT_CODE, @@ -55,7 +55,7 @@ #{empowerName,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{empowerCost,jdbcType=DECIMAL}, #{invoiceType,jdbcType=VARCHAR}, #{anticode,jdbcType=VARCHAR}) - + insert into FIN_OPB_ACCOUNTRECORD @@ -165,7 +165,7 @@ - + update FIN_OPB_ACCOUNTRECORD @@ -220,7 +220,7 @@ where SEQUENCE_NO = #{sequenceNo,jdbcType=VARCHAR} - + update FIN_OPB_ACCOUNTRECORD set CARD_NO = #{cardNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapperExtend.xml index 6f6251060..370ac1eb1 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbAccountrecordMapperExtend.xml @@ -1,7 +1,7 @@ - select from lchis.FIN_OPB_ACCOUNTRECORD diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbFeedetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbFeedetailMapper.xml index a521a9bda..b14df7170 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbFeedetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbFeedetailMapper.xml @@ -1,7 +1,7 @@ - + @@ -129,7 +129,7 @@ and MO_ORDER = #{moOrder,jdbcType=VARCHAR} and INVOICE_SEQ = #{invoiceSeq,jdbcType=VARCHAR} - + insert into FIN_OPB_FEEDETAIL (RECIPE_NO, SEQUENCE_NO, TRANS_TYPE, MO_ORDER, INVOICE_SEQ, CLINIC_CODE, @@ -192,7 +192,7 @@ #{listprintDate,jdbcType=TIMESTAMP}, #{docSubspecialtyCode,jdbcType=VARCHAR}, #{docSubspecialtyName,jdbcType=VARCHAR}, #{medType,jdbcType=VARCHAR}) - + insert into FIN_OPB_FEEDETAIL @@ -728,7 +728,7 @@ - + update FIN_OPB_FEEDETAIL @@ -988,7 +988,7 @@ and MO_ORDER = #{moOrder,jdbcType=VARCHAR} and INVOICE_SEQ = #{invoiceSeq,jdbcType=VARCHAR} - + update FIN_OPB_FEEDETAIL set CLINIC_CODE = #{clinicCode,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbFeedetailMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbFeedetailMapperExtend.xml index 85d2ea642..7e7f26832 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbFeedetailMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbFeedetailMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.FIN_OPB_FEEDETAIL @@ -15,7 +15,7 @@ - select from lchis.FIN_OPB_FEEDETAIL a @@ -23,7 +23,7 @@ and a.FEE_DATE =]]> to_date(TO_CHAR(#{feeDate},'yyyy-MM-dd hh24:mi:ss'),'yyyy-MM-dd hh24:mi:ss') order by FEE_DATE asc - select a.card_no, a.recipe_no from lchis.fin_opb_feedetail a where a.fee_date ]]> sysdate - 1 diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapper.xml index b9a6e842e..00da5f63b 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOpbInvoiceinfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -74,7 +74,7 @@ and TRANS_TYPE = #{transType,jdbcType=VARCHAR} and INVOICE_SEQ = #{invoiceSeq,jdbcType=VARCHAR} - + insert into LCHIS.FIN_OPB_INVOICEINFO (INVOICE_NO, TRANS_TYPE, INVOICE_SEQ, CARD_NO, REG_DATE, "NAME", @@ -107,7 +107,7 @@ #{printOpcd,jdbcType=VARCHAR}, #{printDate,jdbcType=TIMESTAMP}, #{zfCode,jdbcType=VARCHAR}, #{isElectronic,jdbcType=VARCHAR}, #{electStatus,jdbcType=VARCHAR}) - + insert into LCHIS.FIN_OPB_INVOICEINFO @@ -379,7 +379,7 @@ - + update LCHIS.FIN_OPB_INVOICEINFO @@ -511,7 +511,7 @@ and TRANS_TYPE = #{transType,jdbcType=VARCHAR} and INVOICE_SEQ = #{invoiceSeq,jdbcType=VARCHAR} - + update LCHIS.FIN_OPB_INVOICEINFO set CARD_NO = #{cardNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapper.xml index ac5c3cab6..1278e5ebc 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapper.xml @@ -1,7 +1,7 @@ - + @@ -141,7 +141,7 @@ where CLINIC_CODE = #{clinicCode,jdbcType=VARCHAR} and TRANS_TYPE = #{transType,jdbcType=VARCHAR} - + insert into FIN_OPR_REGISTER (CLINIC_CODE, TRANS_TYPE, CARD_NO, REG_DATE, NOON_CODE, "NAME", @@ -216,7 +216,7 @@ #{balanceState,jdbcType=VARCHAR}, #{modeCode,jdbcType=VARCHAR}, #{mjclinicCode,jdbcType=VARCHAR} ) - + insert into FIN_OPR_REGISTER @@ -848,7 +848,7 @@ - + update FIN_OPR_REGISTER @@ -1162,7 +1162,7 @@ where CLINIC_CODE = #{clinicCode,jdbcType=VARCHAR} and TRANS_TYPE = #{transType,jdbcType=VARCHAR} - + update FIN_OPR_REGISTER set CARD_NO = #{cardNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapperExtend.xml index e1d8d6432..e05e57e00 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOprRegisterMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.FIN_OPR_REGISTER @@ -18,7 +18,7 @@ order by REG_DATE desc - select from LCHIS.FIN_OPR_REGISTER a diff --git a/ruoyi-admin/src/main/resources/mapper/his/FinOprSchemaMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/FinOprSchemaMapper.xml index efde29e27..1ba020058 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/FinOprSchemaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/FinOprSchemaMapper.xml @@ -1,7 +1,7 @@ - + @@ -56,7 +56,7 @@ delete from LCHIS.FIN_OPR_SCHEMA where ID = #{id,jdbcType=VARCHAR} - + insert into LCHIS.FIN_OPR_SCHEMA (ID, SCHEMA_TYPE, SEE_DATE, WEEK, NOON_CODE, BEGIN_TIME, @@ -81,7 +81,7 @@ #{operDate,jdbcType=TIMESTAMP}, #{orderNo,jdbcType=DECIMAL}, #{reglevlCode,jdbcType=VARCHAR}, #{reglevlName,jdbcType=VARCHAR}, #{specialPatientName,jdbcType=VARCHAR}) - + insert into LCHIS.FIN_OPR_SCHEMA @@ -281,7 +281,7 @@ - + update LCHIS.FIN_OPR_SCHEMA @@ -381,7 +381,7 @@ where ID = #{id,jdbcType=VARCHAR} - + update LCHIS.FIN_OPR_SCHEMA set SCHEMA_TYPE = #{schemaType,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MdcDiPathMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MdcDiPathMapper.xml index adb84221c..c9ef04acf 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MdcDiPathMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MdcDiPathMapper.xml @@ -1,7 +1,7 @@ - + @@ -76,7 +76,7 @@ delete from HIT_MDC.MDC_DI_PATH where ID = #{id,jdbcType=DECIMAL} - + insert into HIT_MDC.MDC_DI_PATH (ID, PATIENTNO, CARDNO, VISITTYPE, IS_MAINDIAG, DIAGTYPECODE, @@ -113,7 +113,7 @@ #{isDcupload,jdbcType=DECIMAL}, #{diagName,jdbcType=VARCHAR}, #{invalidReason,jdbcType=VARCHAR}, #{childDiagLevel,jdbcType=DECIMAL}) - + insert into HIT_MDC.MDC_DI_PATH @@ -415,7 +415,7 @@ - + update HIT_MDC.MDC_DI_PATH @@ -566,7 +566,7 @@ where ID = #{id,jdbcType=DECIMAL} - + update HIT_MDC.MDC_DI_PATH set PATIENTNO = #{patientno,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MdcDiPathMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MdcDiPathMapperExtend.xml index c5635eb0f..404996973 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MdcDiPathMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MdcDiPathMapperExtend.xml @@ -1,7 +1,7 @@ - select from HIT_MDC.MDC_DI_PATH diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapper.xml index 771e91b59..dda055b01 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetCasDiagnoseMapper.xml @@ -1,7 +1,7 @@ - + @@ -52,7 +52,7 @@ and HAPPEN_NO = #{happenNo,jdbcType=DECIMAL} and OPER_TYPE = #{operType,jdbcType=VARCHAR} - + insert into MET_CAS_DIAGNOSE (INPATIENT_NO, HAPPEN_NO, OPER_TYPE, DIAG_KIND, LEVEL_CODE, PERIOR_CODE, @@ -73,7 +73,7 @@ #{operDate,jdbcType=TIMESTAMP}, #{operationFlag,jdbcType=VARCHAR}, #{is30disease,jdbcType=VARCHAR} ) - + insert into MET_CAS_DIAGNOSE @@ -225,7 +225,7 @@ - + update MET_CAS_DIAGNOSE @@ -297,7 +297,7 @@ and HAPPEN_NO = #{happenNo,jdbcType=DECIMAL} and OPER_TYPE = #{operType,jdbcType=VARCHAR} - + update MET_CAS_DIAGNOSE set DIAG_KIND = #{diagKind,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetComIcd10Mapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetComIcd10Mapper.xml index 8608eda03..b8a2eec21 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetComIcd10Mapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetComIcd10Mapper.xml @@ -1,7 +1,7 @@ - + @@ -57,7 +57,7 @@ delete from LCHIS.MET_COM_ICD10 where SEQUENCE_NO = #{sequenceNo,jdbcType=VARCHAR} - + insert into LCHIS.MET_COM_ICD10 (SEQUENCE_NO, ICD_CODE, SICD, STAT_CODE, SPELL_CODE, WB_CODE, @@ -82,7 +82,7 @@ #{ageType,jdbcType=VARCHAR}, #{ageRange,jdbcType=VARCHAR}, #{opsLevel,jdbcType=VARCHAR}, #{isSpecific,jdbcType=VARCHAR}, #{icdrange,jdbcType=VARCHAR}) - + insert into LCHIS.MET_COM_ICD10 @@ -282,7 +282,7 @@ - + update LCHIS.MET_COM_ICD10 @@ -382,7 +382,7 @@ where SEQUENCE_NO = #{sequenceNo,jdbcType=VARCHAR} - + update LCHIS.MET_COM_ICD10 set ICD_CODE = #{icdCode,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetComOperationLocalMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetComOperationLocalMapper.xml index 4b1f96533..0c00c3b1c 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetComOperationLocalMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetComOperationLocalMapper.xml @@ -1,7 +1,7 @@ - + @@ -30,7 +30,7 @@ VALID_STATE, START_DATE, STOP_DATE, OPER_CODE, OPER_DATE, LOCAL_OPS_LEVEL, OPS_NATIONLEVEL, IS_MINIINVASIVE, IS_MINIINVASIVE2, FJM, OPRATION_ATTRIBUTE - + insert into LCHIS.MET_COM_OPERATION_LOCAL (SEQUENCE_NO, LOCAL_NAME, ICD_CODE, ICD_NAME, DISEASE_CODE, SPELL_CODE, @@ -47,7 +47,7 @@ #{isMiniinvasive,jdbcType=VARCHAR}, #{isMiniinvasive2,jdbcType=VARCHAR}, #{fjm,jdbcType=VARCHAR}, #{oprationAttribute,jdbcType=VARCHAR}) - + insert into LCHIS.MET_COM_OPERATION_LOCAL diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetIpmBookedMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetIpmBookedMapper.xml index 5c4c7be89..5c6567160 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetIpmBookedMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetIpmBookedMapper.xml @@ -1,7 +1,7 @@ - + @@ -51,7 +51,7 @@ delete from LCHIS.MET_IPM_BOOKED where BOOKED_SQN = #{bookedSqn,jdbcType=VARCHAR} - + insert into LCHIS.MET_IPM_BOOKED (BOOKED_SQN, EXEC_SQN, MO_ORDER, ORDER_SQN, NURSE_CELL_CODE, INPATIENT_NO, @@ -74,7 +74,7 @@ #{emecType,jdbcType=VARCHAR}, #{readFlag,jdbcType=VARCHAR}, #{patientNo,jdbcType=VARCHAR} ) - + insert into LCHIS.MET_IPM_BOOKED @@ -244,7 +244,7 @@ - + update LCHIS.MET_IPM_BOOKED @@ -329,7 +329,7 @@ where BOOKED_SQN = #{bookedSqn,jdbcType=VARCHAR} - + update LCHIS.MET_IPM_BOOKED set EXEC_SQN = #{execSqn,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecdrugMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecdrugMapper.xml index e6a663bd9..55056b25b 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecdrugMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecdrugMapper.xml @@ -1,7 +1,7 @@ - + @@ -117,7 +117,7 @@ delete from LCHIS.MET_IPM_EXECDRUG where EXEC_SQN = #{execSqn,jdbcType=VARCHAR} - + insert into LCHIS.MET_IPM_EXECDRUG (EXEC_SQN, DEPT_CODE, NURSE_CELL_CODE, LIST_DPCD, INPATIENT_NO, PATIENT_NO, @@ -178,7 +178,7 @@ #{compoundExec,jdbcType=VARCHAR}, #{compoundOper,jdbcType=VARCHAR}, #{compoundDept,jdbcType=VARCHAR}, #{compoundDate,jdbcType=TIMESTAMP}) - + insert into LCHIS.MET_IPM_EXECDRUG @@ -696,7 +696,7 @@ - + update LCHIS.MET_IPM_EXECDRUG @@ -955,7 +955,7 @@ where EXEC_SQN = #{execSqn,jdbcType=VARCHAR} - + update LCHIS.MET_IPM_EXECDRUG set DEPT_CODE = #{deptCode,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecdrugMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecdrugMapperExtend.xml index 0e8e0eaa9..999d859e5 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecdrugMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecdrugMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.MET_IPM_EXECDRUG a diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapper.xml index 647cc30cd..588963b5b 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapper.xml @@ -1,7 +1,7 @@ - + @@ -98,7 +98,7 @@ delete from LCHIS.MET_IPM_EXECUNDRUG where EXEC_SQN = #{execSqn,jdbcType=VARCHAR} - + insert into LCHIS.MET_IPM_EXECUNDRUG (EXEC_SQN, DEPT_CODE, NURSE_CELL_CODE, LIST_DPCD, INPATIENT_NO, PATIENT_NO, @@ -147,7 +147,7 @@ #{labBarcode,jdbcType=VARCHAR}, #{chargePrnflag,jdbcType=VARCHAR}, #{chargePrndate,jdbcType=TIMESTAMP}, #{chargePrnusercd,jdbcType=VARCHAR}, #{circultPrnflag,jdbcType=VARCHAR}) - + insert into LCHIS.MET_IPM_EXECUNDRUG @@ -563,7 +563,7 @@ - + update LCHIS.MET_IPM_EXECUNDRUG @@ -771,7 +771,7 @@ where EXEC_SQN = #{execSqn,jdbcType=VARCHAR} - + update LCHIS.MET_IPM_EXECUNDRUG set DEPT_CODE = #{deptCode,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapperExtend.xml index 2266964e2..92c0b49ca 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetIpmExecundrugMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.MET_IPM_EXECUNDRUG a diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetIpmOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetIpmOrderMapper.xml index 679ab84e7..9ba173b5f 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetIpmOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetIpmOrderMapper.xml @@ -1,7 +1,7 @@ - + @@ -129,7 +129,7 @@ delete from MET_IPM_ORDER where MO_ORDER = #{moOrder,jdbcType=VARCHAR} - + insert into MET_IPM_ORDER (MO_ORDER, INPATIENT_NO, PATIENT_NO, DEPT_CODE, NURSE_CELL_CODE, LIST_DPCD, @@ -198,7 +198,7 @@ #{mark4,jdbcType=VARCHAR}, #{mark5,jdbcType=VARCHAR}, #{mark6,jdbcType=VARCHAR} ) - + insert into MET_IPM_ORDER @@ -782,7 +782,7 @@ - + update MET_IPM_ORDER @@ -1074,7 +1074,7 @@ where MO_ORDER = #{moOrder,jdbcType=VARCHAR} - + update MET_IPM_ORDER set INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetMrsBaseMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetMrsBaseMapper.xml index ff4d13842..0815fc576 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetMrsBaseMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetMrsBaseMapper.xml @@ -1,7 +1,7 @@ - + @@ -216,7 +216,7 @@ delete from MET_MRS_BASE where INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR} - + insert into MET_MRS_BASE (INPATIENT_NO, PATIENT_NO, IN_TIMES, CARD_NO, MEDICAL_PAYMENT_TYPE, PACT_CODE, @@ -333,7 +333,7 @@ #{presentProvincelx,jdbcType=VARCHAR}, #{presentCitylx,jdbcType=VARCHAR}, #{presentCountylx,jdbcType=VARCHAR}, #{backDate,jdbcType=TIMESTAMP}, #{backCode,jdbcType=VARCHAR}) - + insert into MET_MRS_BASE @@ -1355,7 +1355,7 @@ - + update MET_MRS_BASE @@ -1866,7 +1866,7 @@ where INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR} - + update MET_MRS_BASE set PATIENT_NO = #{patientNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetMrsBaseMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetMrsBaseMapperExtend.xml index 549271108..945b891b6 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetMrsBaseMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetMrsBaseMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.MET_MRS_BASE diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetNuiCancelitemMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetNuiCancelitemMapper.xml index b0caff668..ab2882b61 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetNuiCancelitemMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetNuiCancelitemMapper.xml @@ -1,7 +1,7 @@ - + @@ -68,7 +68,7 @@ delete from LCHIS.MET_NUI_CANCELITEM where APPLY_NO = #{applyNo,jdbcType=VARCHAR} - + insert into LCHIS.MET_NUI_CANCELITEM (APPLY_NO, BILL_CODE, INPATIENT_NO, "NAME", BABY_FLAG, DEPT_CODE, @@ -101,7 +101,7 @@ #{auditDate2,jdbcType=TIMESTAMP}, #{auditOper3,jdbcType=VARCHAR}, #{auditDate3,jdbcType=TIMESTAMP} ) - + insert into LCHIS.MET_NUI_CANCELITEM @@ -361,7 +361,7 @@ - + update LCHIS.MET_NUI_CANCELITEM @@ -491,7 +491,7 @@ where APPLY_NO = #{applyNo,jdbcType=VARCHAR} - + update LCHIS.MET_NUI_CANCELITEM set BILL_CODE = #{billCode,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapper.xml index 80e39d1af..f26e5e17d 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapper.xml @@ -1,7 +1,7 @@ - + @@ -70,7 +70,7 @@ delete from LCHIS.MET_NUI_EXERECORD where EXEC_SQN = #{execSqn,jdbcType=VARCHAR} - + insert into LCHIS.MET_NUI_EXERECORD (EXEC_SQN, INPATIENT_NO, BARCODE, EXE_STATE, BILL_TYPE, IN_TIME, @@ -103,7 +103,7 @@ #{remark,jdbcType=VARCHAR}, #{extendData1,jdbcType=VARCHAR}, #{extendData2,jdbcType=VARCHAR}, #{extendData3,jdbcType=VARCHAR}, #{extendData4,jdbcType=VARCHAR}) - + insert into LCHIS.MET_NUI_EXERECORD @@ -375,7 +375,7 @@ - + update LCHIS.MET_NUI_EXERECORD @@ -511,7 +511,7 @@ where EXEC_SQN = #{execSqn,jdbcType=VARCHAR} - + update LCHIS.MET_NUI_EXERECORD set INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapperExtend.xml index 7fe2619e7..6cd1af60e 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetNuiExerecordMapperExtend.xml @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOpsApplyMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOpsApplyMapper.xml index a8bb6ad69..e89700e82 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOpsApplyMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOpsApplyMapper.xml @@ -1,7 +1,7 @@ - + @@ -104,7 +104,7 @@ delete from LCHIS.MET_OPS_APPLY where OPERATIONNO = #{operationno,jdbcType=VARCHAR} - + insert into LCHIS.MET_OPS_APPLY (OPERATIONNO, CLINIC_CODE, PATIENT_NO, PASOURCE, "NAME", SEX_CODE, @@ -157,7 +157,7 @@ #{rjssPreFlag,jdbcType=VARCHAR}, #{rjxh,jdbcType=VARCHAR}, #{opsLevel,jdbcType=VARCHAR}, #{moOrder,jdbcType=VARCHAR}, #{insertdate,jdbcType=TIMESTAMP}) - + insert into LCHIS.MET_OPS_APPLY @@ -609,7 +609,7 @@ - + update LCHIS.MET_OPS_APPLY @@ -835,7 +835,7 @@ where OPERATIONNO = #{operationno,jdbcType=VARCHAR} - + update LCHIS.MET_OPS_APPLY set CLINIC_CODE = #{clinicCode,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapper.xml index d78b43778..8cba90483 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapper.xml @@ -1,7 +1,7 @@ - + @@ -33,7 +33,7 @@ and ROLE_CODE = #{roleCode,jdbcType=VARCHAR} and EMPL_CODE = #{emplCode,jdbcType=VARCHAR} - + insert into LCHIS.MET_OPS_ARRANGE (OPERATIONNO, ROLE_CODE, EMPL_CODE, EMPL_NAME, FORE_FLAG, OPER_CODE, @@ -42,7 +42,7 @@ #{emplName,jdbcType=VARCHAR}, #{foreFlag,jdbcType=VARCHAR}, #{operCode,jdbcType=VARCHAR}, #{operDate,jdbcType=TIMESTAMP}, #{operKind,jdbcType=VARCHAR}) - + insert into LCHIS.MET_OPS_ARRANGE @@ -98,7 +98,7 @@ - + update LCHIS.MET_OPS_ARRANGE @@ -122,7 +122,7 @@ and ROLE_CODE = #{roleCode,jdbcType=VARCHAR} and EMPL_CODE = #{emplCode,jdbcType=VARCHAR} - + update LCHIS.MET_OPS_ARRANGE set EMPL_NAME = #{emplName,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapperExtend.xml index 448f094d7..2b4d66d26 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOpsArrangeMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.MET_OPS_ARRANGE diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOpsOperationitemMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOpsOperationitemMapper.xml index 059e8eb43..773148973 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOpsOperationitemMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOpsOperationitemMapper.xml @@ -1,7 +1,7 @@ - + @@ -49,7 +49,7 @@ where OPERATIONNO = #{operationno,jdbcType=VARCHAR} and ITEM_CODE = #{itemCode,jdbcType=VARCHAR} - + insert into LCHIS.MET_OPS_OPERATIONITEM (OPERATIONNO, ITEM_CODE, CLINIC_CODE, DEPT_CODE, ITEM_NAME, UNIT_PRICE, @@ -70,7 +70,7 @@ #{operCode,jdbcType=VARCHAR}, #{operDate,jdbcType=TIMESTAMP}, #{opsLevel,jdbcType=VARCHAR} ) - + insert into LCHIS.MET_OPS_OPERATIONITEM @@ -222,7 +222,7 @@ - + update LCHIS.MET_OPS_OPERATIONITEM @@ -296,7 +296,7 @@ where OPERATIONNO = #{operationno,jdbcType=VARCHAR} and ITEM_CODE = #{itemCode,jdbcType=VARCHAR} - + update LCHIS.MET_OPS_OPERATIONITEM set CLINIC_CODE = #{clinicCode,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOpsOperationitemMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOpsOperationitemMapperExtend.xml index 121f812fe..8e094ff4f 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOpsOperationitemMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOpsOperationitemMapperExtend.xml @@ -1,7 +1,7 @@ - select from LCHIS.MET_OPS_OPERATIONITEM diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapper.xml index eed4b4c77..8b3a94e03 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapper.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ delete from HIS_FSHV1.MET_ORDE_APPLY_TYPE where APPLY_TYPE_ID = #{applyTypeId,jdbcType=VARCHAR} - + insert into HIS_FSHV1.MET_ORDE_APPLY_TYPE (APPLY_TYPE_ID, FLOW_CLASS, PRINT_FLAG, SHEET_TYPE_CLASS, OP_MODEL_TYPE, IP_MODEL_TYPE, @@ -43,7 +43,7 @@ #{createDate,jdbcType=TIMESTAMP}, #{operCode,jdbcType=VARCHAR}, #{operDate,jdbcType=TIMESTAMP} ) - + insert into HIS_FSHV1.MET_ORDE_APPLY_TYPE @@ -105,7 +105,7 @@ - + update HIS_FSHV1.MET_ORDE_APPLY_TYPE @@ -136,7 +136,7 @@ where APPLY_TYPE_ID = #{applyTypeId,jdbcType=VARCHAR} - + update HIS_FSHV1.MET_ORDE_APPLY_TYPE set FLOW_CLASS = #{flowClass,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapperExtend.xml index c3708569f..e964ee33b 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeApplyTypeMapperExtend.xml @@ -1,7 +1,7 @@ - select a.APPLY_TYPE_ID,b.CONS_INFO_NAME as APPLY_TYPE_NAME, a.FLOW_CLASS, a.PRINT_FLAG, a.SHEET_TYPE_CLASS, a.OP_MODEL_TYPE, a.IP_MODEL_TYPE, a.CREATE_DATE, a.OPER_CODE, a.OPER_DATE diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeBigexampartMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeBigexampartMapper.xml index c8682e916..490ca6669 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeBigexampartMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeBigexampartMapper.xml @@ -1,7 +1,7 @@ - + @@ -31,7 +31,7 @@ delete from HIS_FSHV1.MET_ORDE_BIGEXAMPART where BIG_EXAM_PART_ID = #{bigExamPartId,jdbcType=VARCHAR} - + insert into HIS_FSHV1.MET_ORDE_BIGEXAMPART (BIG_EXAM_PART_ID, BIG_EXAM_PART_NAME, SORT_NO, APPLY_TYPE_ID, CREATE_DATE, OPER_CODE, @@ -42,7 +42,7 @@ #{operDate,jdbcType=TIMESTAMP}, #{validState,jdbcType=VARCHAR}, #{englishName,jdbcType=VARCHAR} ) - + insert into HIS_FSHV1.MET_ORDE_BIGEXAMPART @@ -104,7 +104,7 @@ - + update HIS_FSHV1.MET_ORDE_BIGEXAMPART @@ -135,7 +135,7 @@ where BIG_EXAM_PART_ID = #{bigExamPartId,jdbcType=VARCHAR} - + update HIS_FSHV1.MET_ORDE_BIGEXAMPART set BIG_EXAM_PART_NAME = #{bigExamPartName,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeBigexampartMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeBigexampartMapperExtend.xml index 2bd1a89a7..1d439552c 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeBigexampartMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeBigexampartMapperExtend.xml @@ -1,7 +1,7 @@ - select from HIS_FSHV1.MET_ORDE_BIGEXAMPART diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapper.xml index a2fa45dc7..a7eaaa0aa 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapper.xml @@ -1,7 +1,7 @@ - + @@ -34,7 +34,7 @@ delete from HIS_FSHV1.MET_ORDE_EXAMPART where EXAM_PART_ID = #{examPartId,jdbcType=VARCHAR} - + insert into HIS_FSHV1.MET_ORDE_EXAMPART (EXAM_PART_ID, EXAM_PART_NAME, SORT_NO, APPLY_TYPE_ID, BIG_EXAM_PART_ID, VALID_STATE, @@ -47,7 +47,7 @@ #{spellCode,jdbcType=VARCHAR}, #{wbCode,jdbcType=VARCHAR}, #{englishName,jdbcType=VARCHAR} ) - + insert into HIS_FSHV1.MET_ORDE_EXAMPART @@ -127,7 +127,7 @@ - + update HIS_FSHV1.MET_ORDE_EXAMPART @@ -167,7 +167,7 @@ where EXAM_PART_ID = #{examPartId,jdbcType=VARCHAR} - + update HIS_FSHV1.MET_ORDE_EXAMPART set EXAM_PART_NAME = #{examPartName,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapperExtend.xml index fc491adf1..489025c90 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdeExampartMapperExtend.xml @@ -1,7 +1,7 @@ - select from HIS_FSHV1.MET_ORDE_EXAMPART diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdiOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdiOrderMapper.xml index 6ee192213..ce20ffcd7 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdiOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdiOrderMapper.xml @@ -1,7 +1,7 @@ - + @@ -133,7 +133,7 @@ delete from HIS_FSHV1.MET_ORDI_ORDER where MO_ORDER = #{moOrder,jdbcType=VARCHAR} - + insert into HIS_FSHV1.MET_ORDI_ORDER (MO_ORDER, INPATIENT_NO, DEPT_CODE, NURSE_CELL_CODE, MO_STATE, ITEM_TYPE, @@ -204,7 +204,7 @@ #{labPart,jdbcType=VARCHAR}, #{nurseOrderFlag,jdbcType=VARCHAR}, #{execDays,jdbcType=VARCHAR} ) - + insert into HIS_FSHV1.MET_ORDI_ORDER @@ -806,7 +806,7 @@ - + update HIS_FSHV1.MET_ORDI_ORDER @@ -1107,7 +1107,7 @@ where MO_ORDER = #{moOrder,jdbcType=VARCHAR} - + update HIS_FSHV1.MET_ORDI_ORDER set INPATIENT_NO = #{inpatientNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdoOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdoOrderMapper.xml index d688f7073..784598e21 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdoOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdoOrderMapper.xml @@ -1,7 +1,7 @@ - + @@ -125,7 +125,7 @@ delete from HIS_FSHV1.MET_ORDO_ORDER where MO_ORDER = #{moOrder,jdbcType=VARCHAR} - + insert into HIS_FSHV1.MET_ORDO_ORDER (MO_ORDER, CLINIC_NO, PATIENT_ID, MO_STATE, ITEM_TYPE, FLOW_CLASS, @@ -190,7 +190,7 @@ #{needConfirmFlag,jdbcType=VARCHAR}, #{confirmQty,jdbcType=DECIMAL}, #{execDays,jdbcType=VARCHAR}, #{ipoKind,jdbcType=VARCHAR}, #{moOper,jdbcType=VARCHAR}) - + insert into HIS_FSHV1.MET_ORDO_ORDER @@ -750,7 +750,7 @@ - + update HIS_FSHV1.MET_ORDO_ORDER @@ -1030,7 +1030,7 @@ where MO_ORDER = #{moOrder,jdbcType=VARCHAR} - + update HIS_FSHV1.MET_ORDO_ORDER set CLINIC_NO = #{clinicNo,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdtUndrugtermMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdtUndrugtermMapper.xml index 5b1fb46a8..55feeaeaa 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdtUndrugtermMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdtUndrugtermMapper.xml @@ -1,7 +1,7 @@ - + @@ -82,7 +82,7 @@ delete from HIS_FSHV1.MET_ORDT_UNDRUGTERM where TERM_ID = #{termId,jdbcType=VARCHAR} - + insert into HIS_FSHV1.MET_ORDT_UNDRUGTERM (TERM_ID, TERM_CLASS_ID, TERM_CLASS_NAME, TERM_NAME, SPECS, VISIT_TYPE, @@ -123,7 +123,7 @@ #{siGrade,jdbcType=VARCHAR}, #{englishName,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR} ) - + insert into HIS_FSHV1.MET_ORDT_UNDRUGTERM @@ -455,7 +455,7 @@ - + update HIS_FSHV1.MET_ORDT_UNDRUGTERM @@ -621,7 +621,7 @@ where TERM_ID = #{termId,jdbcType=VARCHAR} - + update HIS_FSHV1.MET_ORDT_UNDRUGTERM set TERM_CLASS_ID = #{termClassId,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/MetOrdtUndrugtermMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/MetOrdtUndrugtermMapperExtend.xml index 1c451449b..6450446ec 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/MetOrdtUndrugtermMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/MetOrdtUndrugtermMapperExtend.xml @@ -1,7 +1,7 @@ - select from HIS_FSHV1.MET_ORDT_UNDRUGTERM diff --git a/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapper.xml index 0f4d67cc1..ae5e5b99b 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapper.xml @@ -1,7 +1,7 @@ - + @@ -38,7 +38,7 @@ delete from REALONENIS.NSR_NIS_RECORD_DETAIL where ID = #{id,jdbcType=DECIMAL} - + insert into REALONENIS.NSR_NIS_RECORD_DETAIL (ID, RECORD_ID, INPATIENT_NO, RECORD_TIME, CODE, "VALUE", @@ -53,7 +53,7 @@ #{rName,jdbcType=VARCHAR}, #{showTemperature,jdbcType=DECIMAL}, #{showNurseRecord,jdbcType=DECIMAL}, #{guid,jdbcType=VARCHAR}) - + insert into REALONENIS.NSR_NIS_RECORD_DETAIL @@ -157,7 +157,7 @@ - + update REALONENIS.NSR_NIS_RECORD_DETAIL @@ -209,7 +209,7 @@ where ID = #{id,jdbcType=DECIMAL} - + update REALONENIS.NSR_NIS_RECORD_DETAIL set RECORD_ID = #{recordId,jdbcType=DECIMAL}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapperExtend.xml b/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapperExtend.xml index 680dd6b4c..04986184e 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapperExtend.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/NsrNisRecordDetailMapperExtend.xml @@ -1,7 +1,7 @@ - select from REALONENIS.NSR_NIS_RECORD_DETAIL diff --git a/ruoyi-admin/src/main/resources/mapper/his/NsrStandardCodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/NsrStandardCodeMapper.xml index 0871a17ce..8c7c9671a 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/NsrStandardCodeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/NsrStandardCodeMapper.xml @@ -1,7 +1,7 @@ - + @@ -35,7 +35,7 @@ delete from REALONENIS.NSR_STANDARD_CODE where NCODE = #{ncode,jdbcType=VARCHAR} - + insert into REALONENIS.NSR_STANDARD_CODE (NCODE, ID, NCODE_NAME, DATA_TYPE, PARENT_NCODE_ID, NCODE_DESCRIPTION, @@ -48,7 +48,7 @@ #{isValid,jdbcType=DECIMAL}, #{assessmentItemId,jdbcType=VARCHAR}, #{warningMinValue,jdbcType=VARCHAR}, #{warningMaxValue,jdbcType=VARCHAR}) - + insert into REALONENIS.NSR_STANDARD_CODE @@ -134,7 +134,7 @@ - + update REALONENIS.NSR_STANDARD_CODE @@ -177,7 +177,7 @@ where NCODE = #{ncode,jdbcType=VARCHAR} - + update REALONENIS.NSR_STANDARD_CODE set ID = #{id,jdbcType=DECIMAL}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/OracleSlaveDataMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/OracleSlaveDataMapper.xml index b454e03a0..0a5da7633 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/OracleSlaveDataMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/OracleSlaveDataMapper.xml @@ -1,7 +1,7 @@ - select from LCHIS.VP_COM_PATIENTINFO diff --git a/ruoyi-admin/src/main/resources/mapper/his/PdaBloodCircuitMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/PdaBloodCircuitMapper.xml index 97e895496..73b3bebb0 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/PdaBloodCircuitMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/PdaBloodCircuitMapper.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ TEMPERATUR, PULSE_RATE, HEART_RATE, BREATHING_RATE, SYSTOLIC_PRESSURE, DIASTOLIC_PRESSURE, DROP_SPEED, TONGLU, DRUGS, VALID_FLAG, MARK, PDA_VALUE, PDA_CA_VALUE, PDA_CA_VALUEZS - + insert into REALONENIS.PDA_BLOOD_CIRCUIT (RECORD_ID, BARCODE, CIRCUIT_TYPE, OPERPERSON_CODE, OPERPERSON_NAME, OPER_TIME, @@ -51,7 +51,7 @@ #{pdaValue,jdbcType=VARCHAR}, #{pdaCaValue,jdbcType=VARCHAR}, #{pdaCaValuezs,jdbcType=VARCHAR} ) - + insert into REALONENIS.PDA_BLOOD_CIRCUIT diff --git a/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRecordMapper.xml index 68006f40a..edcaf5732 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/PdaPsrRecordMapper.xml @@ -1,7 +1,7 @@ - + @@ -61,7 +61,7 @@ delete from PDA.PDA_PSR_RECORD where ID = #{id,jdbcType=VARCHAR} - + insert into PDA.PDA_PSR_RECORD (ID, OCUR_DATE, WRITE_DATE, PRESSURE_RESOURCE, RATING_TYPE, INPATIENT_NO, @@ -90,7 +90,7 @@ #{isDeptreport,jdbcType=VARCHAR}, #{damagetype,jdbcType=VARCHAR}, #{damagedegree,jdbcType=VARCHAR} ) - + insert into PDA.PDA_PSR_RECORD @@ -314,7 +314,7 @@ - + update PDA.PDA_PSR_RECORD @@ -426,7 +426,7 @@ where ID = #{id,jdbcType=VARCHAR} - + update PDA.PDA_PSR_RECORD set OCUR_DATE = #{ocurDate,jdbcType=TIMESTAMP}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/PhaComApplyoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/PhaComApplyoutMapper.xml index 276ab93cf..ad303a0f9 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/PhaComApplyoutMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/PhaComApplyoutMapper.xml @@ -1,7 +1,7 @@ - + @@ -111,7 +111,7 @@ delete from LCHIS.PHA_COM_APPLYOUT where APPLY_NUMBER = #{applyNumber,jdbcType=DECIMAL} - + insert into LCHIS.PHA_COM_APPLYOUT (APPLY_NUMBER, DEPT_CODE, DRUG_DEPT_CODE, CLASS3_MEANING_CODE, GROUP_CODE, DRUG_CODE, @@ -168,7 +168,7 @@ #{auditDate3,jdbcType=TIMESTAMP}, #{exeFlag2,jdbcType=VARCHAR}, #{printNum,jdbcType=DECIMAL}, #{preFlag,jdbcType=VARCHAR}) - + insert into LCHIS.PHA_COM_APPLYOUT @@ -650,7 +650,7 @@ - + update LCHIS.PHA_COM_APPLYOUT @@ -891,7 +891,7 @@ where APPLY_NUMBER = #{applyNumber,jdbcType=DECIMAL} - + update LCHIS.PHA_COM_APPLYOUT set DEPT_CODE = #{deptCode,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapper.xml index b81b9f404..2f68315bf 100644 --- a/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/his/PhaComBaseinfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -155,7 +155,7 @@ delete from lchis.PHA_COM_BASEINFO where DRUG_CODE = #{drugCode,jdbcType=VARCHAR} - + insert into lchis.PHA_COM_BASEINFO (DRUG_CODE, TRADE_NAME, SPELL_CODE, WB_CODE, CUSTOM_CODE, REGULAR_NAME, @@ -238,7 +238,7 @@ #{ccfyy,jdbcType=VARCHAR}, #{hjbyy,jdbcType=VARCHAR}, #{zdjk2,jdbcType=VARCHAR} ) - + insert into lchis.PHA_COM_BASEINFO @@ -954,7 +954,7 @@ - + update lchis.PHA_COM_BASEINFO @@ -1312,7 +1312,7 @@ where DRUG_CODE = #{drugCode,jdbcType=VARCHAR} - + update lchis.PHA_COM_BASEINFO set TRADE_NAME = #{tradeName,jdbcType=VARCHAR}, diff --git a/ruoyi-admin/src/main/resources/mapper/winlis/LasRtResultMapper.xml b/ruoyi-admin/src/main/resources/mapper/winlis/LasRtResultMapper.xml index 4d2a71687..a5d7d2542 100644 --- a/ruoyi-admin/src/main/resources/mapper/winlis/LasRtResultMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/winlis/LasRtResultMapper.xml @@ -93,147 +93,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - insert into las_rt_result - - machineid, - sampleid, - itemid, - loincid, - engname, - itemname, - printseq, - barcode, - testtime, - reportvalue, - rerunvalue, - descvalue, - resultlist, - orgvalue, - valuesrc, - rerunflag, - rangeinfo, - unit, - resultflag, - patientid, - patienttype, - sampletype, - testmachineid, - rackcup, - hisitemid, - printrow, - alertflag, - rangelimit, - checkstate, - commtime, - method, - cutoff, - sco, - odvalue, - memovalue, - valuepro, - autoconfirmsign, - autoconfirminfo, - - - #{machineid}, - #{sampleid}, - #{itemid}, - #{loincid}, - #{engname}, - #{itemname}, - #{printseq}, - #{barcode}, - #{testtime}, - #{reportvalue}, - #{rerunvalue}, - #{descvalue}, - #{resultlist}, - #{orgvalue}, - #{valuesrc}, - #{rerunflag}, - #{rangeinfo}, - #{unit}, - #{resultflag}, - #{patientid}, - #{patienttype}, - #{sampletype}, - #{testmachineid}, - #{rackcup}, - #{hisitemid}, - #{printrow}, - #{alertflag}, - #{rangelimit}, - #{checkstate}, - #{commtime}, - #{method}, - #{cutoff}, - #{sco}, - #{odvalue}, - #{memovalue}, - #{valuepro}, - #{autoconfirmsign}, - #{autoconfirminfo}, - - - - - update las_rt_result - - machineid = #{machineid}, - sampleid = #{sampleid}, - itemid = #{itemid}, - loincid = #{loincid}, - engname = #{engname}, - itemname = #{itemname}, - printseq = #{printseq}, - barcode = #{barcode}, - testtime = #{testtime}, - reportvalue = #{reportvalue}, - rerunvalue = #{rerunvalue}, - descvalue = #{descvalue}, - resultlist = #{resultlist}, - orgvalue = #{orgvalue}, - valuesrc = #{valuesrc}, - rerunflag = #{rerunflag}, - rangeinfo = #{rangeinfo}, - unit = #{unit}, - resultflag = #{resultflag}, - patientid = #{patientid}, - patienttype = #{patienttype}, - sampletype = #{sampletype}, - testmachineid = #{testmachineid}, - rackcup = #{rackcup}, - hisitemid = #{hisitemid}, - printrow = #{printrow}, - alertflag = #{alertflag}, - rangelimit = #{rangelimit}, - checkstate = #{checkstate}, - commtime = #{commtime}, - method = #{method}, - cutoff = #{cutoff}, - sco = #{sco}, - odvalue = #{odvalue}, - memovalue = #{memovalue}, - valuepro = #{valuepro}, - autoconfirmsign = #{autoconfirmsign}, - autoconfirminfo = #{autoconfirminfo}, - - where testdate = #{testdate} - - - - delete from las_rt_result where testdate = #{testdate} - - - - delete from las_rt_result where testdate in - - #{testdate} - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/winlis/LasSapSampleregMapper.xml b/ruoyi-admin/src/main/resources/mapper/winlis/LasSapSampleregMapper.xml index 805db4218..cc450364f 100644 --- a/ruoyi-admin/src/main/resources/mapper/winlis/LasSapSampleregMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/winlis/LasSapSampleregMapper.xml @@ -210,321 +210,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - insert into las_sap_samplereg - - machineid, - sampleid, - barcode, - patienttype, - patientid, - patientseq, - patientname, - patientsex, - patientage, - patientageunit, - patienttel, - patientbedno, - patientidenno, - patientrace, - patientsite, - execsqn, - emc, - hisitemidlist, - hisitemnamelist, - hisitemprice, - doctorid, - doctorname, - deptid, - deptname, - ordertime, - execdeptid, - execdeptname, - wardid, - wardname, - sampletype, - urineqty, - samplestate, - sampleposition, - diagnosis, - confirmstate, - printstate, - alertstate, - state, - testtype, - groupid, - nurseid, - nursename, - sampletime, - senderid, - sendername, - sendtime, - sendformid, - inceptorid, - inceptorname, - incepttime, - accepterid, - acceptername, - accepttime, - approverid, - approvername, - approvetime, - memo, - rackcup, - printedtime, - printerid, - printername, - checktime, - resulttime, - hospitalid, - sampleid2, - lismemo, - birthday, - extrainfo, - planitemcount, - actualitemcount, - testeditemcount, - ishighrisk, - isgcp, - barcode2, - barprinttime, - documenttime, - documentid, - documentname, - reporttime, - samplegetname, - samplegetid, - state2, - lsptestform, - execsqn2, - diagnosisid, - patientid2, - patientid3, - patientinfo, - autoconfirminfo, - barcodememo, - tjflag, - menstrualcycle, - translationinfo, - mixcode, - passportno, - patientnameen, - - - #{machineid}, - #{sampleid}, - #{barcode}, - #{patienttype}, - #{patientid}, - #{patientseq}, - #{patientname}, - #{patientsex}, - #{patientage}, - #{patientageunit}, - #{patienttel}, - #{patientbedno}, - #{patientidenno}, - #{patientrace}, - #{patientsite}, - #{execsqn}, - #{emc}, - #{hisitemidlist}, - #{hisitemnamelist}, - #{hisitemprice}, - #{doctorid}, - #{doctorname}, - #{deptid}, - #{deptname}, - #{ordertime}, - #{execdeptid}, - #{execdeptname}, - #{wardid}, - #{wardname}, - #{sampletype}, - #{urineqty}, - #{samplestate}, - #{sampleposition}, - #{diagnosis}, - #{confirmstate}, - #{printstate}, - #{alertstate}, - #{state}, - #{testtype}, - #{groupid}, - #{nurseid}, - #{nursename}, - #{sampletime}, - #{senderid}, - #{sendername}, - #{sendtime}, - #{sendformid}, - #{inceptorid}, - #{inceptorname}, - #{incepttime}, - #{accepterid}, - #{acceptername}, - #{accepttime}, - #{approverid}, - #{approvername}, - #{approvetime}, - #{memo}, - #{rackcup}, - #{printedtime}, - #{printerid}, - #{printername}, - #{checktime}, - #{resulttime}, - #{hospitalid}, - #{sampleid2}, - #{lismemo}, - #{birthday}, - #{extrainfo}, - #{planitemcount}, - #{actualitemcount}, - #{testeditemcount}, - #{ishighrisk}, - #{isgcp}, - #{barcode2}, - #{barprinttime}, - #{documenttime}, - #{documentid}, - #{documentname}, - #{reporttime}, - #{samplegetname}, - #{samplegetid}, - #{state2}, - #{lsptestform}, - #{execsqn2}, - #{diagnosisid}, - #{patientid2}, - #{patientid3}, - #{patientinfo}, - #{autoconfirminfo}, - #{barcodememo}, - #{tjflag}, - #{menstrualcycle}, - #{translationinfo}, - #{mixcode}, - #{passportno}, - #{patientnameen}, - - - - - update las_sap_samplereg - - machineid = #{machineid}, - sampleid = #{sampleid}, - barcode = #{barcode}, - patienttype = #{patienttype}, - patientid = #{patientid}, - patientseq = #{patientseq}, - patientname = #{patientname}, - patientsex = #{patientsex}, - patientage = #{patientage}, - patientageunit = #{patientageunit}, - patienttel = #{patienttel}, - patientbedno = #{patientbedno}, - patientidenno = #{patientidenno}, - patientrace = #{patientrace}, - patientsite = #{patientsite}, - execsqn = #{execsqn}, - emc = #{emc}, - hisitemidlist = #{hisitemidlist}, - hisitemnamelist = #{hisitemnamelist}, - hisitemprice = #{hisitemprice}, - doctorid = #{doctorid}, - doctorname = #{doctorname}, - deptid = #{deptid}, - deptname = #{deptname}, - ordertime = #{ordertime}, - execdeptid = #{execdeptid}, - execdeptname = #{execdeptname}, - wardid = #{wardid}, - wardname = #{wardname}, - sampletype = #{sampletype}, - urineqty = #{urineqty}, - samplestate = #{samplestate}, - sampleposition = #{sampleposition}, - diagnosis = #{diagnosis}, - confirmstate = #{confirmstate}, - printstate = #{printstate}, - alertstate = #{alertstate}, - state = #{state}, - testtype = #{testtype}, - groupid = #{groupid}, - nurseid = #{nurseid}, - nursename = #{nursename}, - sampletime = #{sampletime}, - senderid = #{senderid}, - sendername = #{sendername}, - sendtime = #{sendtime}, - sendformid = #{sendformid}, - inceptorid = #{inceptorid}, - inceptorname = #{inceptorname}, - incepttime = #{incepttime}, - accepterid = #{accepterid}, - acceptername = #{acceptername}, - accepttime = #{accepttime}, - approverid = #{approverid}, - approvername = #{approvername}, - approvetime = #{approvetime}, - memo = #{memo}, - rackcup = #{rackcup}, - printedtime = #{printedtime}, - printerid = #{printerid}, - printername = #{printername}, - checktime = #{checktime}, - resulttime = #{resulttime}, - hospitalid = #{hospitalid}, - sampleid2 = #{sampleid2}, - lismemo = #{lismemo}, - birthday = #{birthday}, - extrainfo = #{extrainfo}, - planitemcount = #{planitemcount}, - actualitemcount = #{actualitemcount}, - testeditemcount = #{testeditemcount}, - ishighrisk = #{ishighrisk}, - isgcp = #{isgcp}, - barcode2 = #{barcode2}, - barprinttime = #{barprinttime}, - documenttime = #{documenttime}, - documentid = #{documentid}, - documentname = #{documentname}, - reporttime = #{reporttime}, - samplegetname = #{samplegetname}, - samplegetid = #{samplegetid}, - state2 = #{state2}, - lsptestform = #{lsptestform}, - execsqn2 = #{execsqn2}, - diagnosisid = #{diagnosisid}, - patientid2 = #{patientid2}, - patientid3 = #{patientid3}, - patientinfo = #{patientinfo}, - autoconfirminfo = #{autoconfirminfo}, - barcodememo = #{barcodememo}, - tjflag = #{tjflag}, - menstrualcycle = #{menstrualcycle}, - translationinfo = #{translationinfo}, - mixcode = #{mixcode}, - passportno = #{passportno}, - patientnameen = #{patientnameen}, - - where testdate = #{testdate} - - - - delete from las_sap_samplereg where testdate = #{testdate} - - - - delete from las_sap_samplereg where testdate in - - #{testdate} - - - \ No newline at end of file