diff --git a/openhis-server-new/openhis-ybapp/pom.xml b/openhis-server-new/openhis-ybapp/pom.xml deleted file mode 100644 index 46203ce9..00000000 --- a/openhis-server-new/openhis-ybapp/pom.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - openhis-server - com.openhis - 0.0.1-SNAPSHOT - - 4.0.0 - - openhis-ybapp - - - 17 - 17 - - - - - - - - - - - - org.springframework.boot - spring-boot-starter - 2.5.15 - - - com.alibaba - fastjson - 2.0.43 - compile - - - org.apache.httpcomponents - httpclient - - - - com.openhis - openhis-common - 0.0.1-SNAPSHOT - - - - - com.yomahub - liteflow-spring-boot-starter - 2.12.4.1 - - - junit - junit - test - - - org.springframework.boot - spring-boot-configuration-processor - true - - - cn.hutool - hutool-all - 5.3.8 - - - org.bouncycastle - bcprov-jdk15on - 1.69 - - - com.alibaba - fastjson - 2.0.43 - - - commons-httpclient - commons-httpclient - 3.1 - - - org.apache.httpcomponents - httpclient - 4.5.5 - - - com.itextpdf - kernel - 7.1.2 - - - org.apache.httpcomponents - httpmime - 4.5 - - - - - com.itextpdf - itextpdf - 5.5.12 - - - com.itextpdf - itext-asian - 5.2.0 - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.15 - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - false - ${project.artifactId} - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 9 - 9 - - - - ${project.artifactId} - - - \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java deleted file mode 100644 index d1d20eab..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/OpenHisYbApplication.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.openhis; - -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.nio.charset.StandardCharsets; -import java.util.Base64; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.env.Environment; - -import com.alibaba.fastjson.JSON; -import com.openhis.pojo.ResultBody; -import com.openhis.utils.EasyGmUtils; - -/** - * 启动程序 - * - * @author system - */ -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.core", "com.openhis"}) -public class OpenHisYbApplication { - public static void main(String[] args) throws UnknownHostException { - // System.setProperty("spring.devtools.restart.enabled", "false"); - ConfigurableApplicationContext application = SpringApplication.run(OpenHisYbApplication.class, args); - Environment env = application.getEnvironment(); - String ip = InetAddress.getLocalHost().getHostAddress(); - String port = env.getProperty("server.port"); - String path = env.getProperty("server.servlet.context-path"); - System.out.println("医保启动"); - - String msg = "{\"cainfo\":\"nz6uO/SDPvEnusDW091FTX+aUO50CUE1c3zSm9BLXMWUvbfxfLvDClwa2LR2sPESmti47a+c7CVec3OaZhte0A==\",\"err_msg\":\"成功\",\"inf_refmsgid\":\"220000202506231058383283681313\",\"infcode\":\"0\",\"output\":\"wYVUH0j0Lo9hUdRpaTd/9fNss5V0kDK/qwpDGA9bWrgED86hlNPordYmAs+bre/01Ik/gO+mzsX1K4yjzaAz8ze6AwQocY9JFBIjP/JV31P2eoq0+w1ZjXnu2BekEvqD+yfpd0IB1ENBS5fxv+wZde1D3h4wk12tdMGC0AY65TREGJXcGigTot6c3L8ZJsyG1uZbDQVur4t9p1Mv/1EJaXy3VWhZjoSDR/y615yvHA2Dmvuca60XU4gXdMluHnqxvs8TC6b/fFZqEl66bkP0Ic98CTzVPMSSZu37FX+9jdvZ28Ecq0KnN0v+scyX1RYe1SDRyWWSO+J7coAdYYnLYEQS7jGPOmNVjVP68LKAEPvLTxWh/sfMTYvcEZ0e3pDYTVLb9rODmF693Khns9qKJ5mEDCdKUksSgY63jaxpC8LgIszJnp0A4198MeVNRbMe51IuXJaYvdA58UgVr6smU8VY7NfdDJ/uuGAOv+rtHgykyWYKYmV0SV94oMSomCqCzhMN3g3+mv6mA6hdFixpQAzJLWmkM5wq92fSIwYfpZEFz/wxz7LI18myTO0Mw1Kygo2DIbfbFRIElo29Un7MlTFFQZC45XcEj1oIIvnh53h9sxREpuziJjj4wubMbCj1PM+ZM07zcYef2ZNxq8VoduTP7I8HTrQ+jGls7TmZ4npKvOrPV+v6LTiSnvHbOXfK0O1heRetpUURrAbkC3xsllV1rYSa1rR8gKLI8pHBRwpKK0krxlcM4Nyq1veI1+TfBHwjcLNeh3EK51Tij8cGoMDsub6G06uNhYEoCjz++uXX1ikzWDaAe+z3bjsPzdBMR4HjTy06F4W8OjcsslUABM6WF+DPZrIH0EbXB8ZCn92RKeTLCEJ5Ybczq7u9F48sVto6NTk4z54yZ31aFgu7n4Q6AVa4LHVJElgKHt3lHq4feWhhVwTDMIgOVC/a8esAoJcXySMDeLv6aqgs5rcH0Lh4UC/OYVa3eG10QSvbbh8JIhgspApZLlYOQw7TytxSEdtjw5UZMcaY8XXhEEiRr3hUAtJjzz7++N+N6Qdv8hLbJXIYeqPRnYf/PkxZjxOoITp86SGIjsYXd4DFIOQWRlmRPyzlws6Pj8TKN5st2FAve7vk5UNP/lk4X6noc0IgEAYnOPkO1ntztGTCm3XsJCyAHDnjDjPk1gimJy79yq8FpXkRA8o8PQfE6B8I8aKhli5X1wU18r3X8zrq8f8+/z6UstXcdR2p7hyfm+cjLwukVn1/kwvMFxa/4K7BMBAIAcB4Md1TduGioGBRT2JRbF7dO5VUN0YYUk2h2XUW2C1j5DAwTQuZTK5b0r9bY70IDCOYmAq4xd3lJMUfB1qq4TQve1Mm0hn25bNE7gvS4NrZcE5WI/4y6LYDd4TET7Mu1Y/6Rx92gGNzO9eLJ+xEkmB4M6LpBbTeMUl8KIzD8QNldA0pfZ5AhAKuuKtbOgujzQM8h7owsFgfPofTWg+jmIbI3nVJCzpfTp7R9hp69svbkN3p691VGuhc7weMwGRvmVl8HMe2quRDGt0Vfg4Bnak3QWzIHtlsYSf6v63SRre33JXC9KlrR8qa/XekbEgMh2Zur2ppszhwVs5hce5UCWfJzEO8G9bMecvz/C+tizI=\",\"refmsg_time\":\"20250623105838020\",\"respond_time\":\"20250623105838288\",\"signtype\":\"SM2\"}"; - ResultBody response = JSON.parseObject(msg, ResultBody.class); - System.out.println(com.alibaba.fastjson2.JSON.toJSONString(response)); - byte[] bytes = "8E8DF30BD2420D81".getBytes(StandardCharsets.UTF_8); - System.out.println(bytes.length); - byte[] result = EasyGmUtils.sm4Decrypt("8E8DF30BD2420D81".getBytes(StandardCharsets.UTF_8), - Base64.getDecoder().decode(response.getOutput())); - response.setOutput(new String(result)); - - System.out.println(JSON.toJSONString(response)); - - System.out.println("\n----------------------------------------------------------\n\t" - + "Application OpenHis-YB is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path - + "/\n\t" + "External: \thttp://" + ip + ":" + port + path + "/\n" - + "----------------------------------------------------------"); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java deleted file mode 100644 index 505df87a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/ElepHandlerInt.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.openhis.annotation; - -import java.lang.annotation.*; - -import com.openhis.enums.ElepServiceAdrEnum; -import com.openhis.enums.ServiceAdrEnum; - -/** - * 接口处理器注解 - */ -@Documented -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface ElepHandlerInt { - - ElepServiceAdrEnum value(); - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java deleted file mode 100644 index 1c102b99..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/annotation/HandlerInt.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.openhis.annotation; - -import com.openhis.enums.ServiceAdrEnum; - -import java.lang.annotation.*; - -/** - * 接口处理器注解 - */ -@Documented -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface HandlerInt { - - ServiceAdrEnum value(); - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java deleted file mode 100644 index f0c5d1a2..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/ElepHandlerIntDispatcher.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.openhis.component; - -import com.openhis.context.ElepHandlerServiceContext; -import com.openhis.domain.BaseResponse; -import com.openhis.pojo.RequestData; -import com.openhis.service.IElepHandlerService; -import com.openhis.vo.BaseParam; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import com.openhis.context.HandlerServiceContext; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.HandlerService; - -/** - * handler分发 - */ -@Component -public class ElepHandlerIntDispatcher { - - /** 接口服务容器 */ - @Autowired - private ElepHandlerServiceContext elepHandlerServiceContext; - - /** - * dispatcher 处理器 - * @param intType - * @param requestData - * @return - */ - public BaseResponse dispatcher(String intType, RequestData requestData, BaseParam baseParam) { - // 根据接口类型获取对应服务 - IElepHandlerService elephandlerService = elepHandlerServiceContext.getElepHandlerService(intType); - // 调用对应服务接口 - return elephandlerService.elepHandle(requestData,baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java deleted file mode 100644 index 790956c8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/component/HandlerIntDispatcher.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.openhis.component; - -import com.openhis.vo.BaseParam; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import com.openhis.context.HandlerServiceContext; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.HandlerService; - -/** - * handler分发 - */ -@Component -public class HandlerIntDispatcher { - - /** 接口服务容器 */ - @Autowired - private HandlerServiceContext handlerServiceContext; - - /** - * dispatcher 处理器 - * @param intType - * @param inputData - * @return - */ - public ResultBody dispatcher(String intType, InputData inputData, BaseParam baseParam) { - // 根据接口类型获取对应服务 - HandlerService handlerService = handlerServiceContext.getHandlerService(intType); - // 调用对应服务接口 - return handlerService.handle(inputData,baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java deleted file mode 100644 index 0d3c9a01..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/HospitalInfoConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.PropertySource; -import org.springframework.stereotype.Component; - -/** - * TODO:医疗机构的配置参数 - * - * @author SunJQ - * @date 2025-03-15 - */ -@Data -@Component -@PropertySource(value="classpath:/config/hospital-config.properties",encoding="UTF-8",ignoreResourceNotFound=true) -@ConfigurationProperties(prefix = "pro") -public class HospitalInfoConfig { - /** 同步工作流引擎1同步0不同步 */ - private Integer activitiSync; - /**多租户id配置，编辑用户的时候设置*/ - private String relTenantIds; - /**医保类型，1-市医保，2-省医保，3-省市医保*/ - private String medicareType; - /** 定点医药机构编号 */ - private String fixmedinsCode; - /** 定点医药机构名称 */ - private String fixmedinsName; - /** 统筹区号 */ - private String admvs; - /** 行政区划 */ - private String district; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java deleted file mode 100644 index 0c70a18c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/InterfaceConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.openhis.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.PropertySource; -import org.springframework.stereotype.Component; - -import lombok.Data; - -/** - * 系统参数配置类 - */ -@Data -@Component -@PropertySource(value = "classpath:/config/sys-config.properties", encoding = "UTF-8", ignoreResourceNotFound = true) -@ConfigurationProperties(prefix = "prod") -// @ConfigurationProperties(prefix = "dev") -public class InterfaceConfig { - - /** 文件下载路径 */ - private String filePath; - - /** address */ - private String address; - - /** 缓存时间 */ - private int time; - - /** 是否加密 */ - private Boolean isEncrypt; - - /** 应用密钥 */ - private String cliPubKey; - - /** 秘钥 */ - private String cliPrvKey; - - /** appId */ - private String clientId; - - /** eleAddress */ - private String eleAddress; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java deleted file mode 100644 index 77fc1988..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/config/Tenant.java +++ /dev/null @@ -1,227 +0,0 @@ -package com.openhis.config; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.PropertySource; -import org.springframework.stereotype.Component; - -import java.io.Serializable; -import java.util.Date; - -/** - * 多租户信息表 - * @TableName sys_tenant - */ -//@TableName(value ="sys_tenant") -@Data -@Component -@PropertySource(value="classpath:/config/tenant-config.properties",encoding="UTF-8",ignoreResourceNotFound=true) -@ConfigurationProperties(prefix = "pr") -public class Tenant implements Serializable { - /** - * 租户编码 - */ - //@TableId - private String id; - - /** - * 租户名称 - */ - private String name; - - /** - * 开始时间 - */ - private Date beginDate; - - /** - * 结束时间 - */ - private Date endDate; - - /** - * 客戶端id - */ - private String clientId;//医保用 - - /** - * 客戶端安全码 - */ - private String clientSecret;//医保用 - - /** - * 医保服务平台账号 - */ - private String username;//医保用 - - /** - * 医保服务平台密码 - */ - private String password;//医保用 - - /** - * 终端授权类型 - */ - private String grantType;//医保用 - - /** - * 终端授权范围 - */ - private String scope;//医保用 - - /** - * 公钥 - */ - private String cliPubKey; - - /** - * 秘钥 - */ - private String cliPrvKey;//医保用 - - /** - * 服务端公钥 - */ - private String serverPubKey; - - /** - * 定点医药机构编号 - */ - private String fixmedinsCode;//医保用 - - /** - * 定点医药机构名称 - */ - private String fixmedinsName;//医保用 - - /** - * 统筹区号 - */ - private String admvs;//医保用 - - /** - * 状态 1正常 0冻结 - */ - private Integer status; - - /** - * 创建人 - */ - private String createBy; - - /** - * 创建日期 - */ - private Date createTime; - - /** - * 更新人 - */ - private String updateBy; - - /** - * 更新日期 - */ - private Date updateTime; - - // @TableField(exist = false) - private static final long serialVersionUID = 1L; - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - Tenant other = (Tenant) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) - && (this.getBeginDate() == null ? other.getBeginDate() == null : this.getBeginDate().equals(other.getBeginDate())) - && (this.getEndDate() == null ? other.getEndDate() == null : this.getEndDate().equals(other.getEndDate())) - && (this.getClientId() == null ? other.getClientId() == null : this.getClientId().equals(other.getClientId())) - && (this.getClientSecret() == null ? other.getClientSecret() == null : this.getClientSecret().equals(other.getClientSecret())) - && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername())) - && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword())) - && (this.getGrantType() == null ? other.getGrantType() == null : this.getGrantType().equals(other.getGrantType())) - && (this.getScope() == null ? other.getScope() == null : this.getScope().equals(other.getScope())) - && (this.getCliPubKey() == null ? other.getCliPubKey() == null : this.getCliPubKey().equals(other.getCliPubKey())) - && (this.getCliPrvKey() == null ? other.getCliPrvKey() == null : this.getCliPrvKey().equals(other.getCliPrvKey())) - && (this.getServerPubKey() == null ? other.getServerPubKey() == null : this.getServerPubKey().equals(other.getServerPubKey())) - && (this.getFixmedinsCode() == null ? other.getFixmedinsCode() == null : this.getFixmedinsCode().equals(other.getFixmedinsCode())) - && (this.getFixmedinsName() == null ? other.getFixmedinsName() == null : this.getFixmedinsName().equals(other.getFixmedinsName())) - && (this.getAdmvs() == null ? other.getAdmvs() == null : this.getAdmvs().equals(other.getAdmvs())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) - && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - result = prime * result + ((getBeginDate() == null) ? 0 : getBeginDate().hashCode()); - result = prime * result + ((getEndDate() == null) ? 0 : getEndDate().hashCode()); - result = prime * result + ((getClientId() == null) ? 0 : getClientId().hashCode()); - result = prime * result + ((getClientSecret() == null) ? 0 : getClientSecret().hashCode()); - result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode()); - result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode()); - result = prime * result + ((getGrantType() == null) ? 0 : getGrantType().hashCode()); - result = prime * result + ((getScope() == null) ? 0 : getScope().hashCode()); - result = prime * result + ((getCliPubKey() == null) ? 0 : getCliPubKey().hashCode()); - result = prime * result + ((getCliPrvKey() == null) ? 0 : getCliPrvKey().hashCode()); - result = prime * result + ((getServerPubKey() == null) ? 0 : getServerPubKey().hashCode()); - result = prime * result + ((getFixmedinsCode() == null) ? 0 : getFixmedinsCode().hashCode()); - result = prime * result + ((getFixmedinsName() == null) ? 0 : getFixmedinsName().hashCode()); - result = prime * result + ((getAdmvs() == null) ? 0 : getAdmvs().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", name=").append(name); - sb.append(", beginDate=").append(beginDate); - sb.append(", endDate=").append(endDate); - sb.append(", clientId=").append(clientId); - sb.append(", clientSecret=").append(clientSecret); - sb.append(", username=").append(username); - sb.append(", password=").append(password); - sb.append(", grantType=").append(grantType); - sb.append(", scope=").append(scope); - sb.append(", cliPubKey=").append(cliPubKey); - sb.append(", cliPrvKey=").append(cliPrvKey); - sb.append(", serverPubKey=").append(serverPubKey); - sb.append(", fixmedinsCode=").append(fixmedinsCode); - sb.append(", fixmedinsName=").append(fixmedinsName); - sb.append(", admvs=").append(admvs); - sb.append(", status=").append(status); - sb.append(", createBy=").append(createBy); - sb.append(", createTime=").append(createTime); - sb.append(", updateBy=").append(updateBy); - sb.append(", updateTime=").append(updateTime); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java deleted file mode 100644 index ff695c2c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/ClincStatusConst.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.openhis.constant; - -/** - * 门诊状态常量 - */ -public interface ClincStatusConst { - String STATUS_0 = "0"; - String STATUS_1 = "1"; - String STATUS_2 = "2"; - String CANCLE = "-1"; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java deleted file mode 100644 index 4c3c8c19..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/CommonConstant.java +++ /dev/null @@ -1,327 +0,0 @@ -package com.openhis.constant; - -public interface CommonConstant { - - /** - * 正常状态 - */ - public static final Integer STATUS_NORMAL = 0; - - /** - * 禁用状态 - */ - public static final Integer STATUS_DISABLE = -1; - - /** - * 删除标志 - */ - public static final Integer DEL_FLAG_1 = 1; - - /** - * 未删除 - */ - public static final Integer DEL_FLAG_0 = 0; - - /** - * 系统日志类型： 登录 - */ - public static final int LOG_TYPE_1 = 1; - - /** - * 系统日志类型： 操作 - */ - public static final int LOG_TYPE_2 = 2; - - /** - * 操作日志类型： 查询 - */ - public static final int OPERATE_TYPE_1 = 1; - - /** - * 操作日志类型： 添加 - */ - public static final int OPERATE_TYPE_2 = 2; - - /** - * 操作日志类型： 更新 - */ - public static final int OPERATE_TYPE_3 = 3; - - /** - * 操作日志类型： 删除 - */ - public static final int OPERATE_TYPE_4 = 4; - - /** - * 操作日志类型： 倒入 - */ - public static final int OPERATE_TYPE_5 = 5; - - /** - * 操作日志类型： 导出 - */ - public static final int OPERATE_TYPE_6 = 6; - - - /** {@code 500 Server Error} (HTTP/1.0 - RFC 1945) */ - public static final Integer SC_INTERNAL_SERVER_ERROR_500 = 500; - /** {@code 200 OK} (HTTP/1.0 - RFC 1945) */ - public static final Integer SC_OK_200 = 200; - - /**访问权限认证未通过 510*/ - public static final Integer SC_JEECG_NO_AUTHZ=510; - - /** 登录用户Shiro权限缓存KEY前缀 */ - public static String PREFIX_USER_SHIRO_CACHE = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:"; - /** 登录用户Token令牌缓存KEY前缀 */ - public static final String PREFIX_USER_TOKEN = "prefix_user_token_"; - /** Token缓存时间：3600秒即一小时 */ - public static final int TOKEN_EXPIRE_TIME = 3600; - - - /** - * 0：一级菜单 - */ - public static final Integer MENU_TYPE_0 = 0; - /** - * 1：子菜单 - */ - public static final Integer MENU_TYPE_1 = 1; - /** - * 2：按钮权限 - */ - public static final Integer MENU_TYPE_2 = 2; - - /**通告对象类型（USER:指定用户，ALL:全体用户）*/ - public static final String MSG_TYPE_UESR = "USER"; - public static final String MSG_TYPE_ALL = "ALL"; - - /**发布状态（0未发布，1已发布，2已撤销）*/ - public static final String NO_SEND = "0"; - public static final String HAS_SEND = "1"; - public static final String HAS_CANCLE = "2"; - - /**阅读状态（0未读，1已读）*/ - public static final String HAS_READ_FLAG = "1"; - public static final String NO_READ_FLAG = "0"; - - /**优先级（L低，M中，H高）*/ - public static final String PRIORITY_L = "L"; - public static final String PRIORITY_M = "M"; - public static final String PRIORITY_H = "H"; - - /** - * 短信模板方式 0 .登录模板、1.注册模板、2.忘记密码模板 - */ - public static final String SMS_TPL_TYPE_0 = "0"; - public static final String SMS_TPL_TYPE_1 = "1"; - public static final String SMS_TPL_TYPE_2 = "2"; - - /** - * 状态(0无效1有效) - */ - public static final String STATUS_0 = "0"; - public static final String STATUS_1 = "1"; - - /** - * 同步工作流引擎1同步0不同步 - */ - public static final Integer ACT_SYNC_1 = 1; - public static final Integer ACT_SYNC_0 = 0; - - /** - * 消息类型1:通知公告2:系统消息 - */ - public static final String MSG_CATEGORY_1 = "1"; - public static final String MSG_CATEGORY_2 = "2"; - - /** - * 是否配置菜单的数据权限 1是0否 - */ - public static final Integer RULE_FLAG_0 = 0; - public static final Integer RULE_FLAG_1 = 1; - - /** - * 是否用户已被冻结 1正常(解冻) 2冻结 - */ - public static final Integer USER_UNFREEZE = 1; - public static final Integer USER_FREEZE = 2; - - /**字典翻译文本后缀*/ - public static final String DICT_TEXT_SUFFIX = "_dictText"; - - /** - * 表单设计器主表类型 - */ - public static final Integer DESIGN_FORM_TYPE_MAIN = 1; - - /** - * 表单设计器子表表类型 - */ - public static final Integer DESIGN_FORM_TYPE_SUB = 2; - - /** - * 表单设计器URL授权通过 - */ - public static final Integer DESIGN_FORM_URL_STATUS_PASSED = 1; - - /** - * 表单设计器URL授权未通过 - */ - public static final Integer DESIGN_FORM_URL_STATUS_NOT_PASSED = 2; - - /** - * 表单设计器新增 Flag - */ - public static final String DESIGN_FORM_URL_TYPE_ADD = "add"; - /** - * 表单设计器修改 Flag - */ - public static final String DESIGN_FORM_URL_TYPE_EDIT = "edit"; - /** - * 表单设计器详情 Flag - */ - public static final String DESIGN_FORM_URL_TYPE_DETAIL = "detail"; - /** - * 表单设计器复用数据 Flag - */ - public static final String DESIGN_FORM_URL_TYPE_REUSE = "reuse"; - /** - * 表单设计器编辑 Flag （已弃用） - */ - public static final String DESIGN_FORM_URL_TYPE_VIEW = "view"; - - /** - * online参数值设置（是：Y, 否：N） - */ - public static final String ONLINE_PARAM_VAL_IS_TURE = "Y"; - public static final String ONLINE_PARAM_VAL_IS_FALSE = "N"; - - /** - * 文件上传类型（本地：local，Minio：minio，阿里云：alioss） - */ - public static final String UPLOAD_TYPE_LOCAL = "local"; - public static final String UPLOAD_TYPE_MINIO = "minio"; - public static final String UPLOAD_TYPE_OSS = "alioss"; - - /** - * 文档上传自定义桶名称 - */ - public static final String UPLOAD_CUSTOM_BUCKET = "eoafile"; - /** - * 文档上传自定义路径 - */ - public static final String UPLOAD_CUSTOM_PATH = "eoafile"; - /** - * 文件外链接有效天数 - */ - public static final Integer UPLOAD_EFFECTIVE_DAYS = 1; - - /** - * 员工身份 （1:普通员工 2:上级） - */ - public static final Integer USER_IDENTITY_1 = 1; - public static final Integer USER_IDENTITY_2 = 2; - - /** sys_user 表 username 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username"; - /** sys_user 表 work_no 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no"; - /** sys_user 表 phone 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_SYS_USER_PHONE = "uniq_sys_user_phone"; - /** sys_user 表 email 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_SYS_USER_EMAIL = "uniq_sys_user_email"; - /** sys_quartz_job 表 job_class_name 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_JOB_CLASS_NAME = "uniq_job_class_name"; - /** sys_position 表 code 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_CODE = "uniq_code"; - /** sys_role 表 code 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_SYS_ROLE_CODE = "uniq_sys_role_role_code"; - /** sys_depart 表 code 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_DEPART_ORG_CODE = "uniq_depart_org_code"; - /** - * 在线聊天 是否为默认分组 - */ - public static final String IM_DEFAULT_GROUP = "1"; - /** - * 在线聊天 图片文件保存路径 - */ - public static final String IM_UPLOAD_CUSTOM_PATH = "imfile"; - /** - * 在线聊天 用户状态 - */ - public static final String IM_STATUS_ONLINE = "online"; - - /** - * 在线聊天 SOCKET消息类型 - */ - public static final String IM_SOCKET_TYPE = "chatMessage"; - - /** - * 在线聊天 是否开启默认添加好友 1是 0否 - */ - public static final String IM_DEFAULT_ADD_FRIEND = "1"; - - /** - * 在线聊天 用户好友缓存前缀 - */ - public static final String IM_PREFIX_USER_FRIEND_CACHE = "sys:cache:im:im_prefix_user_friend_"; - - /** - * 考勤补卡业务状态 （1：同意 2：不同意） - */ - public static final String SIGN_PATCH_BIZ_STATUS_1 = "1"; - public static final String SIGN_PATCH_BIZ_STATUS_2 = "2"; - - /** - * 公文文档上传自定义路径 - */ - public static final String UPLOAD_CUSTOM_PATH_OFFICIAL = "officialdoc"; - /** - * 公文文档下载自定义路径 - */ - public static final String DOWNLOAD_CUSTOM_PATH_OFFICIAL = "officaldown"; - - /** - * WPS存储值类别(1 code文号 2 text（WPS模板还是公文发文模板）) - */ - public static final String WPS_TYPE_1="1"; - public static final String WPS_TYPE_2="2"; - - - public final static String X_ACCESS_TOKEN = "X-Access-Token"; - public final static String X_SIGN = "X-Sign"; - public final static String X_TIMESTAMP = "X-TIMESTAMP"; - - /** - * 多租户 请求头 - */ - public final static String TENANT_ID = "tenant-id"; - - /** - * 微服务读取配置文件属性 服务地址 - */ - public final static String CLOUD_SERVER_KEY = "spring.cloud.nacos.discovery.server-addr"; - - /** - * 第三方登录 验证密码/创建用户 都需要设置一个操作码 防止被恶意调用 - */ - public final static String THIRD_LOGIN_CODE = "third_login_code"; - - /** - * 第三方APP同步方向：本地 --> 第三方APP - */ - String THIRD_SYNC_TO_APP = "SYNC_TO_APP"; - /** - * 第三方APP同步方向：第三方APP --> 本地 - */ - String THIRD_SYNC_TO_LOCAL = "SYNC_TO_LOCAL"; - - /** 系统通告消息状态：0=未发布 */ - String ANNOUNCEMENT_SEND_STATUS_0 = "0"; - /** 系统通告消息状态：1=已发布 */ - String ANNOUNCEMENT_SEND_STATUS_1 = "1"; - /** 系统通告消息状态：2=已撤销 */ - String ANNOUNCEMENT_SEND_STATUS_2 = "2"; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java deleted file mode 100644 index a71d6a4f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InputDataTypeConst.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.openhis.constant; - -/** - * 入参类型常量 - */ -public interface InputDataTypeConst { - - String DATA = "data"; - String FEE_DETAIL = "feedetail"; - String SIGN_IN = "signIn"; - String SIGN_OUT = "signOut"; - String MD_TRT_INFO = "mdtrtinfo"; - String DI_SE_INFO = "diseinfo"; - String DRUG_INFO = "druginfo"; - String DRUG_DETAIL = "drugdetail"; - String DSCG_INFO = "dscginfo"; - String PURC_INFO = "purcinfo"; - String INV_INFO = "invinfo"; - String SEL_INFO = "selinfo"; - String DRUG_TRAC_INFO = "drugtracinfo"; - String ADM_INFO = "adminfo"; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java deleted file mode 100644 index 6d995f1c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/constant/InterFaceResultConst.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.openhis.constant; - -/** - * 医保接口标识常量 - */ -public interface InterFaceResultConst { - - /** 标识字段 */ - String INFCODE = "infcode"; - /** 成功 */ - String SUCCESS = "0"; - /** 失败 */ - String FAILED = "-1"; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java deleted file mode 100644 index 34779bad..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/ElepHandlerServiceContext.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.openhis.context; - -import java.util.HashMap; -import java.util.Map; - -import com.openhis.service.IElepHandlerService; -import org.springframework.stereotype.Component; - -import com.openhis.service.HandlerService; - -/** - * 工厂模式 - */ -@Component -public class ElepHandlerServiceContext { - - /** 接口处理器容器 */ - private final Map elepHandlerMap = new HashMap<>(); - - /** - * 根据类型从容器中获取处理器 - * @param type - * @return - */ - public IElepHandlerService getElepHandlerService(String type) { - return elepHandlerMap.get(type); - } - - /** - * 装载处理器 - * @param type - * @param service - */ - public void putElepHandlerService(String type, IElepHandlerService service) { - elepHandlerMap.put(type, service); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java deleted file mode 100644 index bf924752..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/context/HandlerServiceContext.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.openhis.context; - -import com.openhis.service.HandlerService; -import org.springframework.stereotype.Component; - -import java.util.HashMap; -import java.util.Map; - -/** - * 工厂模式 - */ -@Component -public class HandlerServiceContext { - - /** 接口处理器容器 */ - private final Map handlerMap = new HashMap<>(); - - /** - * 根据类型从容器中获取处理器 - * @param type - * @return - */ - public HandlerService getHandlerService(String type) { - return handlerMap.get(type); - } - - /** - * 装载处理器 - * @param type - * @param service - */ - public void putHandlerService(String type, HandlerService service) { - handlerMap.put(type, service); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java deleted file mode 100644 index bb79d803..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbController.java +++ /dev/null @@ -1,371 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.controller; - -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import com.alibaba.fastjson2.JSON; -import com.core.common.annotation.Anonymous; -import com.openhis.config.InterfaceConfig; -import com.openhis.service.FileService; -import com.openhis.service.YbService; -import com.openhis.vo.*; - -import cn.hutool.crypto.asymmetric.Sign; - -/** - * TODO:医保控制层 - * - * @author SunJQ - * @date 2025-03-18 - */ -@RestController -@RequestMapping("/yb") -public class YbController { - - /** 中心接口配置 */ - @Autowired - protected InterfaceConfig interfaceConfig; - // logger.debug("这是专用日志测试"); - Logger logger = LoggerFactory.getLogger(YbController.class); - /** 医保服务 */ - @Autowired - private YbService ybService; - /** 文件服务 */ - @Autowired - private FileService fileService; - - @PostMapping(value = "/signIn") - @Anonymous - public Result signIn(@RequestBody BaseParam sign, HttpServletRequest request) { - return ybService.signIn(sign, request); - } - - @PostMapping(value = "/signOut") - @Anonymous - public Result signOut(BaseParam baseParam, Sign sign) { - return ybService.signOut(baseParam); - } - - @PostMapping(value = "/getPatinfo") - @Anonymous - public Result getPerInfo(@RequestBody BaseParam baseParam) { - return ybService.getPerInfo(baseParam); - } - - @PostMapping(value = "/reg") - @Anonymous - public Result reg(@RequestBody BaseParam baseParam) { - logger.info(JSON.toJSONString(baseParam)); - return ybService.reg(baseParam); - } - - @PostMapping(value = "/cancelReg") - @Anonymous - public Result cancelReg(@RequestBody BaseParam baseParam) { - return ybService.cancelReg(baseParam); - } - - @PostMapping(value = "/preSetl") - @Anonymous - public Result preSetl(@RequestBody BaseParam baseParam) { - return ybService.preSetl(baseParam); - } - - @PostMapping(value = "/unPreSettle") - @Anonymous - public Result unPreSettle(@RequestBody BaseParam baseParam) { - return ybService.cancelFeeDetail(baseParam); - } - - @PostMapping(value = "/upload2203-record") - @Anonymous - public Result upload2203Record(@RequestBody BaseParam baseParam) { - return ybService.saveMedical(baseParam); - } - - @PostMapping(value = "/upload2204-record") - @Anonymous - public Result preSettle(@RequestBody BaseParam baseParam) { - return ybService.upFeeDetail(baseParam); - } - - @PostMapping(value = "/cancel2205") - @Anonymous - public Result cancelFeeDetail(@RequestBody BaseParam baseParam) { - return ybService.cancelFeeDetail(baseParam); - } - - @PostMapping(value = "/setl") - @Anonymous - public Result setl(@RequestBody BaseParam baseParam) { - return ybService.setl(baseParam); - } - - @PostMapping(value = "/cancelSetl") - @Anonymous - public Result cancelSetl(@RequestBody BaseParam baseParam) { - return ybService.cancelSetl(baseParam); - } - - @PostMapping(value = "/download") - @Anonymous - public Result download(BaseParam baseParam, FileDownload fileDownload) { - return ybService.download(baseParam, fileDownload); - } - - @PostMapping(value = "/directoryCheck") - @Anonymous - public Result directoryCheck(@RequestBody BaseParam baseParam) { - return ybService.directoryCheck(baseParam); - } - - @PostMapping(value = "/directoryUnCheck") - @Anonymous - public Result directoryUnCheck(@RequestBody BaseParam baseParam) { - return ybService.directoryUnCheck(baseParam); - } - - @PostMapping(value = "/reconcile") - @Anonymous - public Result reconcileGeneralLedger(@RequestBody BaseParam baseParam) { - return ybService.reconcileGeneralLedger(baseParam); - } - - @PostMapping(value = "/reconcile-detail") - @Anonymous - public Result reconcileGeneralLedgerDetail(BaseParam baseParam, - FinancialSettlement3202Param financial3202Param) { - return ybService.reconcileGeneralLedgerDetail(baseParam, financial3202Param); - } - - @PostMapping(value = "/three-part-search-err") - @Anonymous - public Result threePartSearch(BaseParam baseParam, FinancialSettlement3209AParam financialSettlement3209AParam) { - return ybService.threePartSearch(baseParam, financialSettlement3209AParam); - } - - @PostMapping(value = "/apply-clearing") - @Anonymous - public Result applyFinancialClearing(@RequestBody BaseParam baseParam, Financial3203AParam financial3203AParam) { - return ybService.applyFinancialClearing(baseParam); - } - - @PostMapping(value = "/cancel-clearing") - @Anonymous - public Result cancelFinancialClearing(@RequestBody BaseParam baseParam, Financial3204Param financial3204Param) { - return ybService.cancelFinancialClearing(baseParam, financial3204Param); - } - - @PostMapping(value = "/get-clearing-status") - @Anonymous - public Result getFinancialClearingStatus(@RequestBody BaseParam baseParam, - Clearing3205AParma clearing3205AParma) { - return ybService.getFinancialClearingStatus(baseParam, clearing3205AParma); - } - - @PostMapping(value = "/upload-inventory-count") - @Anonymous - public Result uploadInventoryCount(@RequestBody BaseParam baseParam) { - return ybService.uploadInventoryCount(baseParam); - } - - @PostMapping(value = "/update-inventory") - @Anonymous - public Result updateInventoryCount(@RequestBody BaseParam baseParam) { - return ybService.updateInventoryCount(baseParam); - } - - @PostMapping(value = "/procurement") - @Anonymous - public Result procurement(@RequestBody BaseParam baseParam) { - return ybService.procurement(baseParam); - } - - @PostMapping(value = "/procurement-cancel") - @Anonymous - public Result cancelProcurement(@RequestBody BaseParam baseParam) { - return ybService.cancelProcurement(baseParam); - } - - @PostMapping(value = "/merchandise") - @Anonymous - public Result merchandise(@RequestBody BaseParam baseParam) { - return ybService.merchandise(baseParam); - } - - @PostMapping(value = "/cancel-merchandise") - @Anonymous - public Result cancelMerchandise(@RequestBody BaseParam baseParam) { - return ybService.cancelMerchandise(baseParam); - } - - @PostMapping(value = "/del-goods") - @Anonymous - public Result deleteGoodsInfo(BaseParam baseParam, Medical3507Param medical3507Param) { - return ybService.deleteGoodsInfo(baseParam, medical3507Param); - } - - @PostMapping(value = "/getclroptins") - @Anonymous - public Result getClrOptins(@RequestBody BaseParam baseParam) { - return ybService.getClrOptins(baseParam); - } - - @PostMapping(value = "/file-up1") - @Anonymous - public Result uploadFile(@RequestParam("in") MultipartFile file, // 对应接口参数名"in" - @RequestParam("filename") String filename, @RequestParam("fixmedins_code") String fixmedinsCode) { - - // 1. 基础校验 - if (file.isEmpty()) { - return Result.error("文件不能为空"); - } - if (!file.getOriginalFilename().endsWith(".zip")) { - return Result.error("仅支持ZIP格式文件"); - } - - // 2. 调用Service处理业务逻辑 - try { - // FileResult fileResult = - fileService.uploadFile(file.getInputStream(), filename, fixmedinsCode); - return Result.ok(""); - } catch (Exception e) { - return Result.error("处理失败: " + e.getMessage()); - } - } - - @PostMapping(value = "/file-up2") - @Anonymous - public Result upload3202File(@RequestPart("file") MultipartFile file, - @RequestParam("fixmedinsCode") String fixmedinsCode, @RequestParam("userId") String userId, - @RequestParam("admvs") String admvs) { - - // File9101Param file9101Param = JSON.parseObject(JSON.toJSONString(baseParam.getData()), File9101Param.class); - - // MultipartFile file = file9101Param.getFile(); - String filename = file.getOriginalFilename(); - // String fixmedinsCode = file9101Param.getFixmedinsCode(); - - // 1. 基础校验 - if (file.isEmpty()) { - return Result.error("文件不能为空"); - } - // if (!file.getOriginalFilename().endsWith(".zip")) { - // return Result.error("仅支持ZIP格式文件"); - // } - - // 2. 调用Service处理业务逻辑 - try { - // FileResult fileResult = - // fileService.uploadFile(file,filename, fixmedinsCode); - return fileService.uploadFile(file, filename, fixmedinsCode, admvs, userId); - } catch (Exception e) { - return Result.error("处理失败: " + e.getMessage()); - } - } - - @PostMapping(value = "/file-down") - @Anonymous - public Result downloadFile(FileResult fileResult) { - return fileService.downloadFile(fileResult); - } - - @PostMapping(value = "/queryYbCatalogue") - @Anonymous - public Result queryYbCatalogue(@RequestBody BaseParam baseParam) { - return ybService.queryYbCatalogue(baseParam); - } - - @PostMapping(value = "/upload-2301-fee-detail") - @Anonymous - public Result uploadInpatientFeeDetail(@RequestBody BaseParam baseParam) { - return ybService.uploadInpatientFeeDetail(baseParam); - } - - @PostMapping(value = "/cancel-2302-fee-detail") - @Anonymous - public Result cancelInpatientFeeDetail(@RequestBody BaseParam baseParam) { - return ybService.cancelInpatientFeeDetail(baseParam); - } - - @PostMapping(value = "/inpa-pre-setl") - @Anonymous - public Result prePayInpatient(@RequestBody BaseParam baseParam) { - return ybService.prePayInpatient(baseParam); - } - - @PostMapping(value = "/inpa-setl") - @Anonymous - public Result payInpatient(@RequestBody BaseParam baseParam) { - return ybService.payInpatient(baseParam); - } - - @PostMapping(value = "/inpa-un-setl") - @Anonymous - public Result cancelInpatientPay(@RequestBody BaseParam baseParam) { - return ybService.cancelInpatientPay(baseParam); - } - - @PostMapping(value = "/inpatient-reg") - @Anonymous - public Result inpatientReg(@RequestBody BaseParam baseParam) { - return ybService.inpatientReg(baseParam); - } - - @PostMapping(value = "/discharge-patient") - @Anonymous - public Result dischargePatient(@RequestBody BaseParam baseParam) { - return ybService.dischargePatient(baseParam); - } - - @PostMapping(value = "/change-inpatient-info") - @Anonymous - public Result changeInpatientInfo(@RequestBody BaseParam baseParam) { - return ybService.changeInpatientInfo(baseParam); - } - - @PostMapping(value = "/cancel-inpatient-reg") - @Anonymous - public Result cancelInpatientReg(@RequestBody BaseParam baseParam) { - return ybService.cancelInpatientReg(baseParam); - } - - @PostMapping(value = "/cancel-discharge-patient") - @Anonymous - public Result cancelDischargePatient(@RequestBody BaseParam baseParam) { - return ybService.cancelDischargePatient(baseParam); - } - - /** - * 【3101】明细审核事前事中分析服务 - * - * @param baseParam 基础参数 - * @return 结果 - */ - @PostMapping(value = "/pre-mid-analysis") - @Anonymous - public Result yb3101PreMidAnalysis(@RequestBody BaseParam baseParam) { - return ybService.yb3101PreMidAnalysis(baseParam); - } - - /** - * 【3103】事前事中服务反馈服务 - * - * @param baseParam 基础参数 - * @return 结果 - */ - @PostMapping(value = "/pre-mid-feedback") - @Anonymous - public Result yb3103PreMidFeedback(@RequestBody BaseParam baseParam) { - return ybService.yb3103PreMidFeedback(baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java deleted file mode 100644 index e01b2a1e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/controller/YbElepController.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.controller; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.core.common.annotation.Anonymous; -import com.openhis.service.IYbElepService; -import com.openhis.vo.BaseParam; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.openhis.config.InterfaceConfig; -import com.openhis.domain.*; -import com.openhis.vo.Result; - -/** - * - * @author yuxj - * @date 2025-04-17 - */ -@RestController -@RequestMapping("/ybElep") -public class YbElepController { - - /** 医保服务 */ - @Autowired - private IYbElepService ybElepService; - - /** - * 电子处方上传预核验 - * - * @param baseParam 处方信息 - * @return - */ - @PostMapping(value = "/preCheckPrescription") - @Anonymous - public Result preCheckPrescription(@RequestBody BaseParam baseParam) { - return ybElepService.preCheckPrescription(baseParam); - } - - - /** - * 电子处方医保电子签名 - * - * @param baseParam 电子签名信息 - * @return - */ - @PostMapping(value = "/signature") - @Anonymous - public Result signature(@RequestBody BaseParam baseParam) { - return ybElepService.signature(baseParam); - } - - - /** - * 电子处方上传 - * - * @param baseParam 上传信息 - * @return - */ - @PostMapping(value = "/upload") - @Anonymous - public Result upload(@RequestBody BaseParam baseParam) { - return ybElepService.upload(baseParam); - } - - /** - * 电子处方撤销 - * - * @param baseParam 撤销信息 - * @return - */ - @PostMapping(value = "/revoke") - @Anonymous - public Result revoke(@RequestBody BaseParam baseParam) { - return ybElepService.revoke(baseParam); - } - - /** - * 电子处方信息查询 - * - * @param baseParam 查询信息 - * @return - */ - @PostMapping(value = "/querPrescription") - @Anonymous - public Result querPrescription(@RequestBody BaseParam baseParam) { - return ybElepService.querPrescription(baseParam); - } - - /** - * 电子处方取药结果查询 - * - * @param baseParam 撤销信息 - * @return - */ - @PostMapping(value = "/medresult") - @Anonymous - public Result medresult(@RequestBody BaseParam baseParam) { - return ybElepService.medresult(baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java deleted file mode 100644 index 130cc2b9..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.openhis.domain; - -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * 基础请求模型 - * 包含所有接口共有的请求参数 - */ -@Data -public class BaseRequest { - private String appId; // 应用id - private String version; // 版本号 1.0.0 - private String timestamp; // 当前时间 - private String encType; // 加密方式 SM4 - private String encData; // 加密数据 - private String signType; // 签名方式 SM2 - private String signData; // 签名串 - private String data; // 未签名数据 - public Map toMap() { - Map map = new HashMap<>(); - map.put("appId", this.appId); - map.put("version", this.version); - map.put("timestamp", this.timestamp); - map.put("encType", this.encType); - map.put("encData", this.encData); - map.put("signType", this.signType); - map.put("signData", this.signData); - return map; - } -} - diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java deleted file mode 100644 index a89d7a79..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/BaseResponse.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.openhis.domain; - -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * 基础响应模型 包含所有接口共有的响应参数 - */ -@Data -public class BaseResponse { - private int code; // 响应状态码 - private String message; // 响应异常信息 - private Boolean success; // 响应标识 - private String type; // 类型 - private String appId; // 应用id - private String timestamp; // 当前时间 - private String encType; // 加密方式 SM4 - private String signType; // 签名方式 SM2 - private String signData; // 签名串 - private String encData; // 加密数据 - - public Map toMap() { - Map map = new HashMap<>(); - map.put("code", this.code); - map.put("message", this.message); - map.put("success", this.success); - map.put("type", this.type); - map.put("appId", this.appId); - map.put("timestamp", this.timestamp); - map.put("encType", this.encType); - map.put("signType", this.signType); - map.put("signData", this.signData); - map.put("encData", this.encData); - return map; - } -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java deleted file mode 100644 index b5ddce39..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicPreSettle.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 【2206】医保预结算实体 - * - * @author SunJQ - * @date 2025-04-19 - */ -@Data -@TableName("yb_clinc_pre_settle") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ClinicPreSettle extends HisBaseEntity implements Serializable { - - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private Long id; - - //就诊ID - @JSONField(name="mdtrt_id") - private String mdtrtId; - - //内部就诊ID - @JSONField(serialize=false) - private String regId; - - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - - //结算批次号 - @JSONField(name="chrg_bchno") - private String chrgBchno;//对应payment的显示用流水 - - private String param2203; - - private String result2203; - - private String param2204; - - private String result2204; - - private String param2206; - - private String result2206; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java deleted file mode 100644 index a0474e84..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicReg.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - *【2201】【2202】挂号 退号 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@TableName("yb_clinc_reg") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ClinicReg extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private Long id; - //就诊ID - @JSONField(name="mdtrt_id") - private String mdtrtId; - //参保地医保区划 - @JSONField(name="insuplc_admdvs") - private String insuplcAdmdvs; - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - //险种类型 - @Dict(dictCode = "insutype") - @JSONField(name="insutype") - private String insutype; - //医疗类别 - @Dict(dictCode = "med_type") - @JSONField(serialize=false) - private String medType; - //挂号时间 - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(name="begntime") - private Date begntime; - //就诊凭证类型 - @JSONField(name="mdtrt_cert_type") - private String mdtrtCertType; - //就诊凭证编号 - @JSONField(name="mdtrt_cert_no") - private String mdtrtCertNo; - //证件加密串 - @JSONField(serialize=false) - @TableField(exist = false) - private String busiCardInfo; - //住院/门诊号 - @JSONField(name="ipt_otp_no") - private String iptOtpNo; - //医师编码 - @JSONField(name="atddr_no") - private String atddrNo; - //医师姓名 - @JSONField(name="dr_name") - private String drName; - //科室编码 - @JSONField(name="dept_code") - private String deptCode; - //科室名称 - @JSONField(name="dept_name") - private String deptName; - //科别 - @JSONField(name="caty") - private String caty; - //挂号费 - @JSONField(serialize=false) - private Double regFee; - //检查费 - @JSONField(serialize=false) - private Double checkFee; - //应收金额 - @JSONField(serialize=false) - private Double totalFee; - //状态,0-挂号,1-看诊，2-费用明细，3-预结算，4-结算 - @JSONField(serialize=false) - private String status; - @JSONField(name="psn_cert_type") - @TableField(exist = false) - private String psnCertType; - @JSONField(name="certno") - @TableField(exist = false) - private String certno; - @JSONField(name="psn_type") - @TableField(exist = false) - private String psnType; - @JSONField(name="psn_name") - @TableField(exist = false) - private String psnName; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java deleted file mode 100644 index 1ddb8845..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicSettle.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【2207结算记录】 - * - * @author SunJQ - * @date 2025-04-19 - */ -@Data -@TableName("yb_clinc_settle") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ClinicSettle { - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private Long id; - - private String setlId;//结算id - - private String mdtrtId; // 就诊ID - - private String psnName; // 人员姓名 - - private String psnCertType; // 人员证件类型 - - private String certno; // 证件号码 - - private String insutype; // 险种类型 - - private String psnType; // 人员类别 - - private String cvlservFlag; // 公务员标志 - - private Date setlTime; // 结算时间 - - private String mdtrtCertType; // 就诊凭证类型 - - private String medType; // 医疗类别 - - private BigDecimal medfeeSumamt; // 医疗费总额 - - private BigDecimal fulamtOwnpayAmt; // 全自费金额 - - private BigDecimal overlmtSelfpay; // 超限价自费费用 - - private BigDecimal preselfpayAmt; // 先行自付金额 - - private BigDecimal inscpScpAmt; // 符合政策范围金额 - - private BigDecimal actPayDedc; // 实际支付起付线 - - private BigDecimal hifpPay; // 基本医疗保险统筹基金支出 - - private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例 - - private BigDecimal cvlservPay; // 公务员医疗补助资金支出 - - private BigDecimal hifesPay; // 企业补充医疗保险基金支出 - - private BigDecimal hifmiPay; // 居民大病保险资金支出 - - private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出 - - private BigDecimal mafPay; // 医疗救助基金支出 - - private BigDecimal othPay; // 其他支出 - - private BigDecimal fundPaySumamt; // 基金支付总额 - - private BigDecimal psnPartAmt; // 个人负担总金额 - - private BigDecimal acctPay; // 个人账户支出 - - private BigDecimal psnCashPay; // 个人现金支出 - - private BigDecimal hospPartAmt; // 医院负担金额 - - private BigDecimal balc; // 余额 - - private BigDecimal acctMulaidPay; // 个人账户共济支付金额 - - private String medinsSetlId; // 医药机构结算ID - - private String clrOptins; // 清算经办机构 - - private String clrWay; // 清算方式 - - private String clrType; // 清算类别 - - private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出 - - private String paymentNo;//结算业务流水号 Payment与ClinicSettle是1：N - - private String param2207; - - private String result2207; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java deleted file mode 100644 index 54c5ce79..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnReg.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * 【2202】挂号撤销 - * - * @author SunJQ - * @date 2025-04-21 - */ -@Data -@TableName("yb_clinc_un_reg") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ClinicUnReg { - - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private Long id; - - //就诊ID - @JSONField(name="mdtrt_id") - private String mdtrtId; - - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - - //住院/门诊号 - @JSONField(name="ipt_otp_no") - private String iptOtpNo; - - //取消挂号时间 - private Date unRegTime; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java deleted file mode 100644 index c5d5981e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ClinicUnSettle.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【2208结算撤销】 - * - * @author SunJQ - * @date 2025-04-19 - */ -@Data -@TableName("yb_clinc_un_settle") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ClinicUnSettle extends HisBaseEntity { - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private Long id; - - private String mdtrtId; // 就诊ID - - private String psnName; // 人员姓名 - - private String psnCertType; // 人员证件类型 - - private String certno; // 证件号码 - - private String insutype; // 险种类型 - - private String psnType; // 人员类别 - - private String cvlservFlag; // 公务员标志 - - private Date setlTime; // 结算时间 - - private String mdtrtCertType; // 就诊凭证类型 - - private String medType; // 医疗类别 - - private BigDecimal medfeeSumamt; // 医疗费总额 - - private BigDecimal fulamtOwnpayAmt; // 全自费金额 - - private BigDecimal overlmtSelfpay; // 超限价自费费用 - - private BigDecimal preselfpayAmt; // 先行自付金额 - - private BigDecimal inscpScpAmt; // 符合政策范围金额 - - private BigDecimal actPayDedc; // 实际支付起付线 - - private BigDecimal hifpPay; // 基本医疗保险统筹基金支出 - - private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例 - - private BigDecimal cvlservPay; // 公务员医疗补助资金支出 - - private BigDecimal hifesPay; // 企业补充医疗保险基金支出 - - private BigDecimal hifmiPay; // 居民大病保险资金支出 - - private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出 - - private BigDecimal mafPay; // 医疗救助基金支出 - - private BigDecimal othPay; // 其他支出 - - private BigDecimal fundPaySumamt; // 基金支付总额 - - private BigDecimal psnPartAmt; // 个人负担总金额 - - private BigDecimal acctPay; // 个人账户支出 - - private BigDecimal psnCashPay; // 个人现金支出 - - private BigDecimal hospPartAmt; // 医院负担金额 - - private BigDecimal balc; // 余额 - - private BigDecimal acctMulaidPay; // 个人账户共济支付金额 - - private String medinsSetlId; // 医药机构结算ID - - private String clrOptins; // 清算经办机构 - - private String clrWay; // 清算方式 - - private String clrType; // 清算类别 - - private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出 - - private String param2208; - - private String result2208; - - private String settleId; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java deleted file mode 100644 index d4bc630e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/DirectoryCheckRecord.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【3301、3302】医保目录对照历史表 - * - * @author SunJQ - * @date 2025-04-27 - */ -@Data -@TableName("yb_directory_check_record") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class DirectoryCheckRecord extends HisBaseEntity { - - /** 主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 3301/3302 */ - private Integer type; - - /** 表名 */ - private String tableName; - - /** 业务表主键 */ - private Long tableId; - - /** 组织机构id */ - private Long orgId; - - /** 参数 */ - private String param; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java deleted file mode 100644 index 8b3f1c10..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultDetail.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 【电子处方取药结果查询-输出（节点标识：seltdelts）】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_medresult_detail") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepMedresultDetail extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 医疗目录编码 */ - private String medListCodg; - - /** 药品通用名 */ - private String drugGenname; - - /** 药品商品名 */ - private String drugProdname; - - /** 药品剂型 */ - private String drugDosform; - - /** 药品规格 */ - private BigDecimal drugSpec; - - /** 数量 */ - private BigDecimal cnt; - - /** 批准文号 */ - private String aprvno; - - /** 批次号 */ - private String bchno; - - /** 生产批号 */ - private String manuLotnum; - - /** 生产厂家 */ - private String prdrName; - - /** 取药标志位 */ - private String takeDrugFlag; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java deleted file mode 100644 index 1d2a7262..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInfo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方取药结果查询-输出】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_medresult_info") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepMedresultInfo extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 医保处方编号 */ - private String hiRxno; - - /** 医保结算时间(yyyy-MM-dd HH:mm:ss) */ - private String setlTime; - - /** 医保处方状态编码(参考rx_stas_codg) */ - private String rxStasCodg; - - /** 医保处方状态名称 */ - private String rxStasName; - - /** 处方使用状态编号(参考rx_used_stas_codg) */ - private String rxUsedStasCodg; - - /** 处方使用状态名称 */ - private String rxUsedStasName; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java deleted file mode 100644 index a82361be..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepMedresultInput.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方取药结果查询-输入】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_medresult_input") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepMedresultInput extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 定点医疗机构编号 */ - private String fixmedinsCode; - - /** 医保处方编号 */ - private String hiRxno; - - /** 医保就诊ID(医保门诊挂号时返回) */ - private String mdtrtId; - - /** 人员名称 */ - private String psnName; - - /** 人员证件类型 */ - private String psnCertType; - - /** 证件号码 */ - private String certno; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java deleted file mode 100644 index fea9105d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerDiagnosisInfo.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方信息查询-输出-诊断信息（节点表示： rxDiseList) 】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_quer_diagnosis_info") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepQuerDiagnosisInfo extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 诊断类别 */ - private String diagType; - - /** 主诊断标志 */ - private String maindiagFlag; - - /** 诊断排序号 */ - private String diagSrtNo; - - /** 诊断代码 */ - private String diagCode; - - /** 诊断名称 */ - private String diagName; - - /** 诊断科室 */ - private String diagDept; - - /** 诊断科室代码 */ - private String diagDeptCode; - - /** 诊断医生编码 */ - private String diagDrNo; - - /** 诊断医生姓名 */ - private String diagDrName; - - /** 诊断时间(yyyy-MM-dd HH:mm:ss) */ - private String diagTime; - - /** 中医病名代码 */ - private String tcmDiseCode; - - /** 中医病名名称 */ - private String tcmDiseName; - - /** 中医症候代码 */ - private String tcmsympCode; - - /** 中医症候 */ - private String tcmsymp; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java deleted file mode 100644 index c65dcfe0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionDetail.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 【电子处方信息查询-输出-处方明细信息（节点标识：rxDetlList） 】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_quer_prescription_detail") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepQuerPrescriptionDetail extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 医疗目录编码(医保目录编码) */ - private String medListCodg; - - /** 定点医药机构目录编号(院内药品编码) */ - private String fixmedinsHilistId; - - /** 院内制剂标志(Y/N) */ - private String hospPrepFlag; - - /** 处方项目分类代码 */ - private String rxItemTypeCode; - - /** 处方项目分类名称 */ - private String rxItemTypeName; - - /** 中药类别名称 */ - private String tcmdrugTypeName; - - /** 中药类别代码 */ - private String tcmdrugTypeCode; - - /** 草药脚注 */ - private String tcmherbFoote; - - /** 药物类型代码 */ - private String mednTypeCode; - - /** 药物类型 */ - private String mednTypeName; - - /** 主要用药标志 */ - private String mainMedcFlag; - - /** 加急标志 */ - private String urgtFlag; - - /** 基本药物标志(Y/N) */ - private String basMednFlag; - - /** 基本药物标志(Y/N) */ - private String impDrugFlag; - - /** 药品商品名 */ - private String drugProdname; - - /** 药品通用名 */ - private String drugGenname; - - /** 药品剂型 */ - private String drugDosform; - - /** 药品规格 */ - private String drugSpec; - - /** 生产厂家 */ - private String prdrName; - - /** 用药途径代码 */ - private String medcWayCodg; - - /** 用药途径描述 */ - private String medcWayDscr; - - /** 用药开始时间(yyyy-MM-dd HH:mm:ss) */ - private String medcBegntime; - - /** 用药结束时间(yyyy-MM-dd HH:mm:ss) */ - private String medcEndtime; - - /** 用药天数 */ - private BigDecimal medcDays; - - /** 药品总用药量 */ - private BigDecimal drugCnt; - - /** 药品总用药量单位 */ - private String drugDosunt; - - /** 单次用量 */ - private BigDecimal sinDoscnt; - - /** 单次剂量单位 */ - private String sinDosunt; - - /** 使用频次编码 */ - private String usedFrquCodg; - - /** 使用频次名称 */ - private String usedFrquName; - - /** 医院审批标志(Y/N) */ - private String hospApprFlag; - - /** 取药标志位(Y/N) */ - private String takeDrugFlag; - - /** 是否OTC药品(0-处方药品、1-OTC药品) */ - private String otcFlag; - - /** 自费原因类型 */ - private String selfPayRea; - - /** 自费原因描述 */ - private String realDscr; - - /** 所需药品库存数量 */ - private String drugTotlcnt; - - /** 所需药品库存单位 */ - private String drugTotlcntEmp; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java deleted file mode 100644 index 3b227a52..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInfo.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 【电子处方信息查询-输出-处方信息 】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_quer_prescription_info") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepQuerPrescriptionInfo extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 医保处方编号 */ - private String hiRxno; - - /** 定点医疗机构编号 */ - private String fixmedinsCode; - - /** 定点医疗机构名称 */ - private String fixmedinsName; - - /** 医保处方状态编码 */ - private String rxStasCodg; - - /** 医保处方状态名称 */ - private String rxStasName; - - /** 医保处方使用状态编码 */ - private String rxUsedStasCodg; - - /** 医保处方使用状态名称 */ - private String rxUsedStasName; - - /** 开方时间 */ - private String prscTime; - - /** 药品总用量（剂数） */ - private BigDecimal rxDrugCnt; - - /** 处方整剂用法编码 */ - private String rxUsedWayCodg; - - /** 处方整剂用法名称 */ - private String rxUsedWayName; - - /** 处方整剂频次编号 */ - private String rxFrquCodg; - - /** 处方整剂频次名称 */ - private String rxFrquName; - - /** 处方整剂剂量单位 */ - private String rxDosunt; - - /** 处方整剂单次剂量数 */ - private BigDecimal rxDoscnt; - - /** 处方整剂医嘱说明 */ - private String rxDrordDscr; - - /** 处方有效天数 */ - private BigDecimal valiDays; - - /** 有效截止时间 */ - private String valiEndTime; - - /** 复用（多次）使用标志，0-否、1-是 */ - private String reptFlag; - - /** 最大复用次数 */ - private BigDecimal maxReptCnt; - - /** 已复用次数 */ - private BigDecimal reptdCnt; - - /** 使用最小间隔（天数） */ - private BigDecimal minInrvDays; - - /** 处方类别编码 */ - private String rxTypeCode; - - /** 处方类别名称 */ - private String rxTypeName; - - /** 长期处方标志，0-否、1-是 */ - private String longRxFlag; - - /** 业务类型代码 */ - private String bizTypeCode; - - /** 业务类型名称 */ - private String bizTypeName; - - /** 处方附加属性代码 */ - private String rxExraAttrCode; - - /** 处方附加属性名称 */ - private String rxExraAttrName; - - /** 处方循环限制标志 */ - private String rxCircLimitFlag; -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java deleted file mode 100644 index a38010ba..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerPrescriptionInput.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方信息查询-输入】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_quer_prescription_input") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepQuerPrescriptionInput extends HisBaseEntity { - - /** 定点医疗机构编号 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 定点医疗机构编号 */ - private String fixmedinsCode; - - /** 医保处方编号 */ - private String hiRxno; - - /** 医保就诊 ID */ - private String mdtrtId; - - /** 人员名称 */ - private String psnName; - - /** 人员证件类型 */ - private String psnCertType; - - /** 证件号码 */ - private String certno; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java deleted file mode 100644 index 7065b5a3..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepQuerVisitInfo.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 【电子处方信息查询-输出-就诊信息（节点标识：rxOtpinfo） 】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_quer_visit_info") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepQuerVisitInfo extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 医疗类别(参考医疗类别med_type) */ - private String medType; - - /** 门诊/住院号 */ - private String iptOtpNo; - - /** 门诊住院标志(1-门诊，2-住院) */ - private String otpIptFlag; - - /** 患者姓名 */ - private String patnName; - - /** 年龄 */ - private BigDecimal patnAge; - - /** 患者身高(cm) */ - private BigDecimal patnHgt; - - /** 患者体重(kg) */ - private BigDecimal patnWt; - - /** 性别 */ - private String gend; - - /** 妊娠(孕周) */ - private Integer gesoVal; - - /** 新生儿标志(0-否、1-是) */ - private String nwbFlag; - - /** 新生儿日、月龄 */ - private String nwbAge; - - /** 哺乳期标志(0-否、1-是) */ - private Integer suckPrdFlag; - - /** 过敏史 */ - private String algsHis; - - /** 险种类型 */ - private String insutype; - - /** 开方科室名称 */ - private String prscDeptName; - - /** 开方医师姓名 */ - private String prscDrName; - - /** 药师姓名 */ - private String pharName; - - /** 医疗机构药师审方时间(yyyy-MM-dd HH:mm:ss) */ - private String pharChkTime; - - /** 就诊时间(yyyy-MM-dd HH:mm:ss) */ - private String mdtrtTime; - - /** 病种编码(按病种结算病种目录代码/门诊慢特病种目录代码) */ - private String diseCodg; - - /** 病种名称 */ - private String diseName; - - /** 是否特殊病种 */ - private String spDiseFlag; - - /** 主诊断代码 */ - private String maindiagCode; - - /** 主诊断名称 */ - private String maindiagName; - - /** 疾病病情描述 */ - private String diseCondDscr; - - /** 是否初诊(0-否、1-是) */ - private String fstdiagFlag; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java deleted file mode 100644 index 221c275e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeInput.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【电子处方撤销-输入】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_revoke_input") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepRevokeInput extends HisBaseEntity { - - /** 医保处方编号 */ - @JSONField(serialize=false) - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 医保处方编号 */ - private String hiRxno; - - /** 定点医疗机构编号 */ - private String fixmedinsCode; - - /** 撤销医师的医保医师代码 */ - private String drCode; - - /** 撤销医师姓名 */ - private String undoDrName; - - /** 撤销医师证件类型 */ - private String undoDrCertType; - - /** 撤销医师证件号码 */ - private String undoDrCertno; - - /** 撤销原因描述 */ - private String undoRea; - - /** 撤销时间，格式：yyyy-MM-dd HH:mm:ss */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date undoTime; -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java deleted file mode 100644 index ce11b409..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepRevokeOutput.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方撤销-输出】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_revoke_output") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepRevokeOutput extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 医保处方编号 */ - private String hiRxno; - - /** 医保处方状态编码 */ - private String rxStasCodg; - - /** 医保处方状态名称 */ - private String rxStasName; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java deleted file mode 100644 index deca06fb..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureInput.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方医保电子签名 -输入】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_signature_input") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepSignatureInput extends HisBaseEntity { - - /** 自增主键 */ - @JSONField(serialize=false) - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 定点机构代码，定点机构唯一标识，用于识别机构对应的医保数字证书 */ - private String fixmedinsCode; - - /** 原始待签名处方信息，JSONString序列化后的base64字符值 */ - private String originalValue; - - /** 原始待签名处方文件，文件base64的字符值 */ - private String originalRxFile; - - /** 扩展字段，JSON序列化成字符串后长度不能超过4000 */ - private String extras; - - /** 医保处方编号 */ - @JSONField(serialize=false) - private String hiRxno; - - /** 院内内部处方号 */ - private String prescriptionNo; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java deleted file mode 100644 index 75ca0ed1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepSignatureOutput.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方医保电子签名 -输出】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_signature_output") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepSignatureOutput extends HisBaseEntity { - - /** 自增主键 */ - @JSONField(serialize=false) - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 处方文件，医保电子签名后处方文件originalRxFile的base64值 */ - private String rxFile; - - /** 签名摘要值，医保电子签名后处方信息originalValue的签名结果值 */ - private String signDigest; - - /** 签名机构证书SN */ - private String signCertSn; - - /** 签名机构证书DN */ - private String signCertDn; - - /** 医保处方编号 */ - @JSONField(serialize=false) - private String hiRxno; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java deleted file mode 100644 index 30146ab9..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadInput.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方上传-输入】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_upload_input") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepUploadInput extends HisBaseEntity { - - /** 自增主键 */ - @JSONField(serialize=false) - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 处方追溯码 */ - private String rxTraceCode; - - /** 医保处方编号 */ - private String hiRxno; - - /** 医院就诊 ID */ - private String mdtrtId; - - /** 患者姓名 */ - private String patnName; - - /** 人员证件类型 */ - private String psnCertType; - - /** 证件号码 */ - private String certno; - - /** 定点医疗机构名称 */ - private String fixmedinsName; - - /** 定点医疗机构编号 */ - private String fixmedinsCode; - - /** 开方医保医师代码 */ - private String drCode; - - /** 开方医师姓名 */ - private String prscDrName; - - /** 审方药师科室名称 */ - private String pharDeptName; - - /** 审方药师科室编号 */ - private String pharDeptCode; - - /** 审方药师职称编码 */ - private String pharProfttlCodg; - - /** 审方药师职称名称 */ - private String pharProfttlName; - - /** 审方医保药师代码 */ - private String pharCode; - - /** 审方药师证件类型 */ - private String pharCertType; - - /** 审方药师证件号码 */ - private String pharCertno; - - /** 审方药师姓名 */ - private String pharName; - - /** 审方药师执业资格证号 */ - private String pharPracCertNo; - - /** 医疗机构药师审方时间，格式：yyyy-MM-dd HH:mm:ss */ - private String pharChkTime; - - /** 处方原件，医保电子签名后的处方文件base64字符（PDF或OFD格式） */ - private String rxFile; - - /** 处方信息签名值 */ - private String signDigest; - - /** 扩展字段，JSON格式，长度不超过4000 */ - private String extras; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java deleted file mode 100644 index 792ba7ac..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepUploadOutput.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方上传-输出】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_upload_output") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepUploadOutput extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 医保处方编号 */ - private String hiRxno; - - /** 医保处方状态编码 */ - private String rxStasCodg; - - /** 医保处方状态名称 */ - private String rxStasName; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java deleted file mode 100644 index 39e471b8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriDiagnosisInfo.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【电子处方上传预核验-输入-诊断信息（节点表示：diseinfo)】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_veri_diagnosis_info") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepVeriDiagnosisInfo extends HisBaseEntity { - - /** 自增主键 */ - @JSONField(serialize=false) - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 诊断类别，参考诊断类别(diag_type) */ - private String diagType; - - /** 主诊断标志，0-否、1-是 */ - private String maindiagFlag; - - /** 诊断排序号 */ - private String diagSrtNo; - - /** 诊断代码，医保疾病诊断代码 */ - private String diagCode; - - /** 诊断名称 */ - private String diagName; - - /** 诊断科室名称 */ - private String diagDept; - - /** 诊断科室代码，与科室信息上传中的hosp_dept_codg医院科室编码保持一致 */ - private String diagDeptCode; - - /** 诊断医生编码，国家医保医师代码 */ - private String diagDrNo; - - /** 诊断医生姓名 */ - private String diagDrName; - - /** 诊断时间，格式：yyyy-MM-dd HH:mm:ss */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date diagTime; - - /** 中医病名代码，diag_type为中医诊断(值为2,3)时上传 */ - private String tcmDiseCode; - - /** 中医病名，diag_type为中医诊断(值为2,3)时上传 */ - private String tcmDiseName; - - /** 中医证候代码，diag_type为中医诊断(值为2,3)时上传 */ - private String tcmsympCode; - - /** 中医证候，diag_type为中医诊断(值为2,3)时上传 */ - private String tcmsymp; - - /** 院内内部处方号 */ - @JSONField(serialize=false) - private String prescriptionNo; - - /** 医保处方编号(电子处方信息查询返回时插入记录) */ - @JSONField(serialize=false) - private String hiRxno; -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java deleted file mode 100644 index bce7599e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionDetail.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【电子处方上传预核验-输入-处方明细信息（节点标识 rxdrugdetail） 】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_veri_prescription_detail") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepVeriPrescriptionDetail extends HisBaseEntity { - - /** 自增主键 */ - @JSONField(serialize=false) - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** 医疗目录编码(医保药品编码) */ - private String medListCodg; - - /** 定点医药机构目录编号(院内药品编码) */ - private String fixmedinsHilistId; - - /** 医疗机构制剂标志(0-否、1-是) */ - private String hospPrepFlag; - - /** 处方项目分类代码(11:西药,12:中成药,13:中药饮片) */ - private String rxItemTypeCode; - - /** 处方项目分类名称 */ - private String rxItemTypeName; - - /** 中药类别代码(中药饮片固定传3) */ - private String tcmdrugTypeCode; - - /** 中药类别名称 */ - private String tcmdrugTypeName; - - /** 草药脚注 */ - private String tcmherbFoote; - - /** 药物类型代码(参考medn_type_code) */ - private String mednTypeCode; - - /** 药物类型名称 */ - private String mednTypeName; - - /** 主要用药标志(0-否、1-是) */ - private String mainMedcFlag; - - /** 加急标志(0-否、1-是) */ - private String urgtFlag; - - /** 基本药物标志(0-否、1-是) */ - private String basMednFlag; - - /** 是否进口药品(0-否、1-是) */ - private String impDrugFlag; - - /** 是否OTC药品(0-处方药品、1-OTC药品) */ - private String otcFlag; - - /** 药品通用名 */ - private String drugGenname; - - /** 药品剂型 */ - private String drugDosform; - - /** 药品规格 */ - private String drugSpec; - - /** 药品商品名(非必填) */ - private String drugProdname; - - /** 生产厂家(非必填) */ - private String prdrName; - - /** 用药途径代码(西药/中成药必填) */ - private String medcWayCodg; - - /** 用药途径描述(西药/中成药必填) */ - private String medcWayDscr; - - /** 用药开始时间(yyyy-MM-dd HH:mm:ss) */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date medcBegntime; - - /** 用药结束时间(yyyy-MM-dd HH:mm:ss) */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date medcEndtime; - - /** 用药天数 */ - private String medcDays; - - /** 单次剂量单位(西药/中成药必填) */ - private String sinDosunt; - - /** 单次用量(西药/中成药必填) */ - private String sinDoscnt; - - /** 使用频次编码(西药/中成药必填) */ - private String usedFrquCodg; - - /** 使用频次名称(西药/中成药必填) */ - private String usedFrquName; - - /** 药品总用药量单位(发药计价单位) */ - private String drugDosunt; - - /** 药品总用药量(医保结算数量) */ - private String drugCnt; - - /** 药品单价(按drug_dosunt计价) */ - private String drugPric; - - /** 药品总金额(drug_cnt×drug_pric) */ - private String drugSumamt; - - /** 医院审批标志(1-纳入报销,2-自费) */ - private String hospApprFlag; - - /** 自费原因类型(hosp_appr_flag=2时必填) */ - private String selfPayRea; - - /** 自费原因描述(自费原因类型为6时必填) */ - private String realDscr; - - /** 扩展数据(地方业务扩展信息) */ - private String extras; - - /** 院内内部处方号 */ - @JSONField(serialize=false) - private String prescriptionNo; - - /** 医保处方编号(电子处方信息查询返回时插入记录) */ - @JSONField(serialize=false) - private String hiRxno; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java deleted file mode 100644 index adb6c6e2..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionInfo.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【电子处方上传预核验-输入-处方信息】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_veri_prescription_info") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepVeriPrescriptionInfo extends HisBaseEntity { - /** 自增主键 */ - @JSONField(serialize=false) - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 就诊凭证类型(01-电子凭证令牌、02-身份证号、03-社会保障卡号) */ - private String mdtrtCertType; - - /** 就诊凭证编号 */ - private String mdtrtCertNo; - - /** 卡识别码(就诊凭证类型为"03"时必填) */ - private String cardSn; - - /** 业务类型代码(01-定点医疗机构就诊，02-互联网医院问诊) */ - private String bizTypeCode; - - /** 处方附加属性代码(01-双通道处方，02-门诊统筹处方，99-其他) */ - private String rxExraAttrCode; - - /** 电子凭证令牌(使用医保电子凭证就诊时必填) */ - private String ecToken; - - /** 电子凭证线上身份核验流水号(线上场景互联网医院问诊时使用) */ - private String authNo; - - /** 参保地编号 */ - private String insuPlcNo; - - /** 就医地编号 */ - private String mdtrtareaNo; - - /** 定点医疗机构处方编号(院内内部处方号) */ - private String hospRxno; - - /** 续方的原处方编号 */ - private String initRxno; - - /** 处方类别代码(参考rx_type_code) */ - private String rxTypeCode; - - /** 开方时间(yyyy-MM-dd HH:mm:ss) */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date prscTime; - - /** 药品类目数(剂数) */ - private String rxDrugCnt; - - /** 处方整剂用法编号 */ - private String rxUsedWayCodg; - - /** 处方整剂用法名称 */ - private String rxUsedWayName; - - /** 处方整剂频次编号(参考used_frequ) */ - private String rxFrquCodg; - - /** 处方整剂频次名称 */ - private String rxFrquName; - - /** 处方整剂剂量单位 */ - private String rxDosunt; - - /** 处方整剂单次剂量数 */ - private String rxDoscnt; - - /** 处方整剂医嘱说明 */ - private String rxDrordDscr; - - /** 处方有效天数 */ - private String valiDays; - - /** 有效截止时间(开方时间+处方有效天数) */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date valiEndTime; - - /** 复用(多次)使用标志(0-否、1-是) */ - private String reptFlag; - - /** 最大使用次数(预留字段) */ - private String maxReptCnt; - - /** 使用最小间隔(天数)(预留字段) */ - private String minInvDays; - - /** 续方标志(0-否、1-是) */ - private String rxCotnFlag; - - /** 长期处方标志(0-否、1-是) */ - private String longRxFlag; - - /** 医保处方编号(电子处方信息查询返回时插入记录) */ - @JSONField(serialize=false) - private String hiRxno; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java deleted file mode 100644 index a6d741b7..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriPrescriptionOutput.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【电子处方上传预核验-输出】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_veri_prescription_output") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepVeriPrescriptionOutput extends HisBaseEntity { - - /** 自增主键 */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 处方追溯码 */ - private String rxTraceCode; - - /** 医保处方编号 */ - private String hiRxno; - - /** 药品请求的处方号 */ - private String prescriptionNo; -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java deleted file mode 100644 index 6157b08e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/ElepVeriVisitInfo.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【电子处方上传预核验-输入-就诊信息（节点标识：mdtrtinfo） 】Entity实体 - * - * @author system - * @date 2025-04-17 - */ -@Data -@TableName("yb_elep_veri_visit_info") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ElepVeriVisitInfo extends HisBaseEntity { - /** 自增主键 */ - @JSONField(serialize=false) - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 定点医疗机构名称 */ - private String fixmedinsName; - - /** 定点医疗机构编号 */ - private String fixmedinsCode; - - /** 医保就诊ID(医保门诊挂号时返回) */ - private String mdtrtId; - - /** 医疗类别(参考med_type) */ - private String medType; - - /** 门诊/住院号 */ - private String iptOtpNo; - - /** 门诊住院标识(1-门诊、2-住院) */ - private String otpIptFlag; - - /** 医保人员编号 */ - private String psnNo; - - /** 患者姓名 */ - private String patnName; - - /** 人员证件类型(参考psn_cert_type) */ - private String psnCertType; - - /** 证件号码 */ - private String certno; - - /** 年龄 */ - private String patnAge; - - /** 患者身高(cm) */ - private String patnHgt; - - /** 患者体重(kg) */ - private String patnWt; - - /** 性别(参考gend) */ - private String gend; - - /** 计划生育手术类别 */ - private String birctrlType; - - /** 计划生育手术或生育日期(yyyy-MM-dd) */ - private String birctrlMatnDate; - - /** 生育类别 */ - private String matnType; - - /** 妊娠(孕周) */ - private String gesoVal; - - /** 新生儿标志(0-否、1-是) */ - private String nwbFlag; - - /** 新生儿日、月龄 */ - private String nwbAge; - - /** 哺乳期标志(0-否、1-是) */ - private String suckPrdFlag; - - /** 过敏史 */ - private String algsHis; - - /** 开方科室名称 */ - private String prscDeptName; - - /** 开方科室编号(与医药机构服务的科室管理保持一致) */ - private String prscDeptCode; - - /** 开方医保医师代码(国家医保医师代码) */ - private String drCode; - - /** 开方医师姓名 */ - private String prscDrName; - - /** 开方医师证件类型(参考psn_cert_type) */ - private String prscDrCertType; - - /** 开方医师证件号码 */ - private String prscDrCertno; - - /** 医生职称编码(参考drord_dr_proftt1) */ - private String drProfttlCodg; - - /** 医生职称名称 */ - private String drProfttlName; - - /** 医生科室编码(与医院科室编码字段保持一致) */ - private String drDeptCode; - - /** 医生科室名称 */ - private String drDeptName; - - /** 科别(参考科室代码dept) */ - private String caty; - - /** 就诊时间(yyyy-MM-dd HH:mm:ss) */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date mdtrtTime; - - /** 病种编码 */ - private String diseCodg; - - /** 病种名称 */ - private String diseName; - - /** 特殊病种标志(0-否、1-是) */ - private String spDiseFlag; - - /** 主诊断代码(医保疾病诊断代码) */ - private String maindiagCode; - - /** 主诊断名称 */ - private String maindiagName; - - /** 疾病病情描述 */ - private String diseCondDscr; - - /** 医保费用结算类型(参考hi_feeset1_type) */ - private String hiFeesetlType; - - /** 医保费用类别名称 */ - private String hiFeesetlName; - - /** 挂号费 */ - private String rgstFee; - - /** 医疗费总额 */ - private String medfeeSumamt; - - /** 是否初诊(0-否、1-是) */ - private String fstdiagFlag; - - /** 扩展数据(地方业务扩展信息) */ - private String extras; - - /** 院内内部处方号 */ - @JSONField(serialize=false) - private String prescriptionNo; - - /** 医保处方编号(电子处方信息查询返回时插入记录) */ - @JSONField(serialize=false) - private String hiRxno; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/File.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/File.java deleted file mode 100644 index 575572e0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/File.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * 【9101】【9102】公用 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class File { - - // 文件查询号 - private String fileQuryNo; - - // 文件名称 - private String filename; - - // 下载截止时间 - private Date dldEndtime; - - // 文件数据 - private byte[] fileData; - - // 医药机构编号 - private String fixmedinsCode; - - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java deleted file mode 100644 index b087ffef..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialApplyRecord.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * 【3203】清算申请记录 - * - * @author SunJQ - * @date 2025-04-30 - */ -@Data -@Accessors(chain = true) -@TableName("yb_financial_apply_record") -@EqualsAndHashCode(callSuper = false) -public class FinancialApplyRecord { - //主键 - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - //医院id - private Long orgId; - - //开始时间 - private Date begndate; - - //医院id - private Date enddate; - - //清算类别 - private Date clrType; - - //医疗费总额 - private Date medfeeSumamt; - - //医保认可费用总额 - private Date medSumfee; - - //基金申报总额 - private Date fundAppySum; - - //现金支付金额 - private Date cashPayamt; - - //个人账户支出 - private Date acctPay; - - //申请人 - private Long praId; - - //入参 - private String param; - - // - private String outResult; - - //申请状态 - private String status; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java deleted file mode 100644 index 7b143b1d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/FinancialReconcileRecord.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.annotation.Excel; -import com.core.common.core.domain.HisBaseEntity; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * [3201]对账记录 - * - * @author SunJQ - * @date 2025-04-29 - */ -@Data -@Accessors(chain = true) -@TableName("yb_financial_reconcile_record") -@EqualsAndHashCode(callSuper = false) -public class FinancialReconcileRecord extends HisBaseEntity { - //主键 - @TableId(type = IdType.ASSIGN_ID) - private Long id; - //定点医药机构编号 - @Excel(name = "定点医药机构编号", width = 15) - @JSONField(serialize=false) - private String fixmedinsCode; - //定点医药机构名称 - @Excel(name = "定点医药机构名称", width = 15) - @JSONField(serialize=false) - private String fixmedinsName; - //医保区划 - @Excel(name = "医保区划", width = 15) - @JSONField(serialize=false) - private String admvs; - //险种 - @Excel(name = "险种", width = 15, dictType = "insutype") - @Dict(dictCode = "insutype") - @JSONField(name="insutype") - private String insutype; - //清算类别 - @Excel(name = "清算类别", width = 15, dictType = "clr_type") - @Dict(dictCode = "clr_type") - @JSONField(name="clr_type") - private String clrType; - //结算经办机构 - @Excel(name = "结算经办机构", width = 15) - @JSONField(name="setl_optins") - private String setlOptins; - //对账开始日期 - @Excel(name = "对账开始日期", width = 15, dateFormat = "yyyy-MM-dd") - @JSONField(name="stmt_begndate") - private String stmtBegndate; - //对账结束日期 - @Excel(name = "对账结束日期", width = 15, dateFormat = "yyyy-MM-dd") - @JSONField(name="stmt_enddate") - private String stmtEnddate; - //医疗费总额 - @Excel(name = "医疗费总额", width = 15) - @JSONField(name="medfee_sumamt") - private Double medfeeSumamt; - //基金支付总额 - @Excel(name = "基金支付总额", width = 15) - @JSONField(name="fund_pay_sumamt") - private Double fundPaySumamt; - //个人账户支付金额 - @Excel(name = "个人账户支付金额", width = 15) - @JSONField(name="acct_pay") - private Double acctPay; - //定点医药机构结算笔数 - @Excel(name = "定点医药机构结算笔数", width = 15) - @JSONField(name="fixmedins_setl_cnt") - private Integer fixmedinsSetlCnt; - //对账结果 - @Excel(name = "对账结果", width = 15, dictType = "stmt_rslt") - @Dict(dictCode = "stmt_rslt") - @JSONField(serialize=false) - private String stmtRslt; - //对账结果说明 - @Excel(name = "对账结果说明", width = 15) - @JSONField(serialize=false) - private String stmtRsltDscr; - - //医院id - private Long orgId; - - //入参 - private String param; - - //clr_appy_evt_id 机构清算申请事件ID - private String result; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java deleted file mode 100644 index e74de4c6..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InfoPerson.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import com.openhis.vo.Info5301SpecialConditionResult; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - *【1101】获取身份信息 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@TableName("yb_pub_perinfo") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class InfoPerson extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private Long id; - - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - //人员证件类型 - @JSONField(name="psn_cert_type") - private String psnCertType; - //证件号码 - @JSONField(name="certno") - private String certno; - //人员姓名 - @JSONField(name="psn_name") - private String psnName; - //性别 - @JSONField(name="gend") - private String gend; - //民族 - @JSONField(name="naty") - private String naty; - //出生日期 - @JSONField(name="brdy") - private Date brdy; - //年龄 - @JSONField(name="age") - private Double age; - //参保地医保区划 - private String insuplcAdmdvs; - //险种类型 - private String insutype; - //余额 - private String balc; - - private String param1101; - - private String result1101; - - //人员类别 - private String psnType; - - //人员参保状态 - private String psnInsuStas; - - //个人参保日期 - private String psnInsuDate; - - //公务员标志 - private String cvlservFlag; - - //单位名称 - private String empName; - - //特慢病 - @TableField(exist = false) - private List feedetail; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java deleted file mode 100644 index b9c5e45d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InformationInquiry.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.openhis.domain; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.List; - -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class InformationInquiry { - - // 处方信息 - private ElepQuerPrescriptionInfo prescriptionInfo; - - // 处方明细信息 - private List rxDetlList; - - // 就诊信息 - private List rxOtpinfo; - - // 诊断信息 - private List rxDiseList; - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java deleted file mode 100644 index e8b615d9..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryChangeRecord.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3502】库存信息变更 - * - * @author SunJQ - * @date 2025-04-30 - */ -@Data -@Accessors(chain = true) -@TableName("yb_inventory_change_record") -@EqualsAndHashCode(callSuper = false) -public class InventoryChangeRecord { - //主键 - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - //入参 - private String param; - - //出参 - private String result; - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 库存变更类型（字符型，6位，必填） - @JSONField(name = "inv_chg_type") - private String invChgType; - - // 3. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 4. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 5. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 6. 单价（数值型，16位含6位小数，必填） - @JSONField(name = "pric") - private BigDecimal pric; - - // 7. 数量（数值型，16位含4位小数，必填） - @JSONField(name = "cnt") - private BigDecimal cnt; - - // 8. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 9. 库存变更时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "inv_chg_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date invChgTime; - - // 10. 库存变更经办人姓名（字符型，50位，非必填） - @JSONField(name = "inv_chg_opter_name") - private String invChgOpterName; - - // 11. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 12. 拆零标志（字符型，2位，必填） - @JSONField(name = "trdn_flag") - private String trdnFlag; - - // 13. 溯源码节点信息（字符型，长度未明确，暂定500位） - @JSONField(name = "drugtracinfo") - private String drugtracinfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java deleted file mode 100644 index 5bc176da..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryCheckRecord.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3502】库存信息变更 - * - * @author SunJQ - * @date 2025-04-30 - */ -@Data -@Accessors(chain = true) -@TableName("yb_inventory_check_record") -@EqualsAndHashCode(callSuper = false) -public class InventoryCheckRecord { - //主键 - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - //入参 - private String param; - - //出参 - private String result; - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 5. 盘存日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "invdate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date invdate; - - // 6. 库存数量（数值型，16位含2位小数，必填） - @JSONField(name = "inv_cnt") - private BigDecimal invCnt; - - // 7. 生产批号（字符型，30位，非必填） - @JSONField(name = "manu_lotnum") - private String manuLotnum; - - // 8. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 9. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 10. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java deleted file mode 100644 index dc4326f6..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryDelRecord.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【3507】 - * - * @author SunJQ - * @date 2025-04-30 - */ -@Data -@Accessors(chain = true) -@TableName("yb_inventory_del_record") -@EqualsAndHashCode(callSuper = false) -public class InventoryDelRecord { - //主键 - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - //入参 - private String param; - - //出参 - private String outResult; - - // 定点医药机构批次流水号 - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 进销存数据类型 - @JSONField(name = "inv_data_type") - private String invDataType; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java deleted file mode 100644 index 521122a7..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseRecord.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3503】 - * - * @author SunJQ - * @date 2025-04-30 - */ -@Data -@Accessors(chain = true) -@TableName("yb_inventory_purchase_record") -@EqualsAndHashCode(callSuper = false) -public class InventoryPurchaseRecord { - //主键 - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - //入参 - private String param; - - //出参 - private String outResult; - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 随货单号（字符型，50位，非必填） - @JSONField(name = "dynt_no") - private String dyntNo; - - // 5. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 6. 供应商名称（字符型，200位，必填） - @JSONField(name = "spler_name") - private String splerName; - - // 7. 供应商许可证号（字符型，50位，非必填） - @JSONField(name = "spler_pmtno") - private String splerPmtno; - - // 8. 生产批号（字符型，30位，必填） - @JSONField(name = "manu_lotnum") - private String manuLotnum; - - // 9. 生产厂家名称（字符型，200位，必填） - @JSONField(name = "prodentp_name") - private String prodentpName; - - // 10. 批准文号（字符型，100位，必填） - @JSONField(name = "aprvno") - private String aprvno; - - // 11. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 12. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 13. 最终成交单价（数值型，16位含6位小数，非必填） - @JSONField(name = "finl_trns_pric") - private BigDecimal finlTrnsPric; - - // 14. 采购/退货数量（数值型，16位含4位小数，必填） - @JSONField(name = "purc_retn_cnt") - private BigDecimal purcRetnCnt; - - // 15. 采购发票编码（字符型，50位，非必填） - @JSONField(name = "purc_invo_codg") - private String purcInvoCodg; - - // 16. 采购发票号（字符型，50位，非必填） - @JSONField(name = "purc_invo_no") - private String purcInvoNo; - - // 17. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 18. 采购/退货入库时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "purc_retn_stoin_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date purcRetnStoinTime; - - // 19. 采购/退货经办人姓名（字符型，50位，必填） - @JSONField(name = "purc_retn_opter_name") - private String purcRetnOpterName; - - // 20. 商品赠送标志（字符型，3位，必填） - @JSONField(name = "prod_geay_flag") - private String prodGeayFlag; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java deleted file mode 100644 index 418d567b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventoryPurchaseReturnRecord.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3504】 - * - * @author SunJQ - * @date 2025-04-30 - */ -@Data -@Accessors(chain = true) -@TableName("yb_inventory_purchase_return_record") -@EqualsAndHashCode(callSuper = false) -public class InventoryPurchaseReturnRecord { - //主键 - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - //入参 - private String param; - - //出参 - private String outResult; - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 5. 供应商名称（字符型，200位，必填） - @JSONField(name = "spler_name") - private String splerName; - - // 6. 供应商许可证号（字符型，50位，非必填） - @JSONField(name = "spler_pmtno") - private String splerPmtno; - - // 7. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 8. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 9. 最终成交单价（数值型，16位含6位小数，非必填） - @JSONField(name = "finl_trns_pric") - private BigDecimal finlTrnsPric; - - // 10. 采购/退货数量（数值型，16位含4位小数，必填） - @JSONField(name = "purc_retn_cnt") - private BigDecimal purcRetnCnt; - - // 11. 采购发票编码（字符型，50位，非必填） - @JSONField(name = "purc_invo_codg") - private String purcInvoCodg; - - // 12. 采购发票号（字符型，50位，必填） - @JSONField(name = "purc_invo_no") - private String purcInvoNo; - - // 13. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 14. 采购/退货入库时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "purc_retn_stoin_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date purcRetnStoinTime; - - // 15. 采购/退货经办人姓名（字符型，50位，必填） - @JSONField(name = "purc_retn_opter_name") - private String purcRetnOpterName; - - // 16. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 20. 商品采购流水号（字符型，50位，非必填） - @JSONField(name = "medins_prod_purc_no") - private String medinsProdPurcNo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java deleted file mode 100644 index f9506319..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleRecord.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3505】 - * - * @author SunJQ - * @date 2025-04-30 - */ -@Data -@Accessors(chain = true) -@TableName("yb_inventory_sale_record") -@EqualsAndHashCode(callSuper = false) -public class InventorySaleRecord { - //主键 - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - //入参 - private String param; - - //出参 - private String outResult; - - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 5. 开方医师证件类型（字符型，6位，非必填） - @JSONField(name = "prsc_dr_cert_type") - private String prscDrCertType; - - // 6. 开方医师证件号码（字符型，50位，非必填） - @JSONField(name = "prsc_dr_certno") - private String prscDrCertno; - - // 7. 开方医师姓名（字符型，50位，必填） - @JSONField(name = "prsc_dr_name") - private String prscDrName; - - // 8. 药师证件类型（字符型，6位，非必填） - @JSONField(name = "phar_cert_type") - private String pharCertType; - - // 9. 药师证件号码（字符型，50位，非必填） - @JSONField(name = "phar_certno") - private String pharCertno; - - // 10. 药师姓名（字符型，50位，必填） - @JSONField(name = "phar_name") - private String pharName; - - // 11. 药师执业资格证号（字符型，50位，必填） - @JSONField(name = "phar_prac_cert_no") - private String pharPracCertNo; - - // 12. 医保费用结算类型（字符型，6位，必填） - @JSONField(name = "hi_feesetl_type") - private String hiFeesetlType; - - // 13. 结算ID（字符型，30位，非必填） - @JSONField(name = "setl_id") - private String setlId; - - // 14. 就医流水号（字符型，30位，必填） - @JSONField(name = "mdtrt_sn") - private String mdtrtSn; - - // 15. 人员编号（字符型，30位，非必填） - @JSONField(name = "psn_no") - private String psnNo; - - // 16. 人员证件类型（字符型，6位，必填） - @JSONField(name = "psn_cert_type") - private String psnCertType; - - // 17. 证件号码（字符型，50位，非必填） - @JSONField(name = "certno") - private String certno; - - // 18. 人员姓名（字符型，50位，非必填） - @JSONField(name = "psn_name") - private String psnName; - - // 19. 生产批号（字符型，30位，必填） - @JSONField(name = "manu_lotnum") - private String manuLotnum; - - // 20. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 21. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 22. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 23. 拆零标志（字符型，3位，必填） - @JSONField(name = "trdn_flag") - private String trdnFlag; - - // 24. 最终成交单价（数值型，16位含6位小数，非必填） - @JSONField(name = "finl_trns_pric") - private BigDecimal finlTrnsPric; - - // 25. 处方号（字符型，40位，非必填） - @JSONField(name = "rxno") - private String rxno; - - // 26. 外购处方标志（字符型，3位，必填） - @JSONField(name = "rx_circ_flag") - private String rxCircFlag; - - // 27. 零售单据号（字符型，40位，必填） - @JSONField(name = "rtal_docno") - private String rtalDocno; - - // 29. 销售出库单据号（字符型，40位，非必填） - @JSONField(name = "stoout_no") - private String stooutNo; - - // 30. 批次号（字符型，30位，非必填） - @JSONField(name = "bchno") - private String bchno; - - // 32. 药品条形码（字符型，30位，非必填） - @JSONField(name = "drug_prod_barc") - private String drugProdBarc; - - // 33. 货架位（字符型，20位，非必填） - @JSONField(name = "shelf_posi") - private String shelfPosi; - - // 34. 销售/退货数量（数值型，16位含4位小数，必填） - @JSONField(name = "sel_retn_cnt") - private BigDecimal selRetnCnt; - - // 35. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "sel_retn_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date selRetnTime; - - // 36. 销售/退货经办人姓名（字符型，50位，必填） - @JSONField(name = "sel_retn_opter_name") - private String selRetnOpterName; - - // 37. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 38. 就诊结算类型（字符型，6位，非必填） - @JSONField(name = "mdtrt_setl_type") - private String mdtrtSetlType; - - // 39. 溯源码节点信息（字符型，长度未明确，暂定500位） - @JSONField(name = "drugtracinfo") - private String drugtracinfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java deleted file mode 100644 index 48bc2403..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/InventorySaleReturnRecord.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3506】 - * - * @author SunJQ - * @date 2025-04-30 - */ -@Data -@Accessors(chain = true) -@TableName("yb_inventory_sale_return_record") -@EqualsAndHashCode(callSuper = false) -public class InventorySaleReturnRecord { - //主键 - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - //入参 - private String param; - - //出参 - private String outResult; - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 5. 结算ID（字符型，30位，非必填） - @JSONField(name = "setl_id") - private String setlId; - - // 6. 人员编号（字符型，30位，非必填） - @JSONField(name = "psn_no") - private String psnNo; - - // 7. 人员证件类型（字符型，6位，必填） - @JSONField(name = "psn_cert_type") - private String psnCertType; - - // 8. 证件号码（字符型，50位，非必填） - @JSONField(name = "certno") - private String certno; - - // 9. 人员姓名（字符型，50位，非必填） - @JSONField(name = "psn_name") - private String psnName; - - // 10. 生产批号（字符型，30位，必填） - @JSONField(name = "manu_lotnum") - private String manuLotnum; - - // 11. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 12. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 13. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 14. 拆零标志（字符型，3位，必填） - @JSONField(name = "trdn_flag") - private String trdnFlag; - - // 15. 最终成交单价（数值型，16位含6位小数，非必填） - @JSONField(name = "finl_trns_pric") - private BigDecimal finlTrnsPric; - - // 16. 销售/退货数量（数值型，16位含4位小数，必填） - @JSONField(name = "sel_retn_cnt") - private BigDecimal selRetnCnt; - - // 17. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "sel_retn_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date selRetnTime; - - // 18. 销售/退货经办人姓名（字符型，50位，必填） - @JSONField(name = "sel_retn_opter_name") - private String selRetnOpterName; - - // 19. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 20. 商品销售流水号（字符型，50位，非必填） - @JSONField(name = "medins_prod_sel_no") - private String medinsProdSelNo; - - // 21. 就医流水号（字符型，30位，必填） - @JSONField(name = "mdtrt_sn") - private String mdtrtSn; - - // 22. 溯源码节点信息（字符型，长度未明确，暂定500位） - @JSONField(name = "drugtracinfo") - private String drugtracinfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java deleted file mode 100644 index cb271ece..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/MedicationResultInquiry.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.openhis.domain; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 电子处方取药结果查询 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MedicationResultInquiry { - - /** 医保处方编号 */ - private String hiRxno; - - /** 医保结算时间(yyyy-MM-dd HH:mm:ss) */ - private String setlTime; - - /** 医保处方状态编码(参考rx_stas_codg) */ - private String rxStasCodg; - - /** 医保处方状态名称 */ - private String rxStasName; - - /** 处方使用状态编号(参考rx_used_stas_codg) */ - private String rxUsedStasCodg; - - /** 处方使用状态名称 */ - private String rxUsedStasName; - - // 输出明细信息 - private List seltdelts; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java deleted file mode 100644 index c48d8fa9..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/PreCheckPrescription.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - - -/** - * 电子处方上传预核验 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PreCheckPrescription { - - // 处方信息 - - /** 就诊凭证类型(01-电子凭证令牌、02-身份证号、03-社会保障卡号) */ - private String mdtrtCertType; - - /** 就诊凭证编号 */ - private String mdtrtCertNo; - - /** 卡识别码(就诊凭证类型为"03"时必填) */ - private String cardSn; - - /** 业务类型代码(01-定点医疗机构就诊，02-互联网医院问诊) */ - private String bizTypeCode; - - /** 处方附加属性代码(01-双通道处方，02-门诊统筹处方，99-其他) */ - private String rxExraAttrCode; - - /** 电子凭证令牌(使用医保电子凭证就诊时必填) */ - private String ecToken; - - /** 电子凭证线上身份核验流水号(线上场景互联网医院问诊时使用) */ - private String authNo; - - /** 参保地编号 */ - private String insuPlcNo; - - /** 就医地编号 */ - private String mdtrtareaNo; - - /** 定点医疗机构处方编号(院内内部处方号) */ - private String hospRxno; - - /** 续方的原处方编号 */ - private String initRxno; - - /** 处方类别代码(参考rx_type_code) */ - private String rxTypeCode; - - /** 开方时间(yyyy-MM-dd HH:mm:ss) */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date prscTime; - - /** 药品类目数(剂数) */ - private String rxDrugCnt; - - /** 处方整剂用法编号 */ - private String rxUsedWayCodg; - - /** 处方整剂用法名称 */ - private String rxUsedWayName; - - /** 处方整剂频次编号(参考used_frequ) */ - private String rxFrquCodg; - - /** 处方整剂频次名称 */ - /** 处方整剂频次名称 */ - private String rxFrquName; - - /** 处方整剂剂量单位 */ - private String rxDosunt; - - /** 处方整剂单次剂量数 */ - private String rxDoscnt; - - /** 处方整剂医嘱说明 */ - private String rxDrordDscr; - - /** 处方有效天数 */ - private String valiDays; - - /** 有效截止时间(开方时间+处方有效天数) */ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date valiEndTime; - - /** 复用(多次)使用标志(0-否、1-是) */ - private String reptFlag; - - /** 最大使用次数(预留字段) */ - private String maxReptCnt; - - /** 使用最小间隔(天数)(预留字段) */ - private String minInvDays; - - /** 续方标志(0-否、1-是) */ - private String rxCotnFlag; - - /** 长期处方标志(0-否、1-是) */ - private String longRxFlag; - - /** 医保处方编号(电子处方信息查询返回时插入记录) */ - @JSONField(serialize=false) - private String hiRxno; - - // 处方明细信息 - private List rxdrugdetail; - - // 就诊信息 - private ElepVeriVisitInfo mdtrtinfo; - - // 诊断信息 - private ElepVeriDiagnosisInfo diseinfo; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java deleted file mode 100644 index 52432ad1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/QueryPrescription.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.openhis.domain; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.List; - - -/** - * 电子处方上传预核验 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class QueryPrescription { - - /** 医保处方编号 */ - private String hiRxno; - - /** 定点医疗机构编号 */ - private String fixmedinsCode; - - /** 定点医疗机构名称 */ - private String fixmedinsName; - - /** 医保处方状态编码 */ - private String rxStasCodg; - - /** 医保处方状态名称 */ - private String rxStasName; - - /** 医保处方使用状态编码 */ - private String rxUsedStasCodg; - - /** 医保处方使用状态名称 */ - private String rxUsedStasName; - - /** 开方时间 */ - private String prscTime; - - /** 药品总用量（剂数） */ - private BigDecimal rxDrugCnt; - - /** 处方整剂用法编码 */ - private String rxUsedWayCodg; - - /** 处方整剂用法名称 */ - private String rxUsedWayName; - - /** 处方整剂频次编号 */ - private String rxFrquCodg; - - /** 处方整剂频次名称 */ - private String rxFrquName; - - /** 处方整剂剂量单位 */ - private String rxDosunt; - - /** 处方整剂单次剂量数 */ - private BigDecimal rxDoscnt; - - /** 处方整剂医嘱说明 */ - private String rxDrordDscr; - - /** 处方有效天数 */ - private BigDecimal valiDays; - - /** 有效截止时间 */ - private String valiEndTime; - - /** 复用（多次）使用标志，0-否、1-是 */ - private String reptFlag; - - /** 最大复用次数 */ - private BigDecimal maxReptCnt; - - /** 已复用次数 */ - private BigDecimal reptdCnt; - - /** 使用最小间隔（天数） */ - private BigDecimal minInrvDays; - - /** 处方类别编码 */ - private String rxTypeCode; - - /** 处方类别名称 */ - private String rxTypeName; - - /** 长期处方标志，0-否、1-是 */ - private String longRxFlag; - - /** 业务类型代码 */ - private String bizTypeCode; - - /** 业务类型名称 */ - private String bizTypeName; - - /** 处方附加属性代码 */ - private String rxExraAttrCode; - - /** 处方附加属性名称 */ - private String rxExraAttrName; - - /** 处方循环限制标志 */ - private String rxCircLimitFlag; - - // 处方明细信息 - private List rxDetlList; - - // 就诊信息 - private ElepQuerVisitInfo rxOtpinfo; - - // 诊断信息 - private List rxDiseList; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java deleted file mode 100644 index 3f3e888c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/domain/Sign.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.openhis.domain; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; - -/** - *【9001】【9002】签到 签退 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@TableName("yb_pub_sign") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Sign extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private Long id; - /**操作员编号*/ - @JSONField(name="opter_no") - private String opterNo; - /**签到编号*/ - @JSONField(name="sign_no") - private String signNo; - /**签到时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(serialize=false) - private java.util.Date signTime; - /**签退时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(serialize=false) - private java.util.Date signOutTime; - /**状态，0-新建，1-签到，2-签退*/ - @JSONField(serialize=false) - private String status; - /** 签到MAC地址 */ - @JSONField(name="mac") - @TableField(exist = false) - private String mac; - /** 签到IP地址 */ - @JSONField(name="ip") - @TableField(exist = false) - private String ip; -// /**创建人*/ -// private String createBy; -// /**创建日期*/ -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") -// private java.util.Date createTime; -// /**更新人*/ -// private String updateBy; -// /**更新日期*/ -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") -// private java.util.Date updateTime; -// /**所属部门*/ -// private String sysOrgCode; -// /**租户ID*/ -// private String tenantId; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java deleted file mode 100644 index f265e388..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ElepServiceAdrEnum.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.openhis.enums; - -/** - * 接口地址 - */ -public enum ElepServiceAdrEnum { - - /** 电子处方上传预核验 */ - A0001("A0001", "/fixmedins/uploadChk", "【A0001】电子处方上传预核验"), - /** 电子处方医保电子签名*/ - A0002("A0002", "/fixmedins/rxFixmedinsSign", "【A0002】电子处方医保电子签名"), - /** 电子处方上传 */ - A0003("A0003", "/fixmedins/rxFileUpld", "【A0003】电子处方上传"), - /** 电子处方撤销 */ - A0004("A0004", "/fixmedins/rxUndo", "【A0004】电子处方撤销"), - /** 电子处方信息查询 */ - A0005("A0005", "/fixmedins/hospRxDetlQuery", "【A0005】电子处方信息查询"), - /** 电子处方取药结果查询 */ - A0006("A0006", "/fixmedins/rxSetlInfoQuery", "【A0006】电子处方取药结果查询"); - - - /** 接口编号 */ - private final String num; - /** 接口地址 */ - private final String address; - /** 接口描述 */ - private final String description; - - ElepServiceAdrEnum(String num, String address, String description) { - this.num = num; - this.address = address; - this.description = description; - } - - public String getNum() { - return num; - } - - public String getAddress() { - return address; - } - - public String getDescription() { - return description; - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java deleted file mode 100644 index 94dad6f2..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/enums/ServiceAdrEnum.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.openhis.enums; - -/** - * 接口地址 - */ -public enum ServiceAdrEnum { - - /** 前置接口 */ - TOKEN("token", "/auth/oauth/token", "获取token"), - P9001("9001", "/mbs/fmi/fsi/api/callFsiService/callService", "【9001】签到"), - P9002("9002", "/mbs/fmi/fsi/api/callFsiService/callService", "【9002】签退"), - P1101("1101", "/mbs/fmi/fsi/api/callFsiService/callService", "【1101】人员信息获取"), - P1201("1201", "/mbs/fmi/fsi/api/callFsiService/callService", "【1201】医药机构信息获取"), - P3301("3301", "/mbs/fmi/fsi/api/callFsiService/callService", "【3301】目录对照上传"), - P3302("3302", "/mbs/fmi/fsi/api/callFsiService/callService", "【3302】目录对照撤销"), - /** 目录下载接口 */ - D1301("1301","/mbs/fmi/fsi/api/callFsiService/callService","【1301】西药中成药目录下载"), - D1302("1302","/mbs/fmi/fsi/api/callFsiService/callService","【1302】中药饮片目录下载"), - D1303("1303","/mbs/fmi/fsi/api/callFsiService/callService","【1303】医疗机构制剂目录下载"), - D1304("1304","/mbs/fmi/fsi/api/callFsiService/callService","【1304】民族药品目录查询"), - D1305("1305","/mbs/fmi/fsi/api/callFsiService/callService","【1305】医疗服务项目目录下载"), - D1306("1306","/mbs/fmi/fsi/api/callFsiService/callService","【1306】医用耗材目录下载"), - D1307("1307","/mbs/fmi/fsi/api/callFsiService/callService","【1307】疾病与诊断目录下载"), - D1308("1308","/mbs/fmi/fsi/api/callFsiService/callService","【1308】手术操作目录下载"), - D1309("1309","/mbs/fmi/fsi/api/callFsiService/callService","【1309】门诊慢特病种目录下载"), - D1310("1310","/mbs/fmi/fsi/api/callFsiService/callService","【1310】按病种付费病种目录下载"), - D1311("1311","/mbs/fmi/fsi/api/callFsiService/callService","【1311】日间手术治疗病种目录下载"), - D1312("1312","/mbs/fmi/fsi/api/callFsiService/callService","【1312】医保目录信息查询"), - D1313("1313","/mbs/fmi/fsi/api/callFsiService/callService","【1313】肿瘤形态学目录下载"), - D1314("1314","/mbs/fmi/fsi/api/callFsiService/callService","【1314】中医疾病目录下载"), - D1315("1315","/mbs/fmi/fsi/api/callFsiService/callService","【1315】中医证候目录下载"), - D1316("1316","/mbs/fmi/fsi/api/callFsiService/callService","【1316】医疗目录与医保目录匹配信息查询"), - D1317("1317","/mbs/fmi/fsi/api/callFsiService/callService","【1317】医药机构目录匹配信息查询"), - D1318("1318","/mbs/fmi/fsi/api/callFsiService/callService","【1318】医保目录限价信息查询"), - D1319("1319","/mbs/fmi/fsi/api/callFsiService/callService","【1319】医保目录先自付比例信息查询"), - D1320("1320","/mbs/fmi/fsi/api/callFsiService/callService","【1320】中药配方颗粒目录下载"), - D1321("1321","/mbs/fmi/fsi/api/callFsiService/callService","【1321】医疗服务项目（新）目录下载"), - /** 人员备案接口 */ - F2501("2501", "/mbs/fmi/fsi/api/callFsiService/callService", "【2501】转院备案"), - F2502("2502", "/mbs/fmi/fsi/api/callFsiService/callService", "【2502】转院备案撤销"), - F2503("2503", "/mbs/fmi/fsi/api/callFsiService/callService", "【2503】人员慢特病备案"), - F2504("2504", "/mbs/fmi/fsi/api/callFsiService/callService", "【2504】人员慢特病备案撤销"), - F2505("2505", "/mbs/fmi/fsi/api/callFsiService/callService", "【2505】人员定点备案"), - F2506("2506", "/mbs/fmi/fsi/api/callFsiService/callService", "【2506】人员定点备案撤销"), - /** 药店接口 */ - D2101("2101", "/mbs/fmi/fsi/api/callFsiService/callService", "【2101】药店预结算"), - D2102("2102", "/mbs/fmi/fsi/api/callFsiService/callService", "【2102】药店结算"), - D2103("2103", "/mbs/fmi/fsi/api/callFsiService/callService", "【2103】药店结算撤销"), - /** 门诊接口 */ - C2201("2201", "/mbs/fmi/fsi/api/callFsiService/callService", "【2201】门诊挂号"), - C2202("2202", "/mbs/fmi/fsi/api/callFsiService/callService", "【2202】门诊挂号撤销"), - C2203("2203", "/mbs/fmi/fsi/api/callFsiService/callService", "【2203】门诊就诊信息上传"), - C2203A("2203A", "/mbs/fmi/fsi/api/callFsiService/callService", "【2203A】门诊就诊信息上传"), - C2204("2204", "/mbs/fmi/fsi/api/callFsiService/callService", "【2204】门诊费用明细上传"), - C2205("2205", "/mbs/fmi/fsi/api/callFsiService/callService", "【2205】门诊费用明细撤销"), - C2206("2206", "/mbs/fmi/fsi/api/callFsiService/callService", "【2206】门诊预结算"), - C2207("2207", "/mbs/fmi/fsi/api/callFsiService/callService", "【2207】门诊结算"), - C2208("2208", "/mbs/fmi/fsi/api/callFsiService/callService", "【2208】门诊费用撤销"), - /** 住院接口 */ - H2401("2401", "/mbs/fmi/fsi/api/callFsiService/callService", "【2401】入院办理"), - H2402("2402", "/mbs/fmi/fsi/api/callFsiService/callService", "【2402】出院办理"), - H2403("2403", "/mbs/fmi/fsi/api/callFsiService/callService", "【2403】住院信息变更"), - H2405("2405", "/mbs/fmi/fsi/api/callFsiService/callService", "【2405】出院撤销"), - H2301("2301", "/mbs/fmi/fsi/api/callFsiService/callService", "【2301】住院费用明细上传"), - H2302("2302", "/mbs/fmi/fsi/api/callFsiService/callService", "【2302】住院费用明细撤销"), - H2303("2303", "/mbs/fmi/fsi/api/callFsiService/callService", "【2303】住院预结算"), - H2304("2304", "/mbs/fmi/fsi/api/callFsiService/callService", "【2304】住院结算"), - H2305("2305", "/mbs/fmi/fsi/api/callFsiService/callService", "【2305】住院结算撤销"), - H2404("2404", "/mbs/fmi/fsi/api/callFsiService/callService", "【2404】入院撤销"), - /** 智能审核事前提醒 */ - A3101("3101", "/mbs/fmi/fsi/api/callFsiService/callService", "【3101】明细审核事前事中分析服务"), - A3103("3103", "/mbs/fmi/fsi/api/callFsiService/callService", "【3103】事前事中服务反馈服务"), - /** 医药机构费用结算业务 */ - R3201("3201", "/mbs/fmi/fsi/api/callFsiService/callService", "【3201】医药机构费用结算对总账"), - R3202("3202", "/mbs/fmi/fsi/api/callFsiService/callService", "【3202】医药机构费用结算对明细账"), - R3203("3203", "/mbs/fmi/fsi/api/callFsiService/callService", "【3203】清算申请"), - R3203A("3203A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3203A】清算申请(吉林省)"), - R3204("3204", "/mbs/fmi/fsi/api/callFsiService/callService", "【3204】清算申请撤销"), - R3204A("3204A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3204A】清算申请撤销(吉林省)"), - R3205A("3205A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3205A】清算申请状态查询（吉林省）"), - R3206A("3206A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3206A】清算机构查询(吉林省)"), - R3209A("3206A", "/mbs/fmi/fsi/api/callFsiService/callService", "【3209A】查询跨省三方对账未成功数据(吉林省)"), - R13203("13203", "/mbs/fmi/fsi/api/callFsiService/callService", "【13203】医药机构费用结算日对账结果查询"), - /** 进销存业务 */ - I3501("3501", "/mbs/fmi/fsi/api/callFsiService/callService", "【3501】商品盘存上传"), - I3502("3502", "/mbs/fmi/fsi/api/callFsiService/callService", "【3502】商品库存变更"), - I3503("3503", "/mbs/fmi/fsi/api/callFsiService/callService", "【3503】商品采购"), - I3504("3504", "/mbs/fmi/fsi/api/callFsiService/callService", "【3504】商品采购退货"), - I3505("3505", "/mbs/fmi/fsi/api/callFsiService/callService", "【3505】商品销售"), - I3506("3506", "/mbs/fmi/fsi/api/callFsiService/callService", "【3506】商品销售退货"), - I3507("3507", "/mbs/fmi/fsi/api/callFsiService/callService", "【3507】商品信息删除"), - /** 医保服务查询业务 */ - G5301("5301", "/mbs/fmi/fsi/api/callFsiService/callService", "【5301】人员慢特病备案查询"), - /** 文件上传下载 */ - U9101("9101", "/mbs/fmi/fsi/api/callFsiService/callService", "【9101】文件上传"), - U9102("9102", "/mbs/fmi/fsi/api/callFsiService/callService", "【9102】文件下载"); - /** 接口编号 */ - private final String num; - /** 接口地址 */ - private final String address; - /** 接口描述 */ - private final String description; - - ServiceAdrEnum(String num, String address, String description) { - this.num = num; - this.address = address; - this.description = description; - } - - public String getNum() { - return num; - } - - public String getAddress() { - return address; - } - - public String getDescription() { - return description; - } - - public static ServiceAdrEnum getEnum(String num){ - for (ServiceAdrEnum serviceAdrEnum : ServiceAdrEnum.values()) { - if (serviceAdrEnum.getNum().equals(num)){ - return serviceAdrEnum; - } - } - return null; - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java deleted file mode 100644 index b9d05849..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/ElepHandlerServiceListener.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.openhis.listener; - -import java.util.Map; - -import com.openhis.annotation.ElepHandlerInt; -import com.openhis.context.ElepHandlerServiceContext; -import com.openhis.service.IElepHandlerService; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.stereotype.Component; - -import com.openhis.annotation.HandlerInt; -import com.openhis.context.HandlerServiceContext; -import com.openhis.service.HandlerService; - -/** - * 监听@ElepHandlerInt注解下的类 - */ -@Component -public class ElepHandlerServiceListener implements ApplicationListener { - - /** - * 将实例放到容器 - * @param event - */ - @Override - public void onApplicationEvent(ContextRefreshedEvent event) { - Map beans = event.getApplicationContext().getBeansWithAnnotation(ElepHandlerInt.class); - ElepHandlerServiceContext handlerServiceContext = event.getApplicationContext().getBean(ElepHandlerServiceContext.class); - beans.forEach((name, bean) -> { - ElepHandlerInt typeHandler = bean.getClass().getAnnotation(ElepHandlerInt.class); - handlerServiceContext.putElepHandlerService(typeHandler.value().toString(), (IElepHandlerService) bean); - }); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java deleted file mode 100644 index 4f8f0dac..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/listener/HandlerServiceListener.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.openhis.listener; - -import com.openhis.annotation.HandlerInt; -import com.openhis.context.HandlerServiceContext; -import com.openhis.service.HandlerService; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * 监听@HandlerInt注解下的类 - */ -@Component -public class HandlerServiceListener implements ApplicationListener { - - /** - * 将实例放到容器 - * @param event - */ - @Override - public void onApplicationEvent(ContextRefreshedEvent event) { - Map beans = event.getApplicationContext().getBeansWithAnnotation(HandlerInt.class); - HandlerServiceContext handlerServiceContext = event.getApplicationContext().getBean(HandlerServiceContext.class); - beans.forEach((name, bean) -> { - HandlerInt typeHandler = bean.getClass().getAnnotation(HandlerInt.class); - handlerServiceContext.putHandlerService(typeHandler.value().toString(), (HandlerService) bean); - }); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java deleted file mode 100644 index db3fef33..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/InputData.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.openhis.pojo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.openhis.constant.InputDataTypeConst; - -import lombok.Data; - -/** - * 医保入参 - */ -@Data -public class InputData { - - @JSONField(serialize = false) - private String insuplcAdmdvs; - @JSONField(name = InputDataTypeConst.DATA) - private T data; - @JSONField(name = InputDataTypeConst.FEE_DETAIL) - private T feeDetail; - @JSONField(name = InputDataTypeConst.SIGN_IN) - private T signIn; - @JSONField(name = InputDataTypeConst.SIGN_OUT) - private T signOut; - @JSONField(name = InputDataTypeConst.MD_TRT_INFO) - private T mdTrtInfo; - @JSONField(name = InputDataTypeConst.DI_SE_INFO) - private H diSeInfo; - @JSONField(name = InputDataTypeConst.DRUG_INFO) - private T druginfo; - @JSONField(name = InputDataTypeConst.DRUG_DETAIL) - private H drugdetail; - @JSONField(name = InputDataTypeConst.DSCG_INFO) - private T dscginfo; - @JSONField(name = InputDataTypeConst.PURC_INFO) - private T purcinfo; - @JSONField(name = InputDataTypeConst.INV_INFO) - private T invinfo; - @JSONField(name = InputDataTypeConst.SEL_INFO) - private T selinfo; - @JSONField(name = InputDataTypeConst.ADM_INFO) - private T adminfo; - - public InputData(T param, String insuplcAdmdvs, String flag) { - this.insuplcAdmdvs = insuplcAdmdvs == null ? "" : insuplcAdmdvs; - if (InputDataTypeConst.DATA.equals(flag)) { - this.data = param; - } else if (InputDataTypeConst.FEE_DETAIL.equals(flag)) { - this.feeDetail = param; - } else if (InputDataTypeConst.SIGN_IN.equals(flag)) { - this.signIn = param; - } else if (InputDataTypeConst.SIGN_OUT.equals(flag)) { - this.signOut = param; - } else if (InputDataTypeConst.PURC_INFO.equals(flag)) { - this.purcinfo = param; - } else if (InputDataTypeConst.INV_INFO.equals(flag)) { - this.invinfo = param; - } else if (InputDataTypeConst.SEL_INFO.equals(flag)) { - this.selinfo = param; - } - } - - public InputData(T param1, H param2, String insuplcAdmdvs, String flag) { - this.insuplcAdmdvs = insuplcAdmdvs == null ? "" : insuplcAdmdvs; - if (InputDataTypeConst.MD_TRT_INFO.equals(flag)) { - this.mdTrtInfo = param1; - this.diSeInfo = param2; - } else if (InputDataTypeConst.DRUG_INFO.equals(flag)) { - this.druginfo = param1; - this.drugdetail = param2; - } else if (InputDataTypeConst.DSCG_INFO.equals(flag)) { - this.dscginfo = param1; - this.diSeInfo = param2; - } else if (InputDataTypeConst.ADM_INFO.equals(flag)) { - this.adminfo = param1; - this.diSeInfo = param2; - } - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java deleted file mode 100644 index a9bc4f50..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/PDFInputDto.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.openhis.web.ybmanage.dto; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * PDF模板替换内容实体类 - * - * @author liuhr - * @date 2025/4/30 - */ -@Data -@Accessors(chain = true) -public class PDFInputDto { - - /** 医保电子处方追溯码 */ - private String rxTraceCode; - - /** 机构名 */ - private String orgName; - - /** 门诊/住院病历号 */ - private String iptOtpNo; - - /** 院内处方编号 */ - private String prescriptionNo; - - /** 科别/病区和床位 */ - private String locationName; - - /** 姓名 */ - private String patnName; - - /** 性别 */ - private String gender; - - /** 年龄 */ - private BigDecimal patnAge; - - /** 费别 */ - private String hiFeesetlType; - - /** 开具日期 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") - private Date prscTime; - - /** 临床诊断 */ - private String diagName; - - /** 处方有效天数 */ - private BigDecimal valiDays; - - /** 开方医师 */ - private String prscDrName; - - /** 审核药师 */ - private String pharName; - - /** 调配、复核药师 */ - private String disRevPharName; - - /** 核对、发药药师 */ - private String checkPharName; - - /** 延长处方用量原因 */ - private String reason; - - /** 药品信息列表 */ - private List medDetailList; - - /** - * 药品明细信息 - */ - @Data - @AllArgsConstructor - @NoArgsConstructor // 关键注解 - public static class MedDetail { - - /** 药品名字 */ - private String medName; - - /** 药品规格 */ - private String drugSpec; - - /** 单次用量 */ - private String sinDoscnt; - - /** 单次剂量单位 */ - private String sinDosunt; - - /** 使用频次编码 */ - private String usedFrquCodg; - - /** 用药途径 */ - private String medWay; - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java deleted file mode 100644 index 5c33e7de..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/RequestData.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.openhis.pojo; - -import lombok.Data; - -/** - * 医保入参 - */ -@Data -public class RequestData { - - private T data; - public RequestData(T param) { - this.data = param; - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java deleted file mode 100644 index 237b1ec9..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/ResultBody.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.openhis.pojo; - -import com.alibaba.fastjson2.annotation.JSONField; - -import lombok.Data; - -/** - * 医保结果 - */ -@Data -public class ResultBody { - - /** 交易状态码 */ - @JSONField(name="infcode") - private String infcode; - /** 发送方报文ID */ - @JSONField(name="warnMsg") - private String warn_msg; - /** 数字签名信息 */ - @JSONField(name="cainfo") - private String cainfo; - /** 错误信息 */ - @JSONField(name="err_msg") - private String errMsg; - /** 接收报文时间 */ - @JSONField(name="refmsg_time") - private String refmsgTime; - /** 签名类型 */ - @JSONField(name="signtype") - private String signtype; - /** 响应报文时间 */ - @JSONField(name="respond_time") - private String respondTime; - /** 接收方报文ID */ - @JSONField(name="inf_refmsgid") - private String infRefmsgid; - /** 交易输出 */ - @JSONField(name="output") - private String output; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java deleted file mode 100644 index 6cc24e1c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/pojo/TransBody.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.openhis.pojo; - -import com.alibaba.fastjson2.annotation.JSONField; - -import lombok.Builder; -import lombok.Data; - -/** - * 接口交易报文实体 - * @param - */ -@Data -@Builder -public class TransBody { - - /** 交易编号 */ - @JSONField(name="infno") - private String infno; - /** 发送方报文ID */ - @JSONField(name="msgid") - private String msgid; - /** 就医地医保区划 */ - @JSONField(name="mdtrtarea_admvs") - private String mdtrtareaAdmvs; - /** 参保地医保区划 */ - @JSONField(name="insuplc_admdvs") - private String insuplcAdmdvs; - /** 接收方系统代码 */ - @JSONField(name="recer_sys_code") - private String recerSysCode; - /** 设备编号 */ - @JSONField(name="dev_no") - private String devNo; - /** 设备安全信息 */ - @JSONField(name="dev_safe_info") - private String devSafeInfo; - /** 数字签名信息 */ - @JSONField(name="cainfo") - private String cainfo; - /** 签名类型 */ - @JSONField(name="signtype") - private String signtype; - /** 接口版本号 */ - @JSONField(name="infver") - private String infver; - /** 经办人类别 */ - @JSONField(name="opter_type") - private String opterType; - /** 经办人 */ - @JSONField(name="opter") - private String opter; - /** 经办人姓名 */ - @JSONField(name="opter_name") - private String opterName; - /** 交易时间 */ - @JSONField(name="inf_time") - private String infTime; - /** 定点医药机构编号 */ - @JSONField(name="fixmedins_code") - private String fixmedinsCode; - /** 定点医药机构名称 */ - @JSONField(name="fixmedins_name") - private String fixmedinsName; - /** 交易签到流水号 */ - @JSONField(name="sign_no") - private String signNo; - @JSONField(name="enc_type") - private String encType; - /** 交易输入 */ - @JSONField(name="input") - private T input; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java deleted file mode 100644 index 768533a3..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/FileService.java +++ /dev/null @@ -1,252 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.openhis.config.InterfaceConfig; -import com.openhis.utils.RedisUtil; -import com.openhis.vo.FileDownload; -import com.openhis.vo.FileResult; -import com.openhis.vo.Result; -import org.apache.commons.compress.utils.IOUtils; -import org.apache.http.HttpEntity; -import org.apache.http.HttpStatus; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ByteArrayEntity; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; - -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Service; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.*; - -/** - * 文件服务 - * - * @author SunJQ - * @date 2025-05-04 - */ -@Service -public class FileService { - - @Autowired - private InterfaceConfig interfaceConfig; - @Autowired - private RedisUtil redisUtil; - - - private static final String url = "http://ddjk.jlhs.gov.cn:20215/mbs/fsi/api/fileupload"; - - /** - * 调用普通交易及文件下载交易 - */ - public Result downloadFile(FileResult fileResult) { - CloseableHttpClient httpclient = HttpClients.createDefault(); - HttpPost httppost = new HttpPost(url); - RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(10000).setSocketTimeout(10000).build(); - httppost.setConfig(requestConfig); - FileDownload fileDownload = new FileDownload(); - fileDownload.setFilename(fileResult.getFilename()).setFileQuryNo(fileResult.getFileQuryNo()).setFixmedinsCode(fileResult.getFixmedinsCode()); - ByteArrayEntity entity = new ByteArrayEntity(JSON.toJSONString(fileDownload).getBytes(StandardCharsets.UTF_8)); - entity.setContentType("text/plain"); - httppost.setEntity(entity); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httppost); - int statusCode = response.getStatusLine().getStatusCode(); - if (statusCode != HttpStatus.SC_OK) { - httppost.abort(); - throw new RuntimeException("HttpClient,error status code :" + statusCode); - } - HttpEntity responseEntity = response.getEntity(); - String result; - if (responseEntity != null) { - if (responseEntity.getContentType().getValue().contains("application/octet-stream")) { - //拼接文件路径 - String filePath = interfaceConfig.getFilePath(); - long time = new Date().getTime(); - - InputStream content = responseEntity.getContent(); - //返回文件流 - File file = new File(filePath+"\\\\"+time+".txt"); - FileOutputStream fileOutputStream = new FileOutputStream(file); - int temp; - while ((temp = content.read()) != -1) { - fileOutputStream.write(temp); - } - fileOutputStream.close(); - return Result.okMsg("文件下载成功"+filePath+"\\\\"+time+".txt"); - } else { - //返回字符串 - result = EntityUtils.toString(responseEntity, "UTF-8"); - System.out.println(result); - } - } - EntityUtils.consume(entity); - } catch (ClientProtocolException e) { - throw new RuntimeException("提交给服务器的请求，不符合HTTP协议", e); - } catch (IOException e) { - throw new RuntimeException("向服务器承保接口发起http请求,执行post请求异常", e); - } finally { - if (response != null) { - try { - response.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if (httpclient != null) { - try { - httpclient.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.error("下载失败"); - } - - - /** - * 调用文件上传交易 - */ - public Result uploadFile(MultipartFile file, String text, String fixmedinsCode, String admvs, String userId) { - HttpEntity responseEntity = null; - try { - CloseableHttpClient httpclient = HttpClients.createDefault(); - HttpPost httppost = new HttpPost(url); - RequestConfig requestConfig = RequestConfig.custom() - .setConnectTimeout(10000) - .setSocketTimeout(10000) - .build(); - httppost.setConfig(requestConfig); - - // 设置认证头 - httppost.setHeader("Authorization", String.valueOf( - redisUtil.get("USER_TOKEN:USER_TOKEN_" + admvs + ":" + userId) - )); - - // 创建JSON请求体 - 这是关键改变！ - JSONObject requestBody = new JSONObject(); - requestBody.put("fixmedins_code", fixmedinsCode); - requestBody.put("filename", file.getOriginalFilename()); - requestBody.put("file", Base64.getEncoder().encodeToString(file.getBytes())); - - // 设置JSON请求体 - StringEntity entity = new StringEntity( - requestBody.toJSONString(), - ContentType.APPLICATION_JSON - ); - httppost.setEntity(entity); - - System.out.println("Sending JSON: " + requestBody.toJSONString()); - - try (CloseableHttpResponse response = httpclient.execute(httppost)) { - int statusCode = response.getStatusLine().getStatusCode(); - if (statusCode != HttpStatus.SC_OK) { - throw new RuntimeException("HTTP error, status code: " + statusCode); - } - - responseEntity = response.getEntity(); - if (responseEntity != null) { - String result = EntityUtils.toString(responseEntity, StandardCharsets.UTF_8); - System.out.println("Response: " + result); - return Result.ok(result); - // 处理返回结果... - } - } - } catch (Exception e) { - throw new RuntimeException("Request failed: " + e.getMessage(), e); - } - return Result.ok(responseEntity); - } - - public FileResult uploadFile(InputStream fileStream, - String filename, - String fixmedinsCode) throws IOException{ -// // 1. 预处理校验（与之前方案一致） -// validateZipFile(fileData); -// List txtLines = extractTxtContent(fileData); -// validateTxtFormat(txtLines); - - // 2. 构建请求（关键修改点） - CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost(url); - - // 构建multipart请求体（参考医保局示例） - MultipartEntityBuilder builder = MultipartEntityBuilder.create(); - builder.setCharset(StandardCharsets.UTF_8); - - // 添加JSON参数（根据实际接口要求调整） - builder.addTextBody("jsonStr", buildJsonRequest(filename, fixmedinsCode)); - - // 添加文件参数（注意参数名需与接口文档一致） - builder.addBinaryBody( - "in", // 对应接口参数代码"in" - IOUtils.toByteArray(fileStream), - ContentType.APPLICATION_OCTET_STREAM, - filename - ); - - HttpEntity entity = builder.build(); - httpPost.setEntity(entity); - - // 3. 执行请求（关键修改点） - try (CloseableHttpResponse response = httpClient.execute(httpPost)) { - int statusCode = response.getStatusLine().getStatusCode(); - if (statusCode != HttpStatus.SC_OK) { - throw new RuntimeException("医保接口调用失败，状态码：" + statusCode); - } - - // 解析响应（参考医保局示例） - HttpEntity responseEntity = response.getEntity(); - String responseBody = EntityUtils.toString(responseEntity, StandardCharsets.UTF_8); - return parseMedicareResponse(responseBody); - } - } - - private String buildJsonRequest(String filename, String fixmedinsCode) { - // 根据实际接口要求构建JSON请求体 - return String.format( - "{" + - "\"filename\":\"%s\"," + - "\"fixmedins_code\":\"%s\"" + - "}", - filename, - fixmedinsCode - ); - } - - private FileResult parseMedicareResponse(String jsonResponse) { - // 解析医保局返回的JSON响应（根据实际响应结构调整） - // 示例解析逻辑，需替换为实际解析代码 - ObjectMapper mapper = new ObjectMapper(); - try { - return mapper.readValue(jsonResponse, FileResult.class); - } catch (JsonProcessingException e) { - throw new RuntimeException("响应解析失败", e); - } - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java deleted file mode 100644 index 8296da02..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/HandlerService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.openhis.service; - -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.vo.BaseParam; - -import java.util.Map; -/** - * - */ -public interface HandlerService { - - /** - * 发送数据 - * @param inputData - * @return - */ - ResultBody handle(InputData inputData, BaseParam baseParam); - - /** - * 初始化接口报文 - * @param intNum - * @param inputData - * @return - */ - String initTransBody(String intNum,InputData inputData,BaseParam baseParam); - - /** - * 发送数据 - * @return - */ - Map getHeader(BaseParam baseParam); - - /** - * 发送数据 - * @param url - * @param transBody - * @return - */ - ResultBody sendDatas(String url, String transBody,BaseParam baseParam); - - /** - * 获取token - * @return - */ - String getToken(BaseParam baseParam); -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java deleted file mode 100644 index afd96ca3..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IElepHandlerService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.openhis.service; - -import java.util.Map; - -import com.alibaba.fastjson2.JSONObject; -import com.openhis.domain.BaseResponse; -import com.openhis.pojo.RequestData; -import com.openhis.vo.BaseParam; - -/** - * - */ -public interface IElepHandlerService { - - /** - * 发送数据 - * @param requestData 请求数据 - * @return 请求数据 - */ - BaseResponse elepHandle(RequestData requestData, BaseParam baseParam); - - /** - * 初始化接口报文 - * @param intNum 类型 - * @param requestData 请求数据 - * @return - */ - JSONObject initTransBody(String intNum, RequestData requestData, BaseParam baseParam); - - - /** - * 发送数据 - * @param url url - * @param request 请求数据 - * @return - */ - BaseResponse sendDatas(String url, JSONObject request,BaseParam baseParam); - - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java deleted file mode 100644 index 8a0aa3b7..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/IYbElepService.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.domain.*; -import com.openhis.vo.BaseParam; -import com.openhis.vo.Result; -import org.springframework.web.bind.annotation.PostMapping; - -/** - * - * @author yuxj - * @date 2025-04-17 - */ -public interface IYbElepService { - - /** - * 电子处方上传预核验 - * - * @param baseParam 处方信息 - * @return - */ - Result preCheckPrescription(BaseParam baseParam); - - /** - * 电子处方医保电子签名 - * - * @param baseParam 电子签名信息 - * @return - */ - Result signature(BaseParam baseParam); - - /** - * 电子处方上传 - * - * @param baseParam 上传信息 - * @return - */ - Result upload(BaseParam baseParam); - - /** - * 电子处方撤销 - * - * @param baseParam 撤销信息 - * @return - */ - Result revoke(BaseParam baseParam); - - /** - * 电子处方信息查询 - * - * @param baseParam 查询信息 - * @return - */ - Result querPrescription(BaseParam baseParam); - - /** - * 电子处方取药结果查询 - * - * @param baseParam 撤销信息 - * @return - */ - Result medresult(BaseParam baseParam); -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java deleted file mode 100644 index 168e47c8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/YbService.java +++ /dev/null @@ -1,348 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.vo.*; - -/** - * TODO:医保同一服务层 - * - * @author SunJQ - * @date 2025-03-19 - */ -public interface YbService { - - /** - * 签到 - * - * @param sign - * @param request - * @return - */ - Result signIn(BaseParam sign, HttpServletRequest request); - - /** - * 签到 - * - * @param sign - * @return - */ - Result signOut(BaseParam sign); - - /** - * 读卡获取身份信息 - * - * @param baseParam - * @return - */ - Result getPerInfo(BaseParam baseParam); - - /** - * 挂号 - * - * @param baseParam - * @return - */ - Result reg(BaseParam baseParam); - - /** - * 退号 - * - * @param baseParam - * @return - */ - Result cancelReg(BaseParam baseParam); - - /** - * 门诊就诊信息上传 - * - * @param - * @return - */ - Result saveMedical(BaseParam baseParam); - - /** - * 门诊费用明细上传 - * - * @param baseParam - * @return - */ - Result upFeeDetail(BaseParam baseParam); - - /** - * 门诊费预结算 - * - * @param baseParam - * @return - */ - Result preSetl(BaseParam baseParam); - - /** - * 门诊费用明细撤销 - * - * @param baseParam - * @return - */ - Result cancelFeeDetail(BaseParam baseParam); - - /** - * 门诊费用结算 - * - * @param - * @return - */ - Result setl(BaseParam baseParam); - - /** - * 门诊费用撤销 - * - * @param - * @return - */ - Result cancelSetl(BaseParam baseParam); - - /** - * 目录下载 - * - * @param fileDownload - * @return - */ - Result download(BaseParam baseParam, FileDownload fileDownload); - - /** - * 预结算 - * - * @param baseParam - * @return - */ - Result preSettle(BaseParam baseParam); - - /** - * 目录对照 - * - * @param baseParam - * @return - */ - Result directoryCheck(BaseParam baseParam); - - /** - * 目录对照撤销 - * - * @param baseParam - * @return - */ - Result directoryUnCheck(BaseParam baseParam); - - /** - * 对总账 - * - * @param baseParam - * @return - */ - Result reconcileGeneralLedger(BaseParam baseParam); - - /** - * 明细对账 - * - * @param financial3202Param - * @return - */ - Result reconcileGeneralLedgerDetail(BaseParam baseParam, FinancialSettlement3202Param financial3202Param); - - /** - * 第三方异常数据结算 - * - * @param financialSettlement3209AParam - * @return - */ - Result threePartSearch(BaseParam baseParam, FinancialSettlement3209AParam financialSettlement3209AParam); - - /** - * 清算申请 - * - * @param - * @return - */ - Result applyFinancialClearing(BaseParam baseParam); - - /** - * 清算申请状态查询 - * - * @param clearing3205AParma - * @return - */ - Result getFinancialClearingStatus(BaseParam baseParam, Clearing3205AParma clearing3205AParma); - - /** - * 撤销清算申请 - * - * @param financial3204Param - * @return - */ - Result cancelFinancialClearing(BaseParam baseParam, Financial3204Param financial3204Param); - - /** - * 库存盘点上传 - * - * @param baseParam - * @return - */ - Result uploadInventoryCount(BaseParam baseParam); - - /** - * 库存信息变更 - * - * @param baseParam - * @return - */ - Result updateInventoryCount(BaseParam baseParam); - - /** - * 商品采购 - * - * @param baseParam - * @return - */ - Result procurement(BaseParam baseParam); - - /** - * 商品采购撤销 - * - * @param baseParam - * @return - */ - Result cancelProcurement(BaseParam baseParam); - - /** - * 商品销售 - * - * @param baseParam - * @return - */ - Result merchandise(BaseParam baseParam); - - /** - * 商品销售退货 - * - * @param baseParam - * @return - */ - Result cancelMerchandise(BaseParam baseParam); - - Result deleteGoodsInfo(BaseParam baseParam, Medical3507Param medical3507Param); - - /** - * 医保目录信息查询 - * - * @param baseParam - * @return - */ - Result queryYbCatalogue(BaseParam baseParam); - - /** - * 3206A - * - * @param baseParam - * @return - */ - Result getClrOptins(BaseParam baseParam); - - /** - * 【2301】上传住院费用明细 - * - * @param baseParam - * @return - */ - Result uploadInpatientFeeDetail(BaseParam baseParam); - - /** - * 【2302】住院费用明细撤销 - * - * @param baseParam - * @return - */ - Result cancelInpatientFeeDetail(BaseParam baseParam); - - /** - * 【2303】住院预结算 - * - * @param baseParam - * @return - */ - Result prePayInpatient(BaseParam baseParam); - - /** - * 【2304】住院结算 - * - * @param baseParam - * @return - */ - Result payInpatient(BaseParam baseParam); - - /** - * 【2305】取消住院结算 - * - * @param baseParam - * @return - */ - Result cancelInpatientPay(BaseParam baseParam); - - /** - * 【2401】 办理入院 - * - * @param baseParam - * @return - */ - Result inpatientReg(BaseParam baseParam); - - /** - * 【2402】 办理出院 - * - * @param baseParam - * @return - */ - Result dischargePatient(BaseParam baseParam); - - /** - * 【2403】 住院信息变更 - * - * @param baseParam - * @return - */ - Result changeInpatientInfo(BaseParam baseParam); - - /** - * 【2404】 撤销入院 - * - * @param baseParam - * @return - */ - Result cancelInpatientReg(BaseParam baseParam); - - /** - * 【2405】 撤销出院 - * - * @param baseParam - * @return - */ - Result cancelDischargePatient(BaseParam baseParam); - - /** - * 【3101】明细审核事前事中分析服务 - * - * @param baseParam 基础参数 - * @return 结果 - */ - Result yb3101PreMidAnalysis(BaseParam baseParam); - - /** - * 【3103】事前事中服务反馈服务 - * - * @param baseParam 基础参数 - * @return 结果 - */ - Result yb3103PreMidFeedback(BaseParam baseParam); -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java deleted file mode 100644 index 1e375275..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/ElepHandlerServiceImpl.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.openhis.service.impl; - -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; -import com.core.common.exception.ServiceException; -import com.openhis.domain.BaseResponse; -import com.openhis.pojo.RequestData; -import com.openhis.service.IElepHandlerService; -import com.openhis.utils.HseEncAndDecUtil; -import com.openhis.utils.RedisUtil; -import com.openhis.utils.SignUtil; -import com.openhis.vo.BaseParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.StatusLine; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; - -/** - * 医保交易 - */ -@Component -@Slf4j -public abstract class ElepHandlerServiceImpl implements IElepHandlerService { - Logger logger = LoggerFactory.getLogger(ElepHandlerServiceImpl.class); - /********************************************************************** - * - * @method handle - * @author TianYi - * @Date 2021-08-13 - * @param requestData - * @return - * @description 发送数据 - **********************************************************************/ - @Override - public abstract BaseResponse elepHandle(RequestData requestData, BaseParam baseParam); - - - /********************************************************************** - * - * @method sendDatas - * @author TianYi - * @Date 2021-08-13 - * @param intNum - * @param requestData - * @return - * @description 初始化数据体 - **********************************************************************/ - @Override - public JSONObject initTransBody(String intNum, RequestData requestData, BaseParam baseParam) { - String prePrvKey = baseParam.getBaseInfo().getPrePrvKey(); - String appId = baseParam.getBaseInfo().getPreAppId(); - String appSecret = baseParam.getBaseInfo().getPreAppSecret(); - - String sortedData = SignUtil.getValue(JSONObject.toJSONString(requestData.getData())); - logger.info("【" + intNum + "】 整体入参：====" + JSONObject.toJSONString(sortedData)); - System.out.println("【" + intNum + "】 整体入参：====" + JSONObject.toJSONString(sortedData)); - - // 加密数据 - try { - JSONObject jsonObject = JSON.parseObject(sortedData); - JSONObject inputObject = HseEncAndDecUtil.encryptMsg(appId, appSecret, prePrvKey, "", jsonObject); - - logger.info("【" + intNum + "】 加密后的整体入参：====" + JSONObject.toJSONString(inputObject)); - System.out.println("【" + intNum + "】 加密后的整体入参：====" + JSONObject.toJSONString(inputObject)); - return inputObject; - } catch (Exception e) { - throw new ServiceException("加密数据异常"); - } - - } - - - /********************************************************************** - * - * @method sendDatas - * @author TianYi - * @Date 2021-08-13 - * @param url - * @param request - * @return - * @description 发送数据 - **********************************************************************/ - @Override - public BaseResponse sendDatas(String url, JSONObject request, BaseParam baseParam) { - String appId = baseParam.getBaseInfo().getPreAppId(); - String appSecret = baseParam.getBaseInfo().getPreAppSecret(); - - logger.info("响应URL：====" + url); - System.out.println("响应URL：====" + url); - - CloseableHttpClient client = HttpClients.createDefault(); - String encData = request.getString("encData"); - String signData = request.getString("signData"); - request.remove("encData"); - request.remove("signData"); - String sortjson = SignUtil.getValue(request); - sortjson = sortjson.substring(0, sortjson.length() - 1) + ",\"encData\":\"" + encData + "\"" + ",\"signData\":\"" + signData + "\"}"; - - BaseResponse response = null; - HttpPost httpPost = new HttpPost(url); - StringEntity entity; - try { - entity = new StringEntity(sortjson);//解决中文乱码问题 - } catch (UnsupportedEncodingException e) { - throw new ServiceException("解决中文乱码问题失败"); - } - - httpPost.addHeader("Content-Type", "application/json; charset=utf-8"); - httpPost.setEntity(entity); - try { - HttpResponse resp = client.execute(httpPost);//执行时机 - - String respResult = ""; - StatusLine statusLine = resp.getStatusLine();//获取请求对象中的响应行对象 - int responseCode = statusLine.getStatusCode();//从状态行中获取状态码 - if (responseCode == 200) { - HttpEntity entity2 = resp.getEntity(); - if (entity2 != null) { - System.out.println("响应内容："); - System.out.println(JSON.toJSONString(response)); - //根据httpclient的官方说明中，EntityUtils.toString(httpEntity) 这个被调用一次后就会自动销毁 - BufferedReader in = new BufferedReader(new InputStreamReader(resp.getEntity().getContent(), "UTF-8")); - StringBuffer sb = new StringBuffer(""); - String line = ""; - String NL = System.getProperty("line.separator"); - while ((line = in.readLine()) != null) { - sb.append(line + NL); - } - in.close(); - String content = sb.toString(); - response = JSONObject.parseObject(content, BaseResponse.class); - System.out.println("响应之后出参：====" + response); - logger.info("出参数据：====" + response); - //数据解密 - String testdecData = null; - if (response.getCode() == 0){ - try { - testdecData = HseEncAndDecUtil.sm4Decrypt(appId, appSecret, response.getEncData()); - System.out.println("解密后的数据" + testdecData); - logger.info("解密后的出参数据：====" + testdecData); - response.setEncData(testdecData); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - return response; - } - } else { - throw new ServiceException("电子处方网络请求失败"); - } - client.close(); - } catch (IOException e) { - throw new ServiceException("电子处方网络请求失败"); - } - return response; - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java deleted file mode 100644 index d10826f6..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/HandlerServiceImpl.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.openhis.service.impl; - -import static com.alibaba.fastjson.JSON.parseObject; - -import java.nio.charset.StandardCharsets; -import java.util.Base64; -import java.util.HashMap; -import java.util.Map; - -import com.openhis.vo.BaseParam; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.stereotype.Component; - -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; -import com.openhis.config.InterfaceConfig; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.pojo.TransBody; -import com.openhis.service.HandlerService; -import com.openhis.utils.BusnessIdUtil; -import com.openhis.utils.EasyGmUtils; -import com.openhis.utils.HttpClientUtil; -import com.openhis.utils.RedisUtil; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.http.HttpRequest; -import lombok.extern.slf4j.Slf4j; - -/** - * 医保交易 - */ -@Component -@Slf4j -public abstract class HandlerServiceImpl implements HandlerService { - - /** - * 中心接口配置 - */ - @Autowired - protected InterfaceConfig interfaceConfig; - /** - * redis工具 - */ - @Autowired - private RedisUtil redisUtil; - /** - * 多租户服务 - */ - @Autowired - private BusnessIdUtil busnessIdUtil; - - Logger logger = LoggerFactory.getLogger(HandlerServiceImpl.class); - - @Override - public abstract ResultBody handle(InputData inputData, BaseParam baseParam); - - - @Override - public String initTransBody(String intNum, InputData inputData, BaseParam baseParam) { - // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // com.openhis.vo.LoginUser sysUser = loginUserUtil.getLoginUser(); - // 从缓存中获取签到编号 - String signNo = ""; - if (redisUtil.hasKey("USER_SIGNNO:"+ baseParam.getBaseInfo().getAdmvs()+ ":" + baseParam.getBaseInfo().getUserId())) { - signNo = redisUtil.get("USER_SIGNNO:"+ baseParam.getBaseInfo().getAdmvs()+ ":" + baseParam.getBaseInfo().getUserId()).toString(); - } - if("9001".equals(intNum)){ - signNo = ""; - } - logger.info("【" + intNum + "】加密前的input：====" + JSONObject.toJSONString(inputData)); - System.out.println("【" + intNum + "】加密前的input：====" + JSONObject.toJSONString(inputData)); - - TransBody transBody = TransBody.builder().infno(intNum) - .msgid(busnessIdUtil.getMsgid(baseParam.getBaseInfo().getFixmedinsCode())) - .mdtrtareaAdmvs(baseParam.getBaseInfo().getAdmvs()) - .insuplcAdmdvs(intNum.equals("9001") || intNum.equals("1101") || intNum.equals("3206A") || intNum.equals("3301") || intNum.equals("3302")|| intNum.equals("3203A") ? baseParam.getBaseInfo().getAdmvs() - : baseParam.getBaseInfo().getInsuplcAdmdvs()) - .recerSysCode("sys01").devNo("").devSafeInfo("") - .cainfo(interfaceConfig.getIsEncrypt() ? sign(JSONObject.toJSONString(inputData),baseParam) : "") - .signtype(interfaceConfig.getIsEncrypt() ? "SM2" : "").infver("V1.0").opterType("1").encType("SM4") - .opter(baseParam.getBaseInfo().getUserId().toString()).opterName(baseParam.getBaseInfo().getRealname()) - .infTime(DateUtil.now()).fixmedinsCode(baseParam.getBaseInfo().getFixmedinsCode()) - .fixmedinsName(baseParam.getBaseInfo().getFixmedinsName()).signNo(signNo) - // .fixmedinsName(baseParam.getBaseInfo().getFixmedinsName()).signNo("220000202505210958500117447359") - .input(interfaceConfig.getIsEncrypt() ? encrypt(JSONObject.toJSONString(inputData),baseParam) : inputData).build(); - System.out.println("【" + intNum + "】" + " 整体入参：====" + JSONObject.toJSONString(transBody)); - logger.info("【" + intNum + "】 整体入参：====" + JSONObject.toJSONString(transBody)); - return JSONObject.toJSONString(transBody); - } - - - @Override - public Map getHeader(BaseParam baseParam) { - Map header = new HashMap(); - header.put("Authorization", "Bearer " + this.getToken(baseParam)); - header.put(HttpHeaders.CONTENT_TYPE, "application/json"); - return header; - } - - - @Override - public ResultBody sendDatas(String url, String transBody, BaseParam baseParam) { - String result = - HttpRequest.post(url).addHeaders(getHeader(baseParam)).body(transBody).timeout(20000).execute().body(); - System.out.println("解密之前医保返回出参：====" + result); - logger.info("解密之前医保返回出参：====" + result); - ResultBody resultBody = JSONObject.parseObject(result, ResultBody.class); - // 判断返回值是否需要解密 - String decryptFlag = baseParam.getBaseInfo().getDecryptFlag(); - if (interfaceConfig.getIsEncrypt()&&"1".equals(decryptFlag)) { - decrypt(resultBody,baseParam); - } - System.out.println("解密之后出参：====" + resultBody); - logger.info("解密之后出参：====" + resultBody); - return resultBody; - } - - - @Override - public String getToken(BaseParam baseParam) { - String accessToken = ""; - Long userId = baseParam.getBaseInfo().getUserId(); - if (redisUtil.hasKey("USER_TOKEN:USER_TOKEN_"+baseParam.getBaseInfo().getAdmvs()+ ":" + userId)) { - // 获取缓存 - accessToken = String.valueOf(redisUtil.get("USER_TOKEN:USER_TOKEN_"+baseParam.getBaseInfo().getAdmvs()+ ":" + userId)); - } else { - Map parmap = new HashMap(); - parmap.put("username", baseParam.getBaseInfo().getYbUsername()); - parmap.put("password", baseParam.getBaseInfo().getYbPassword()); - parmap.put("scope", baseParam.getBaseInfo().getYbScope()); - parmap.put("grant_type", baseParam.getBaseInfo().getYbGrantType()); - System.out.println(parmap); - Map headermap = new HashMap(); - headermap.put("Authorization", "Basic " + Base64.getEncoder().encodeToString( - (baseParam.getBaseInfo().getYbClientId() + ":" + baseParam.getBaseInfo().getYbClientSecret()).getBytes(StandardCharsets.UTF_8))); - headermap.put(HttpHeaders.CONTENT_TYPE, "application/x-www-form-urlencoded"); - System.out.println(interfaceConfig.getAddress() + ServiceAdrEnum.TOKEN.getAddress()); - String result = HttpClientUtil.sendIOPost(interfaceConfig.getAddress() + ServiceAdrEnum.TOKEN.getAddress(), - parmap, headermap, "utf8", null); - System.out.println(result); - accessToken = JSON.parseObject(result).getString("access_token"); - // 数据插入缓存（set中的参数含义：key值，user对象，缓存存在时间10（long类型），时间单位） - System.out.println("token:"+accessToken); - redisUtil.set("USER_TOKEN:USER_TOKEN_"+baseParam.getBaseInfo().getAdmvs()+ ":" + userId, accessToken, interfaceConfig.getTime()); - log.info("数据插入缓存" + accessToken); - } - return accessToken; - } - - - private String sign(String signBody,BaseParam baseParam) { - byte[] prvKey = Base64.getDecoder().decode(baseParam.getBaseInfo().getYbCliPrvKey()); - byte[] asig = EasyGmUtils.signSm3WithSm2(signBody.getBytes(StandardCharsets.UTF_8), - baseParam.getBaseInfo().getYbClientId().getBytes(StandardCharsets.UTF_8), prvKey); - String signStr = new String(Base64.getEncoder().encode(asig)); - return signStr; - } - - - private String encrypt(String param,BaseParam baseParam) { - byte[] encrypt = param.getBytes(); - byte[] bs = EasyGmUtils.sm4Encrypt(baseParam.getBaseInfo().getYbClientId().getBytes(StandardCharsets.UTF_8), encrypt); - String result = new String(Base64.getEncoder().encode(bs)); - return result; - } - - - private void decrypt(ResultBody resultBody, BaseParam baseParam) { - System.out.println(JSON.toJSONString(resultBody)); - byte[] result = EasyGmUtils.sm4Decrypt(baseParam.getBaseInfo().getYbClientId().getBytes(StandardCharsets.UTF_8), - Base64.getDecoder().decode(resultBody.getOutput())); - resultBody.setOutput(new String(result)); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java deleted file mode 100644 index 2b4c807a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbElepServiceImpl.java +++ /dev/null @@ -1,341 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl; - -import static com.alibaba.fastjson.JSON.parseObject; - -import java.io.IOException; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; - -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.core.common.utils.SecurityUtils; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.itextpdf.text.DocumentException; -import com.openhis.common.constant.CommonConstants; -import com.openhis.common.enums.ybenums.YbDrugMedWay; -import com.openhis.common.enums.ybenums.YbGender; -import com.openhis.common.enums.ybenums.YbUsedFrqu; -import com.openhis.component.ElepHandlerIntDispatcher; -import com.openhis.config.InterfaceConfig; -import com.openhis.config.Tenant; -import com.openhis.enums.ElepServiceAdrEnum; -import com.openhis.pojo.RequestData; -import com.openhis.utils.PDFTemplateFillerUtil; -import com.openhis.utils.RedisUtil; -import com.openhis.vo.BaseInfo; -import com.openhis.vo.BaseParam; -import com.openhis.web.ybmanage.dto.PDFInputDto; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.openhis.domain.*; -import com.openhis.service.*; -import com.openhis.vo.Result; - -/** - * @author yuxj - * @date 2025-04-17 - */ -@Service -public class YbElepServiceImpl implements IYbElepService { - - /** - * 接口分发器 - */ - @Autowired - private ElepHandlerIntDispatcher elepHandlerIntDispatcher; - - /** - * redis工具 - */ - @Autowired - private RedisUtil redisUtil; - /** - * 中心接口配置 - */ - @Autowired - protected InterfaceConfig interfaceConfig; - - @Autowired - private Tenant tenant; - - /** - * 电子处方上传预核验 - * - * @param baseParam 处方信息 - * @return 返回值 - */ - public Result preCheckPrescription(BaseParam baseParam) { - BaseInfo baseInfo = baseParam.getBaseInfo(); - baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName()); - PreCheckPrescription prescriptioninfo = - JSON.parseObject(JSON.toJSONString(baseParam.getData()), PreCheckPrescription.class); - // 调用分发器处理预核验业务 - BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0001.toString(), - new RequestData(prescriptioninfo), baseParam); - // 检查服务调用是否成功 - if (result.getCode() == 0) { - // 解析返回结果中的数据 - ElepVeriPrescriptionOutput output = null; - try { - ObjectMapper objectMapper = new ObjectMapper(); - output = objectMapper.readValue(result.getEncData(), ElepVeriPrescriptionOutput.class); - } catch (Exception e) { - Result.error("返回参数转换错误"); - } - // 做成PDF - List medDetailList = new ArrayList<>(); - PDFInputDto.MedDetail medDetail; - String pattern = "\\s*\\([^)]*\\)$"; - for (ElepVeriPrescriptionDetail item : prescriptioninfo.getRxdrugdetail()) { - medDetail = new PDFInputDto.MedDetail(); - // 药品名字 - medDetail.setMedName(item.getDrugGenname()); - // 药品规格 - medDetail.setDrugSpec(item.getDrugSpec() + " * " + item.getDrugCnt() + item.getDrugDosunt()); - // 单次用量 - medDetail.setSinDoscnt("每次" + item.getSinDoscnt()); - // 单次剂量单 - medDetail.setSinDosunt(item.getSinDosunt()); - // 使用频次编码 - medDetail.setUsedFrquCodg(YbUsedFrqu.getByValue(item.getUsedFrquCodg()).getDescription().replaceAll(pattern, "")); - // 用药途径 - medDetail.setMedWay(YbDrugMedWay.getByValue(item.getMedcWayCodg()).getDescription()); - medDetailList.add(medDetail); - } - // 主诊断名称 - String diagName = prescriptioninfo.getDiseinfo().getDiagName(); - - // 做成原始PDF文件 - PDFInputDto pdfInputDto = new PDFInputDto() - // 医保电子处方追溯码 - .setRxTraceCode(output.getRxTraceCode()) - // 机构名 - .setOrgName(prescriptioninfo.getMdtrtinfo().getFixmedinsName()) - // 门诊/住院病历号 - .setIptOtpNo(prescriptioninfo.getMdtrtinfo().getIptOtpNo()) - // 院内处方编号 - .setPrescriptionNo(prescriptioninfo.getHospRxno()) - // 科别/病区和床位 - .setLocationName(prescriptioninfo.getMdtrtinfo().getPrscDeptName()) - // 姓名 - .setPatnName(prescriptioninfo.getMdtrtinfo().getPatnName()) - // 性别 - .setGender(YbGender.getByValue(prescriptioninfo.getMdtrtinfo().getGend()).getDescription()) - // 年龄 - .setPatnAge(new BigDecimal(prescriptioninfo.getMdtrtinfo().getPatnAge())) - // 费别 - .setHiFeesetlType(baseInfo.getMedType()) - // 开具日期 - .setPrscTime(prescriptioninfo.getPrscTime()) - // 临床诊断 - .setDiagName(diagName) - // 处方有效天数 - .setValiDays(new BigDecimal(prescriptioninfo.getValiDays())) - // 开方医师 - .setPrscDrName(prescriptioninfo.getMdtrtinfo().getPrscDrName()) - // 审核药师 - .setPharName(baseInfo.getDutyDoctorName()) - // 调配、复核药师 - .setDisRevPharName(null) - // 核对、发药药师 - .setCheckPharName(null) - // 延长处方用量原因 - .setReason(null) - // 药品明细信息 - .setMedDetailList(medDetailList); - - // 获取当前日期 - LocalDate currentDate = LocalDate.now(); - // 定义格式（yyyyMMdd） - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); - // 格式化日期 - String formattedDate = currentDate.format(formatter); - //创建日期文件夹 - Boolean pathFlg = PDFTemplateFillerUtil.makePath(baseInfo.getOutputPath(), formattedDate); - if (!pathFlg) { - return Result.error("创建文件夹时发生错误"); - } - //pdf模板文件全路径 - String templatePath = baseInfo.getTemplatePath(); - //生成的pdf模板文件全路径 - String outputPath = baseInfo.getOutputPath() + formattedDate + "\\" + prescriptioninfo.getHospRxno() + ".pdf"; - //盖章全路径 - String hospitalSealPath = baseInfo.getHospitalSealPath(); - try { - PDFTemplateFillerUtil.fillPdfTemplate(templatePath, outputPath, hospitalSealPath, pdfInputDto); - System.out.println("PDF 填充完成，文件已保存到：" + outputPath); - } catch (IOException | DocumentException e) { - e.printStackTrace(); - System.err.println("填充 PDF 时发生错误：" + e.getMessage()); - return Result.error("填充 PDF 时发生错误：" + e.getMessage()); - } - // 将pdf的名字保存 - redisUtil.set("RxFileName", outputPath); - - // 返回成功响应 - return Result.ok("电子处方上传预核验成功！", output); - } - - return Result.error(result.getMessage()); - } - - /** - * 电子处方医保电子签名 - * - * @param baseParam 电子签名信息 - * @return 返回值 - */ - public Result signature(BaseParam baseParam) { - BaseInfo baseInfo = baseParam.getBaseInfo(); - baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName()); - ElepSignatureInput signatureInput = - JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepSignatureInput.class); - String prescriptionNo = signatureInput.getPrescriptionNo(); - signatureInput.setPrescriptionNo(null); - - // 调用分发器处理电子签名业务 - BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0002.toString(), - new RequestData(signatureInput), baseParam); - // 检查服务调用是否成功 - if (result.getCode() == 0) { - // 解析返回结果中的数据 - ElepSignatureOutput output = - parseObject(parseObject(result.getEncData()).toString(), ElepSignatureOutput.class); - - LocalDate currentDate = LocalDate.now(); - // 定义格式（yyyyMMdd） - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); - // 格式化日期 - String formattedDate = currentDate.format(formatter); - String folderPath = baseInfo.getOutputPath() + formattedDate + "\\"; // Windows 绝对路径，注意末尾的反斜杠 - String fileName = prescriptionNo + ".pdf"; // 文件名由处方号拼接而成 - // 拼接完整的文件路径 - String filePath = folderPath + fileName; - // 做成PDF文件 - boolean rxFileBool = PDFTemplateFillerUtil.makePDF(output.getRxFile(), filePath); - if (!rxFileBool) { - return Result.error("PDF文件做成失败！"); - } - - // 返回成功响应 - return Result.ok("电子处方医保电子签名成功！", output); - } - - return Result.error(result.getMessage()); - } - - /** - * 电子处方上传 - * - * @param baseParam 上传信息 - * @return 返回值 - */ - public Result upload(BaseParam baseParam) { - BaseInfo baseInfo = baseParam.getBaseInfo(); - baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName()); - - ElepUploadInput uploadInput = - JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepUploadInput.class); - - // 调用分发器处理上传业务 - BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0003.toString(), - new RequestData(uploadInput), baseParam); - // 检查服务调用是否成功 - if (result.getCode() == 0) { - // 解析返回结果中的数据 - ElepUploadOutput output = parseObject(parseObject(result.getEncData()).toString(), ElepUploadOutput.class); - // 返回成功响应 - return Result.ok("电子处方上传成功！", output); - } - - return Result.error(result.getMessage()); - } - - /** - * 电子处方撤销 - * - * @param baseParam 撤销信息 - * @return 返回值 - */ - public Result revoke(BaseParam baseParam) { - BaseInfo baseInfo = baseParam.getBaseInfo(); - baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName()); - - ElepRevokeInput revokeInput = - JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepRevokeInput.class); - // 调用分发器处理上传业务 - BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0004.toString(), - new RequestData(revokeInput), baseParam); - // 检查服务调用是否成功 - if (result.getCode() == 0) { - // 解析返回结果中的数据 - ElepRevokeOutput output = parseObject(parseObject(result.getEncData()).toString(), ElepRevokeOutput.class); - // 返回成功响应 - return Result.ok("电子处方撤销成功！", output); - } - return Result.error(result.getMessage()); - } - - /** - * 电子处方信息查询 - * - * @param baseParam 查询信息 - * @return 返回值 - */ - public Result querPrescription(BaseParam baseParam) { - BaseInfo baseInfo = baseParam.getBaseInfo(); - baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName()); - - ElepQuerPrescriptionInput querPrescriptionInput = - JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepQuerPrescriptionInput.class); -// (ElepQuerPrescriptionInput)baseParam.getData(); - // 调用分发器处理信息查询业务 - BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0005.toString(), - new RequestData(querPrescriptionInput), baseParam); - // 检查服务调用是否成功 - if (result.getCode() == 0) { - // 解析返回结果中的数据 - QueryPrescription output = - parseObject(parseObject(result.getEncData()).toString(), QueryPrescription.class); - // 返回成功响应 - return Result.ok("电子处方信息查询成功！", output); - } - return Result.error(result.getMessage()); - } - - /** - * 电子处方取药结果查询 - * - * @param baseParam 撤销信息 - * @return 返回值 - */ - public Result medresult(BaseParam baseParam) { - BaseInfo baseInfo = baseParam.getBaseInfo(); - baseInfo.setAdmvs(baseInfo.getAdmvs()).setFixmedinsCode(baseInfo.getFixmedinsCode()).setFixmedinsName(baseInfo.getFixmedinsName()); - - ElepMedresultInput medresultInput = - JSON.parseObject(JSON.toJSONString(baseParam.getData()), ElepMedresultInput.class); - - // 调用分发器处理结果查询业务 - BaseResponse result = elepHandlerIntDispatcher.dispatcher(ElepServiceAdrEnum.A0006.toString(), - new RequestData(medresultInput), baseParam); - // 检查服务调用是否成功 - if (result.getCode() == 0) { - // 解析返回结果中的数据 - MedicationResultInquiry output = - parseObject(parseObject(result.getEncData()).toString(), MedicationResultInquiry.class); - // 返回成功响应 - return Result.ok("电子处方取药结果查询成功！", output); - } - - return Result.error(result.getMessage()); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java deleted file mode 100644 index 55aa6c77..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/YbServiceImpl.java +++ /dev/null @@ -1,1196 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl; - -import static com.alibaba.fastjson.JSON.parseObject; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.core.common.exception.ServiceException; -import com.core.common.utils.DateUtils; -import com.core.common.utils.StringUtils; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.openhis.component.HandlerIntDispatcher; -import com.openhis.config.InterfaceConfig; -import com.openhis.config.Tenant; -import com.openhis.constant.ClincStatusConst; -import com.openhis.constant.InputDataTypeConst; -import com.openhis.constant.InterFaceResultConst; -import com.openhis.domain.InfoPerson; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.YbService; -import com.openhis.utils.RedisUtil; -import com.openhis.vo.*; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Console; - -/** - * TODO:医保同一服务层 - * - * @author SunJQ - * @date 2025-03-19 - */ -@Service -public class YbServiceImpl implements YbService { - /**********************************************************************/ - /** - * 接口分发器 - */ - @Autowired - private HandlerIntDispatcher handlerIntDispatcher; - /** - * redis工具 - */ - @Autowired - private RedisUtil redisUtil; - /** - * 中心接口配置 - */ - @Autowired - protected InterfaceConfig interfaceConfig; - @Autowired - private Tenant tenant; - - /**********************************************************************/ - - /**********************************************************************/ - /** - * 签到 - * - * @param baseParam - * @param request - * @return - */ - public Result signIn(BaseParam baseParam, HttpServletRequest request) { - // BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - Sign1101Param sign = parseObject(JSON.toJSONString(baseParam.getData()), Sign1101Param.class); - - Console.error("AAA:" + sign.getMac() + "|" + sign.getIp() + "|" + sign.getOpterNo()); - // Sign1101Param sign = (Sign1101Param)baseParam.getData(); - // sign.setIp(request.getRemoteAddr()); - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P9001.toString(), - new InputData(sign, null, InputDataTypeConst.SIGN_IN), baseParam); - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - Sign param = parseObject(parseObject(result.getOutput()).getString("signinoutb"), Sign.class); - param.setOpterNo(sign.getOpterNo()); - param.setStatus("1"); - redisUtil.set( - "USER_SIGNNO:" + baseParam.getBaseInfo().getAdmvs() + ":" + baseParam.getBaseInfo().getUserId(), - param.getSignNo(), 24 * 3600); - return Result.ok("签到成功！", param); - } - return Result.error(result.getErrMsg()); - } - - /** - * 签退 - * - * @param baseParam - * @return - */ - public Result signOut(BaseParam baseParam) { - // Sign signInfo = getById(sign.getId()); - // LoginUser sysUser = loginUserUtil.getLoginUser(); - Long userId = baseParam.getBaseInfo().getUserId(); - Sign signInfo = parseObject(String.valueOf(redisUtil.get("USER_SIGNNO:USER_SIGNNO_" + userId)), Sign.class); - Sign inputData = new Sign(); - inputData.setOpterNo(signInfo.getOpterNo()); - inputData.setSignNo(signInfo.getSignNo()); - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P9002.toString(), - new InputData(inputData, null, InputDataTypeConst.SIGN_OUT), baseParam); - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - Sign param = parseObject(parseObject(result.getOutput()).getString("signoutoutb"), Sign.class); - signInfo.setSignOutTime(param.getSignTime()); - signInfo.setStatus("2"); - // updateById(signInfo); - // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - redisUtil.del("USER_SIGNNO:USER_SIGNNO_" + userId); - return Result.ok("签退成功！", signInfo); - } - return Result.error(result.getErrMsg()); - } - - /** - * 读卡获取身份信息 - * - * @param baseParam - * @return - */ - public Result getPerInfo(BaseParam baseParam) { - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P1101.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObj = parseObject(result.getOutput()); - InfoPerson perinfo = parseObject(resultObj.getString("baseinfo"), InfoPerson.class); - JSONArray insuinfo = resultObj.getJSONArray("insuinfo"); - // if (insuinfo.size() == 1) { - // JSONObject obj = insuinfo.getJSONObject(0); - // perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs")); - // perinfo.setInsutype(obj.getString("insutype")); - // perinfo.setBalc(obj.getString("balc")); - // return Result.OK("获取成功", perinfo); - // } - for (int i = 0, size = insuinfo.size(); i < size; i++) { - JSONObject obj = insuinfo.getJSONObject(i); - String insuplc_admdvs = obj.getString("insuplc_admdvs");// 获取参保地 - if (StringUtils.isEmpty(insuplc_admdvs)) { - throw new ServiceException("查询不到参保地信息"); - } - if (insuplc_admdvs.equals(baseInfo.getAdmvs())) { - // 职工 - if ("310".equals(obj.getString("insutype")) && "1".equals(obj.getString("psn_insu_stas"))) { - perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs")); - perinfo.setInsutype(obj.getString("insutype")); - perinfo.setBalc(obj.getString("balc")); - perinfo.setCvlservFlag(obj.getString("cvlserv_flag")); - perinfo.setPsnType(obj.getString("psn_type")); - perinfo.setPsnInsuDate(obj.getString("psn_insu_date")); - perinfo.setEmpName(obj.getString("emp_name")); - } - // 居民 - if ("390".equals(obj.getString("insutype")) && "1".equals(obj.getString("psn_insu_stas"))) { - perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs")); - perinfo.setInsutype(obj.getString("insutype")); - perinfo.setBalc(obj.getString("balc")); - perinfo.setCvlservFlag(obj.getString("cvlserv_flag")); - perinfo.setPsnType(obj.getString("psn_type")); - perinfo.setPsnInsuDate(obj.getString("psn_insu_date")); - perinfo.setEmpName(obj.getString("emp_name")); - } - } else { - // 2025.06.25 同关确认异地默认是参保状态 - perinfo.setInsuplcAdmdvs(obj.getString("insuplc_admdvs")); - perinfo.setInsutype(obj.getString("insutype")); - perinfo.setBalc(obj.getString("balc")); - perinfo.setCvlservFlag(obj.getString("cvlserv_flag")); - perinfo.setPsnType(obj.getString("psn_type")); - perinfo.setPsnInsuDate(obj.getString("psn_insu_date")); - perinfo.setEmpName(obj.getString("emp_name")); - } - } - - // 查询慢特病信息 - baseParam.getBaseInfo().setInsuplcAdmdvs(perinfo.getInsuplcAdmdvs()); - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.G5301.toString(), - new InputData(new Info5301Param().setPsnNo(perinfo.getPsnNo()), null, InputDataTypeConst.DATA), - baseParam); - if ("0".equals(resultBody.getInfcode())) { - resultObj = parseObject(resultBody.getOutput()); - JSONArray feedetail = resultObj.getJSONArray("feedetail"); - - List list = new ArrayList<>(); - Info5301SpecialConditionResult info5301SpecialConditionResult; - // 慢性病赋值 - for (int i = 0; i < feedetail.size(); i++) { - JSONObject obj = feedetail.getJSONObject(i); - info5301SpecialConditionResult = new Info5301SpecialConditionResult(); - info5301SpecialConditionResult.setOpspDiseName(obj.getString("opsp_dise_name")) - .setOpspDiseCode(obj.getString("opsp_dise_code")).setBegndate(obj.getString("begndate")) - .setEnddate(obj.getString("enddate")); - - list.add(info5301SpecialConditionResult); - } - perinfo.setFeedetail(list); - } - // redisUtil.set(String.format("%s:%s:%s", "PERSON-INFO", readcard.getMdtrtCertType(), - // readcard.getMdtrtCertNo()), perinfo, 72000); - System.out.println(JSON.toJSONString(perinfo)); - return Result.ok("获取成功", perinfo); - } - return Result.error(result.getErrMsg()); - } - - /** - * 挂号 - * - * @param baseParam - * @return - */ - public Result reg(BaseParam baseParam) { - Result result; - try { - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - ClinicReg reg = parseObject(JSON.toJSONString(baseParam.getData()), ClinicReg.class); - String mdtrtCertNo = reg.getMdtrtCertNo(); - reg.setMdtrtCertNo(reg.getMdtrtCertNo()); - reg.setBegntime(DateUtil.date()); - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2201.toString(), - new InputData(reg, null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - JSONObject resultObj = parseObject(resultBody.getOutput()); - reg.setStatus(ClincStatusConst.STATUS_0); - reg.setMdtrtCertNo(mdtrtCertNo); - reg.setMdtrtId(resultObj.getJSONObject("data").getString("mdtrt_id")); - result = Result.ok(reg); - } else { - result = Result.error(resultBody.getErrMsg(), reg); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Result cancelReg(BaseParam baseParam) { - Result result; - try { - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - ClinicReg reg = parseObject(JSON.toJSONString(baseParam.getData()), ClinicReg.class); - ClinicReg transReg = new ClinicReg(); - transReg.setPsnNo(reg.getPsnNo()); - transReg.setMdtrtId(reg.getMdtrtId()); - transReg.setIptOtpNo(reg.getIptOtpNo()); - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2202.toString(), - new InputData(transReg, null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - reg.setStatus(ClincStatusConst.CANCLE); - // regService.updateById(reg); - result = Result.ok(transReg); - } else { - result = Result.error(resultBody.getErrMsg(), reg); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 门诊就诊信息上传 - * - * @param baseParam - * @return - */ - @Override - public Result saveMedical(BaseParam baseParam) { - Result result; - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - Clinic2203MedicalParam medical = - parseObject(JSON.toJSONString(baseParam.getData()), Clinic2203MedicalParam.class); - try { - List diseinfoList = medical.getDiseinfoList(); - medical.setBegntime(DateUtil.date()); - if (diseinfoList != null) { - diseinfoList.stream().forEach(diseInfo -> diseInfo.setDiagTime(DateUtil.date())); - } else { - // throw new ServiceException("诊断节点列表不能为空"); - result = Result.error("诊断节点列表不能为空"); - } - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2203.toString(), - new InputData(medical, diseinfoList, medical.getInsuplcAdmdvs(), InputDataTypeConst.MD_TRT_INFO), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - result = Result.ok(resultBody); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 门诊费用明细上传 - * - * @param baseParam - * @return - */ - public Result upFeeDetail(BaseParam baseParam) { - Result result; - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - Clinic2204OrderParam clinic2204OrderParam = - parseObject(JSON.toJSONString(baseParam.getData()), Clinic2204OrderParam.class); - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2204.toString(), - new InputData(clinic2204OrderParam.getFeedetail(), clinic2204OrderParam.getInsuplcAdmdvs(), - InputDataTypeConst.FEE_DETAIL), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - // 将返回结果解析成JSON - JSONObject resultObj = parseObject(resultBody.getOutput()); - List feedetails = - JSONObject.parseArray(resultObj.getString("result"), Clinic2204FeeDetailResult.class); - result = Result.ok(new Clinic2204OrderResult().setResult(feedetails)); - } else { - result = Result.error(resultBody.getErrMsg(), new Clinic2204OrderResult()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 门诊费用明细上传 - * - * @return - */ - public Result cancelFeeDetail(BaseParam baseParam) { - Result result; - try { - // 调用接口 - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2205.toString(), - new InputData(baseParam.getData(), baseParam.getBaseInfo().getInsuplcAdmdvs(), InputDataTypeConst.DATA), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - result = Result.ok(resultBody); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 预结算 - * - * @param baseParam - * @return - */ - public Result preSetl(BaseParam baseParam) { - Result result; - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - Clinic2206OrderParam clinic2206OrderParam = - parseObject(JSON.toJSONString(baseParam.getData()), Clinic2206OrderParam.class); - Clinic2206OrderResult clinic2206OrderResult = new Clinic2206OrderResult(); - try { - String mdtrtCertNo = clinic2206OrderParam.getMdtrtCertNo(); - clinic2206OrderResult.setMdtrtCertNo(clinic2206OrderParam.getMdtrtCertNoEncrypt()); - // 调用接口 - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2206.toString(), - new InputData(clinic2206OrderParam, clinic2206OrderParam.getInsuplcAdmdvs(), InputDataTypeConst.DATA), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - // 将返回结果解析成JSON - JSONObject resultObj = parseObject(resultBody.getOutput()); - // 解析结算信息 - clinic2206OrderResult = parseObject(resultObj.getString("setlinfo"), Clinic2206OrderResult.class); - // 结算基金分项信息 - List clincSetldetailList = - JSONObject.parseArray(resultObj.getString("setldetail"), Clinic2206FundPaymentResult.class); - - clinic2206OrderResult.setMdtrtCertNo(mdtrtCertNo); - - clinic2206OrderResult.setSetldetail(clincSetldetailList); - - result = Result.ok(clinic2206OrderResult); - } else { - result = Result.error(resultBody.getErrMsg(), clinic2206OrderResult); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 门诊费用结算 - * - * @param baseParam - * @return - */ - public Result setl(BaseParam baseParam) { - Result result; - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - Clinic2206OrderParam clincOrder = - parseObject(JSON.toJSONString(baseParam.getData()), Clinic2206OrderParam.class); - - try { - // 调用接口 - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2207.toString(), - new InputData(clincOrder, clincOrder.getInsuplcAdmdvs(), InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - // 将返回结果解析成JSON - JSONObject resultObj = parseObject(resultBody.getOutput()); - // 解析结算信息 - Clinic2207OrderResult clincSetlinfo = - parseObject(resultObj.getString("setlinfo"), Clinic2207OrderResult.class); - // 结算基金分项信息 - List clincSetldetailList = - JSONObject.parseArray(resultObj.getString("setldetail"), Clinic2206FundPaymentResult.class); - clincSetlinfo.setSetldetail(clincSetldetailList); - - result = Result.ok(clincSetlinfo); - } else { - result = Result.error(resultBody.getErrMsg(), new Clinic2206OrderResult()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 门诊费用撤销 - * - * @param baseParam - * @return - */ - public Result cancelSetl(BaseParam baseParam) { - Result result; - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - Clinic2208UnSetlInfoParam setlinfo = - parseObject(JSON.toJSONString(baseParam.getData()), Clinic2208UnSetlInfoParam.class); - - try { - // 调用接口 - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2208.toString(), - new InputData(setlinfo, baseInfo.getInsuplcAdmdvs(), InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - - // 将返回结果解析成JSON - JSONObject resultObj = parseObject(resultBody.getOutput()); - // 解析结算信息 - Clinic2208UnSetlInfoResult clincSetlinfo = - parseObject(resultObj.getString("setlinfo"), Clinic2208UnSetlInfoResult.class); - // 结算基金分项信息 - List clincSetldetailList = - JSONObject.parseArray(resultObj.getString("setldetail"), Clinic2206FundPaymentResult.class); - // 保存结算信息和结算基金分项信息 - clincSetlinfo.setSetldetail(clincSetldetailList); - - result = Result.ok(clincSetlinfo); - } else { - result = Result.error(resultBody.getErrMsg(), new Clinic2208UnSetlInfoResult()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 下载目录 - * - * @param fileDownload - * @return - */ - @Override - public Result download(BaseParam baseParam, FileDownload fileDownload) { - Result result; - try { - ServiceAdrEnum anEnum = ServiceAdrEnum.getEnum(fileDownload.getCode()); - ResultBody resultBody = handlerIntDispatcher.dispatcher(anEnum.toString(), - new InputData(fileDownload.getVersion(), null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - result = Result.ok("下载成功"); - } - result = Result.error("下载失败"); - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 诊断及费用明细上传 - * - * @param baseParam - * @return - */ - @Override - public Result preSettle(BaseParam baseParam) { - Result result; - HashMap hashMap = new HashMap(); - ObjectMapper objectMapper = new ObjectMapper(); - try { - hashMap = objectMapper.readValue(String.valueOf(baseParam.getData()), HashMap.class); - // 处理obj - } catch (IOException e) { - System.err.println("JSON解析错误: " + e.getMessage()); - e.printStackTrace(); - } - - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - Clinic2203MedicalParam p2203 = - parseObject(JSON.toJSONString(String.valueOf(hashMap.get("P2203"))), Clinic2203MedicalParam.class); - Clinic2204OrderParam p2204 = - parseObject(JSON.toJSONString(String.valueOf(hashMap.get("P2204"))), Clinic2204OrderParam.class); - try { - List diseinfoList = p2203.getDiseinfoList(); - diseinfoList.stream().forEach(diseInfo -> diseInfo.setDiagTime(DateUtil.date())); - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2203.toString(), - new InputData(p2203, diseinfoList, p2203.getInsuplcAdmdvs(), InputDataTypeConst.MD_TRT_INFO), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - ResultBody result2204 = handlerIntDispatcher.dispatcher(ServiceAdrEnum.C2204.toString(), - new InputData(p2204, p2204.getInsuplcAdmdvs(), InputDataTypeConst.FEE_DETAIL), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - // 将返回结果解析成JSON - JSONObject resultObj = parseObject(result2204.getOutput()); - // 解析结算信息 - Clinic2204OrderResult clinic2204OrderResult = - parseObject(resultObj.getString("result"), Clinic2204OrderResult.class); - result = Result.ok(clinic2204OrderResult); - } else { - result = Result.error("诊断信息上传失败"); - } - } else { - result = Result.error("就诊信息上传失败"); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 目录对照 - * - * @param baseParam - * @return - */ - @Override - public Result directoryCheck(BaseParam baseParam) { - Result result; - try { - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - - MedicalDirectory3301ListParam medicalDirectory3301ListParam = - JSON.parseObject(JSON.toJSONString(baseParam.getData()), MedicalDirectory3301ListParam.class); - // MedicalDirectory3301Param medicalDirectory3301Param = - // parseObject(JSON.toJSONString(baseParam.getData()), MedicalDirectory3301Param.class); - ResultBody resultInfo = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P3301.toString(), - new InputData(medicalDirectory3301ListParam.getData(), null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultInfo.getInfcode())) { - result = Result.ok(resultInfo); - } else { - result = Result.error(resultInfo.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 目录对照 - * - * @param baseParam - * @return - */ - @Override - public Result directoryUnCheck(BaseParam baseParam) { - Result result; - try { - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - MedicalDirectory3302ParamDto medicalDirectory3302ParamDto = - parseObject(JSON.toJSONString(baseParam.getData()), MedicalDirectory3302ParamDto.class); - MedicalDirectory3302Param medicalDirectory3302Param = new MedicalDirectory3302Param(); - medicalDirectory3302Param.setFixmedinsCode(medicalDirectory3302ParamDto.getFixmedinsCode()) - .setFixmedinsHilistId(medicalDirectory3302ParamDto.getFixmedinsHilistId()) - .setListType(medicalDirectory3302ParamDto.getListType()) - .setMedListCodg(medicalDirectory3302ParamDto.getMedListCodg()); - ResultBody resultInfo = handlerIntDispatcher.dispatcher(ServiceAdrEnum.P3302.toString(), - new InputData(medicalDirectory3302ParamDto, null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultInfo.getInfcode())) { - result = Result.ok(resultInfo); - } else { - result = Result.error(resultInfo.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - /** - * 结算对总账 - * - * @param baseParam - * @return - */ - @Transactional(rollbackFor = Exception.class) - public Result reconcileGeneralLedger(BaseParam baseParam) { - Result result; - Financial3201Output financial3201Output = new Financial3201Output(); - try { - // com.core.common.core.domain.model.LoginUser loginUser = SecurityUtils.getLoginUser(); - // LoginUser sysUser = loginUserUtil.getLoginUser(); - // reconciliation.setFixmedinsCode(sysUser.getFixmedinsCode()); - // reconciliation.setFixmedinsName(sysUser.getFixmedinsName()); - // reconciliation.setAdmvs(sysUser.getAdmvs()); - // reconciliation.setSetlOptins(sysUser.getAdmvs()); - Financial3201Param financial3201Param = - parseObject(JSON.toJSONString(baseParam.getData()), Financial3201Param.class); - // 调用接口 - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3201.toString(), - new InputData(financial3201Param, financial3201Param.getAdmvs(), InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - // reconciliation.setCreateTime(new Date()); - financial3201Output.setSetlOptins(financial3201Param.getSetlOptins()); - financial3201Output.setStmtRslt(resultObj.getJSONObject("stmtinfo").getString("stmt_rslt")); - financial3201Output.setStmtRsltDscr(resultObj.getJSONObject("stmtinfo").getString("stmt_rslt_dscr")); - result = Result.ok(financial3201Output); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result reconcileGeneralLedgerDetail(BaseParam baseParam, - FinancialSettlement3202Param financial3202Param) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3202.toString(), - new InputData(financial3202Param, financial3202Param.getSetlOptins(), InputDataTypeConst.DATA), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - FinancialSettlement3202Result financialSettlement3202Result = new FinancialSettlement3202Result(); - financialSettlement3202Result.setFilename(resultObj.getJSONObject("fileinfo").getString("filename")); - financialSettlement3202Result - .setFileQuryNo(resultObj.getJSONObject("fileinfo").getString("file_qury_no")); - financialSettlement3202Result.setDldEndtime(DateUtils.dateTime("yyyy-MM-dd HH:mm:ss", - resultObj.getJSONObject("fileinfo").getString("dld_endtime"))); - - result = Result.ok(financialSettlement3202Result); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result threePartSearch(BaseParam baseParam, FinancialSettlement3209AParam financialSettlement3209AParam) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3202.toString(), - new InputData(financialSettlement3209AParam, financialSettlement3209AParam.getClrOptins(), - InputDataTypeConst.DATA), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - result = Result.ok(resultObj.getJSONObject("selt_list")); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result applyFinancialClearing(BaseParam baseParam) { - Result result; - Financial3203AParam financial3203AParam = - parseObject(JSON.toJSONString(baseParam.getData()), Financial3203AParam.class); - - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3203A.toString(), - new InputData(baseParam.getData(), financial3203AParam.getClrOptins(), InputDataTypeConst.DATA), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - result = Result.ok(resultObj.getJSONObject("clr_appy_evt_id")); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result cancelFinancialClearing(BaseParam baseParam, Financial3204Param financial3204Param) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3204A.toString(), - new InputData(financial3204Param, financial3204Param.getClrOptins(), InputDataTypeConst.DATA), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - result = Result.ok(resultBody); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result getFinancialClearingStatus(BaseParam baseParam, Clearing3205AParma clearing3205AParma) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3205A.toString(), - new InputData(clearing3205AParma, clearing3205AParma.getClrOptins(), InputDataTypeConst.DATA), - baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - result = Result.ok(resultObj.getJSONObject("clr_appys")); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result uploadInventoryCount(BaseParam baseParam) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3501.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.INV_INFO), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - result = Result.ok(resultBody); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result updateInventoryCount(BaseParam baseParam) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3502.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.INV_INFO), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - result = Result.ok(resultBody); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result procurement(BaseParam baseParam) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3503.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.PURC_INFO), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - result = Result.ok(resultBody); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result cancelProcurement(BaseParam baseParam) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3504.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.PURC_INFO), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - // JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - result = Result.ok(resultBody); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result merchandise(BaseParam baseParam) { - Result result = null; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3505.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.SEL_INFO), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - Medical3505Result medical3505Result = new Medical3505Result(); - if (resultObj.get("msgRslt") != null && resultObj.get("retRslt") != null) { - medical3505Result.setMsgRslt(resultObj.get("msgRslt").toString()); - medical3505Result.setRetRslt(resultObj.get("retRslt").toString()); - } else { - medical3505Result.setMsgRslt("成功"); - medical3505Result.setRetRslt("1"); - } - result = Result.ok(medical3505Result); - } else if (InterFaceResultConst.FAILED.equals(resultBody.getInfcode())) { - Medical3505Result medical3505Result = new Medical3505Result(); - medical3505Result.setRetRslt("-1"); - medical3505Result.setMsgRslt(resultBody.getErrMsg()); - result = Result.ok(medical3505Result); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result cancelMerchandise(BaseParam baseParam) { - Result result = null; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3506.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.SEL_INFO), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - JSONObject resultObj = JSONObject.parseObject(resultBody.getOutput()); - Medical3505Result medical3505Result = new Medical3505Result(); - if (resultObj.get("msgRslt") != null && resultObj.get("retRslt") != null) { - medical3505Result.setMsgRslt(resultObj.get("msgRslt").toString()); - medical3505Result.setRetRslt(resultObj.get("retRslt").toString()); - } else { - medical3505Result.setMsgRslt("成功"); - medical3505Result.setRetRslt("1"); - } - result = Result.ok(medical3505Result); - } else if (InterFaceResultConst.FAILED.equals(resultBody.getInfcode())) { - Medical3505Result medical3505Result = new Medical3505Result(); - medical3505Result.setRetRslt("-1"); - medical3505Result.setMsgRslt(resultBody.getErrMsg()); - result = Result.ok(medical3505Result); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result deleteGoodsInfo(BaseParam baseParam, Medical3507Param medical3507Param) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.I3507.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - result = Result.ok(resultBody); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result getClrOptins(BaseParam baseParam) { - Result result; - try { - ResultBody resultBody = handlerIntDispatcher.dispatcher(ServiceAdrEnum.R3206A.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(resultBody.getInfcode())) { - result = Result.ok(resultBody); - } else { - result = Result.error(resultBody.getErrMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - result = Result.error("网络异常"); - } - return result; - } - - @Override - public Result queryYbCatalogue(BaseParam baseParam) { - BaseInfo baseInfo = baseParam.getBaseInfo(); - // baseInfo.setAdmvs(tenant.getAdmvs()).setFixmedinsCode(tenant.getFixmedinsCode()) - // .setFixmedinsName(tenant.getFixmedinsName()); - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.D1312.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - // System.out.println("---------1312result---------------" + result); - String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObj = parseObject(result.getOutput()); - data = resultObj.getString("data"); - } - return Result.ok("获取成功", data); - } - - /** - * 2301 住院费用明细上传 - * - * @param baseParam - * @return - */ - @Override - public Result uploadInpatientFeeDetail(BaseParam baseParam) { - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2301.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObj = parseObject(result.getOutput()); - data = resultObj.getString("result"); - } - return Result.ok("获取成功", data); - } - - /** - * 2302 住院费用明细撤销 - * - * @param baseParam - * @return - */ - @Override - public Result cancelInpatientFeeDetail(BaseParam baseParam) { - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2302.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObj = parseObject(result.getOutput()); - data = resultObj.getString("result"); - } - return Result.ok("获取成功", data); - } - - /** - * 2303 住院预结算 - * - * @param baseParam - * @return - */ - @Override - public Result prePayInpatient(BaseParam baseParam) { - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2303.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObj = parseObject(result.getOutput()); - data = resultObj.getString("result"); - } - return Result.ok("获取成功", data); - } - - /** - * 2304 住院结算 - * - * @param baseParam - * @return - */ - @Override - public Result payInpatient(BaseParam baseParam) { - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2304.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObj = parseObject(result.getOutput()); - data = resultObj.getString("result"); - } - return Result.ok("获取成功", data); - } - - /** - * 2305 住院结算撤销 - * - * @param baseParam - * @return - */ - @Override - public Result cancelInpatientPay(BaseParam baseParam) { - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2305.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObj = parseObject(result.getOutput()); - data = resultObj.getString("result"); - } - return Result.ok("获取成功", data); - } - - @Override - public Result inpatientReg(BaseParam baseParam) { - JSONObject resultObj = parseObject(String.valueOf(baseParam.getData())); - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2401.toString(), - new InputData(resultObj.getString("mdtrtinfo"), resultObj.getString("diseinfo"), null, - InputDataTypeConst.MD_TRT_INFO), - baseParam); - String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObject = parseObject(result.getOutput()); - data = resultObject.getString("result"); - } - return Result.ok("获取成功", data); - } - - @Override - public Result dischargePatient(BaseParam baseParam) { - JSONObject resultObj = parseObject(String.valueOf(baseParam.getData())); - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2402.toString(), - new InputData(resultObj.getString("dscginfo"), resultObj.getString("diseinfo"), null, - InputDataTypeConst.DSCG_INFO), - baseParam); - // String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObject = parseObject(result.getOutput()); - // data = resultObject.getString("result"); - return Result.ok("获取成功"); - } - return Result.error("上传失败"); - } - - @Override - public Result changeInpatientInfo(BaseParam baseParam) { - JSONObject resultObj = parseObject(String.valueOf(baseParam.getData())); - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2403.toString(), - new InputData(resultObj.getString("adminfo"), resultObj.getString("diseinfo"), null, - InputDataTypeConst.ADM_INFO), - baseParam); - // String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObject = parseObject(result.getOutput()); - // data = resultObject.getString("result"); - return Result.ok("获取成功"); - } - return Result.error("上传失败"); - } - - @Override - public Result cancelInpatientReg(BaseParam baseParam) { - // JSONObject resultObj = parseObject(String.valueOf(baseParam.getData())); - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2404.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - // String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObject = parseObject(result.getOutput()); - // data = resultObject.getString("result"); - return Result.ok("获取成功"); - } - return Result.error("上传失败"); - } - - @Override - public Result cancelDischargePatient(BaseParam baseParam) { - // JSONObject resultObj = parseObject(String.valueOf(baseParam.getData())); - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.H2405.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - // String data = ""; - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObject = parseObject(result.getOutput()); - // data = resultObject.getString("result"); - return Result.ok("获取成功"); - } - return Result.error("上传失败"); - } - - /** - * 【3101】明细审核事前事中分析服务 - * - * @param baseParam 基础参数 - * @return 结果 - */ - @Override - public Result yb3101PreMidAnalysis(BaseParam baseParam) { - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.A3101.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObj = parseObject(result.getOutput()); - String data = resultObj.getString("result"); - return Result.ok("获取成功", data); - } else { - return Result.error("获取失败"); - } - } - - /** - * 【3103】事前事中服务反馈服务 - * - * @param baseParam 基础参数 - * @return 结果 - */ - @Override - public Result yb3103PreMidFeedback(BaseParam baseParam) { - ResultBody result = handlerIntDispatcher.dispatcher(ServiceAdrEnum.A3103.toString(), - new InputData(baseParam.getData(), null, InputDataTypeConst.DATA), baseParam); - if (InterFaceResultConst.SUCCESS.equals(result.getInfcode())) { - JSONObject resultObj = parseObject(result.getOutput()); - String data = resultObj.getString("result"); - return Result.ok("获取成功", data); - } else { - return Result.error("获取失败"); - } - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java deleted file mode 100644 index b8b46629..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicDiagInfoUpServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.openhis.service.impl.clinc; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 门诊就诊信息上传 - * - * @author SunJQ - * @date 2025-05-07 - */ -@Service -@HandlerInt(ServiceAdrEnum.C2203) -public class ClinicDiagInfoUpServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2203.getAddress(),initTransBody(ServiceAdrEnum.C2203.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java deleted file mode 100644 index 4e553103..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailDelServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.clinc; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 费用明细撤销 - * - * @author SunJQ - * @date 2025-05-07 - */ -@Service -@HandlerInt(ServiceAdrEnum.C2205) -public class ClinicFeeDetailDelServiceImpl extends HandlerServiceImpl { - - - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.C2205.getAddress(),initTransBody(ServiceAdrEnum.C2205.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java deleted file mode 100644 index 629ba17a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicFeeDetailUpServiceImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.openhis.service.impl.clinc; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - - -/** - * 费用明细上传 - */ -@Service -@HandlerInt(ServiceAdrEnum.C2204) -public class ClinicFeeDetailUpServiceImpl extends HandlerServiceImpl { - - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2204.getAddress(),initTransBody(ServiceAdrEnum.C2204.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java deleted file mode 100644 index 41760833..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicPreSetlServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.clinc; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 门诊预结算 - */ -@Service -@HandlerInt(ServiceAdrEnum.C2206) -public class ClinicPreSetlServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2206.getAddress(),initTransBody(ServiceAdrEnum.C2206.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java deleted file mode 100644 index 84db828a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReRegServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.clinc; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 撤销挂号接口 - */ -@Service -@HandlerInt(ServiceAdrEnum.C2202) -public class ClinicReRegServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2202.getAddress(),initTransBody(ServiceAdrEnum.C2202.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java deleted file mode 100644 index 31cb1b7b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicReSetlServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.clinc; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 门诊反结 - */ -@Service -@HandlerInt(ServiceAdrEnum.C2208) -public class ClinicReSetlServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2208.getAddress(),initTransBody(ServiceAdrEnum.C2208.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java deleted file mode 100644 index 3c162bcc..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicRegServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.openhis.service.impl.clinc; - -import com.alibaba.fastjson2.JSON; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 挂号接口 - */ -@Service -@HandlerInt(ServiceAdrEnum.C2201) -public class ClinicRegServiceImpl extends HandlerServiceImpl { - - Logger logger = LoggerFactory.getLogger(ClinicRegServiceImpl.class); - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - logger.info(ServiceAdrEnum.C2201.getDescription()+" : "+ JSON.toJSONString(inputData)); - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2201.getAddress(),initTransBody(ServiceAdrEnum.C2201.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java deleted file mode 100644 index 02f1cca7..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/clinc/ClinicSetlServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.clinc; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 门诊结算 - */ -@Service -@HandlerInt(ServiceAdrEnum.C2207) -public class ClinicSetlServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.C2207.getAddress(),initTransBody(ServiceAdrEnum.C2207.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java deleted file mode 100644 index a67edcf7..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/MedresultServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.openhis.service.impl.common; - -import com.core.common.utils.SecurityUtils; -import com.openhis.common.constant.CommonConstants; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.ElepHandlerInt; -import com.openhis.domain.BaseResponse; -import com.openhis.enums.ElepServiceAdrEnum; -import com.openhis.pojo.RequestData; -import com.openhis.service.impl.ElepHandlerServiceImpl; - -/** - * 电子处方取药结果查询 - */ -@ElepHandlerInt(ElepServiceAdrEnum.A0006) -@Service -public class MedresultServiceImpl extends ElepHandlerServiceImpl { - - /** - * 处理交易 - * @param requestData 请求信息 - * @return - */ - @Override - public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){ - String eleAddress = baseParam.getBaseInfo().getEleAddress(); - return sendDatas(eleAddress+ ElepServiceAdrEnum.A0006.getAddress(),initTransBody(ElepServiceAdrEnum.A0006.getNum(),requestData,baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java deleted file mode 100644 index 3c35d293..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/PreCheckPrescriptionServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.openhis.service.impl.common; - -import com.core.common.utils.SecurityUtils; -import com.openhis.annotation.ElepHandlerInt; -import com.openhis.common.constant.CommonConstants; -import com.openhis.domain.BaseResponse; -import com.openhis.enums.ElepServiceAdrEnum; -import com.openhis.pojo.RequestData; -import com.openhis.service.impl.ElepHandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; - -/** - * 电子处方上传预核验接口 - */ -@ElepHandlerInt(ElepServiceAdrEnum.A0001) -@Service -public class PreCheckPrescriptionServiceImpl extends ElepHandlerServiceImpl { - - /** - * 处理交易 - * @param requestData 请求信息 - * @return - */ - @Override - public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){ - String eleAddress = baseParam.getBaseInfo().getEleAddress(); - return sendDatas(eleAddress+ ElepServiceAdrEnum.A0001.getAddress(),initTransBody(ElepServiceAdrEnum.A0001.getNum(),requestData, baseParam), baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java deleted file mode 100644 index 66a6fecb..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/QuerPrescriptionServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.openhis.service.impl.common; - -import com.core.common.utils.SecurityUtils; -import com.openhis.common.constant.CommonConstants; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.ElepHandlerInt; -import com.openhis.domain.BaseResponse; -import com.openhis.enums.ElepServiceAdrEnum; -import com.openhis.pojo.RequestData; -import com.openhis.service.impl.ElepHandlerServiceImpl; - -/** - * 电子处方信息查询 - */ -@ElepHandlerInt(ElepServiceAdrEnum.A0005) -@Service -public class QuerPrescriptionServiceImpl extends ElepHandlerServiceImpl { - - /** - * 处理交易 - * @param requestData 请求信息 - * @return - */ - @Override - public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){ - String eleAddress = baseParam.getBaseInfo().getEleAddress(); - return sendDatas(eleAddress+ ElepServiceAdrEnum.A0005.getAddress(),initTransBody(ElepServiceAdrEnum.A0005.getNum(),requestData, baseParam), baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java deleted file mode 100644 index 87b8f0dd..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/RevokeServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.openhis.service.impl.common; - -import com.core.common.utils.SecurityUtils; -import com.openhis.common.constant.CommonConstants; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.ElepHandlerInt; -import com.openhis.domain.BaseResponse; -import com.openhis.enums.ElepServiceAdrEnum; -import com.openhis.pojo.RequestData; -import com.openhis.service.impl.ElepHandlerServiceImpl; - -/** - * 电子处方撤销 - */ -@ElepHandlerInt(ElepServiceAdrEnum.A0004) -@Service -public class RevokeServiceImpl extends ElepHandlerServiceImpl { - - /** - * 处理交易 - * @param requestData 请求信息 - * @return - */ - @Override - public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){ - String eleAddress = baseParam.getBaseInfo().getEleAddress(); - return sendDatas(eleAddress+ElepServiceAdrEnum.A0004.getAddress(),initTransBody(ElepServiceAdrEnum.A0004.getNum(),requestData, baseParam), baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java deleted file mode 100644 index 8c7bea3a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/SignatureServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.openhis.service.impl.common; - -import com.core.common.utils.SecurityUtils; -import com.openhis.common.constant.CommonConstants; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.ElepHandlerInt; -import com.openhis.domain.BaseResponse; -import com.openhis.enums.ElepServiceAdrEnum; -import com.openhis.pojo.RequestData; -import com.openhis.service.impl.ElepHandlerServiceImpl; - -/** - * 电子处方医保电子签名 - */ -@ElepHandlerInt(ElepServiceAdrEnum.A0002) -@Service -public class SignatureServiceImpl extends ElepHandlerServiceImpl { - - /** - * 处理交易 - * @param requestData 请求信息 - * @return - */ - @Override - public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam){ - String eleAddress = baseParam.getBaseInfo().getEleAddress(); - return sendDatas(eleAddress+ElepServiceAdrEnum.A0002.getAddress(),initTransBody(ElepServiceAdrEnum.A0002.getNum(),requestData, baseParam), baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java deleted file mode 100644 index d4496f88..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/common/UploadServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.openhis.service.impl.common; - -import com.core.common.utils.SecurityUtils; -import com.openhis.common.constant.CommonConstants; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.ElepHandlerInt; -import com.openhis.domain.BaseResponse; -import com.openhis.enums.ElepServiceAdrEnum; -import com.openhis.pojo.RequestData; -import com.openhis.service.impl.ElepHandlerServiceImpl; - -/** - * 电子处方上传 - */ -@ElepHandlerInt(ElepServiceAdrEnum.A0003) -@Service -public class UploadServiceImpl extends ElepHandlerServiceImpl { - - /** - * 处理交易 - * - * @param requestData 请求信息 - * @return - */ - @Override - public BaseResponse elepHandle(RequestData requestData, BaseParam baseParam) { - String eleAddress = baseParam.getBaseInfo().getEleAddress(); - return sendDatas(eleAddress + ElepServiceAdrEnum.A0003.getAddress(), initTransBody(ElepServiceAdrEnum.A0003.getNum(), requestData, baseParam), baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java deleted file mode 100644 index 812292d1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/DrugContrastUpServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.directory; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 药品目录对照上传 - */ -@HandlerInt(ServiceAdrEnum.P3301) -@Service -public class DrugContrastUpServiceImpl extends HandlerServiceImpl { - - /** - * - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P3301.getAddress(),initTransBody(ServiceAdrEnum.P3301.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java deleted file mode 100644 index 3c3c12e7..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/directory/RepealDrugContrastUpServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.directory; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 目录对照撤销 - */ -@HandlerInt(ServiceAdrEnum.P3302) -@Service -public class RepealDrugContrastUpServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P3302.getAddress(),initTransBody(ServiceAdrEnum.P3302.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java deleted file mode 100644 index 55574ce3..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/down/DownloadServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.down; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * TODO:目录下载服务 - * - * @author SunJQ - * @date 2025-03-25 - */ -@Service -@HandlerInt(ServiceAdrEnum.D1301) -public class DownloadServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - ServiceAdrEnum anEnum = ServiceAdrEnum.getEnum(inputData.getData().toString()); - return sendDatas(interfaceConfig.getAddress()+anEnum.getAddress(),initTransBody(anEnum.getNum(),inputData, baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java deleted file mode 100644 index 1f6ca382..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugPreSetlServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.drugstore; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 药店预结算 - */ -@Service -@HandlerInt(ServiceAdrEnum.D2101) -public class DrugPreSetlServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.D2101.getAddress(),initTransBody(ServiceAdrEnum.D2101.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java deleted file mode 100644 index d42c58e9..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugReSetlServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.drugstore; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 药店结算撤销 - */ -@Service -@HandlerInt(ServiceAdrEnum.D2103) -public class DrugReSetlServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.D2103.getAddress(),initTransBody(ServiceAdrEnum.D2103.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java deleted file mode 100644 index 7588685b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/drugstore/DrugSetlServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.drugstore; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 药店结算 - */ -@Service -@HandlerInt(ServiceAdrEnum.D2102) -public class DrugSetlServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.D2102.getAddress(),initTransBody(ServiceAdrEnum.D2102.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java deleted file mode 100644 index 714e848e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/FixmedinsServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.filing; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 人员定点备案撤销 - */ -@Service -@HandlerInt(ServiceAdrEnum.F2505) -public class FixmedinsServiceImpl extends HandlerServiceImpl { - - /** - * - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.F2505.getAddress(),initTransBody(ServiceAdrEnum.F2505.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java deleted file mode 100644 index eaf93e4b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReFixmedinsServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.filing; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 人员定点备案撤销 - */ -@Service -@HandlerInt(ServiceAdrEnum.F2506) -public class ReFixmedinsServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.F2506.getAddress(),initTransBody(ServiceAdrEnum.F2506.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java deleted file mode 100644 index 1b65250f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/ReSlowdiseaseServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.filing; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 人员慢特病备案撤销 - */ -@Service -@HandlerInt(ServiceAdrEnum.F2504) -public class ReSlowdiseaseServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.F2504.getAddress(),initTransBody(ServiceAdrEnum.F2504.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java deleted file mode 100644 index d5a953cf..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/filing/SlowdiseServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.filing; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 人员慢特病备案 - */ -@Service -@HandlerInt(ServiceAdrEnum.F2503) -public class SlowdiseServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.F2503.getAddress(),initTransBody(ServiceAdrEnum.F2503.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java deleted file mode 100644 index c08d7827..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/CatalogueInfoServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.openhis.service.impl.info; - -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; - -/** - * 医保目录信息查询接口 - */ -@Service -@HandlerInt(ServiceAdrEnum.D1312) -public class CatalogueInfoServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress() + ServiceAdrEnum.D1312.getAddress(), - initTransBody(ServiceAdrEnum.D1312.getNum(), inputData, baseParam), baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java deleted file mode 100644 index d5c6da07..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetMedicalInfoServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.info; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 医药机构信息获取 - */ -@Service -@HandlerInt(ServiceAdrEnum.P1201) -public class GetMedicalInfoServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P1201.getAddress(),initTransBody(ServiceAdrEnum.P1201.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java deleted file mode 100644 index 1dd45453..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPatientSpecialConditionServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.openhis.service.impl.info; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -@Service -@HandlerInt(ServiceAdrEnum.G5301) -public class GetPatientSpecialConditionServiceImpl extends HandlerServiceImpl { - - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.G5301.getAddress(),initTransBody(ServiceAdrEnum.G5301.getNum(),inputData, baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java deleted file mode 100644 index 0e744852..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/GetPersonInfoServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.openhis.service.impl.info; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - - -/** - * 人员信息获取接口 - */ -@Service -@HandlerInt(ServiceAdrEnum.P1101) -public class GetPersonInfoServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P1101.getAddress(),initTransBody(ServiceAdrEnum.P1101.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java deleted file mode 100644 index 2776da9a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignInServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.info; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 签到接口 - */ -@HandlerInt(ServiceAdrEnum.P9001) -@Service -public class SignInServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P9001.getAddress(),initTransBody(ServiceAdrEnum.P9001.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java deleted file mode 100644 index 96f05857..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/info/SignOutServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.info; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 签退接口 - */ -@HandlerInt(ServiceAdrEnum.P9002) -@Service -public class SignOutServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.P9002.getAddress(),initTransBody(ServiceAdrEnum.P9002.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java deleted file mode 100644 index 3cc5cdfa..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ChHospitalizedServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; - -/** - * 住院信息变更 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2403) -public class ChHospitalizedServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2403.getAddress(),initTransBody(ServiceAdrEnum.H2403.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java deleted file mode 100644 index 2fb5139a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/DischargedServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 办理出院 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2402) -public class DischargedServiceImpl extends HandlerServiceImpl { - - /** - * - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2402.getAddress(),initTransBody(ServiceAdrEnum.H2402.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java deleted file mode 100644 index efe42be3..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/FeeDetailServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 住院费用明细上传 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2301) -public class FeeDetailServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2301.getAddress(),initTransBody(ServiceAdrEnum.H2301.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java deleted file mode 100644 index 4cba9d80..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaPreSetlServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 住院预结算 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2303) -public class HaPreSetlServiceImpl extends HandlerServiceImpl { - - /** - * - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2303.getAddress(),initTransBody(ServiceAdrEnum.H2303.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java deleted file mode 100644 index 88b22525..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaReSetlServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 住院结算撤销 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2305) -public class HaReSetlServiceImpl extends HandlerServiceImpl { - - /** - * - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2305.getAddress(),initTransBody(ServiceAdrEnum.H2305.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java deleted file mode 100644 index 4270c327..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HaSetlServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 住院结算 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2304) -public class HaSetlServiceImpl extends HandlerServiceImpl { - - /** - * - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2304.getAddress(),initTransBody(ServiceAdrEnum.H2304.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java deleted file mode 100644 index 0051ca2a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/HospitalizedServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 办理住院 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2401) -public class HospitalizedServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2401.getAddress(),initTransBody(ServiceAdrEnum.H2401.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java deleted file mode 100644 index 16a40d16..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReDischargedServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 办理出院 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2405) -public class ReDischargedServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2405.getAddress(),initTransBody(ServiceAdrEnum.H2405.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java deleted file mode 100644 index c4eacff0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReFeeDetailServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 住院费用明细撤销 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2302) -public class ReFeeDetailServiceImpl extends HandlerServiceImpl { - - /** - * - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2302.getAddress(),initTransBody(ServiceAdrEnum.H2302.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java deleted file mode 100644 index 8b45c32a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inhospital/ReHospitalizedServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.inhospital; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 撤销住院 - */ -@Service -@HandlerInt(ServiceAdrEnum.H2404) -public class ReHospitalizedServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.H2404.getAddress(),initTransBody(ServiceAdrEnum.H2404.getNum(),inputData, baseParam),baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java deleted file mode 100644 index 8ade967c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryChangeServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.inventory; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 商品盘点变更 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.I3502) -public class PhysicalInventoryChangeServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3502.getAddress(),initTransBody(ServiceAdrEnum.I3502.getNum(),inputData, baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java deleted file mode 100644 index 3ee98bdb..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PhysicalInventoryServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.inventory; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 商品盘点上传 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.I3501) -public class PhysicalInventoryServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3501.getAddress(),initTransBody(ServiceAdrEnum.I3501.getNum(),inputData, baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java deleted file mode 100644 index cf8e1d97..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurchasingServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.inventory; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 商品销售 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.I3505) -public class PurchasingServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3505.getAddress(),initTransBody(ServiceAdrEnum.I3505.getNum(),inputData, baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java deleted file mode 100644 index d717fdb8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/PurgeProductRecordsServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.inventory; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 商品信息删除 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.I3507) -public class PurgeProductRecordsServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3507.getAddress(),initTransBody(ServiceAdrEnum.I3507.getNum(),inputData,baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java deleted file mode 100644 index fe677572..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockReplenishmentServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.inventory; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 商品采购 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.I3503) -public class StockReplenishmentServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3503.getAddress(),initTransBody(ServiceAdrEnum.I3503.getNum(),inputData, baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java deleted file mode 100644 index 57d686a5..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/StockUnReplenishmentServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.inventory; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 商品采购退货 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.I3504) -public class StockUnReplenishmentServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3504.getAddress(),initTransBody(ServiceAdrEnum.I3504.getNum(),inputData, baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java deleted file mode 100644 index a72a7d36..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/inventory/UnPurchasingServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.inventory; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 商品销售退货 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.I3506) -public class UnPurchasingServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.I3506.getAddress(),initTransBody(ServiceAdrEnum.I3506.getNum(),inputData, baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java deleted file mode 100644 index 09e37e7d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DayReconciliationServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.reconciliation; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 日对账 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.R13203) -public class DayReconciliationServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.R13203.getAddress(),initTransBody(ServiceAdrEnum.R13203.getNum(),inputData,baseParam),baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java deleted file mode 100644 index baf348e5..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/DetailReconciliationServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.reconciliation; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 对明细账 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.R3202) -public class DetailReconciliationServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.R3202.getAddress(),initTransBody(ServiceAdrEnum.R3202.getNum(),inputData, baseParam), baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java deleted file mode 100644 index 0e97d652..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyAServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.reconciliation; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 清算申请 - */ -@Service -@HandlerInt(ServiceAdrEnum.R3203A) -public class MonthSetlApplyAServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3203A.getAddress(),initTransBody(ServiceAdrEnum.R3203A.getNum(),inputData, baseParam), baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java deleted file mode 100644 index 906d7c17..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthSetlApplyServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.reconciliation; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 清算申请 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.R3203) -public class MonthSetlApplyServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3203.getAddress(),initTransBody(ServiceAdrEnum.R3203.getNum(),inputData, baseParam), baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java deleted file mode 100644 index 97631d23..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyAServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.reconciliation; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 清算申请撤销 - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.R3204A) -public class MonthUnSetlApplyAServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3204A.getAddress(),initTransBody(ServiceAdrEnum.R3204A.getNum(),inputData, baseParam), baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java deleted file mode 100644 index b9a8ce05..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/MonthUnSetlApplyServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.reconciliation; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 清算申请撤销(吉林省) - * - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.R3204) -public class MonthUnSetlApplyServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3204.getAddress(),initTransBody(ServiceAdrEnum.R3204.getNum(),inputData, baseParam), baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java deleted file mode 100644 index e81d82dc..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationOrgServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.reconciliation; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 清算申请状态查询（吉林省） - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.R3206A) -public class ReconciliationOrgServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3206A.getAddress(),initTransBody(ServiceAdrEnum.R3206A.getNum(),inputData, baseParam), baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java deleted file mode 100644 index 98e65af6..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ReconciliationServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.reconciliation; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 清算申请状态查询（吉林省） - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.R3205A) -public class ReconciliationServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ ServiceAdrEnum.R3205A.getAddress(),initTransBody(ServiceAdrEnum.R3205A.getNum(),inputData, baseParam), baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java deleted file mode 100644 index 4a1b73d5..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/ThreePartReconciliationServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.service.impl.reconciliation; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -/** - * 查询跨省三方对账未成功数据(吉林省) - * - * @author SunJQ - * @date 2025-04-28 - */ -@Service -@HandlerInt(ServiceAdrEnum.R3209A) -public class ThreePartReconciliationServiceImpl extends HandlerServiceImpl { - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam) { - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.R3209A.getAddress(),initTransBody(ServiceAdrEnum.R3209A.getNum(),inputData, baseParam), baseParam); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java deleted file mode 100644 index ffb976ec..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/service/impl/reconciliation/TotalReconciliationServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.service.impl.reconciliation; - -import com.openhis.service.impl.HandlerServiceImpl; -import com.openhis.vo.BaseParam; -import org.springframework.stereotype.Service; - -import com.openhis.annotation.HandlerInt; -import com.openhis.enums.ServiceAdrEnum; -import com.openhis.pojo.InputData; -import com.openhis.pojo.ResultBody; - -/** - * 对总账 - */ -@Service -@HandlerInt(ServiceAdrEnum.R3201) -public class TotalReconciliationServiceImpl extends HandlerServiceImpl { - - /** - * 处理交易 - * @param inputData - * @return - */ - @Override - public ResultBody handle(InputData inputData, BaseParam baseParam){ - return sendDatas(interfaceConfig.getAddress()+ServiceAdrEnum.R3201.getAddress(),initTransBody(ServiceAdrEnum.R3201.getNum(),inputData, baseParam), baseParam); - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java deleted file mode 100644 index a10dfe69..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BCUtils.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.openhis.utils; - -import org.bouncycastle.jce.provider.BouncyCastleProvider; - -import javax.crypto.Cipher; -import javax.crypto.NoSuchPaddingException; -import java.security.*; - -public class BCUtils { - - static { - if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) { - Security.addProvider(new BouncyCastleProvider()); - } - } - - public static Cipher getCipher(final String algorithm) { - try { - return Cipher.getInstance(algorithm, BouncyCastleProvider.PROVIDER_NAME); - } catch (final NoSuchAlgorithmException | NoSuchPaddingException | NoSuchProviderException e) { - throw new IllegalArgumentException(e); - } - } - - public static MessageDigest getMessageDigest(final String algorithm) { - try { - return MessageDigest.getInstance(algorithm, BouncyCastleProvider.PROVIDER_NAME); - } catch (final NoSuchAlgorithmException | NoSuchProviderException e) { - throw new IllegalArgumentException(e); - } - } - - public static Signature getSignature(final String algorithm) { - try { - return Signature.getInstance(algorithm, BouncyCastleProvider.PROVIDER_NAME); - } catch (final NoSuchAlgorithmException | NoSuchProviderException e) { - throw new IllegalArgumentException(e); - } - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java deleted file mode 100644 index fe4c28b0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/BusnessIdUtil.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.openhis.utils; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.RandomUtil; -import org.springframework.stereotype.Component; - -/** - * 生成msg交易id - */ -@Component -public class BusnessIdUtil { - - /** - * 生成msg_id - * @return - */ - public String getMsgid(String fixmedinsCode){ - return fixmedinsCode + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomInt(1000, 9999); - } - - /** - * 生成发票号 - * @return - */ - public static String gettInvoiceNo(String fixmedinsCode){ - return DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomNumbers(6); - } - - /** - * 生成费用明细流水号 - * @return - */ - public String gettFeedetlSn(String fixmedinsCode){ - return fixmedinsCode + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomNumbers(4); - } - - /** - * 生成id - * @return - */ - public String getId(String fixmedinsCode){ - return fixmedinsCode + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomNumbers(10); - } - - /** - * 生成医院科室编码 - * @return - */ - public String getCodg(String fixmedinsCode){ - return fixmedinsCode + DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + RandomUtil.randomNumbers(4); - } - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java deleted file mode 100644 index db09592b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/CusAccessObjectUtil.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.openhis.utils; - -import javax.servlet.http.HttpServletRequest; - -/** - * 获取用户真实ip工具类 - */ -public class CusAccessObjectUtil { - - /** - * 获取用户真实IP地址 - * @param request - * @return - */ - public static String getIpAddress(HttpServletRequest request) { - String ip = request.getHeader("x-forwarded-for"); - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("Proxy-Client-IP"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("WL-Proxy-Client-IP"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("HTTP_CLIENT_IP"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("HTTP_X_FORWARDED_FOR"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getRemoteAddr(); - } - return ip; - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java deleted file mode 100644 index 059029f5..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/EasyGmUtils.java +++ /dev/null @@ -1,324 +0,0 @@ -package com.openhis.utils; - -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1Integer; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.gm.GMNamedCurves; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.crypto.InvalidCipherTextException; -import org.bouncycastle.crypto.engines.SM2Engine; -import org.bouncycastle.crypto.params.ECDomainParameters; -import org.bouncycastle.crypto.params.ECPrivateKeyParameters; -import org.bouncycastle.crypto.params.ECPublicKeyParameters; -import org.bouncycastle.crypto.params.ParametersWithRandom; -import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey; -import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey; -import org.bouncycastle.jcajce.spec.SM2ParameterSpec; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ECParameterSpec; -import org.bouncycastle.jce.spec.ECPrivateKeySpec; -import org.bouncycastle.jce.spec.ECPublicKeySpec; -import org.bouncycastle.util.BigIntegers; -import org.bouncycastle.util.encoders.Hex; - -import javax.crypto.Cipher; -import javax.crypto.spec.SecretKeySpec; -import java.io.IOException; -import java.math.BigInteger; -import java.security.*; -import java.util.Arrays; - -/** - * 注意事项： - * 这个版本的BC对SM3withSM2的结果为asn1格式的r和s，如果需要直接拼接的r||s需要自己转换。下面rsAsn1ToPlainByteArray、rsPlainByteArrayToAsn1就在干这事。 - * 这个版本的BC对SM2的结果为C1||C2||C3，据说为旧标准，新标准为C1||C3||C2，用新标准的需要自己转换。下面changeC1C2C3ToC1C3C2、changeC1C3C2ToC1C2C3就在干这事。 - */ -public class EasyGmUtils { - - private static X9ECParameters x9ECParameters = GMNamedCurves.getByName("sm2p256v1"); - private static ECDomainParameters ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN()); - private static ECParameterSpec ecParameterSpec = new ECParameterSpec(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN()); - - - public static byte[] signSm3WithSm2(byte[] msg, byte[] userId, byte[] privateKeyBytes) { - BCECPrivateKey bcecPrivateKey = getPrivatekeyFromD(BigIntegers.fromUnsignedByteArray(privateKeyBytes)); - return signSm3WithSm2(msg, userId, bcecPrivateKey); - - } - - /** - * @param msg - * @param userId - * @param privateKey - * @return r||s，直接拼接byte数组的rs - */ - public static byte[] signSm3WithSm2(byte[] msg, byte[] userId, PrivateKey privateKey) { - return rsAsn1ToPlainByteArray(signSm3WithSm2Asn1Rs(msg, userId, privateKey)); - } - - - /** - * @param msg - * @param userId - * @param privateKey - * @return rs in asn1 format - */ - public static byte[] signSm3WithSm2Asn1Rs(byte[] msg, byte[] userId, PrivateKey privateKey) { - try { - SM2ParameterSpec parameterSpec = new SM2ParameterSpec(userId); - Signature signer = BCUtils.getSignature("SM3withSM2"); -// signer.setParameter(parameterSpec); - signer.initSign(privateKey, new SecureRandom()); - signer.update(msg, 0, msg.length); - byte[] sig = signer.sign(); - return sig; - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - public static boolean verifySm3WithSm2(byte[] msg, byte[] userId, byte[] rs, byte[] publicKeyBytes) { - if (publicKeyBytes.length != 64 && publicKeyBytes.length != 65) { - throw new RuntimeException("err key length"); - } - - BigInteger x, y; - if (publicKeyBytes.length > 64) { - x = BigIntegers.fromUnsignedByteArray(publicKeyBytes, 1, 32); - y = BigIntegers.fromUnsignedByteArray(publicKeyBytes, 33, 32); - } else { - x = BigIntegers.fromUnsignedByteArray(publicKeyBytes, 0, 32); - y = BigIntegers.fromUnsignedByteArray(publicKeyBytes, 32, 32); - } - BCECPublicKey bcecPublicKey = getPublickeyFromXY(x, y); - - return verifySm3WithSm2(msg, userId, rs, bcecPublicKey); - } - - /** - * @param msg - * @param userId - * @param rs r||s，直接拼接byte数组的rs - * @param publicKey - * @return - */ - public static boolean verifySm3WithSm2(byte[] msg, byte[] userId, byte[] rs, PublicKey publicKey) { - return verifySm3WithSm2Asn1Rs(msg, userId, rsPlainByteArrayToAsn1(rs), publicKey); - } - - /** - * @param msg - * @param userId - * @param rs in asn1 format - * @param publicKey - * @return - */ - public static boolean verifySm3WithSm2Asn1Rs(byte[] msg, byte[] userId, byte[] rs, PublicKey publicKey) { - try { - - Signature verifier = BCUtils.getSignature("SM3withSM2"); -// verifier.setParameter(parameterSpec); - verifier.initVerify(publicKey); - verifier.update(msg, 0, msg.length); - return verifier.verify(rs); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - /** - * bc加解密使用旧标c1||c2||c3，此方法在加密后调用，将结果转化为c1||c3||c2 - * - * @param c1c2c3 - * @return - */ - private static byte[] changeC1C2C3ToC1C3C2(byte[] c1c2c3) { - final int c1Len = (x9ECParameters.getCurve().getFieldSize() + 7) / 8 * 2 + 1; //sm2p256v1的这个固定65。可看GMNamedCurves、ECCurve代码。 - final int c3Len = 32; //new SM3Digest().getDigestSize(); - byte[] result = new byte[c1c2c3.length]; - System.arraycopy(c1c2c3, 0, result, 0, c1Len); //c1 - System.arraycopy(c1c2c3, c1c2c3.length - c3Len, result, c1Len, c3Len); //c3 - System.arraycopy(c1c2c3, c1Len, result, c1Len + c3Len, c1c2c3.length - c1Len - c3Len); //c2 - return result; - } - - - /** - * bc加解密使用旧标c1||c3||c2，此方法在解密前调用，将密文转化为c1||c2||c3再去解密 - * - * @param c1c3c2 - * @return - */ - private static byte[] changeC1C3C2ToC1C2C3(byte[] c1c3c2) { - final int c1Len = (x9ECParameters.getCurve().getFieldSize() + 7) / 8 * 2 + 1; //sm2p256v1的这个固定65。可看GMNamedCurves、ECCurve代码。 - final int c3Len = 32; //new SM3Digest().getDigestSize(); - byte[] result = new byte[c1c3c2.length]; - System.arraycopy(c1c3c2, 0, result, 0, c1Len); //c1: 0->65 - System.arraycopy(c1c3c2, c1Len + c3Len, result, c1Len, c1c3c2.length - c1Len - c3Len); //c2 - System.arraycopy(c1c3c2, c1Len, result, c1c3c2.length - c3Len, c3Len); //c3 - return result; - } - - private final static int RS_LEN = 32; - - private static byte[] bigIntToFixexLengthBytes(BigInteger rOrS) { - // for sm2p256v1, n is 00fffffffeffffffffffffffffffffffff7203df6b21c6052b53bbf40939d54123, - // r and s are the result of mod n, so they should be less than n and have length<=32 - byte[] rs = rOrS.toByteArray(); - if (rs.length == RS_LEN) { - return rs; - } else if (rs.length == RS_LEN + 1 && rs[0] == 0) { - return Arrays.copyOfRange(rs, 1, RS_LEN + 1); - } else if (rs.length < RS_LEN) { - byte[] result = new byte[RS_LEN]; - Arrays.fill(result, (byte) 0); - System.arraycopy(rs, 0, result, RS_LEN - rs.length, rs.length); - return result; - } else { - throw new RuntimeException("err rs: " + Hex.toHexString(rs)); - } - } - - /** - * BC的SM3withSM2签名得到的结果的rs是asn1格式的，这个方法转化成直接拼接r||s - * - * @param rsDer rs in asn1 format - * @return sign result in plain byte array - */ - private static byte[] rsAsn1ToPlainByteArray(byte[] rsDer) { - ASN1Sequence seq = ASN1Sequence.getInstance(rsDer); - byte[] r = bigIntToFixexLengthBytes(ASN1Integer.getInstance(seq.getObjectAt(0)).getValue()); - byte[] s = bigIntToFixexLengthBytes(ASN1Integer.getInstance(seq.getObjectAt(1)).getValue()); - byte[] result = new byte[RS_LEN * 2]; - System.arraycopy(r, 0, result, 0, r.length); - System.arraycopy(s, 0, result, RS_LEN, s.length); - return result; - } - - /** - * BC的SM3withSM2验签需要的rs是asn1格式的，这个方法将直接拼接r||s的字节数组转化成asn1格式 - * - * @param sign in plain byte array - * @return rs result in asn1 format - */ - private static byte[] rsPlainByteArrayToAsn1(byte[] sign) { - if (sign.length != RS_LEN * 2) { - throw new RuntimeException("err rs. "); - } - BigInteger r = new BigInteger(1, Arrays.copyOfRange(sign, 0, RS_LEN)); - BigInteger s = new BigInteger(1, Arrays.copyOfRange(sign, RS_LEN, RS_LEN * 2)); - ASN1EncodableVector v = new ASN1EncodableVector(); - v.add(new ASN1Integer(r)); - v.add(new ASN1Integer(s)); - try { - return new DERSequence(v).getEncoded("DER"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public static BCECPrivateKey getPrivatekeyFromD(BigInteger d) { - ECPrivateKeySpec ecPrivateKeySpec = new ECPrivateKeySpec(d, ecParameterSpec); - return new BCECPrivateKey("EC", ecPrivateKeySpec, BouncyCastleProvider.CONFIGURATION); - } - - public static BCECPublicKey getPublickeyFromXY(BigInteger x, BigInteger y) { - ECPublicKeySpec ecPublicKeySpec = new ECPublicKeySpec(x9ECParameters.getCurve().createPoint(x, y), ecParameterSpec); - return new BCECPublicKey("EC", ecPublicKeySpec, BouncyCastleProvider.CONFIGURATION); - } - - /** - * c1||c3||c2 - * - * @param data - * @param key - * @return - */ - public static byte[] sm2Decrypt(byte[] data, PrivateKey key) { - return sm2DecryptOld(changeC1C3C2ToC1C2C3(data), key); - } - - /** - * c1||c3||c2 - * - * @param data - * @param key - * @return - */ - - public static byte[] sm2Encrypt(byte[] data, PublicKey key) { - return changeC1C2C3ToC1C3C2(sm2EncryptOld(data, key)); - } - - /** - * c1||c2||c3 - * - * @param data - * @param key - * @return - */ - public static byte[] sm2EncryptOld(byte[] data, PublicKey key) { - BCECPublicKey localECPublicKey = (BCECPublicKey) key; - ECPublicKeyParameters ecPublicKeyParameters = new ECPublicKeyParameters(localECPublicKey.getQ(), ecDomainParameters); - SM2Engine sm2Engine = new SM2Engine(); - sm2Engine.init(true, new ParametersWithRandom(ecPublicKeyParameters, new SecureRandom())); - try { - return sm2Engine.processBlock(data, 0, data.length); - } catch (InvalidCipherTextException e) { - throw new RuntimeException(e); - } - } - - /** - * c1||c2||c3 - * - * @param data - * @param key - * @return - */ - public static byte[] sm2DecryptOld(byte[] data, PrivateKey key) { - BCECPrivateKey localECPrivateKey = (BCECPrivateKey) key; - ECPrivateKeyParameters ecPrivateKeyParameters = new ECPrivateKeyParameters(localECPrivateKey.getD(), ecDomainParameters); - SM2Engine sm2Engine = new SM2Engine(); - sm2Engine.init(false, ecPrivateKeyParameters); - try { - return sm2Engine.processBlock(data, 0, data.length); - } catch (InvalidCipherTextException e) { - throw new RuntimeException(e); - } - } - - public static byte[] sm4Encrypt(byte[] keyBytes, byte[] plain) { - if (keyBytes.length != 16) { - throw new RuntimeException("err key length"); - } - - try { - Key key = new SecretKeySpec(keyBytes, "SM4"); - - Cipher out = BCUtils.getCipher("SM4/ECB/PKCS7Padding"); - out.init(Cipher.ENCRYPT_MODE, key); - return out.doFinal(plain); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - public static byte[] sm4Decrypt(byte[] keyBytes, byte[] cipher) { -// if (keyBytes.length != 16) throw new RuntimeException("err key length"); - if (cipher.length % 16 != 0) { - throw new RuntimeException("err data length"); - } - - try { - Key key = new SecretKeySpec(keyBytes, "SM4"); - Cipher in = BCUtils.getCipher("SM4/ECB/PKCS7Padding"); - in.init(Cipher.DECRYPT_MODE, key); - return in.doFinal(cipher); - - } catch (Exception e) { - throw new RuntimeException(e); - } - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java deleted file mode 100644 index e1a4830b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HseEncAndDecUtil.java +++ /dev/null @@ -1,279 +0,0 @@ -package com.openhis.utils; - -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; -import org.bouncycastle.util.encoders.Hex; - -import java.io.UnsupportedEncodingException; -import java.nio.charset.StandardCharsets; -import java.util.Base64; -import java.util.Iterator; -import java.util.Map; - -import static java.util.Base64.getEncoder; - - -/** - * 电子凭证加解密和. - */ -public class HseEncAndDecUtil { - - - /** - * sm2签名 - * @param message 未加密报文 - * @param sm4key 渠道sm4密钥 - * @param prvKey 渠道私钥 - * @return 签名串 String - * @throws Exception - */ - public static String signature(String message,String sm4key,String prvKey,String appId){ - byte[] messageByte; - try { - JSONObject jsonObject = JSON.parseObject(message); - removeEmpty(jsonObject); - messageByte = SignUtil.getSignText(jsonObject, sm4key).getBytes("UTF-8"); - }catch (Exception e){ - messageByte = message.getBytes(); - } - System.out.println("待签名的参数："+ messageByte); - //byte[] prvKeyBite = Base64.getDecoder().decode(prvKey); - //byte[] asig = EasyGmUtils.signSm3WithSm2(message.getBytes(StandardCharsets.UTF_8), - //appId.getBytes(StandardCharsets.UTF_8), prvKeyBite); - //String signStr = new String(Base64.getEncoder().encode(secKey)); - //return signStr; - byte[] chnlSecretByte = sm4key.getBytes(); - byte[] prvkey = Base64.getDecoder().decode(prvKey); - return Base64.getEncoder().encodeToString(EasyGmUtils.signSm3WithSm2(messageByte, chnlSecretByte, prvkey)); - } - - /** - * sm2验签 - * @param msg sm4解密后报文 - * @param source 原始响应报文 - * @param signData 签名串 - * @param sm4key 渠道密钥 - * @param pubKey 平台公钥 - * @return 验证是否通过 boolean - * @throws Exception - */ - public static boolean verify(String msg,String source, String signData,String sm4key,String pubKey){ - byte[] msgByte; - try { - JSONObject jsonObject = JSON.parseObject(msg); - JSONObject jsonObjects = JSON.parseObject(source); - jsonObjects.remove("signData"); - jsonObjects.remove("encData"); - jsonObjects.put("data",jsonObject); - removeEmpty(jsonObject); - String str = SignUtil.getSignText(jsonObjects, sm4key); - msgByte = str.getBytes("UTF-8"); - }catch (Exception e){ - msgByte = msg.getBytes(); - } - byte[] signatureByte = Base64.getDecoder().decode(signData), - chnlSecretByte = sm4key.getBytes(), - pubKeyByte = Base64.getDecoder().decode(pubKey); - - return EasyGmUtils.verifySm3WithSm2(msgByte, chnlSecretByte, signatureByte, pubKeyByte); - } - - - /** - * sm4加密 - * @param chnlId 渠道id - * @param sm4key 渠道sm4密钥 - * @param message 待加密报文 - * @return 加密后的报文内容 String - * @throws Exception - */ - public static String sm4Encrypt(String chnlId,String sm4key,String message) throws Exception { - //用appId加密appSecret获取新秘钥 - byte[] appSecretEncData = EasyGmUtils.sm4Encrypt(chnlId.substring(0, 16).getBytes("UTF-8"), sm4key.getBytes("UTF-8")); - //新秘钥串 - byte[] secKey = Hex.toHexString(appSecretEncData).toUpperCase().substring(0, 16).getBytes("UTF-8"); - //加密数据 - return Hex.toHexString(EasyGmUtils.sm4Encrypt(secKey, message.getBytes("UTF-8"))).toUpperCase(); - } - - /** - * sm4解密 - * @param chnlId 渠道id - * @param sm4key 渠道sm4密钥 - * @param message 待解密报文 - * @return 解密后的报文 String - * @throws Exception - */ - public static String sm4Decrypt (String chnlId,String sm4key,String message) throws Exception{ - //生产解密key - byte[] appSecretEncDataDecode = EasyGmUtils.sm4Encrypt(chnlId.substring(0, 16).getBytes("UTF-8"), sm4key.getBytes("UTF-8")); - byte[] secKeyDecode = Hex.toHexString(appSecretEncDataDecode).toUpperCase().substring(0, 16).getBytes("UTF-8"); - return new String(EasyGmUtils.sm4Decrypt(secKeyDecode, Hex.decode(message))); - } - - private final static String version = "1.0.0"; - private final static String encType = "sm4"; - private final static String signType = "sm2"; - /** - * 创建请求报文 - * @param chnlId 渠道id - * @param encData 加密的报文 - * @param signData 签名的报文 - * @param transType 请求接口名 - * @return - */ - public static JSONObject buildMsg(String chnlId,String encData,String signData,String transType){ - JSONObject jsonObject = new JSONObject(); - jsonObject.put("appId",chnlId); - jsonObject.put("encData",encData); - jsonObject.put("encType",encType); - jsonObject.put("signData",signData); - jsonObject.put("signType",signType); - jsonObject.put("timestamp", System.currentTimeMillis()); - jsonObject.put("transType",transType); - jsonObject.put("version",version); - return jsonObject; - } - - /** - * 创建和加密请求报文 - * @param chnlId 渠道id - * @param sm4key 渠道sm4密钥 - * @param prvkey 渠道私钥 - * @param transType 请求接口名 - * @param body 原始未加密的请求报文体 - * @return - * @throws Exception - */ - public static JSONObject encryptMsg(String chnlId,String sm4key,String prvkey,String transType,JSONObject body) throws Exception { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("appId",chnlId); - jsonObject.put("encType",encType); - jsonObject.put("data",body); - jsonObject.put("signType",signType); - jsonObject.put("timestamp", System.currentTimeMillis()); - jsonObject.put("transType",transType); - jsonObject.put("version",version); - //加密后的报文 - String encData = sm4Encrypt(chnlId,sm4key, body.toJSONString()); - //签名 - String signData = signature(jsonObject.toJSONString(), sm4key, prvkey,chnlId); - jsonObject.remove("data"); - jsonObject.put("encData",encData); - jsonObject.put("signData",signData); - return jsonObject; - } - - /** - * 解密报文 - * @param jsonObject 医保电子凭证响应的原始加密报文 - * @param sm4key 渠道sm4密钥 - * @param pubKey 平台公钥 - * @param chnlIdSrc 渠道id（兼容旧中台报文返回参数无渠道id参数情况） - * @return - * @throws Exception - */ - public static String decryptMsg(JSONObject jsonObject,String sm4key,String pubKey,String chnlIdSrc) throws Exception { - String chnlId = (String) jsonObject.get("appId"); - chnlId = StringUtil.isEmpty(chnlId)?chnlIdSrc:chnlId; - String msg = (String) jsonObject.get("encData"); - String message = (String) jsonObject.get("message"); - String code = (String) jsonObject.get("code"); - if (!"0".equals(code)){ - throw new RuntimeException(message); - } - //解密 - String msgS = sm4Decrypt(chnlId,sm4key,msg); - //验签 - String signData = (String) jsonObject.get("signData"); - boolean flag = verify(msgS,jsonObject.toJSONString(),signData,sm4key,pubKey); - if (!flag){ - throw new RuntimeException("验签失败！！！"); - } - return msgS; - } - - /** - * 移除json中空值的键值对 - * @param jsonObject - */ - private static void removeEmpty(JSONObject jsonObject){ - Iterator> it = jsonObject.entrySet().iterator(); - while (it.hasNext()){ - Map.Entry entry = it.next(); - Object value = entry.getValue(); - if (value instanceof JSONArray) { - JSONArray jsonArray = (JSONArray) value; - // 数组长度为0时将其处理,防止Gson转换异常 - if (jsonArray.size() == 0) { - it.remove(); - } else { - for (Object o : jsonArray) { - JSONObject asJsonObject = (JSONObject) o; - removeEmpty(asJsonObject); - } - } - } - if (value instanceof JSONObject) { - JSONObject asJsonObject = (JSONObject) value; - removeEmpty(asJsonObject); - } - if (value == null){ - it.remove(); - } - if (value instanceof String &&StringUtil.isEmpty(value)){ - it.remove(); - } - } - } - - public static void main(String[] args) throws Exception{ - - /** - * 生成sm2公私钥 - */ -// System.out.println(SM2Util.getKeyPairStr()); - - - /** - * 渠道id - */ - String chnlId = ""; - /** - * 渠道私钥 - */ - String prvkey = "TcuVE2p/="; - /** - * 渠道密钥 - */ - String sm4key = ""; - /** - * 平台公钥 - */ - String pubKey = "+++Vvnrxdp8CnkYFXBdu6c="; - - /** - * 报文体 - */ - JSONObject body = new JSONObject(); - body.put("appUserId","ohNH9sgKsmJC3tR_spm9jcQx_bh"); - body.put("appId",chnlId); - body.put("idNo",""); - body.put("idType","01"); - body.put("userName",""); - body.put("authCode","111111"); - body.put("redirectURL","www.baidu.com"); - body.put("phone","18050860136"); - body.put("certificateStatus","asdas"); - - - JSONObject s1 = encryptMsg(chnlId,sm4key,prvkey,"ec.gen.link",body); - System.out.println("加密后的报文:"+s1); - - String s2 = decryptMsg(s1,sm4key,pubKey,chnlId); - System.out.println("解密后的报文:"+s2); - - } - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java deleted file mode 100644 index 48d32f99..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/HttpClientUtil.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.openhis.utils; - -import org.apache.http.HttpEntity; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - - -/** - * 获取tokenHttp工具类 - */ -public class HttpClientUtil { - - /** - * psot请求 - * @param url - * @param param - * @param header - * @param charset - * @param input - * @return - */ - public static String sendIOPost(String url, Map param, Map header, String charset, String input) { - String result = null; - CloseableHttpResponse response = null; - CloseableHttpClient httpclient = null; - try { - httpclient = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost(url); - List list = new ArrayList<>(); - if (param != null) { - Iterator iterator = param.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry elem = (Map.Entry) iterator.next(); - list.add(new BasicNameValuePair(elem.getKey(), elem.getValue())); - } - } - if (list.size() > 0) { - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, charset); - httpPost.setEntity(entity); - } - if (input != null) { - StringEntity entity = new StringEntity(input, charset); - httpPost.setEntity(entity); - } - if (header != null) { - Iterator iterator = header.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry elem = (Map.Entry) iterator.next(); - httpPost.setHeader(elem.getKey(), elem.getValue()); - } - } - response = httpclient.execute(httpPost); - if (response != null) { - HttpEntity resEntity = response.getEntity(); - if (resEntity != null) { - result = EntityUtils.toString(resEntity, charset); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - if (response != null) { - response.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - try { - if (httpclient != null) { - httpclient.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return result; - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java deleted file mode 100644 index 4086e66d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/PDFTemplateFillerUtil.java +++ /dev/null @@ -1,279 +0,0 @@ -package com.openhis.utils; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.math.BigDecimal; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Date; -import java.util.List; - -import com.itextpdf.text.DocumentException; -import com.itextpdf.text.Image; -import com.itextpdf.text.pdf.*; -import com.openhis.utils.RedisUtil; -import com.openhis.web.ybmanage.dto.PDFInputDto; -import org.springframework.beans.factory.annotation.Autowired; - -import static com.alibaba.fastjson.JSON.parseObject; - -/** - * PDF模板替换类 - * - * @author liuhr - * @date 2025/4/30 - */ -public final class PDFTemplateFillerUtil { - - // "--"分隔处方结束 - public static final String DASH_LINE = - "-------------------------------------------------------------------------------------------------------"; - - /** - * 根据模板pdf文件，替换生成新的pdf - * - * @param templatePath 模板pdf文件 - * @param outputPath 替换后的pdf文件 - * @param hospitalSealPath 医院盖章路径 - * @param dto 替换内容 - */ - public static void fillPdfTemplate(String templatePath, String outputPath, String hospitalSealPath, PDFInputDto dto) - throws IOException, DocumentException { - PdfReader reader = new PdfReader(templatePath); - PdfStamper stamper = new PdfStamper(reader, new FileOutputStream(outputPath)); - - // 设置字体类型和大小（需要提前注册字体） - // 设置字体为宋体（SimSun） - BaseFont baseFont = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED); - stamper.getAcroFields().setFieldProperty("$HOS_NAME", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$HOS_NAME", "textsize", 14f, null); - stamper.getAcroFields().setFieldProperty("$QR_NUMBER", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$QR_NUMBER", "textsize", 10f, null); - stamper.getAcroFields().setFieldProperty("$BUS_NO", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$BUS_NO", "textsize", 10f, null); - stamper.getAcroFields().setFieldProperty("$P_NO", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$P_NO", "textsize", 10f, null); - stamper.getAcroFields().setFieldProperty("$LOCATION_NAME", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$LOCATION_NAME", "textsize", 10f, null); - stamper.getAcroFields().setFieldProperty("$GENDER", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$GENDER", "textsize", 10f, null); - stamper.getAcroFields().setFieldProperty("$AGE", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$AGE", "textsize", 10f, null); - stamper.getAcroFields().setFieldProperty("$CONTRACT", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$CONTRACT", "textsize", 8f, null); - stamper.getAcroFields().setFieldProperty("$DATE", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$DATE", "textsize", 10f, null); - stamper.getAcroFields().setFieldProperty("$DAYS", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$DAYS", "textsize", 10f, null); - stamper.getAcroFields().setFieldProperty("$DIAG_NAME", "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$DIAG_NAME", "textsize", 10f, null); - - // 替换文本内容 - stamper.getAcroFields().setField("$QR_NUMBER", dto.getRxTraceCode()); - stamper.getAcroFields().setField("$HOS_NAME", dto.getOrgName()); - stamper.getAcroFields().setField("$BUS_NO", dto.getIptOtpNo()); - stamper.getAcroFields().setField("$P_NO", dto.getPrescriptionNo()); - stamper.getAcroFields().setField("$LOCATION_NAME", dto.getLocationName()); - stamper.getAcroFields().setField("$PATIENT_NAME", dto.getPatnName()); - stamper.getAcroFields().setField("$GENDER", dto.getGender()); - stamper.getAcroFields().setField("$AGE", dto.getPatnAge().toString()+ "岁"); - stamper.getAcroFields().setField("$CONTRACT", dto.getHiFeesetlType()); - // 设置时间格式为 "yyyy-MM-dd HH:mm:ss" - // 设置时间格式为中文格式 "xx年xx月xx日" - SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日"); - stamper.getAcroFields().setField("$DATE", sdf.format(dto.getPrscTime())); - stamper.getAcroFields().setField("$DIAG_NAME", " " + dto.getDiagName()); - stamper.getAcroFields().setField("$DAYS", dto.getValiDays().toString() + "天"); - stamper.getAcroFields().setField("$REASON", dto.getReason()); - stamper.getAcroFields().setField("$P1_NAME", dto.getPrscDrName()); - stamper.getAcroFields().setField("$P2_NAME", dto.getPharName()); - stamper.getAcroFields().setField("$P3_NAME", dto.getDisRevPharName()); - stamper.getAcroFields().setField("$P4_NAME", dto.getCheckPharName()); - - // 处理药品明细信息 - if (dto.getMedDetailList() != null && !dto.getMedDetailList().isEmpty()) { - List medDetails = dto.getMedDetailList(); - medDetails.forEach(medDetail -> { - String strName = medDetail.getMedName() + " " + medDetail.getDrugSpec(); - String strDose = "用法： "; - // 单次用量及单位 - if (medDetail.getSinDoscnt() != null && medDetail.getSinDosunt() != null) { - strDose = strDose + medDetail.getSinDoscnt() + medDetail.getSinDosunt(); - } - strDose = strDose + " " + medDetail.getUsedFrquCodg() + " " + medDetail.getMedWay(); - - int index = medDetails.indexOf(medDetail) + 1; - - try { - stamper.getAcroFields().setFieldProperty("$NAME_" + index, "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$NAME_" + index, "textsize", 10f, null); - stamper.getAcroFields().setFieldProperty("$DOSE_" + index, "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$DOSE_" + index, "textsize", 10f, null); - - stamper.getAcroFields().setField("$NAME_" + index, strName); - stamper.getAcroFields().setField("$DOSE_" + index, strDose); - boolean isLastItem = medDetails.indexOf(medDetail) == medDetails.size() - 1; - // 最后一张打印“---” - if (isLastItem) { - stamper.getAcroFields().setFieldProperty("$LINE_" + index, "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$LINE_" + index, "textsize", 13f, null); - stamper.getAcroFields().setFieldProperty("$EMPTY_" + index, "textfont", baseFont, null); - stamper.getAcroFields().setFieldProperty("$EMPTY_" + index, "textsize", 7f, null); - - stamper.getAcroFields().setField("$LINE_" + index, DASH_LINE); - stamper.getAcroFields().setField("$EMPTY_" + index, "(以下是空白)"); - } - } catch (IOException e) { - e.printStackTrace(); - } catch (DocumentException e) { - e.printStackTrace(); - } - }); - } - - // 删除空白的元素 - for (int i = 1; i < 6; i++) { - // 检查字段是否存在并且内容为空 - if (stamper.getAcroFields().getField("$EMPTY_" + i) == null || stamper.getAcroFields().getField("$EMPTY_" + i).isEmpty()) { - stamper.getAcroFields().removeField("$LINE_" + i); - stamper.getAcroFields().removeField("$EMPTY_" + i); - } - } - - // 生成二维码 - PdfContentByte cb = stamper.getOverContent(1); // 获取第一页的内容画布 - int qrX = 80; // 二维码 X 坐标（根据模板调整） - int qrY = 680; // 二维码 Y 坐标（根据模板调整） - int qrSize = 100; // 二维码大小 - - BarcodeQRCode qrCode = new BarcodeQRCode(dto.getRxTraceCode(), qrSize, qrSize, null); - Image qrImage = qrCode.getImage(); - qrImage.setAbsolutePosition(qrX, qrY); - cb.addImage(qrImage); - - // 添加医院红章图片 - if (hospitalSealPath != null && !hospitalSealPath.isEmpty()) { - try { - Image hospitalSeal = Image.getInstance(hospitalSealPath); - // 设置图片的高度和宽度（按照实际需求设置） - hospitalSeal.scaleToFit(120, 100); // 设置图片大小为宽100，高100 - // 获取PDF页面的实际宽度和高度 - float pageSizeWidth = reader.getPageSize(1).getWidth(); - float pageSizeHeight = reader.getPageSize(1).getHeight(); - // 计算右下角的位置（留出一些边距） - int sealX = (int) (pageSizeWidth - hospitalSeal.getScaledWidth() - 80); // X坐标（右下角） - int sealY = (int) (pageSizeHeight - hospitalSeal.getScaledHeight() - 550); // Y坐标（右下角） - hospitalSeal.setAbsolutePosition(sealX, sealY); - cb.addImage(hospitalSeal); - } catch (Exception e) { - e.printStackTrace(); - System.err.println("添加医院红章图片时发生错误：" + e.getMessage()); - } - } - - stamper.close(); - reader.close(); - } - - /** - * 处方文件获取 - * - * @param fileName pdf文件名路径 - */ - public static String getPDFFile(String fileName) { - - File file = new File(fileName); - - // 校验文件是否存在 - if (!file.exists() || !file.isFile() || !file.getName().toLowerCase().endsWith(".pdf")) { - return null; - } - try (FileInputStream fis = new FileInputStream(file)) { - // 读取文件字节数组 - byte[] fileBytes = new byte[(int) file.length()]; - int bytesRead = fis.read(fileBytes); - if (bytesRead != fileBytes.length) { - return null; - } - // Base64编码（标准格式，无换行符） - return Base64.getEncoder().encodeToString(fileBytes); - - } catch (Exception e) { - return null; - } - } - - /** - * 做成PDF - * - * @param rxFileString pdf信息 - * @param fileName pdf文件名路径 - */ - public static Boolean makePDF(String rxFileString, String fileName) { - try { - // 验证Base64字符串格式 - if (rxFileString == null || rxFileString.isEmpty()) { - return false; - } - // 解码Base64字符串 - byte[] pdfBytes = Base64.getDecoder().decode(rxFileString); - // 创建目标目录（如果不存在） - String directoryPath; - int lastSlash = fileName.lastIndexOf('/'); - if (lastSlash == -1) { - // 没有目录部分，可能是当前目录下的文件（如 "file.pdf"） - directoryPath = ""; // 或者 "." 表示当前目录 - } else { - directoryPath = fileName.substring(0, lastSlash); - } - Files.createDirectories(Paths.get(directoryPath)); - - // 写入文件 - try (FileOutputStream fos = new FileOutputStream(fileName)) { - fos.write(pdfBytes); - } - - } catch (Exception e) { - return false; - } - - return true; - } - - /** - * 创建当天日期的文件夹 - * - * @param outputPath 父文件夹 - * @param datePathName 日期文件夹名 - */ - public static Boolean makePath(String outputPath, String datePathName) { - try { - // 构建代表新文件夹的File对象 - File newDir = new File(outputPath, datePathName); - - // 检查新文件夹是否已存在 - if (!newDir.exists()) { - // 创建新文件夹 - boolean created = newDir.mkdir(); - - if (created) { - System.out.println("文件夹创建成功：" + newDir.getAbsolutePath()); - return true; - } else { - System.out.println("文件夹创建失败，可能是父文件夹不存在或者没有写入权限：" + newDir.getAbsolutePath()); - return false; - } - } else { - System.out.println("文件夹已存在,不创建新的文件夹：" + newDir.getAbsolutePath()); - return true; - } - } catch (Exception e) { - return false; - } - } -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java deleted file mode 100644 index 93365981..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/RedisUtil.java +++ /dev/null @@ -1,611 +0,0 @@ -package com.openhis.utils; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.*; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; -import org.springframework.data.redis.core.RedisTemplate; -import java.util.*; -import java.util.concurrent.TimeUnit; - -/** - * redis 工具类 - * @Author Scott - * - */ -@Component -public class RedisUtil { - - @Autowired - private RedisTemplate redisTemplate; - @Autowired - private StringRedisTemplate stringRedisTemplate; - - /** - * 指定缓存失效时间 - * - * @param key 键 - * @param time 时间(秒) - * @return - */ - public boolean expire(String key, long time) { - try { - if (time > 0) { - redisTemplate.expire(key, time, TimeUnit.SECONDS); - } - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 根据key 获取过期时间 - * - * @param key 键 不能为null - * @return 时间(秒) 返回0代表为永久有效 - */ - public long getExpire(String key) { - return redisTemplate.getExpire(key, TimeUnit.SECONDS); - } - - /** - * 判断key是否存在 - * - * @param key 键 - * @return true 存在 false不存在 - */ - public boolean hasKey(String key) { - try { - return redisTemplate.hasKey(key); - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 删除缓存 - * - * @param key 可以传一个值 或多个 - */ - @SuppressWarnings("unchecked") - public void del(String... key) { - if (key != null && key.length > 0) { - if (key.length == 1) { - redisTemplate.delete(key[0]); - } else { - redisTemplate.delete((Collection) CollectionUtils.arrayToList(key)); - } - } - } - - // ============================String============================= - /** - * 普通缓存获取 - * - * @param key 键 - * @return 值 - */ - public Object get(String key) { - return key == null ? null : redisTemplate.opsForValue().get(key); - } - - /** - * 普通缓存放入 - * - * @param key 键 - * @param value 值 - * @return true成功 false失败 - */ - public boolean set(String key, Object value) { - try { - redisTemplate.opsForValue().set(key, value); - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - - } - - /** - * 普通缓存放入并设置时间 - * - * @param key 键 - * @param value 值 - * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期 - * @return true成功 false 失败 - */ - public boolean set(String key, Object value, long time) { - try { - if (time > 0) { - redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); - } else { - set(key, value); - } - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 递增 - * - * @param key 键 - * @param by 要增加几(大于0) - * @return - */ - public long incr(String key, long delta) { - if (delta < 0) { - throw new RuntimeException("递增因子必须大于0"); - } - return redisTemplate.opsForValue().increment(key, delta); - } - - /** - * 递减 - * - * @param key 键 - * @param by 要减少几(小于0) - * @return - */ - public long decr(String key, long delta) { - if (delta < 0) { - throw new RuntimeException("递减因子必须大于0"); - } - return redisTemplate.opsForValue().increment(key, -delta); - } - - // ================================Map================================= - /** - * HashGet - * - * @param key 键 不能为null - * @param item 项 不能为null - * @return 值 - */ - public Object hget(String key, String item) { - return redisTemplate.opsForHash().get(key, item); - } - - /** - * 获取hashKey对应的所有键值 - * - * @param key 键 - * @return 对应的多个键值 - */ - public Map hmget(String key) { - return redisTemplate.opsForHash().entries(key); - } - - /** - * HashSet - * - * @param key 键 - * @param map 对应多个键值 - * @return true 成功 false 失败 - */ - public boolean hmset(String key, Map map) { - try { - redisTemplate.opsForHash().putAll(key, map); - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * HashSet 并设置时间 - * - * @param key 键 - * @param map 对应多个键值 - * @param time 时间(秒) - * @return true成功 false失败 - */ - public boolean hmset(String key, Map map, long time) { - try { - redisTemplate.opsForHash().putAll(key, map); - if (time > 0) { - expire(key, time); - } - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 向一张hash表中放入数据,如果不存在将创建 - * - * @param key 键 - * @param item 项 - * @param value 值 - * @return true 成功 false失败 - */ - public boolean hset(String key, String item, Object value) { - try { - redisTemplate.opsForHash().put(key, item, value); - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 向一张hash表中放入数据,如果不存在将创建 - * - * @param key 键 - * @param item 项 - * @param value 值 - * @param time 时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间 - * @return true 成功 false失败 - */ - public boolean hset(String key, String item, Object value, long time) { - try { - redisTemplate.opsForHash().put(key, item, value); - if (time > 0) { - expire(key, time); - } - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 删除hash表中的值 - * - * @param key 键 不能为null - * @param item 项 可以使多个 不能为null - */ - public void hdel(String key, Object... item) { - redisTemplate.opsForHash().delete(key, item); - } - - /** - * 判断hash表中是否有该项的值 - * - * @param key 键 不能为null - * @param item 项 不能为null - * @return true 存在 false不存在 - */ - public boolean hHasKey(String key, String item) { - return redisTemplate.opsForHash().hasKey(key, item); - } - - /** - * hash递增 如果不存在,就会创建一个 并把新增后的值返回 - * - * @param key 键 - * @param item 项 - * @param by 要增加几(大于0) - * @return - */ - public double hincr(String key, String item, double by) { - return redisTemplate.opsForHash().increment(key, item, by); - } - - /** - * hash递减 - * - * @param key 键 - * @param item 项 - * @param by 要减少记(小于0) - * @return - */ - public double hdecr(String key, String item, double by) { - return redisTemplate.opsForHash().increment(key, item, -by); - } - - // ============================set============================= - /** - * 根据key获取Set中的所有值 - * - * @param key 键 - * @return - */ - public Set sGet(String key) { - try { - return redisTemplate.opsForSet().members(key); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - /** - * 根据value从一个set中查询,是否存在 - * - * @param key 键 - * @param value 值 - * @return true 存在 false不存在 - */ - public boolean sHasKey(String key, Object value) { - try { - return redisTemplate.opsForSet().isMember(key, value); - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 将数据放入set缓存 - * - * @param key 键 - * @param values 值 可以是多个 - * @return 成功个数 - */ - public long sSet(String key, Object... values) { - try { - return redisTemplate.opsForSet().add(key, values); - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - - /** - * 将set数据放入缓存 - * - * @param key 键 - * @param time 时间(秒) - * @param values 值 可以是多个 - * @return 成功个数 - */ - public long sSetAndTime(String key, long time, Object... values) { - try { - Long count = redisTemplate.opsForSet().add(key, values); - if (time > 0) { - expire(key, time); - } - return count; - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - - /** - * 获取set缓存的长度 - * - * @param key 键 - * @return - */ - public long sGetSetSize(String key) { - try { - return redisTemplate.opsForSet().size(key); - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - - /** - * 移除值为value的 - * - * @param key 键 - * @param values 值 可以是多个 - * @return 移除的个数 - */ - public long setRemove(String key, Object... values) { - try { - Long count = redisTemplate.opsForSet().remove(key, values); - return count; - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - // ===============================list================================= - - /** - * 获取list缓存的内容 - * - * @param key 键 - * @param start 开始 - * @param end 结束 0 到 -1代表所有值 - * @return - */ - public List lGet(String key, long start, long end) { - try { - return redisTemplate.opsForList().range(key, start, end); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - /** - * 获取list缓存的长度 - * - * @param key 键 - * @return - */ - public long lGetListSize(String key) { - try { - return redisTemplate.opsForList().size(key); - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - - /** - * 通过索引 获取list中的值 - * - * @param key 键 - * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推 - * @return - */ - public Object lGetIndex(String key, long index) { - try { - return redisTemplate.opsForList().index(key, index); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - /** - * 将list放入缓存 - * - * @param key 键 - * @param value 值 - * @param time 时间(秒) - * @return - */ - public boolean lSet(String key, Object value) { - try { - redisTemplate.opsForList().rightPush(key, value); - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 将list放入缓存 - * - * @param key 键 - * @param value 值 - * @param time 时间(秒) - * @return - */ - public boolean lSet(String key, Object value, long time) { - try { - redisTemplate.opsForList().rightPush(key, value); - if (time > 0) { - expire(key, time); - } - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 将list放入缓存 - * - * @param key 键 - * @param value 值 - * @param time 时间(秒) - * @return - */ - public boolean lSet(String key, List value) { - try { - redisTemplate.opsForList().rightPushAll(key, value); - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 将list放入缓存 - * - * @param key 键 - * @param value 值 - * @param time 时间(秒) - * @return - */ - public boolean lSet(String key, List value, long time) { - try { - redisTemplate.opsForList().rightPushAll(key, value); - if (time > 0) { - expire(key, time); - } - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 根据索引修改list中的某条数据 - * - * @param key 键 - * @param index 索引 - * @param value 值 - * @return - */ - public boolean lUpdateIndex(String key, long index, Object value) { - try { - redisTemplate.opsForList().set(key, index, value); - return true; - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * 移除N个值为value - * - * @param key 键 - * @param count 移除多少个 - * @param value 值 - * @return 移除的个数 - */ - public long lRemove(String key, long count, Object value) { - try { - Long remove = redisTemplate.opsForList().remove(key, count, value); - return remove; - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - - /** - * 获取指定前缀的一系列key - * 使用scan命令代替keys, Redis是单线程处理，keys命令在KEY数量较多时， - * 操作效率极低【时间复杂度为O(N)】，该命令一旦执行会严重阻塞线上其它命令的正常请求 - * @param keyPrefix - * @return - */ - private Set keys(String keyPrefix) { - String realKey = keyPrefix + "*"; - - try { - return redisTemplate.execute((RedisCallback>) connection -> { - Set binaryKeys = new HashSet<>(); - Cursor cursor = connection.scan(new ScanOptions.ScanOptionsBuilder().match(realKey).count(Integer.MAX_VALUE).build()); - while (cursor.hasNext()) { - binaryKeys.add(new String(cursor.next())); - } - - return binaryKeys; - }); - } catch (Throwable e) { - e.printStackTrace(); - } - - return null; - } - - /** - * 删除指定前缀的一系列key - * @param keyPrefix - */ - public void removeAll(String keyPrefix) { - try { - Set keys = keys(keyPrefix); - redisTemplate.delete(keys); - } catch (Throwable e) { - e.printStackTrace(); - } - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java deleted file mode 100644 index c6572163..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/SignUtil.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.openhis.utils; - -import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; - -import java.util.*; - - -public class SignUtil { - private static List ignoreSign = new ArrayList(); - - public static String getSignText(JSONObject jsonObject, String appSecret) { - Map signMap = new TreeMap(); - Set> entrys = jsonObject.entrySet(); - Iterator var4 = entrys.iterator(); - - while (var4.hasNext()) { - Map.Entry entry = (Map.Entry) var4.next(); - if (!StringUtil.isEmpty(entry.getValue()) && !ignoreSign.contains(entry.getKey())) { - signMap.put(entry.getKey(), getValue(entry.getValue())); - } - } - - ArrayList list = new ArrayList(); - Iterator var10 = signMap.entrySet().iterator(); - - while (var10.hasNext()) { - Map.Entry entry = (Map.Entry) var10.next(); - if (StringUtil.isNotEmpty(getObjString(entry.getValue()))) { - list.add((String) entry.getKey() + "=" + (String) entry.getValue() + "&"); - } - } - - int size = list.size(); - String[] arrayToSort = (String[]) list.toArray(new String[size]); - Arrays.sort(arrayToSort, String.CASE_INSENSITIVE_ORDER); - StringBuilder sb = new StringBuilder(); - - for (int i = 0; i < size; ++i) { - sb.append(arrayToSort[i]); - } - - String signText = sb.append("key=").append(appSecret).toString(); - return signText; - } - - public static String getObjString(Object object) { - return object == null ? "" : (String) object; - } - - public static String getValue(Object value) { - return value instanceof String ? getObjString(value) : treeJsonParam(value); - } - - private static String treeJsonParam(Object value) { - String jsonParam = null; - if (value instanceof Map) { - Map treeNestedMap = new TreeMap(); - Map nestedMap = (Map) value; - Iterator var4 = nestedMap.entrySet().iterator(); - - while (var4.hasNext()) { - Map.Entry nestedEntry = (Map.Entry) var4.next(); - treeNestedMap.put((String) nestedEntry.getKey(), nestedEntry.getValue()); - } - - jsonParam = JSONObject.toJSONString(treeParams(treeNestedMap)); - } else if (value instanceof ArrayList) { - ArrayList ar = (ArrayList) value; - jsonParam = JSONObject.toJSONString(treeList(ar)); - } else if (value instanceof JSONArray) { - JSONArray jarr = (JSONArray) value; - jsonParam = JSONObject.toJSONString(treeJsonArray(jarr)); - } else { - jsonParam = value.toString(); - } - - return jsonParam; - } - - private static Map treeParams(Map params) { - if (params == null) { - return new TreeMap(); - } else { - Map treeParams = new TreeMap(); - Iterator var2 = params.entrySet().iterator(); - - while (true) { - while (var2.hasNext()) { - Map.Entry entry = (Map.Entry) var2.next(); - String key = (String) entry.getKey(); - Object value = entry.getValue(); - if (value instanceof Map) { - Map treeNestedMap = new TreeMap(); - Map nestedMap = (Map) value; - Iterator var8 = nestedMap.entrySet().iterator(); - - while (var8.hasNext()) { - Map.Entry nestedEntry = (Map.Entry) var8.next(); - treeNestedMap.put((String) nestedEntry.getKey(), nestedEntry.getValue()); - } - - treeParams.put(key, treeParams(treeNestedMap)); - } else if (value instanceof ArrayList) { - ArrayList ar = (ArrayList) value; - treeParams.put(key, treeList(ar)); - } else if (value instanceof JSONArray) { - JSONArray ar = (JSONArray) value; - treeParams.put(key, treeJsonArray(ar)); - } else if (!"".equals(value) && value != null) { - treeParams.put(key, value.toString()); - } - } - - return treeParams; - } - } - } - - private static JSONArray treeList(ArrayList list) { - if (list != null && list.size() != 0) { - JSONArray jsonArray = new JSONArray(); - int size = list.size(); - - for (int i = 0; i < size; ++i) { - jsonArray.add(i, list.get(i)); - } - - return treeJsonArray(jsonArray); - } else { - return null; - } - } - - private static JSONArray treeJsonArray(JSONArray jarr) { - if (jarr != null && jarr.size() != 0) { - JSONArray jsonArray = new JSONArray(); - int size = jarr.size(); - - for (int i = 0; i < size; ++i) { - Object value = jarr.get(i); - if (!(value instanceof Map)) { - if (value instanceof ArrayList) { - ArrayList ar = (ArrayList) value; - jsonArray.add(i, treeList(ar)); - } else if (value instanceof JSONArray) { - JSONArray ar = (JSONArray) value; - jsonArray.add(i, treeJsonArray(ar)); - } else if (!"".equals(value)) { - jsonArray.add(i, value.toString()); - } - } else { - Map treeNestedMap = new TreeMap(); - Map nestedMap = (Map) value; - Iterator var7 = nestedMap.entrySet().iterator(); - - while (var7.hasNext()) { - Map.Entry nestedEntry = (Map.Entry) var7.next(); - treeNestedMap.put((String) nestedEntry.getKey(), nestedEntry.getValue()); - } - - jsonArray.add(i, treeParams(treeNestedMap)); - } - } - - return jsonArray; - } else { - return null; - } - } - - static { - ignoreSign.add("signData"); - ignoreSign.add("encData"); - ignoreSign.add("extra"); - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java deleted file mode 100644 index 97631bf9..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/utils/StringUtil.java +++ /dev/null @@ -1,428 +0,0 @@ -package com.openhis.utils; - - -import java.io.IOException; -import java.io.InputStream; -import java.math.BigDecimal; -import java.net.URLDecoder; -import java.text.SimpleDateFormat; -import java.util.*; - -/** - * - */ -public final class StringUtil { - public static final int XFF00 = 65280; - public static final int XF0 = 240; - public static final int X0F = 15; - public static final int XFF = 255; - public static final int X000000FF = 255; - public static final int X0000FF00 = 65280; - public static final int SIXTEEN = 16; - public static final char[] HEX_CHARS = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; - - public StringUtil() { - } - - public static String getRandomString(int length) { - String base = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - Random random = new Random(); - StringBuffer sb = new StringBuffer(); - - for (int i = 0; i < length; ++i) { - int number = random.nextInt(base.length()); - sb.append(base.charAt(number)); - } - - return sb.toString(); - } - - public static String getRandomNumber(int length) { - String base = "0123456789"; - Random random = new Random(); - StringBuffer sb = new StringBuffer(); - - for (int i = 0; i < length; ++i) { - int number = random.nextInt(base.length()); - sb.append(base.charAt(number)); - } - - return sb.toString(); - } - - public static int[] splitToIntArray(String s, String delim) { - String[] stringValueArray = split(s, delim); - int[] intValueArray = new int[stringValueArray.length]; - - for (int i = 0; i < intValueArray.length; ++i) { - intValueArray[i] = Integer.parseInt(stringValueArray[i]); - } - - return intValueArray; - } - - public static String[] split(String source, String div) { - int arynum = 0; - int div_length = div.length(); - int intIdx; - if (source.compareTo("") != 0) { - if (source.indexOf(div) != -1) { - intIdx = source.indexOf(div); - - for (int var6 = 1; source.indexOf(div, intIdx + div_length) != -1; arynum = var6++) { - intIdx = source.indexOf(div, intIdx + div_length); - } - - arynum += 2; - } else { - arynum = 1; - } - } else { - arynum = 0; - } - - String[] returnStr = new String[arynum]; - if (source.compareTo("") == 0) { - return returnStr; - } else if (source.indexOf(div) == -1) { - returnStr[0] = source.substring(0, source.length()); - return returnStr; - } else { - intIdx = source.indexOf(div); - returnStr[0] = source.substring(0, intIdx); - - int intCount; - for (intCount = 1; source.indexOf(div, intIdx + div_length) != -1; ++intCount) { - int intIdex = source.indexOf(div, intIdx + div_length); - returnStr[intCount] = source.substring(intIdx + div_length, intIdex); - intIdx = source.indexOf(div, intIdx + div_length); - } - - returnStr[intCount] = source.substring(intIdx + div_length, source.length()); - return returnStr; - } - } - - public static int doNullInt(String srcInt) { - return srcInt != null && !"".equals(srcInt) ? Integer.parseInt(srcInt) : 0; - } - - public static int doNullInt(Object obj) { - String srcInt = doNullStr(obj); - return srcInt != null && !"".equals(srcInt) ? Integer.parseInt(srcInt) : 0; - } - - public static long doNullLong(String srcInt) { - return srcInt != null && !"".equals(srcInt) ? Long.parseLong(srcInt) : 0L; - } - - public static long doNullLong(Object obj) { - String srcInt = doNullStr(obj); - return srcInt != null && !"".equals(srcInt) ? Long.parseLong(srcInt) : 0L; - } - - public static String doNullStr(Object obj) { - String str = ""; - if (obj != null) { - str = String.valueOf(obj); - if (str.equals("null")) { - str = ""; - } - } - - return str; - } - - public static Integer doNullInteger(Object obj) { - String str = doNullStr(obj); - if (isEmpty(str)) { - str = "0"; - } else { - int i = str.indexOf("."); - if (i > 0) { - str = str.substring(0, i); - } - } - - return Integer.valueOf(str); - } - - public static boolean isEmpty(String[] string) { - return string == null || string.length == 0; - } - - public static boolean isEmpty(String string) { - return string == null || "".equals(string.trim()) || "null".equals(string.trim()); - } - - public static boolean isNotEmpty(String string) { - return !isEmpty(string); - } - - public static boolean isEmpty(Object o) { - return o == null || "".equals(o); - } - - public static String padRight(String value, int totalWidth, char paddingChar) { - String temp = value; - if (value.length() > totalWidth) { - return value; - } else { - while (temp.length() < totalWidth) { - temp = temp + paddingChar; - } - - return temp; - } - } - - public static String padLeft(String value, int totalWidth, char paddingChar) { - String temp = value; - if (value.length() > totalWidth) { - return value; - } else { - while (temp.length() < totalWidth) { - temp = paddingChar + temp; - } - - return temp; - } - } - - public static String reTrimByString(String value) { - String reValue; - if (value != null && !value.equals("")) { - reValue = value.trim(); - } else { - reValue = ""; - } - - return reValue; - } - - public static String reTrimByObject(Object obj) { - String reValue; - if (obj != null && !obj.equals("")) { - reValue = String.valueOf(obj).trim(); - } else { - reValue = ""; - } - - return reValue; - } - - public static int indexOfStringArray(String[] strArr, String str) { - int index = -1; - if (strArr != null && str != null) { - for (int i = 0; i < strArr.length; ++i) { - if (str.equals(strArr[i])) { - index = i; - break; - } - } - } - - return index; - } - - public static String replaceFirst(String whole, String strold, String strnew) { - if (whole.indexOf(strold) > -1 && strnew != null) { - String whole_one = whole.substring(0, whole.indexOf(strold)); - String whole_two = whole.substring(whole.indexOf(strold) + strold.length()); - whole = whole_one + strnew + whole_two; - } - - return whole; - } - - public static Long[] convertionToLong(String[] strs) { - Long[] longs = null; - if (!isEmpty(strs)) { - longs = new Long[strs.length]; - - for (int i = 0; i < strs.length; ++i) { - String str = strs[i]; - long thelong = Long.valueOf(str).longValue(); - longs[i] = thelong; - } - } - - return longs; - } - - public static Long[] convertionToLongArr(String strs, String splitChar) { - if (isEmpty(splitChar)) { - splitChar = ","; - } - - Long[] result = null; - if (!isEmpty(strs)) { - String[] ids = strs.split(splitChar); - result = new Long[ids.length]; - - for (int i = 0; i < ids.length; ++i) { - result[i] = new Long(ids[i]); - } - } - - return result; - } - - public static String[] decodeStringToArray(String str, String div) { - ArrayList array = new ArrayList(); - StringTokenizer fenxi = new StringTokenizer(str, div); - - while (fenxi.hasMoreTokens()) { - String s1 = fenxi.nextToken(); - array.add(s1); - } - - String[] result = new String[array.size()]; - - for (int i = 0; i < result.length; ++i) { - result[i] = (String) array.get(i); - } - - return result; - } - - public static String convertionLongToString(Long[] l, String splitChar) { - String result = null; - if (l != null) { - result = Arrays.toString(l); - result = result.substring(1, result.length() - 1); - if (!isEmpty(splitChar)) { - result = result.replaceAll(",", splitChar); - } - } - - return result; - } - - public static String convertionObjectArrayToStr(Object[] strings, String regx) { - String result = null; - if (regx != null) { - result = Arrays.toString(strings); - result = result.substring(1, result.length() - 1); - if (!isEmpty(regx)) { - result = result.replaceAll(",", regx); - } - } - - return result; - } - - public static String charEncoding(String str) { - try { - str = URLDecoder.decode(str, "UTF-8"); - } catch (Exception var2) { - str = null; - } - - return str; - } - - public static String getStrTransMean(String str, String sregex, String sreplace) { - if (!isEmpty(str)) { - str = str.replaceAll(sregex, sreplace); - } - - return str; - } - - public static String replaceSpecialChar(String s) { - return s.replaceAll("/|\\\\|\\$|#|&|%|\\*|\\^|;|,|<|>|&|'|\"", ""); - } - - public static String replaceSpecialCode(String s) { - return null != s && !"".equals(s) ? s.replaceAll("<|>|\"|%|;|\\(|\\)|&|'|\\+|\\\\", "") : s; - } - - public static String getMapValue(Map map) { - StringBuffer str = new StringBuffer(); - Iterator it = map.values().iterator(); - - while (it.hasNext()) { - String val = String.valueOf(it.next()); - str.append(val); - } - - return str.toString(); - } - - public static String bSubstring(String s, int length) { - try { - byte[] bytes = s.getBytes("Unicode"); - int n = 0; - - int i; - for (i = 2; i < bytes.length && n < length; ++i) { - if (i % 2 == 1) { - ++n; - } else if (bytes[i] != 0) { - ++n; - } - } - - if (i % 2 == 1) { - if (bytes[i - 1] != 0) { - --i; - } else { - ++i; - } - } - - return new String(bytes, 0, i, "Unicode"); - } catch (Exception var5) { - return new String(""); - } - } - - public static String getString(Object o) { - return o == null ? "" : o.toString(); - } - - public static Properties getProperties(String filename) { - Properties properties = new Properties(); - InputStream in = null; - in = StringUtil.class.getClassLoader().getResourceAsStream(filename); - - try { - properties.load(in); - return properties; - } catch (IOException var4) { - return properties; - } - } - - public static String dateTostr(Date date, String format) throws Exception { - SimpleDateFormat dateFormat = new SimpleDateFormat(format); - String dateStr = null; - dateStr = dateFormat.format(date); - return dateStr; - } - - public static String iso8859ToUTF8(Object obj) { - try { - return obj == null ? "" : new String(obj.toString().getBytes("UTF-8"), "iso-8859-1"); - } catch (Exception var2) { - return ""; - } - } - - public static String utf8ToIso8859(Object obj) { - try { - return obj == null ? "" : new String(obj.toString().getBytes("iso-8859-1"), "UTF-8"); - } catch (Exception var2) { - return ""; - } - } - - public static BigDecimal getStrBigDecimal(String str) { - return isEmpty(str) ? null : new BigDecimal(str); - } - - public static String cutString(String str, int size) { - return isNotEmpty(str) && str.length() > 100 ? str.substring(0, 100) : str; - } -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java deleted file mode 100644 index 26c00c38..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseInfo.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 医保所需要的基础信息，如医生信息或者医院信息，目的是为医保服务提供数据信息 - * - * @author SunJQ - * @date 2025-05-04 - */ -@Data -@Accessors(chain = true) -public class BaseInfo { - /******************医保机构信息******************/ - - - /********************医院信息********************/ - - /** (必填)统筹区号 */ - private String admvs;// - - /** (必填)定点医药机构编号 */ - private String fixmedinsCode; - - /** (必填)定点医药机构名称 */ - private String fixmedinsName; - - /** (必填)医保app的Controller路径 */ - private String ybUrl; - - /** (必填)客戶端id */ - private String ybClientId;//医保用 2025/05/21 无人解答医保与电子处方的这些信息是否一致，防止修改某一变量导致另一个功能失效，分开保存 - - /** (必填)客戶端安全码 */ - private String ybClientSecret;//医保用 - - /** (必填)医保服务平台账号 */ - private String ybUsername;//医保用 - - /** (必填)医保服务平台密码 */ - private String ybPassword;//医保用 - - /** (必填)终端授权类型 */ - private String ybGrantType;//医保用 - - /** (必填)终端授权范围 */ - private String ybScope;//医保用 - - /** (必填)秘钥 */ - private String ybCliPrvKey;//医保用 - - /********************医护信息********************/ - - /** (必填) 用户id */ - private Long UserId; - - /** (必填)登录人名字 */ - private String realname; - - /********************患者信息********************/ - - /** 参保地医保区划 */ - private String insuplcAdmdvs;//如果交易输入中含有人员编号，此项必填，可通过【1101】人员信息获取交易取得 2025/05/20 经测试发现2201-2208几个接口没传psn_no但是也要传这个 - - /********************电子处方********************/ - //电子处方 - private String cliPrvKey; - private String cliPubKey; - private String clientId; - private String eleAddress; - private String username; - private String password; - private String scope; - private String grantType; - private String clientSecret; - private String time; - private String preAppId; - private String preAppSecret; - private String prePrvKey; - private String prePubKey; - private String templatePath; - private String outputPath; - private String hospitalSealPath; - private String medType; - private String dutyDoctorName; - /********************共通参数********************/ - //是否解密 - private String decryptFlag; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java deleted file mode 100644 index 427c6fdc..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/BaseParam.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -public class BaseParam { - - Object data; - - BaseInfo baseInfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java deleted file mode 100644 index 37cd72d7..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelPaymentDto.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.math.BigDecimal; -import java.util.List; - -/** - * 退费入参 - * - * @author SunJQ - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -public class CancelPaymentDto { - /** - * id - */ - private Long id; - - /** 收款员 */ - private Long entererId; - - /** 支付的患者ID */ - @NotNull - private Long patientId; - - /** 应收金额 */ - private BigDecimal tenderedAmount; - - /** 找零金额 */ - private BigDecimal returnedAmount; - - /** 付款总额 */ - private BigDecimal displayAmount; - - /** 就诊ID */ - @JsonSerialize(using = ToStringSerializer.class) - private Long encounterId; - - /** 收费项 */ - private List chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合 - - /** 支付详细 */ - @NotEmpty - private List paymentDetails; - - /** 支付批次号 */ - private String chrgBchno;//医保预结算时返回，医保结算时必传，否则结算时一直预结算 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java deleted file mode 100644 index 2e7a44f4..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/CancelRegPaymentDto.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.openhis.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.math.BigDecimal; -import java.util.List; - -@Data -@Accessors(chain = true) -public class CancelRegPaymentDto { - /** - * id - */ - private Long id; - - /** 收款员 */ - private Long entererId; - - /** 支付的患者ID */ - @NotNull - private Long patientId; - - /** 应收金额 */ - private BigDecimal tenderedAmount; - - /** 找零金额 */ - private BigDecimal returnedAmount; - - /** 付款总额 */ - private BigDecimal displayAmount; - - /** 就诊ID */ - @JsonSerialize(using = ToStringSerializer.class) - private Long encounterId; - - /** 收费项 */ - private List chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合 - - /** 支付详细 */ - @NotEmpty - private List paymentDetails; - - /** 支付批次号 */ - private String chrgBchno;//医保预结算时返回，医保结算时必传，否则结算时一直预结算 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java deleted file mode 100644 index 919f504e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312Output.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.openhis.vo; - -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * 【1312】医保目录信息查询 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Catalogue1312Output extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - // 医保目录编码 - private String hilistCode; - - // 医保目录名称 - private String hilistName; - - // 参保机构医保区划 - private String insuAdmdvs; - - // 开始日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date begndate; - - // 结束日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date enddate; - - // 医疗收费项目类别 - private String medChrgitmType; - - // 收费项目等级 - private String chrgitmLv; - - // 限制使用标志 - private String lmtUsedFlag; - - // 目录类别 - private String listType; - - // 医疗使用标志 - private String medUseFlag; - - // 生育使用标志 - private String matnUsedFlag; - - // 医保目录使用类别 - private String hilistUseType; - - // 限复方使用类型 - private String lmtCpndType; - - // 五笔助记码 - private String wubi; - - // 拼音助记码 - private String pinyin; - - // 备注 - private String memo; - - // 有效标志 - private String valiFlag; - - // 唯一记录号 - private String rid; - - // 更新时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updtTime; - - // 创建人 - private String crterId; - - // 创建人姓名 - private String crterName; - - // 创建时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date crteTime; - - // 创建机构 - private String crteOptinsNo; - - // 经办人 - private String opterId; - - // 经办人姓名 - private String opterName; - - // 经办时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date optTime; - - // 经办机构 - private String optinsNo; - - // 统筹区 - private String poolareaNo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java deleted file mode 100644 index b2f2ea66..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Catalogue1312QueryParam.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【1312】医保目录信息查询 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Catalogue1312QueryParam { - - // 医保目录编码 - @JSONField(name = "hilist_code") - private String hilistCode; - - // 参保地区编码 - @JSONField(name = "insuplc_admdvs") - private String insuplcAdmdvs; - // 更新时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "updt_time") - private Date updtTime; - - // 页数 - @JSONField(name = "page_num") - private Integer pageNum; - // 当前页面查询数量 - @JSONField(name = "page_size") - private Integer pageSize; - - // 解密标记 - @JSONField(name = "decrypt_flag") - private String decryptFlag; - - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java deleted file mode 100644 index c0122710..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDetailVO.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.openhis.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.openhis.common.annotation.Dict; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -@Data -public class ChargeItemDetailVO { - - @Dict(dictCode = "chrgitm_lv") - private String dirClass;//医保等级 - - - /** ID */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 状态 */ - private Integer statusEnum; - - /** - * 账单生成来源 - */ - private Integer generateSourceEnum; - - /** 层级 */ - private String busNo; - - /** 处方号 */ - private String prescriptionNo; - - /** 患者ID */ - private Long patientId; - - /** 类别 */ - private Integer contextEnum; - - /** 就诊ID */ - private Long encounterId; - - /** 发生时间 */ - private Date occurrenceTime; - - /** 执行人Id */ - private Long performerId; - - /** 执行科室 */ - private Long performingOrgId; - - /** 开立科室 */ - private Long requestingOrgId; - - /** 成本科室 */ - private Long costOrgId; - - /** 数量 */ - private Integer quantityValue; - - /** 单位 */ - private String quantityUnit; - - /** 单价 */ - private BigDecimal unitPrice; - - /** 总价 */ - private BigDecimal totalPrice; - - /** 费用定价ID */ - private Long definitionId; - - /** 定价子表主键 */ - private Long defDetailId; - - /** 原价 */ - private BigDecimal baseAmount; - - /** 折后价格 */ - private BigDecimal discountAmount; - - /** 附加价格 */ - private BigDecimal surchargeAmount; - - /** 改价原因 */ - private String overrideReasonCode; - - /** 改价原因文本 */ - private String overrideReasonText; - - /** 开立人ID */ - private Long entererId; - - /** 开立时间 */ - private Date enteredDate; - - /** 医疗服务所在表 */ - private String serviceTable; - - /** 医疗服务ID */ - private Long serviceId; - - /** 产品所在表 */ - private String productTable; - - /** 产品ID */ - private Long productId; - - /** 索赔结果 */ - private Integer claimStateEnum; - - /** 打印次数 */ - private Integer printCount; - - /** 关联账户ID */ - private Long accountId; - - /** 机构 */ - private Long orgId; - - /** 退费ID */ - private Long refundId; - - /** 诊断ID */ - private Long diagnosisId;//adm_encounter_diagnosis表主键 - - /** - * 子项json - */ - private String childrenJson; - - /** - * 诊断id - */ - private Long conditionId; - - /** - * 就诊诊断id - */ - private Long encounterDiagnosisId; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java deleted file mode 100644 index 21bc1332..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ChargeItemDto.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 收费项目 - * - * @author SunJQ - * @date 2025-03-31 - */ -@Data -@Accessors(chain = true) -public class ChargeItemDto { - - private String typeCode; - - - /** ID */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - - /** 状态 */ - private Integer statusEnum; - - /** - * 账单生成来源 - */ - private Integer generateSourceEnum; - - /** 层级 */ - private String busNo; - - /** 处方号 */ - private String prescriptionNo; - - /** 患者ID */ - private Long patientId; - - /** 类别 */ - private Integer contextEnum; - - /** 就诊ID */ - private Long encounterId; - - /** 发生时间 */ - private Date occurrenceTime; - - /** 执行人Id */ - private Long performerId; - - /** 执行科室 */ - private Long performingOrgId; - - /** 开立科室 */ - private Long requestingOrgId; - - /** 成本科室 */ - private Long costOrgId; - - /** 数量 */ - private Integer quantityValue; - - /** 单位 */ - private String quantityUnit; - - /** 单价 */ - private BigDecimal unitPrice; - - /** 总价 */ - private BigDecimal totalPrice; - - /** 费用定价ID */ - private Long definitionId; - - /** 定价子表主键 */ - private Long defDetailId; - - /** 原价 */ - private BigDecimal baseAmount; - - /** 折后价格 */ - private BigDecimal discountAmount; - - /** 附加价格 */ - private BigDecimal surchargeAmount; - - /** 改价原因 */ - private String overrideReasonCode; - - /** 改价原因文本 */ - private String overrideReasonText; - - /** 开立人ID */ - private Long entererId; - - /** 开立时间 */ - private Date enteredDate; - - /** 医疗服务所在表 */ - private String serviceTable; - - /** 医疗服务ID */ - private Long serviceId; - - /** 产品所在表 */ - private String productTable; - - /** 产品ID */ - private Long productId; - - /** 索赔结果 */ - private Integer claimStateEnum; - - /** 打印次数 */ - private Integer printCount; - - /** 关联账户ID */ - private Long accountId; - - /** 机构 */ - private Long orgId; - - /** 退费ID */ - private Long refundId; - - /** 诊断ID */ - private Long diagnosisId;//adm_encounter_diagnosis表主键 - - /** - * 子项json - */ - private String childrenJson; - - /** - * 诊断id - */ - private Long conditionId; - - /** - * 就诊诊断id - */ - private Long encounterDiagnosisId; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java deleted file mode 100644 index b08ca800..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3204AParam.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【3204A】清算申请撤销(吉林省) - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Clearing3204AParam { - - // 机构清算申请事件ID - @JSONField(name = "clr_apply_evt_id") - private String clrApplyEvtId; - - // 清算机构 - @JSONField(name = "clr_optins") - private String clrOptins; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java deleted file mode 100644 index f0811709..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AParma.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【3205A】清算申请状态查询（吉林省） - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Clearing3205AParma extends Financial3203AParam { - - // 清算机构 - @JSONField(name = "clr_optins") - private String clrOptins; - - // 清算状态 - @JSONField(name = "clr_stas") - private String clrStas; - - // 清算月份 - @JSONField(name = "clr_ym") - private String clrYm; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java deleted file mode 100644 index 6731710f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AResult.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3205A】清算申请状态查询（吉林省） - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Clearing3205AResult { - // 定点医药机构名称 - @JSONField(name = "fixmedins_name") - private String fixmedinsName; - - // 定点医药机构编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - // 清算状态 - @JSONField(name = "clr_stas") - private String clrStas; - - // 经办时间 - @JSONField(name = "opt_time") - private Date optTime; - - // 医疗费总额 - @JSONField(name = "medfee_Sumamt") - private BigDecimal medfeeSumamt; - - // 医保费用总额 - @JSONField(name = "hi_agre_sumfee") - private BigDecimal hiAgreSumfee; - - // 基金申报总额 - @JSONField(name = "fund_appy_sum") - private BigDecimal fundAppySum; - - // 现金支付金额 - @JSONField(name = "cash_payamt") - private BigDecimal cashPayamt; - - // 个人账户支出 - @JSONField(name = "acct_pay") - private BigDecimal acctPay; - - // 开始日期 - @JSONField(name = "begndate") - private Date begndate; - - // 结束日期 - @JSONField(name = "enddate") - private Date enddate; - - // 清算年月 - @JSONField(name = "clr_ym") - private String clrYm; - - // 清算经办机构 - @JSONField(name = "clr_optins") - private String clrOptins; - - // 经办人 - @JSONField(name = "opter_id") - private String opterId; - - // 经办人姓名 - @JSONField(name = "opter_name") - private String opterName; - - // 经办机构 - @JSONField(name = "optins_no") - private String optinsNo; - - // 机构清算申请事件ID - @JSONField(name = "clr_appy_evt_id") - private String clrAppyEvtId; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java deleted file mode 100644 index 491f0c0b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3205AWebParma.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 【3205A】前端入参 - * - * @author SunJQ - * @date 2025-04-17 - */ -@Data -public class Clearing3205AWebParma { - // 清算机构 - @NotNull - private String clrOptins; - - // 清算状态 - private String clrStas; - - // 清算月份 例如：202310 - private String clrYm; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java deleted file mode 100644 index 7615d93f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AParam.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *【3206A】清算机构查询(吉林省) - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Clearing3206AParam { - - //定点编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - //页数 - @JSONField(name = "page_num") - private Integer pageNum = 1; - - //当前页面 - @JSONField(name = "page_size") - private Integer pageSize; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java deleted file mode 100644 index 389ac900..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clearing3206AResult.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *【3206A】清算机构查询(吉林省) - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Clearing3206AResult { - //总页数 - @JSONField(name = "pages") - private Integer pages; - //清算机构（明细） - @JSONField(name = "clr_optins") - private String clrOptins; - //页数 - @JSONField(name = "page_num") - private Integer pageNum; - //当前页面查询数量 - @JSONField(name = "page_size") - private Integer pageSize; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java deleted file mode 100644 index 6e44a822..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203DiseInfoParam.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.core.common.annotation.Excel; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - *【2203】门诊就诊信息上传 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -public class Clinic2203DiseInfoParam extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private String id; - //就诊ID内部 - @Excel(name = "就诊ID内部", width = 15) - @JSONField(serialize=false) - private String encounterId; - //定点医药机构编号 - @JSONField(serialize=false) - private String fixmedinsCode; - - //定点医药机构名称 - @JSONField(serialize=false) - private String fixmedinsName; - // 就医地医保区划 - @JSONField(serialize=false) - private String mdtrtareaAdmvs; - // 参保地医保区划 - @JSONField(serialize=false) - private String insuplcAdmdvs; - // 就诊ID - @Excel(name = "就诊ID", width = 15) - @JSONField(serialize=false) - private String mdtrtId; - // 就诊信息ID - @JSONField(serialize=false) - private String medicalId; - // 诊断类别 - @JSONField(name="diag_type") - private String diagType; - // 诊断排序号 - @JSONField(name="diag_srt_no") - private String diagSrtNo; - // 诊断代码 - @JSONField(name="diag_code") - private String diagCode; - // 诊断名称 - @JSONField(name="diag_name") - private String diagName; - // 诊断科室 - @JSONField(name="diag_dept") - private String diagDept; - // 诊断医生编码 - @JSONField(name="dise_dor_no") - private String diseDorNo; - // 诊断医生姓名 - @JSONField(name="dise_dor_name") - private String diseDorName; - // 诊断时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name="diag_time") - private Date diagTime; - // 有效标志 - @JSONField(name="vali_flag") - private String valiFlag; -// // 创建人 -// @JSONField(serialize=false) -// private String createBy; -// // 创建日期 -// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") -// @DateTimeFormat(pattern = "yyyy-MM-dd") -// @JSONField(serialize=false) -// private Date createTime; -// // 更新人 -// @JSONField(serialize=false) -// private String updateBy; -// // 更新日期 -// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") -// @DateTimeFormat(pattern = "yyyy-MM-dd") -// @JSONField(serialize=false) -// private Date updateTime; - // 所属部门 -// @JSONField(serialize=false) -// private String sysOrgCode; -// // 租户编码 -// @JSONField(serialize=false) -// private String tenantId; -// @JSONField(serialize=false) -// private String district; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java deleted file mode 100644 index 948a35d6..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203Medical.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - *【2203】门诊就诊信息上传 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -public class Clinic2203Medical extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - // 主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private String id; - // 就诊ID内部 - @JSONField(serialize=false) - private String regId; - // 定点医药机构编号 - @JSONField(serialize=false) - private String fixmedinsCode; - // 定点医药机构名称 - @JSONField(serialize=false) - private String fixmedinsName; - // 就医地医保区划 - @JSONField(serialize=false) - private String mdtrtareaAdmvs; - // 参保地医保区划 - @JSONField(serialize=false) - private String insuplcAdmdvs; - // 就诊ID - @JSONField(name="mdtrt_id") - private String mdtrtId; - // 人员编号 - @JSONField(name="psn_no") - private String psnNo; - // 医疗类别 - @Dict(dictCode = "med_type") - @JSONField(name="med_type") - private String medType; - // 诊断时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name="begntime") - private Date begntime; - // 主要病情描述 - @JSONField(name="main_cond_dscr") - private String mainCondDscr; - // 病种编码 - @JSONField(name="dise_codg") - private String diseCodg; - // 病种名称 - @JSONField(name="dise_name") - private String diseName; - // 计划生育手术类别 - @Dict(dictCode = "birctrl_type") - @JSONField(name="birctrl_type") - private String birctrlType; - // 计划生育手术或生育日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name="birctrl_matn_date") - private Date birctrlMatnDate; - @JSONField(serialize=false) - private String district; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java deleted file mode 100644 index 4130639b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2203MedicalParam.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - -/** - * 【2203】门诊就诊信息上传 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Clinic2203MedicalParam { - // 主键 - @JSONField(serialize = false) - private String id; - // 就诊ID内部 - @JSONField(serialize = false) - private String regId; - // 定点医药机构编号 - @JSONField(serialize = false) - private String fixmedinsCode; - // 定点医药机构名称 - @JSONField(serialize = false) - private String fixmedinsName; - // 就医地医保区划 - @JSONField(serialize = false) - private String mdtrtareaAdmvs; - // 参保地医保区划 - @JSONField(name = "insuplc_admdvs") - private String insuplcAdmdvs; - // 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - // 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - // 医疗类别 - @Dict(dictCode = "med_type") - @JSONField(name = "med_type") - private String medType; - // 诊断时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "begntime") - private Date begntime; - // 主要病情描述 - @JSONField(name = "main_cond_dscr") - private String mainCondDscr; - // 病种编码 - @JSONField(name = "dise_codg") - private String diseCodg; - // 病种名称 - @JSONField(name = "dise_name") - private String diseName; - // 计划生育手术类别 - @Dict(dictCode = "birctrl_type") - @JSONField(name = "birctrl_type") - private String birctrlType; - // 计划生育手术或生育日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "birctrl_matn_date") - private Date birctrlMatnDate; - @JSONField(name = "diseinfo") - private List diseinfoList; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java deleted file mode 100644 index 74328158..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailParam.java +++ /dev/null @@ -1,239 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.core.common.annotation.Excel; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - *【2204】门诊费用明细信息上传 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -public class Clinic2204FeeDetailParam extends HisBaseEntity implements Serializable { - - private static final long serialVersionUID = 1L; - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private String id; - //就诊ID内部 - @JSONField(serialize=false) - private String regId; - //订单主键 - @JSONField(serialize=false) - private String orderId; - //定点医药机构编号 - @JSONField(serialize=false) - private String fixmedinsCode; - //定点医药机构名称 - @JSONField(serialize=false) - private String fixmedinsName; - //就医地医保区划 - @JSONField(serialize=false) - private String mdtrtareaAdmvs; - //参保地医保区划 - @JSONField(serialize=false) - private String insuplcAdmdvs; - //病历号 - @JSONField(serialize=false) - private String medicalNo; - //费用明细流水号 - @JSONField(name="feedetl_sn") - private String feedetlSn; - //就诊ID - @JSONField(name="mdtrt_id") - private String mdtrtId; - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - //收费批次号 - @JSONField(name="chrg_bchno") - private String chrgBchno; - //病种编码 - @JSONField(name="dise_codg") - private String diseCodg; - //处方号 - @JSONField(name="rxno") - private String rxno; - //外购处方标志 - @Dict(dictCode = "rx_circ_flag") - @JSONField(name="rx_circ_flag") - private String rxCircFlag; - //费用发生时间 - @Excel(name = "费用发生时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(name="fee_ocur_time") - private Date feeOcurTime; - //商品名 - @Excel(name = "商品名", width = 15) - private String tradename; - //药品类别 - @Dict(dictCode = "list_type") - private String drugtype; - //剂型 - @Dict(dictCode = "drug_dosform") - private String dosemodel; - //项目等级 - @Dict(dictCode = "chrgitm_lv") - private String feegrade; - //处方标志 - @Dict(dictCode = "rx_flag") - private String rxflag; - //生产厂家 - @Excel(name = "生产厂家", width = 15) - private String producingarea; - //医疗目录编码 - @Excel(name = "医疗目录编码", width = 15) - @JSONField(name="med_list_codg") - private String medListCodg; - //医药机构目录编码 - @Excel(name = "医药机构目录编码", width = 15) - @JSONField(name="medins_list_codg") - private String medinsListCodg; - //明细项目费用总额 - @Excel(name = "明细项目费用总额", width = 15) - @JSONField(name="det_item_fee_sumamt") - private Double detItemFeeSumamt; - //数量 - @Excel(name = "数量", width = 15) - @JSONField(name="cnt") - private Double cnt; - //单价 - @JSONField(name="pric") - private Double pric; - //单次剂量描述 - @JSONField(name="sin_dos_dscr") - private String sinDosDscr; - //使用频次描述 - @JSONField(name="used_frqu_dscr") - private String usedFrquDscr; - //周期天数 - @JSONField(name="prd_days") - private String prdDays; - //用药途径描述 - @JSONField(name="medc_way_dscr") - private String medcWayDscr; - //开单科室编码 - @JSONField(name="bilg_dept_codg") - private String bilgDeptCodg; - //开单科室名称 - @JSONField(name="bilg_dept_name") - private String bilgDeptName; - //开单医生编码 - @JSONField(name="bilg_dr_codg") - private String bilgDrCodg; - //开单医师姓名 - @JSONField(name="bilg_dr_name") - private String bilgDrName; - //受单科室编码 - @JSONField(name="acord_dept_codg") - private String acordDeptCodg; - //受单科室名称 - @JSONField(name="acord_dept_name") - private String acordDeptName; - //受单医生编码 - @JSONField(name="orders_dr_code") - private String ordersDrCode; - //受单医生姓名 - @JSONField(name="orders_dr_name") - private String ordersDrName; - //医院审批标志 - @Dict(dictCode = "hosp_appr_flag") - @JSONField(name="hosp_appr_flag") - private String hospApprFlag; - //中药使用方式 - @Dict(dictCode = "tcmdrug_used_way") - @JSONField(name="tcmdrug_used_way") - private String tcmdrugUsedWay; - //外检标志 - @Dict(dictCode = "etip_flag") - @JSONField(name="etip_flag") - private String etipFlag; - //外检医院编码 - @JSONField(name="etip_hosp_code") - private String etipHospCode; - //出院带药标志 - @Dict(dictCode = "dscg_tkdrug_flag") - @JSONField(name="dscg_tkdrug_flag") - private String dscgTkdrugFlag; - //生育费用标志 - @Dict(dictCode = "matn_fee_flag") - @JSONField(name="matn_fee_flag") - private String matnFeeFlag; - //定价上限金额 - @JSONField(name="pric_uplmt_amt") - private Double pricUplmtAmt; - //自付比例 - @JSONField(name="selfpay_prop") - private Double selfpayProp; - //全自费金额 - @JSONField(name="fulamt_ownpay_amt") - private Double fulamtOwnpayAmt; - //超限价金额 - @JSONField(name="overlmt_amt") - private Double overlmtAmt; - //先行自付金额 - @JSONField(name="preselfpay_amt") - private Double preselfpayAmt; - //符合政策范围金额 - @JSONField(name="inscp_scp_amt") - private Double inscpScpAmt; - //收费项目等级 - @Dict(dictCode = "chrgitm_lv") - @JSONField(name="chrgitm_lv") - private String chrgitmLv; - //医疗收费项目类别 - @Dict(dictCode = "med_chrgitm_type") - @JSONField(name="med_chrgitm_type") - private String medChrgitmType; - //基本药物标志 - @Dict(dictCode = "bas_medn_flag") - @JSONField(name="bas_medn_flag") - private String basMednFlag; - //医保谈判药品标志 - @Dict(dictCode = "hi_nego_drug_flag") - @JSONField(name="hi_nego_drug_flag") - private String hiNegoDrugFlag; - //儿童用药标志 - @Dict(dictCode = "chld_medc_flag") - @JSONField(name="chld_medc_flag") - private String chldMedcFlag; - //目录特项标志 - @Dict(dictCode = "list_sp_item_flag") - @JSONField(name="list_sp_item_flag") - private String listSpItemFlag; - //限制使用标志 - @Dict(dictCode = "lmt_used_flag") - @JSONField(name="lmt_used_flag") - private String lmtUsedFlag; - //直报标志 - @Dict(dictCode = "drt_reim_flag") - @JSONField(name="drt_reim_flag") - private String drtReimFlag; - //备注 - @JSONField(name="memo") - private String memo; - //上报状态，0-未上报，1-已上报 - @JSONField(serialize=false) - private String status; - private String district; - @TableField(exist = false) - private String setlTimeStart; - @TableField(exist = false) - private String setlTimeEnd; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java deleted file mode 100644 index 32ab6b49..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204FeeDetailResult.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 【2204】接口返回参数 - * - * @author SunJQ - * @date 2025-04-19 - */ -@Data -@Accessors(chain = true) -public class Clinic2204FeeDetailResult { - // 主键字段（根据Y标识判断） - @JSONField(name = "feedetl_sn") - private String feedetlSn; // 费用明细流水号 - - // 数值型字段使用BigDecimal保证精度 - @JSONField(name = "det_item_fee_sumamt") - private BigDecimal detItemFeeSumamt; // 明细项目费用总额 - - @JSONField(name = "cnt") - private BigDecimal cnt; // 数量 - - @JSONField(name = "pric") - private BigDecimal pric; // 单价 - - @JSONField(name = "pric_uplmt_amt") - private BigDecimal pricUplmtAmt; // 定价上限金额 - - @JSONField(name = "selfpay_prop") - private BigDecimal selfpayProp; // 自付比例 - - @JSONField(name = "fulamt_ownpay_amt") - private BigDecimal fulamtOwnpayAmt; // 全自费金额 - - @JSONField(name = "overlmt_amt") - private BigDecimal overlmtAmt; // 超限价金额 - - @JSONField(name = "preselfpay_amt") - private BigDecimal preselfpayAmt; // 先行自付金额 - - @JSONField(name = "inscp_scp_amt") - private BigDecimal inscpScpAmt; // 符合政策范围金额 - - // 字符型字段 - @JSONField(name = "chrgitm_lv") - private String chrgitmLv; // 收费项目等级 - - @JSONField(name = "med_chrgitm_type") - private String medChrgitmType; // 医疗收费项目类别 - - @JSONField(name = "bas_medn_flag") - private String basMednFlag; // 基本药物标志 - - @JSONField(name = "hi_nego_drug_flag") - private String hiNegoDrugFlag; // 医保谈判药品标志 - - @JSONField(name = "chld_medc_flag") - private String chldMedcFlag; // 儿童用药标志 - - @JSONField(name = "list_sp_item_flag") - private String listSpItemFlag; // 目录特项标志 - - @JSONField(name = "lmt_used_flag") - private String lmtUsedFlag; // 限制使用标志 - - @JSONField(name = "drt_reim_flag") - private String drtReimFlag; // 直报标志 - - @JSONField(name = "memo") - private String memo; // 备注 - - @JSONField(name = "exp_content") - private String expContent; // 字段扩展 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java deleted file mode 100644 index 636e52c0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderParam.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 【2204】门诊费用明细信息上传 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Clinic2204OrderParam { - // 就医地医保区划 - @JSONField(serialize = false) - private String mdtrtareaAdmvs; - // 参保地医保区划 - @JSONField(name = "insuplc_admdvs") - private String insuplcAdmdvs; - @JSONField(serialize = false) - private String chrgBchno; - @JSONField(name = "feedetail") - private List feedetail; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java deleted file mode 100644 index 72156dc6..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2204OrderResult.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - *【2204】门诊费用明细信息上传 - * - * @author SunJQ - * @date 2025-04-20 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Clinic2204OrderResult { - //2204门诊费用明细信息上传输出 - @JSONField(name = "result") - List result; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java deleted file mode 100644 index b6d4c369..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2205OrderParam.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 就诊明细撤销 - * - * @author SunJQ - * @date 2025-05-07 - */ -@Data -@Accessors(chain = true) -public class Clinic2205OrderParam { - - //就诊ID - @JSONField(name="mdtrt_id") - private String mdtrtId; - - //收费批次号 - @JSONField(name="chrg_bchno") - private String chrgBchno; - - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - - //人员编号 - @JSONField(name="exp_content") - private String expContent; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java deleted file mode 100644 index 99b72c73..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206FundPaymentResult.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 【2206】医保基金支付详情 - * - * @author SunJQ - * @date 2025-04-19 - */ -@Data -@Accessors(chain = true) -public class Clinic2206FundPaymentResult { - // 主键字段（根据Y标识判断） - //@JSONField(name = "fund_pay_type") - private String fundPayType; // 基金支付类型 - - // 数值型字段使用BigDecimal保证精度 - //@JSONField(name = "inscp_scp_amt") - private BigDecimal inscpScpAmt; // 符合政策范围金额 - - //@JSONField(name = "crt_payb_lmt_amt") - private BigDecimal crtPaybLmtAmt; // 本次可支付限额金额 - - //@JSONField(name = "fund_payamt") - private BigDecimal fundPayamt; // 基金支付金额 - - // 字符型字段 - //@JSONField(name = "fund_pay_type_name") - private String fundPayTypeName; // 基金支付类型名称 - - //@JSONField(name = "setl_proc_info") - private String setlProcInfo; // 结算过程信息 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java deleted file mode 100644 index bdcfaa48..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderOutput.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【2206】医保预结算的输出参数 - * - * @author SunJQ - * @date 2025-04-19 - */ -@Data -@Accessors(chain = true) -public class Clinic2206OrderOutput { - // 主键字段 - private String mdtrtId; // 就诊ID - - private String psnNo; // 人员编号 - - private String psnName; // 人员姓名 - - private String psnCertType; // 人员证件类型 - - private String certno; // 证件号码 - - private String gend; // 性别 - - private String naty; // 民族 - - private Date brdy; // 出生日期 - - private BigDecimal age; // 年龄 - - private String insutype; // 险种类型 - - private String psnType; // 人员类别 - - private String cvlservFlag; // 公务员标志 - - private Date setlTime; // 结算时间 - - private String mdtrtCertType; // 就诊凭证类型 - - private String medType; // 医疗类别 - - private BigDecimal medfeeSumamt; // 医疗费总额 - - private BigDecimal fulamtOwnpayAmt; // 全自费金额 - - private BigDecimal overlmtSelfpay; // 超限价自费费用 - - private BigDecimal preselfpayAmt; // 先行自付金额 - - private BigDecimal inscpScpAmt; // 符合政策范围金额 - - private BigDecimal actPayDedc; // 实际支付起付线 - - private BigDecimal hifpPay; // 基本医疗保险统筹基金支出 - - private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例 - - private BigDecimal cvlservPay; // 公务员医疗补助资金支出 - - private BigDecimal hifesPay; // 企业补充医疗保险基金支出 - - private BigDecimal hifmiPay; // 居民大病保险资金支出 - - private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出 - - private BigDecimal mafPay; // 医疗救助基金支出 - - private BigDecimal othPay; // 其他支出 - - private BigDecimal fundPaySumamt; // 基金支付总额 - - private BigDecimal psnPartAmt; // 个人负担总金额 - - private BigDecimal acctPay; // 个人账户支出 - - private BigDecimal psnCashPay; // 个人现金支出 - - private BigDecimal hospPartAmt; // 医院负担金额 - - private BigDecimal balc; // 余额 - - private BigDecimal acctMulaidPay; // 个人账户共济支付金额 - - private String medinsSetlId; // 医药机构结算ID 存放发送方报文ID - - private String clrOptins; // 清算经办机构 - - private String clrWay; // 清算方式 - - private String clrType; // 清算类别 - - private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出 - - private String expContent; // 字段扩展 - - private List setldetail;// 结算详细信息 - - private String mdtrtCertNo; // 就诊凭证编号 - - private String chrgBchno; // 收费批次号 - - private String busNo; // 挂号采访码 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java deleted file mode 100644 index 577f44ea..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderParam.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - *【2206】门诊预结算 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -public class Clinic2206OrderParam extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private String id; - //内部就诊ID - @JSONField(serialize=false) - private String regId; - //人员姓名 - @JSONField(serialize=false) - private String name; - //性别 - @Dict(dictCode = "sex") - @JSONField(serialize=false) - private String sex; - //民族 - @Dict(dictCode = "naty") - @JSONField(serialize=false) - private String naty; - //出生日期 - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @JSONField(serialize=false) - private Date brdy; - //年龄 - @JSONField(serialize=false) - private Double age; - //定点医药机构编号 - @JSONField(serialize=false) - private String fixmedinsCode; - //定点医药机构名称 - @JSONField(serialize=false) - private String fixmedinsName; - //就医地医保区划 - @JSONField(serialize=false) - private String mdtrtareaAdmvs; - //参保地医保区划 - @JSONField(name="insuplc_admdvs") - private String insuplcAdmdvs; - //病历号 - @JSONField(serialize=false) - private String medicalNo; - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - //就诊凭证类型 - @Dict(dictCode = "mdtrt_cert_type") - @JSONField(name="mdtrt_cert_type") - private String mdtrtCertType; - //就诊凭证编号 - @JSONField(name="mdtrt_cert_no") - private String mdtrtCertNo; - //就诊凭证加密 - @TableField(exist = false) - @JSONField(serialize=false) - private String mdtrtCertNoEncrypt; - //医疗类别 - @Dict(dictCode = "med_type") - @JSONField(name="med_type") - private String medType; - //医疗费总额 - @JSONField(name="medfee_sumamt") - private Double medfeeSumamt; - //个人结算方式 - @Dict(dictCode = "psn_setlway") - @JSONField(name="psn_setlway") - private String psnSetlway; - //就诊ID - @JSONField(name="mdtrt_id") - private String mdtrtId; - //收费批次号 - @JSONField(name="chrg_bchno") - private String chrgBchno; - //险种类型 - @Dict(dictCode = "insutype") - @JSONField(name="insutype") - private String insutype; - //个人账户使用标志 - @Dict(dictCode = "acct_used_flag") - @JSONField(name="acct_used_flag") - private String acctUsedFlag; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java deleted file mode 100644 index b963faa5..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResult.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【2206】医保预结算的输出参数 - * - * @author SunJQ - * @date 2025-04-19 - */ -@Data -@Accessors(chain = true) -public class Clinic2206OrderResult { - // 主键字段 - @JSONField(name = "mdtrt_id") - private String mdtrtId; // 就诊ID - - @JSONField(name = "psn_no") - private String psnNo; // 人员编号 - - @JSONField(name = "psn_name") - private String psnName; // 人员姓名 - - @JSONField(name = "psn_cert_type") - private String psnCertType; // 人员证件类型 - - @JSONField(name = "certno") - private String certno; // 证件号码 - - @JSONField(name = "gend") - private String gend; // 性别 - - @JSONField(name = "naty") - private String naty; // 民族 - - @JSONField(name = "brdy") - private Date brdy; // 出生日期 - - @JSONField(name = "age") - private BigDecimal age; // 年龄 - - @JSONField(name = "insutype") - private String insutype; // 险种类型 - - @JSONField(name = "psn_type") - private String psnType; // 人员类别 - - @JSONField(name = "cvlserv_flag") - private String cvlservFlag; // 公务员标志 - - @JSONField(name = "setl_time") - private Date setlTime; // 结算时间 - - @JSONField(name = "mdtrt_cert_type") - private String mdtrtCertType; // 就诊凭证类型 - - @JSONField(name = "med_type") - private String medType; // 医疗类别 - - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; // 医疗费总额 - - @JSONField(name = "fulamt_ownpay_amt") - private BigDecimal fulamtOwnpayAmt; // 全自费金额 - - @JSONField(name = "overlmt_selfpay") - private BigDecimal overlmtSelfpay; // 超限价自费费用 - - @JSONField(name = "preselfpay_amt") - private BigDecimal preselfpayAmt; // 先行自付金额 - - @JSONField(name = "inscp_scp_amt") - private BigDecimal inscpScpAmt; // 符合政策范围金额 - - @JSONField(name = "act_pay_dedc") - private BigDecimal actPayDedc; // 实际支付起付线 - - @JSONField(name = "hifp_pay") - private BigDecimal hifpPay; // 基本医疗保险统筹基金支出 - - @JSONField(name = "pool_prop_selfpay") - private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例 - - @JSONField(name = "cvlserv_pay") - private BigDecimal cvlservPay; // 公务员医疗补助资金支出 - - @JSONField(name = "hifes_pay") - private BigDecimal hifesPay; // 企业补充医疗保险基金支出 - - @JSONField(name = "hifmi_pay") - private BigDecimal hifmiPay; // 居民大病保险资金支出 - - @JSONField(name = "hifob_pay") - private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出 - - @JSONField(name = "maf_pay") - private BigDecimal mafPay; // 医疗救助基金支出 - - @JSONField(name = "oth_pay") - private BigDecimal othPay; // 其他支出 - - @JSONField(name = "fund_pay_sumamt") - private BigDecimal fundPaySumamt; // 基金支付总额 - - @JSONField(name = "psn_part_amt") - private BigDecimal psnPartAmt; // 个人负担总金额 - - @JSONField(name = "acct_pay") - private BigDecimal acctPay; // 个人账户支出 - - @JSONField(name = "psn_cash_pay") - private BigDecimal psnCashPay; // 个人现金支出 - - @JSONField(name = "hosp_part_amt") - private BigDecimal hospPartAmt; // 医院负担金额 - - @JSONField(name = "balc") - private BigDecimal balc; // 余额 - - @JSONField(name = "acct_mulaid_pay") - private BigDecimal acctMulaidPay; // 个人账户共济支付金额 - - @JSONField(name = "medins_setl_id") - private String medinsSetlId; // 医药机构结算ID 存放发送方报文ID - - @JSONField(name = "clr_optins") - private String clrOptins; // 清算经办机构 - - @JSONField(name = "clr_way") - private String clrWay; // 清算方式 - - @JSONField(name = "clr_type") - private String clrType; // 清算类别 - - @JSONField(name = "hifdm_pay") - private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出 - - @JSONField(name = "exp_content") - private String expContent; // 字段扩展 - - @JSONField(name = "setldetail") - private List setldetail;// 结算详细信息 - - @JSONField(name = "mdtrt_cert_no") - private String mdtrtCertNo; // 就诊凭证编号 - - @JSONField(serialize = false) - private String chrgBchno; // 收费批次号 - - @JSONField(serialize = false) - private String busNo; // 挂号 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java deleted file mode 100644 index 717ac2d6..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206OrderResultDto.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 预结算结果集 - * - * @author SunJQ - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -public class Clinic2206OrderResultDto { - - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; // 医疗费总额 - - @JSONField(name = "fulamt_ownpay_amt") - private BigDecimal fulamtOwnpayAmt; // 全自费金额 - - @JSONField(name = "overlmt_selfpay") - private BigDecimal overlmtSelfpay; // 超限价自费费用 - - @JSONField(name = "preselfpay_amt") - private BigDecimal preselfpayAmt; // 先行自付金额 - - @JSONField(name = "inscp_scp_amt") - private BigDecimal inscpScpAmt; // 符合政策范围金额 - - @JSONField(name = "act_pay_dedc") - private BigDecimal actPayDedc; // 实际支付起付线 - - @JSONField(name = "hifp_pay") - private BigDecimal hifpPay; // 基本医疗保险统筹基金支出 - - @JSONField(name = "pool_prop_selfpay") - private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例 - - @JSONField(name = "cvlserv_pay") - private BigDecimal cvlservPay; // 公务员医疗补助资金支出 - - @JSONField(name = "hifes_pay") - private BigDecimal hifesPay; // 企业补充医疗保险基金支出 - - @JSONField(name = "hifmi_pay") - private BigDecimal hifmiPay; // 居民大病保险资金支出 - - @JSONField(name = "hifob_pay") - private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出 - - @JSONField(name = "maf_pay") - private BigDecimal mafPay; // 医疗救助基金支出 - - @JSONField(name = "oth_pay") - private BigDecimal othPay; // 其他支出 - - @JSONField(name = "fund_pay_sumamt") - private BigDecimal fundPaySumamt; // 基金支付总额 - - @JSONField(name = "psn_part_amt") - private BigDecimal psnPartAmt; // 个人负担总金额 - - @JSONField(name = "acct_pay") - private BigDecimal acctPay; // 个人账户支出 - - @JSONField(name = "psn_cash_pay") - private BigDecimal psnCashPay; // 个人现金支出 - - @JSONField(name = "hosp_part_amt") - private BigDecimal hospPartAmt; // 医院负担金额 - - @JSONField(name = "hifdm_pay") - private BigDecimal hifdmPay; - - @JSONField(name = "acct_mulaid_pay") - private BigDecimal acctMulaidPay; // 个人账户共济支付金额 - - private String chrgBchno;//收费批次号 - - private Long accountId;//账户id - - private String medType;//医疗类型 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java deleted file mode 100644 index e754138c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2206SetldetaiResult.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.core.common.annotation.Excel; -import com.core.common.core.domain.HisBaseEntity; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *【2206】门诊预结算-输出参数 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -public class Clinic2206SetldetaiResult extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private String id; - //结算清单主键 - @Excel(name = "结算清单主键", width = 15) - @JSONField(serialize=false) - private String orderId; - //结算信息主键 - @JSONField(serialize=false) - private String setlinfoId; - //内部就诊ID - @JSONField(serialize=false) - private String regId; - //基金支付类型 - @JSONField(name="fund_pay_type") - @Dict(dictCode = "fund_pay_type") - private String fundPayType; - //符合政策范围金额 - @JSONField(name="inscp_scp_amt") - private Double inscpScpAmt; - //本次可支付限额金额 - @JSONField(name="crt_payb_lmt_amt") - private Double crtPaybLmtAmt; - //基金支付金额 - @JSONField(name="fund_payamt") - private Double fundPayamt; - //基金支付类型名称 - @JSONField(name="fund_pay_type_name") - private String fundPayTypeName; - //结算过程信息 - @JSONField(name="setl_proc_info") - private String setlProcInfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java deleted file mode 100644 index af91b63f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResult.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【2207】医保预结算的输出参数 - * - * @author SunJQ - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -public class Clinic2207OrderResult { - // 主键字段 - @JSONField(name = "mdtrt_id") - private String mdtrtId; // 就诊ID - - @JSONField(name = "setl_id") - private String setlId;// 结算id 2207时有值 2206无值 - - @JSONField(name = "psn_no") - private String psnNo; // 人员编号 - - @JSONField(name = "psn_name") - private String psnName; // 人员姓名 - - @JSONField(name = "psn_cert_type") - private String psnCertType; // 人员证件类型 - - @JSONField(name = "certno") - private String certno; // 证件号码 - - @JSONField(name = "gend") - private String gend; // 性别 - - @JSONField(name = "naty") - private String naty; // 民族 - - @JSONField(name = "brdy") - private Date brdy; // 出生日期 - - @JSONField(name = "age") - private BigDecimal age; // 年龄 - - @JSONField(name = "insutype") - private String insutype; // 险种类型 - - @JSONField(name = "psn_type") - private String psnType; // 人员类别 - - @JSONField(name = "cvlserv_flag") - private String cvlservFlag; // 公务员标志 - - @JSONField(name = "setl_time") - private Date setlTime; // 结算时间 - - @JSONField(name = "mdtrt_cert_type") - private String mdtrtCertType; // 就诊凭证类型 - - @JSONField(name = "med_type") - private String medType; // 医疗类别 - - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; // 医疗费总额 - - @JSONField(name = "fulamt_ownpay_amt") - private BigDecimal fulamtOwnpayAmt; // 全自费金额 - - @JSONField(name = "overlmt_selfpay") - private BigDecimal overlmtSelfpay; // 超限价自费费用 - - @JSONField(name = "preselfpay_amt") - private BigDecimal preselfpayAmt; // 先行自付金额 - - @JSONField(name = "inscp_scp_amt") - private BigDecimal inscpScpAmt; // 符合政策范围金额 - - @JSONField(name = "act_pay_dedc") - private BigDecimal actPayDedc; // 实际支付起付线 - - @JSONField(name = "hifp_pay") - private BigDecimal hifpPay; // 基本医疗保险统筹基金支出 - - @JSONField(name = "pool_prop_selfpay") - private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例 - - @JSONField(name = "cvlserv_pay") - private BigDecimal cvlservPay; // 公务员医疗补助资金支出 - - @JSONField(name = "hifes_pay") - private BigDecimal hifesPay; // 企业补充医疗保险基金支出 - - @JSONField(name = "hifmi_pay") - private BigDecimal hifmiPay; // 居民大病保险资金支出 - - @JSONField(name = "hifob_pay") - private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出 - - @JSONField(name = "maf_pay") - private BigDecimal mafPay; // 医疗救助基金支出 - - @JSONField(name = "oth_pay") - private BigDecimal othPay; // 其他支出 - - @JSONField(name = "fund_pay_sumamt") - private BigDecimal fundPaySumamt; // 基金支付总额 - - @JSONField(name = "psn_part_amt") - private BigDecimal psnPartAmt; // 个人负担总金额 - - @JSONField(name = "acct_pay") - private BigDecimal acctPay; // 个人账户支出 - - @JSONField(name = "psn_cash_pay") - private BigDecimal psnCashPay; // 个人现金支出 - - @JSONField(name = "hosp_part_amt") - private BigDecimal hospPartAmt; // 医院负担金额 - - @JSONField(name = "balc") - private BigDecimal balc; // 余额 - - @JSONField(name = "acct_mulaid_pay") - private BigDecimal acctMulaidPay; // 个人账户共济支付金额 - - @JSONField(name = "medins_setl_id") - private String medinsSetlId; // 医药机构结算ID 存放发送方报文ID - - @JSONField(name = "clr_optins") - private String clrOptins; // 清算经办机构 - - @JSONField(name = "clr_way") - private String clrWay; // 清算方式 - - @JSONField(name = "clr_type") - private String clrType; // 清算类别 - - @JSONField(name = "hifdm_pay") - private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出 - - @JSONField(name = "exp_content") - private String expContent; // 字段扩展 - - @JSONField(name = "setldetail") - private List setldetail;// 结算详细信息 - - @JSONField(serialize = false) - private String chrgBchno; // 收费批次号 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java deleted file mode 100644 index 22accbf0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.openhis.vo; - -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -@Getter -@Setter -@Accessors(chain = true) -public class Clinic2207OrderResultDto extends Clinic2207OrderResult { - - private Long accountId; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java deleted file mode 100644 index 92f40fc4..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2207OrderResultInfoDto.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 结算基础信息 - * - * @author SunJQ - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -public class Clinic2207OrderResultInfoDto { - // 主键字段 - @JSONField(name = "mdtrt_id") - private String mdtrtId; // 就诊ID - - @JSONField(name = "psn_no") - private String psnNo; // 人员编号 - - @JSONField(name = "psn_name") - private String psnName; // 人员姓名 - - @JSONField(name = "psn_cert_type") - private String psnCertType; // 人员证件类型 - - @JSONField(name = "certno") - private String certno; // 证件号码 - - @JSONField(name = "gend") - private String gend; // 性别 - - @JSONField(name = "naty") - private String naty; // 民族 - - @JSONField(name = "brdy") - private Date brdy; // 出生日期 - - @JSONField(name = "age") - private BigDecimal age; // 年龄 - - @JSONField(name = "insutype") - private String insutype; // 险种类型 - - @JSONField(name = "psn_type") - private String psnType; // 人员类别 - - @JSONField(name = "cvlserv_flag") - private String cvlservFlag; // 公务员标志 - - @JSONField(name = "setl_time") - private Date setlTime; // 结算时间 - - @JSONField(name = "mdtrt_cert_type") - private String mdtrtCertType; // 就诊凭证类型 - - @JSONField(name = "med_type") - private String medType; // 医疗类别 - - @JSONField(name = "medins_setl_id") - private String medinsSetlId; // 医药机构结算ID 存放发送方报文ID - - @JSONField(name = "setldetail") - private List setldetail;// 结算详细信息 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java deleted file mode 100644 index b30c7556..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoOutput.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【2208】门诊结算撤销 - * - * @author SunJQ - * @date 2025-04-21 - */ -@Data -@Accessors(chain = true) -public class Clinic2208UnSetlInfoOutput { - - // 1. 就诊ID（字符型，30位，必填） - private String mdtrtId; - - // 2. 结算ID（字符型，30位，必填） - private String setlId; - - // 3. 清算经办机构（字符型，6位） - private String clrOptins; - - // 4. 结算时间（日期时间型，格式：yyyy-MM-dd HH:mm:ss，必填） - private Date setlTime; - - // 5. 医疗费总额（数值型，16位含2位小数，必填） - private BigDecimal medfeeSumamt; - - // 6. 全自费金额（数值型，16位含2位小数，必填） - private BigDecimal fulamtOwnpayAmt; - - // 7. 超限价自费费用（数值型，16位含2位小数，必填） - private BigDecimal overlmtSelfpay; - - // 8. 先行自付金额（数值型，16位含2位小数，必填） - private BigDecimal preselfpayAmt; - - // 9. 符合政策范围金额（数值型，16位含2位小数，必填） - private BigDecimal inscpScpAmt; - - // 10. 实际支付起付线（数值型，16位含2位小数） - private BigDecimal actPayDedc; - - // 11. 基本医疗保险统筹基金支出（数值型，16位含2位小数，必填） - private BigDecimal hifpPay; - - // 12. 统筹基金支付比例（数值型，5位含4位小数，必填） - private BigDecimal poolPropSelfpay; - - // 13. 公务员医疗补助支出（数值型，16位含2位小数，必填） - private BigDecimal cvlservPay; - - // 14. 企业补充医保支出（数值型，16位含2位小数，必填） - private BigDecimal hifesPay; - - // 15. 居民大病保险支出（数值型，16位含2位小数，必填） - private BigDecimal hifmiPay; - - // 16. 职工大额医疗补助支出（数值型，16位含2位小数，必填） - private BigDecimal hifobPay; - - // 17. 医疗救助基金支出（数值型，16位含2位小数，必填） - private BigDecimal mafPay; - - // 18. 其他支出（数值型，16位含2位小数，必填） - private BigDecimal othPay; - - // 19. 基金支付总额（数值型，16位含2位小数，必填） - private BigDecimal fundPaySumamt; - - // 20. 个人负担总金额（数值型，16位含2位小数，必填） - private BigDecimal psnPartAmt; - - // 21. 个人账户支出（数值型，16位含2位小数，必填） - private BigDecimal acctPay; - - // 22. 余额（数值型，16位含2位小数，必填） - private BigDecimal balc; - - // 23. 个人账户共济支付（数值型，16位含2位小数，必填） - private BigDecimal acctMulaidPay; - - // 24. 医院负担金额（数值型，16位含2位小数，必填） - private BigDecimal hospPartAmt; - - // 25. 医药机构结算ID（字符型，30位，必填） - private String medinsSetlId; - - // 26. 个人现金支出（数值型，16位含2位小数，必填） - private BigDecimal pdnCashPay; - - // 27. 伤残人员医疗补助支出（数值型，16位含2位小数，必填） - private BigDecimal hifdmPay; - - //结算详细信息 - private List setldetail;//结算详细信息 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java deleted file mode 100644 index 88ae1c5d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoParam.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *【2208】门诊结算撤销 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -public class Clinic2208UnSetlInfoParam extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - - //就诊ID - @JSONField(name="mdtrt_id") - private String mdtrtId; - //结算ID - @JSONField(name="setl_id") - private String setlId; - //参保地医保区划 -// @JSONField(name="insuplc_admdvs") -// private String insuplcAdmdvs; - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java deleted file mode 100644 index ab15332a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Clinic2208UnSetlInfoResult.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【2208】门诊结算撤销 - * - * @author SunJQ - * @date 2025-04-21 - */ -@Data -@Accessors(chain = true) -public class Clinic2208UnSetlInfoResult { - - // 1. 就诊ID（字符型，30位，必填） - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 2. 结算ID（字符型，30位，必填） - @JSONField(name = "setl_id") - private String setlId; - - // 3. 清算经办机构（字符型，6位） - @JSONField(name = "clr_optins") - private String clrOptins; - - // 4. 结算时间（日期时间型，格式：yyyy-MM-dd HH:mm:ss，必填） - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "setl_time") - private Date setlTime; - - // 5. 医疗费总额（数值型，16位含2位小数，必填） - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; - - // 6. 全自费金额（数值型，16位含2位小数，必填） - @JSONField(name = "fulamt_ownpay_amt") - private BigDecimal fulamtOwnpayAmt; - - // 7. 超限价自费费用（数值型，16位含2位小数，必填） - @JSONField(name = "overlmt_selfpay") - private BigDecimal overlmtSelfpay; - - // 8. 先行自付金额（数值型，16位含2位小数，必填） - @JSONField(name = "preselfpay_amt") - private BigDecimal preselfpayAmt; - - // 9. 符合政策范围金额（数值型，16位含2位小数，必填） - @JSONField(name = "inscp_scp_amt") - private BigDecimal inscpScpAmt; - - // 10. 实际支付起付线（数值型，16位含2位小数） - @JSONField(name = "act_pay_dedc") - private BigDecimal actPayDedc; - - // 11. 基本医疗保险统筹基金支出（数值型，16位含2位小数，必填） - @JSONField(name = "hifp_pay") - private BigDecimal hifpPay; - - // 12. 统筹基金支付比例（数值型，5位含4位小数，必填） - @JSONField(name = "pool_prop_selfpay") - private BigDecimal poolPropSelfpay; - - // 13. 公务员医疗补助支出（数值型，16位含2位小数，必填） - @JSONField(name = "cvlserv_pay") - private BigDecimal cvlservPay; - - // 14. 企业补充医保支出（数值型，16位含2位小数，必填） - @JSONField(name = "hifes_pay") - private BigDecimal hifesPay; - - // 15. 居民大病保险支出（数值型，16位含2位小数，必填） - @JSONField(name = "hifmi_pay") - private BigDecimal hifmiPay; - - // 16. 职工大额医疗补助支出（数值型，16位含2位小数，必填） - @JSONField(name = "hifob_pay") - private BigDecimal hifobPay; - - // 17. 医疗救助基金支出（数值型，16位含2位小数，必填） - @JSONField(name = "maf_pay") - private BigDecimal mafPay; - - // 18. 其他支出（数值型，16位含2位小数，必填） - @JSONField(name = "oth_pay") - private BigDecimal othPay; - - // 19. 基金支付总额（数值型，16位含2位小数，必填） - @JSONField(name = "fund_pay_sumamt") - private BigDecimal fundPaySumamt; - - // 20. 个人负担总金额（数值型，16位含2位小数，必填） - @JSONField(name = "psn_part_amt") - private BigDecimal psnPartAmt; - - // 21. 个人账户支出（数值型，16位含2位小数，必填） - @JSONField(name = "acct_pay") - private BigDecimal acctPay; - - // 22. 余额（数值型，16位含2位小数，必填） - @JSONField(name = "balc") - private BigDecimal balc; - - // 23. 个人账户共济支付（数值型，16位含2位小数，必填） - @JSONField(name = "acct_mulaid_pay") - private BigDecimal acctMulaidPay; - - // 24. 医院负担金额（数值型，16位含2位小数，必填） - @JSONField(name = "hosp_part_amt") - private BigDecimal hospPartAmt; - - // 25. 医药机构结算ID（字符型，30位，必填） - @JSONField(name = "medins_setl_id") - private String medinsSetlId; - - // 26. 个人现金支出（数值型，16位含2位小数，必填） - @JSONField(name = "pdn_cash_pay") - private BigDecimal pdnCashPay; - - // 27. 伤残人员医疗补助支出（数值型，16位含2位小数，必填） - @JSONField(name = "hifdm_pay") - private BigDecimal hifdmPay; - - //结算详细信息 - @JSONField(name = "setldetail") - private List setldetail;//结算详细信息 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java deleted file mode 100644 index 8e7aa26f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - *【2201】【2202】挂号 退号 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class ClinicReg extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private String id; - //就诊ID - @JSONField(name="mdtrt_id") - private String mdtrtId; - //参保地医保区划 - @JSONField(serialize=false) - private String insuplcAdmdvs; - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - //险种类型 - //@Dict(dictCode = "insutype") - @JSONField(name="insutype") - private String insutype; - //医疗类别 - //@Dict(dictCode = "med_type") - @JSONField(serialize=false) - private String medType; - //挂号时间 - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(name="begntime") - private Date begntime; - //就诊凭证类型 - @Dict(dictCode = "mdtrt_cert_type") - @JSONField(name="mdtrt_cert_type") - private String mdtrtCertType; - //就诊凭证编号 - @JSONField(name="mdtrt_cert_no") - private String mdtrtCertNo; -// //证件加密串 -// @JSONField(serialize=false) -// @TableField(exist = false) -// private String mdtrtCertNoEncrypt; - //住院/门诊号 - @JSONField(name="ipt_otp_no") - private String iptOtpNo;//使用bus_no - //医师编码 - //@Dict(dictTable = "business_pub_medicalstaff", dictText = "name", dictCode = "id") - @JSONField(name="atddr_no") - private String atddrNo; - //医师姓名 - @JSONField(name="dr_name") - private String drName; - //科室编码 - //@Dict(dictTable = "business_pub_dept", dictText = "hosp_dept_name", dictCode = "id") - @JSONField(name="dept_code") - private String deptCode; - //科室名称 - @JSONField(name="dept_name") - private String deptName; - //科别 - @Dict(dictCode = "dept") - @JSONField(name="caty") - private String caty; - //挂号费 - @JSONField(serialize=false) - private Double regFee; - //检查费 - @JSONField(serialize=false) - private Double checkFee; - //应收金额 - @JSONField(serialize=false) - private Double totalFee; - //状态,0-挂号,1-看诊，2-费用明细，3-预结算，4-结算 - @JSONField(serialize=false) - @Dict(dictCode = "clinc_status") - private String status; - - @JSONField(name="psn_cert_type") - @TableField(exist = false) - private String psnCertType; - @JSONField(name="certno") - @TableField(exist = false) - private String certno; - @JSONField(name="psn_type") - @TableField(exist = false) - private String psnType; - @JSONField(name="psn_name") - @TableField(exist = false) - private String psnName; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java deleted file mode 100644 index 25b9d60d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ClinicReg2201Output.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@Accessors(chain = true) -public class ClinicReg2201Output { - private static final long serialVersionUID = 1L; - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private String id; - //就诊ID - private String mdtrtId; - //参保地医保区划 - @JSONField(serialize=false) - private String insuplcAdmdvs; - //人员编号 - private String psnNo; - //险种类型 - private String insutype; - //医疗类别 - @JSONField(serialize=false) - private String medType; - //挂号时间 - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date begntime; - //就诊凭证类型 - private String mdtrtCertType; - //就诊凭证编号 - private String mdtrtCertNo; - //证件加密串 - @JSONField(serialize=false) - @TableField(exist = false) - private String mdtrtCertNoEncrypt; - //住院/门诊号 - private String iptOtpNo; - //医师编码 - private String atddrNo; - //医师姓名 - private String drName; - //科室编码 - private String deptCode; - //科室名称 - private String deptName; - //科别 - private String caty; - //挂号费 - private Double regFee; - //检查费 - private Double checkFee; - //应收金额 - private Double totalFee; - //状态,0-挂号,1-看诊，2-费用明细，3-预结算，4-结算 - private String status; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java deleted file mode 100644 index 6748837f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/DispenseInventory3505Dto.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 药品发放和库存表连接信息 - * - * @author wangyang - * @date 2025-03-14 - */ -@Data -@Accessors(chain = true) -public class DispenseInventory3505Dto { - - /** 药品发放表主键ID */ - @JsonSerialize(using = ToStringSerializer.class) - private Long dispenseId; - - /** 就诊id */ - @JsonSerialize(using = ToStringSerializer.class) - private Long encounterId; - - /** 药品请求表主键ID */ - @JsonSerialize(using = ToStringSerializer.class) - private Long medReqId; - - /** 病人id */ - @JsonSerialize(using = ToStringSerializer.class) - private Long patientId; - - /** 请求单位编码 */ - private String dispenseUnitCode; - - /** 请求数量 */ - private Integer dispenseQuantity; - - /** 发放数量 */ - private Integer dispenseStatus; - - /** 库存项目表主键ID */ - @JsonSerialize(using = ToStringSerializer.class) - private Long inventoryId; - - /** 拆零单位 */ - private String inventoryUnitCode; - - /** 当前库存数量(拆零单位) */ - private BigDecimal inventoryQuantity; - - /** 拆零比 */ - private BigDecimal partPercent; - - /** 批号 */ - private String lotNumber; - - /** 生产日期 */ - private Date productionDate; - - /** 发药时间 */ - private Date dispenseTime; - - /** 有效期止 */ - private Date expirationDate; - - /** 追溯码 */ - private String traceNo; - - /** 医保编码 */ - private String ybNo; - - /** 就诊编号 */ - private String encounterNo; - - /** 药品编码 */ - private String medicationNo; - - /** 执业资格证号 */ - private String pharPracCertNo; - - /** 发药编号 */ - private String dispenseNo; - - /** 处方标志 */ - private Integer rxFlag; - - /** 配药人 */ - private String preparerName; - - /** 发药人 */ - private String dispenseName; - - /** 开方人 */ - private String practitionerName; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java deleted file mode 100644 index 76fd2746..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceChargeDetailDto.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 收费项目明细 - * - * @author yuxj - * @date 2025-04-22 - */ -@Data -@Accessors(chain = true) -public class EleInvoiceChargeDetailDto { - - // 医疗收费项目类别; - private String ybType; - // 数量 - private Integer number; - // 金额 - private BigDecimal amt; - // 自费金额 - private BigDecimal selfAmt; - // 收费项目名称 - private String chargeName; - // 收费项目代码 - private String chargeCode; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java deleted file mode 100644 index 2d94610e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceListDetailDto.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 清单项目明细 - * - * @author yuxj - * @date 2025-04-22 - */ -@Data -@Accessors(chain = true) -public class EleInvoiceListDetailDto { - // 明细流水号 - private Long listDetailNo; - // 医疗收费项目类别; - private String ybType; - // 药品编码 - private String code; - // 药品名称 - private String name; - // 医保项目编码 - private String ybCode; - // 计量单位 - private String unit; - // 单价 - private BigDecimal std; - // 数量 - private Integer number; - // 金额 - private BigDecimal amt; - // 自费金额 - private BigDecimal selfAmt; - // 医保药品分类 - private Integer medicalCareType; - // 收费项目名称 - private String chargeName; - // 收费项目代码 - private String chargeCode; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java deleted file mode 100644 index e70a64b0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePatientInfoDto.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * 患者信息 - * - * @author yuxj - * @date 2025-04-22 - */ -@Data -@Accessors(chain = true) -public class EleInvoicePatientInfoDto { - // 患者id - private Long payerId; - - // 患者姓名 - private String payer; - - // 患者院内编码/病历号 - private String caseNumber; - - // 性别 - private Integer genderEnum; - private String genderEnum_enumText; - - // 生日 - private Date birthDate; - - // 电话 - private String tel; - - // 身份证号 - private String cardNo; - - // 就诊编码 - private String encounterBusNo; - - // 就诊日期 - private String consultationDate; - - // 住院日期 - private String inHospitalDate; - - // 出院日期 - private String outHospitalDate; - - // 就诊科室名称 - private String patientCategory; - - // 就诊科室编码 - private String patientCategoryCode; - - // 医疗机构类型 - private String medicalInstitution; - - // 医保区域编码 - private String medCareAreaCode; - - // 入院科室编码 - private String categoryCode; - // 入院科室名称 - private String category; - // 出院科室编码 - private String leaveCategoryCode; - // 出院科室名称 - private String leaveCategory; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java deleted file mode 100644 index 34025f8c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoicePaymentInfoDto.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 付款信息 - * - * @author yuxj - * @date 2025-04-22 - */ -@Data -@Accessors(chain = true) -public class EleInvoicePaymentInfoDto { - // 付款状态 - private Integer paymentStatus; - - // 发票id - private Long invoiceId; - - // 发票状态 - private Integer invoiceStatus; - - // 结算id - private Long paymentId; - - // 支付的业务标识符(用于显示,支付流水号) - private String busNo; - - // 收费员 - private String payee; - - // 开票总金额 - private BigDecimal totalAmt; - - // 个人现金支付金额 - private BigDecimal rmbCashPayAmount; - // 个人现金支付金额(微信) - private BigDecimal wxPayAmount; - // 个人现金支付金额(支付宝) - private BigDecimal aliPayAmount; - // 个人现金支付金额(银联) - private BigDecimal debitPayAmount; - // 个人医保账户支付 - private BigDecimal zhPayAmount; - // 基金支付总额 - private BigDecimal ybFundFayAmount; - // 其他（如医院负担金额） - private BigDecimal otherPayAmount; - // 账户共济支付金额 - private BigDecimal aelfYbZhGjValue; - - // 付款账单集合 - private String chargeItemIds; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java deleted file mode 100644 index e7f3525f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/EleInvoiceResultDto.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.openhis.common.enums.InvoiceStatus; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 返回信息 - * - * @author yuxj - * @date 2025-04-22 - */ -@Data -@Accessors(chain = true) -public class EleInvoiceResultDto { - - private Long id; - - /** 患者ID */ - private Long patientId; - - /** 状态 */ - private InvoiceStatus statusEnum; - - /** 类别 */ - private String typeCode; - - /** 取消原因 */ - private String cancelledReason; - - /** 收费项 */ - private String chargeItemIds; - - /** 发票净额总记 */ - private BigDecimal totalNet; - - /** 发票总计金额 */ - private BigDecimal totalGross; - - /** 付款详情 */ - private String paymentTerms; - - /** 账单批次号 */ - private String batchCode; - - /** 结算批次号 */ - private String qrCode; - - /** 发票编号 */ - private String busNo; - - /** 开票员 */ - private Long invoicingStaffId; - /** 电子票据代码 */ - private String billBatchCode; - /** 电子票据号码 */ - private String billNo; - /** 电子校验码 */ - private String random; - /** 电子票据生成时间 */ - private String billCreateTime; - /** 电子票据二维码图片数据 */ - private String billQrCode; - /** 电子票据H5页面URL */ - private String pictureUrl; - /** 电子票据外网H5页面URL */ - private String pictureNetUrl; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java deleted file mode 100644 index 460d7e96..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/File9101Param.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.openhis.vo; - -import lombok.Data; -import org.springframework.web.multipart.MultipartFile; - -@Data -public class File9101Param { - - private MultipartFile file; - - private String filename; - - private String fixmedinsCode; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java deleted file mode 100644 index 291e560b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileDownload.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 【9102】下载实体 - */ -@Data -@Accessors(chain = true) -public class FileDownload { - @JSONField(serialize = false) - private String code; - @JSONField(name = "ver") - private String version; - @JSONField(name = "filename") - private String filename; - @JSONField(name = "file_qury_no") - private String fileQuryNo; - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java deleted file mode 100644 index f6ecfcf0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FileResult.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * 【9101】【9102】公用 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FileResult { - - // 文件查询号 - @JSONField(name="file_qury_no") - private String fileQuryNo; - - // 文件名称 - @JSONField(name="filename") - private String filename; - - // 下载截止时间 - @JSONField(name="dld_endtime") - private Date dldEndtime; - - // 文件数据 - @JSONField(serialize=false) - private byte[] fileData; - - // 医药机构编号 - @JSONField(name="fixmedins_code") - private String fixmedinsCode; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java deleted file mode 100644 index 0d4506b1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Param.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *【13203】医药机构费用结算日对账结果查询 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Financial13203Param { - - // 对账日期，格式：YYYY-MM-DD - @JSONField(name = "stmt_date") - private String stmtDate; - - // 明细对账结果，1：不平，0：平 - @JSONField(name = "stmt_rslt") - private String stmtRslt; - - // 查询页面数据量，最大100 - @JSONField(name = "page_size") - private String pageSize; - - // 页数，默认1 - @JSONField(name = "page_num") - private String pageNum; - - // 清算机构编码 - @JSONField(name = "clr_optins") - private String clrOptins; - - // 清算类别 - @JSONField(name = "clr_type") - private String clrType; - - // 险种 - @JSONField(name = "insutype") - private String insutype; - - // 就医类别，2：本地就医，3：省内异地就医，4：跨省就医 - @JSONField(name = "clr_pay_loc") - private String clrPayLoc; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java deleted file mode 100644 index b931d301..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203Result.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *【13203】医药机构费用结算日对账结果查询-输出参数 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Financial13203Result { - - // 退费标识 - @JSONField(name = "refd_setl_flag") - private String refdSetlFlag; - - // 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 就诊流水号 - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 结算ID - @JSONField(name = "setl_id") - private String setlId; - - // 人员名称 - @JSONField(name = "psn_name") - private String psnName; - - // 对账结果 - @JSONField(name = "stmt_rslt") - private String stmtRslt; - - // 总医疗费 - @JSONField(name = "medfee_sumamt") - private String medfeeSumamt; - - // 清算机构编码 - @JSONField(name = "clr_optins") - private String clrOptins; - - // 报文ID - @JSONField(name = "msg_id") - private String msgId; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java deleted file mode 100644 index 1a0e123e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial13203WebParam.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; - -/** - * 【13202】前台入参 - * - * @author SunJQ - * @date 2025-04-29 - */ -@Data -public class Financial13203WebParam { - - // 对账日期，格式：YYYY-MM-DD - @JSONField(name = "stmt_date") - private String stmtDate; - - // 明细对账结果，1：不平，0：平 - @JSONField(name = "stmt_rslt") - private String stmtRslt; - - // 查询页面数据量，最大100 - @JSONField(name = "page_size") - private String pageSize; - - // 页数，默认1 - @JSONField(name = "page_num") - private String pageNum; - - // 清算机构编码 - @JSONField(name = "clr_optins") - private String clrOptins; - - // 清算类别 - @JSONField(name = "clr_type") - private String clrType; - - // 险种 - @JSONField(name = "insutype") - private String insutype; - - // 就医类别，2：本地就医，3：省内异地就医，4：跨省就医 - @JSONField(name = "clr_pay_loc") - private String clrPayLoc; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java deleted file mode 100644 index e53070b2..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Output.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.openhis.vo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Financial3201Output { - - //结算经办机构 - private String setlOptins; - //对账结果 - private String stmtRslt; - //对账结果说明 - private String stmtRsltDscr; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java deleted file mode 100644 index 444cb58a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3201Param.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.core.common.annotation.Excel; -import com.core.common.core.domain.HisBaseEntity; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *【3201】月结对账 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Financial3201Param extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - //定点医药机构编号 - @Excel(name = "定点医药机构编号", width = 15) - @JSONField(serialize=false) - private String fixmedinsCode; - //定点医药机构名称 - @Excel(name = "定点医药机构名称", width = 15) - @JSONField(serialize=false) - private String fixmedinsName; - //医保区划 - @Excel(name = "医保区划", width = 15) - @JSONField(serialize=false) - private String admvs; - //险种 - @Excel(name = "险种", width = 15, dictType = "insutype") - @Dict(dictCode = "insutype") - @JSONField(name="insutype") - private String insutype; - //清算类别 - @Excel(name = "清算类别", width = 15, dictType = "clr_type") - @Dict(dictCode = "clr_type") - @JSONField(name="clr_type") - private String clrType; - //结算经办机构 - @Excel(name = "结算经办机构", width = 15) - @JSONField(name="setl_optins") - private String setlOptins; - //对账开始日期 - @Excel(name = "对账开始日期", width = 15, dateFormat = "yyyy-MM-dd") - @JSONField(name="stmt_begndate") - private String stmtBegndate; - //对账结束日期 - @Excel(name = "对账结束日期", width = 15, dateFormat = "yyyy-MM-dd") - @JSONField(name="stmt_enddate") - private String stmtEnddate; - //医疗费总额 - @Excel(name = "医疗费总额", width = 15) - @JSONField(name="medfee_sumamt") - private Double medfeeSumamt; - //基金支付总额 - @Excel(name = "基金支付总额", width = 15) - @JSONField(name="fund_pay_sumamt") - private Double fundPaySumamt; - //个人账户支付金额 - @Excel(name = "个人账户支付金额", width = 15) - @JSONField(name="acct_pay") - private Double acctPay; - //定点医药机构结算笔数 - @Excel(name = "定点医药机构结算笔数", width = 15) - @JSONField(name="fixmedins_setl_cnt") - private Integer fixmedinsSetlCnt; - //对账结果 - @Excel(name = "对账结果", width = 15, dictType = "stmt_rslt") - @Dict(dictCode = "stmt_rslt") - @JSONField(serialize=false) - private String stmtRslt; - //对账结果说明 - @Excel(name = "对账结果说明", width = 15) - @JSONField(serialize=false) - private String stmtRsltDscr; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java deleted file mode 100644 index cc9bc902..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileParam.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 【3202】文件输入实体 - * - * @author SunJQ - * @date 2025-04-22 - */ -@Data -@Accessors(chain = true) -public class Financial3202FileParam { - // 1. 结算ID（字符型，30位，必填） - @JSONField(name = "setl_id") - private String setlId; - - // 2. 就诊ID（字符型，30位，必填） - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 3. 人员编号（字符型，30位，必填） - @JSONField(name = "psn_no") - private String psnNo; - - // 4. 医疗费总额（数值型，16位含2位小数，必填） - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; - - // 5. 基金支付总额（数值型，16位含2位小数，必填） - @JSONField(name = "fund_pay_sumamt") - private BigDecimal fundPaySumamt; - - // 6. 个人账户支出（数值型，16位含2位小数，必填） - @JSONField(name = "acct_pay") - private BigDecimal acctPay; - - // 7. 退费结算标志（字符型，3位，必填） - @JSONField(name = "refd_setl_flag") - private String refdSetlFlag; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java deleted file mode 100644 index 106f5d99..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3202FileResult.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; - -import java.math.BigDecimal; - -/** - * 【3202】文件输出实体 - * - * @author SunJQ - * @date 2025-04-22 - */ -public class Financial3202FileResult { - // 1. 人员编号（字符型，30位，必填） - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 就诊ID（字符型，30位，非必填） - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 3. 结算ID（字符型，30位，非必填） - @JSONField(name = "setl_id") - private String setlId; - - // 4. 发送方报文ID（字符型，30位，必填） - @JSONField(name = "msgid") - private String msgid; - - // 5. 对账结果（字符型，6位，必填） - @JSONField(name = "stmt_rslt") - private String stmtRslt; - - // 6. 退费结算标志（字符型，3位，必填） - @JSONField(name = "refd_setl_flag") - private String refdSetlFlag; - - // 7. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 8. 医疗费总额（数值型，16位含2位小数，非必填） - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; - - // 9. 基金支付总额（数值型，16位含2位小数，非必填） - @JSONField(name = "fund_pay_sumamt") - private BigDecimal fundPaySumamt; - - // 10. 个人账户支出（数值型，16位含2位小数，非必填） - @JSONField(name = "acct_pay") - private BigDecimal acctPay; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java deleted file mode 100644 index d02f5261..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AParam.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - *【3203A】清算 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Financial3203AParam extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - - // 1. 清算类别（字符型，30位，必填） - @JSONField(name = "clr_type") - private String clrType; - - // 2. 医疗费总额（数值型，16位含2位小数，必填） - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; - - // 3. 医保认可费用总额（数值型，16位含2位小数，必填） - @JSONField(name = "med_sumfee") - private BigDecimal medSumfee; - - // 4. 基金申报总额（数值型，16位含2位小数，必填） - @JSONField(name = "fund_appy_sum") - private BigDecimal fundAppySum; - - // 5. 现金支付金额（数值型，16位含2位小数，必填） - @JSONField(name = "cash_payamt") - private BigDecimal cashPayamt; - - // 6. 个人账户支出（数值型，16位含2位小数，必填） - @JSONField(name = "acct_pay") - private BigDecimal acctPay; - - // 7. 开始日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "begndate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date begndate; - - // 8. 结束日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "enddate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date enddate; - - // 9. 清算机构（字符型，6位，必填） - @JSONField(name = "clr_optins") - private String clrOptins; // 必须是准确的6位编码 -// -// // 统筹区号,仅传参用 -// @JSONField(deserialize = false) -// private String admvs; // 必须是准确的6位编码 -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java deleted file mode 100644 index a5f5daf1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203AWebParam.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - * 【3203A】前台入参 - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -@Accessors(chain = true) -public class Financial3203AWebParam { - - /** 清算类别 */ - @NotNull - private String clrType; - /** 开始时间 */ - @NotNull - private Date stmtBegnDate; - /** 结束时间 */ - @NotNull - private Date stmtEndDate; - /** 清算机构 */ - @NotNull - private String clrOptins; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java deleted file mode 100644 index 917bc7d8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203Param.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3203】清算申请 - * - * @author SunJQ - * @date 2025-04-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Financial3203Param { - private static final long serialVersionUID = 1L; - - // 1. 清算类别（字符型，30位，必填） - @JSONField(name = "clr_type") - private String clrType; - - // 10. 清算方式（字符型，30位，必填） - @JSONField(name = "clr_way") - private String clrWay; - - // 2. 医疗费总额（数值型，16位含2位小数，必填） - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; - - // 3. 医保认可费用总额（数值型，16位含2位小数，必填） - @JSONField(name = "med_sumfee") - private BigDecimal medSumfee; - - // 4. 基金申报总额（数值型，16位含2位小数，必填） - @JSONField(name = "fund_appy_sum") - private BigDecimal fundAppySum; - - // 5. 现金支付金额（数值型，16位含2位小数，必填） - @JSONField(name = "cash_payamt") - private BigDecimal cashPayamt; - - // 6. 个人账户支出（数值型，16位含2位小数，必填） - @JSONField(name = "acct_pay") - private BigDecimal acctPay; - - // 7. 开始日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "begndate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date begndate; - - // 8. 结束日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "enddate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date enddate; - - // 9. 清算年月 - @JSONField(name = "setlym") - private String setlym; - - // 11. 清算人次 - @JSONField(name = "psntime") - private Long psntime; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java deleted file mode 100644 index 50cac93d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203VO.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 【3203】后台计算结果 DB映射实体 - * - * @author SunJQ - * @date 2025-04-29 - */ -@Data -public class Financial3203VO { - // 清算人次 - private Long psntime; - // 医保认可费用总额（数值型，16位含2位小数，必填） - private BigDecimal medSumfee; - // 现金支付金额（数值型，16位含2位小数，必填） - private BigDecimal cashPayamt; - // 个人账户支出（数值型，16位含2位小数，必填） - private BigDecimal acctPay; - /** 医疗费用总额 */ - private BigDecimal medFeeSumAmt; - /** 基金支付总额 */ - private BigDecimal fundPaySumAmt; - /** 个人账户支付总额 */ - private BigDecimal acctGjPay; - /** 现金支付总额 */ - private BigDecimal selfPayCash; - /** 微信支付总额 */ - private BigDecimal selfPayVX; - /** 阿里支付总额 */ - private BigDecimal selfPayALI; - /** 银行卡支付总额 */ - private BigDecimal selfPayUNION; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java deleted file mode 100644 index 6c66ef21..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3203WebParam.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * 【3203】前台入参 - * - * @author SunJQ - * @date 2025-04-29 - */ -@Data -public class Financial3203WebParam { - - // 清算类别（字符型，30位，必填） - @JSONField(name = "clr_type") - private String clrType; - - // 清算方式（字符型，30位，必填） - @JSONField(name = "clr_way") - private String clrWay; - - // 开始日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "begndate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date begndate; - - // 结束日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "enddate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date enddate; - - // 清算年月 - @JSONField(name = "setlym") - private String setlym; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java deleted file mode 100644 index ffc76743..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Financial3204Param.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【3204A】清算申请撤销 - * - * @author SunJQ - * @date 2025-04-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Financial3204Param { - /** - * 机构清算申请事件ID - */ - @JSONField(name = "clr_appy_evt_id") - private String clrAppyEvtId; - /** - * 清算机构 - */ - @JSONField(name = "clr_optins") - private String clrOptins; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java deleted file mode 100644 index 9dcbbaa6..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Param.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3202】医药机构费用结算对明细账 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FinancialSettlement3202Param { - // 1. 结算经办机构（字符型，6位，必填） - @JSONField(name = "setl_optins") - private String setlOptins; - - // 2. 文件查询号（字符型，30位，必填） - @JSONField(name = "file_qury_no") - private String fileQuryNo; - - // 3. 对账开始日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "stmt_begndate") - @JsonFormat(pattern = "yyyy-MM-dd") - private String stmtBegndate; - - // 4. 对账结束日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "stmt_enddate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date stmtEnddate; - - // 5. 医疗费总额（数值型，16位含2位小数，必填） - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; - - // 6. 基金支付总额（数值型，16位含2位小数，必填） - @JSONField(name = "fund_pay_sumamt") - private BigDecimal fundPaySumamt; - - // 7. 现金支付金额（数值型，16位含2位小数，必填） - @JSONField(name = "cash_payamt") - private BigDecimal cashPayamt; - - // 8. 定点医药机构结算笔数（数值型，10位，必填） - @JSONField(name = "fixmedins_setl_cnt") - private Integer fixmedinsSetlCnt; - - // 9. 清算类别（字符型，6位，必填） - @JSONField(name = "clr_type") - private String clrType; - - // 10. 退费结算标志（字符型，3位，必填） - @JSONField(name = "refd_setl_flag") - private String refdSetlFlag; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java deleted file mode 100644 index 64dbf268..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3202Result.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * 【3202】医药机构费用结算对明细账-文件输出实体 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FinancialSettlement3202Result { - // 1. 文件查询号（字符型，30位，必填） - @JSONField(name = "file_qury_no") - private String fileQuryNo; - - // 2. 文件名称（字符型，200位，必填） - @JSONField(name = "filename") - private String filename; - - // 3. 下载截止时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "dld_endtime") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date dldEndtime; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java deleted file mode 100644 index f2b21c79..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AParam.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - *【3209A】查询跨省三方对账未成功数据(吉林省)-输入参数 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FinancialSettlement3209AParam { - - // 清算类别 - @JSONField(name = "clr_type") - private String clrType; - - // 开始日期 - @JSONField(name = "begndate") - private Date begndate; - - // 结束日期 - @JSONField(name = "enddate") - private Date enddate; - - // 清算机构 - @JSONField(name = "clr_optins") - private String clrOptins; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java deleted file mode 100644 index db17e7a0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FinancialSettlement3209AResult.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【3209A】查询跨省三方对账未成功数据(吉林省)-输出参数] - * - * @author SunJQ - * @date 2025-04-21 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FinancialSettlement3209AResult { - // 结算ID - @JSONField(name = "setlId") - private String setlId; - - // 参保地区划 - @JSONField(name = "insuAdmdvs") - private String insuAdmdvs; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java deleted file mode 100644 index f0299ae4..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiConsultation3101Param.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.List; -import java.util.Set; - -/** - * 【3101】明细审核事前分析服务（输入-规则分析信息） - * 【3102】明细审核事中分析服务（输入-规则分析信息） - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiConsultation3101Param { - - // 1. 系统编码 - @JSONField(name = "syscode") - private String syscode; - - // 2. 参保人信息 - @JSONField(name = "patient_dtos") - private List patientDtos; - - // 3. 规则标识集合（非必填） - @JSONField(name = "rule_ids") - private Set ruleIds; - - // 4. 任务ID - @JSONField(name = "task_id") - private String taskId; - - // 5. 触发场景 - @JSONField(name = "trig_scen") - private String trigScen; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java deleted file mode 100644 index 7576cc88..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiDiagnose3101Param.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【3101】明细审核事前分析服务（输入-诊断信息） - * 【3102】明细审核事中分析服务（输入-诊断信息） - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiDiagnose3101Param { - - // 1. 诊断标识 - @JSONField(name = "dise_id") - private String diseId; - - // 2. 出入诊断类别 - @JSONField(name = "inout_dise_type") - private String inoutDiseType; - - // 3. 主诊断标志 - @JSONField(name = "maindise_flag") - private String maindiseFlag; - - // 4. 诊断排序号 - @JSONField(name = "dias_srt_no") - private String diasSrtNo; - - // 5. 诊断(疾病)编码 - @JSONField(name = "dise_codg") - private String diseCodg; - - // 6. 诊断(疾病)名称 - @JSONField(name = "dise_name") - private String diseName; - - // 7. 诊断日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "dise_date") - private Date diseDate; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java deleted file mode 100644 index 4bbbfa0f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiEncounter3101Param.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【3101】明细审核事前分析服务（输入-就诊信息） - * 【3102】明细审核事中分析服务（输入-就诊信息） - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiEncounter3101Param { - // 1. 就诊标识 - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 2. 医疗服务机构标识 - @JSONField(name = "medins_id") - private String medinsId; - - // 3. 医疗机构名称 - @JSONField(name = "medins_name") - private String medinsName; - - // 4. 医疗机构行政区划编码 - @JSONField(name = "medins_admdvs") - private String medinsAdmdvs; - - // 5. 医疗服务机构类型 - @JSONField(name = "medins_type") - private String medinsType; - - // 6. 医疗机构等级 - @JSONField(name = "medins_lv") - private String medinsLv; - - // 7. 病区标识 - @JSONField(name = "wardarea_codg") - private String wardareaCodg; - - // 8. 病房号 - @JSONField(name = "wardno") - private String wardno; - - // 9. 病床号 - @JSONField(name = "bedno") - private String bedno; - - // 10. 入院日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "adm_date") - private Date admDate; - - // 11. 出院日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "dscg_date") - private Date dscgDate; - - // 12. 主诊断编码 - @JSONField(name = "dscg_main_dise_codg") - private String dscgMainDiseCodg; - - // 13. 主诊断名称 - @JSONField(name = "dscg_main_dise_name") - private String dscgMainDiseName; - - // 14. 诊断信息DTO - @JSONField(name = "fsi_diagnose_dtos") - private List fsiDiagnoseDtos; - - // 15. 医师标识 - @JSONField(name = "dr_codg") - private String drCodg; - - // 16. 入院科室标识 - @JSONField(name = "adm_dept_codg") - private String admDeptCodg; - - // 17. 入院科室名称 - @JSONField(name = "adm_dept_name") - private String admDeptName; - - // 18. 出院科室标识 - @JSONField(name = "dscg_dept_codg") - private String dscgDeptCodg; - - // 19. 出院科室名称 - @JSONField(name = "dscg_dept_name") - private String dscgDeptName; - - // 20. 就诊类型 - @JSONField(name = "med_mdtrt_type") - private String medMdtrtType; - - // 21. 医疗类别 - @JSONField(name = "med_type") - private String medType; - - // 22. 处方(医嘱)信息 - @JSONField(name = "fsi_order_dtos") - private List fsiOrderDtos; - - // 23. 生育状态 - @JSONField(name = "matn_stas") - private String matnStas; - - // 24. 总费用 - @JSONField(name = "medfee_sumamt") - private BigDecimal medfeeSumamt; - - // 25. 自费金额 - @JSONField(name = "ownpay_amt") - private BigDecimal ownpayAmt; - - // 26. 自付金额 - @JSONField(name = "selfpay_amt") - private BigDecimal selfpayAmt; - - // 27. 个人账户支付金额 - @JSONField(name = "acct_payamt") - private BigDecimal acctPayamt; - - // 28. 救助金支付金额 - @JSONField(name = "ma_amt") - private BigDecimal maAmt; - - // 29. 统筹金支付金额 - @JSONField(name = "hifp_payamt") - private BigDecimal hifpPayamt; - - // 30. 结算总次数 - @JSONField(name = "setl_totlnum") - private Integer setlTotlnum; - - // 31. 险种 - @JSONField(name = "insutype") - private String insutype; - - // 32. 报销标志 - @JSONField(name = "reim_flag") - private String reimFlag; - - // 33. 异地结算标志 - @JSONField(name = "out_setl_flag") - private String outSetlFlag; - - // 34. 手术操作集合 - @JSONField(name = "fsi_operation_dtos") - private List fsiOperationDtos; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java deleted file mode 100644 index 7d44ea4f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103DataParam.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 【3103】事前事中服务反馈服务（输入） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiFeedback3103DataParam { - // 1. 反馈类型 - @JSONField(name = "warn_type") - private String warnType; - - // 2. 处理数据集合 - @JSONField(name = "warns") - private List warns; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java deleted file mode 100644 index b2645272..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiFeedback3103WarnsParam.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【3103】事前事中服务反馈服务（输入-反馈处理数据） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiFeedback3103WarnsParam { - // 1. 违规标识 - @JSONField(name = "warn_rslt_id") - private String warnRsltId; - - // 2. 处理方式 - @JSONField(name = "dspo_way") - private String dspoWay; - - // 3. 处理原因 - @JSONField(name = "dspo_way_rea") - private String dspoWayRea; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java deleted file mode 100644 index 9472bc69..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOperation3101Param.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【3101】明细审核事前分析服务（输入-手术操作信息） - * 【3102】明细审核事中分析服务（输入-手术操作信息） - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiOperation3101Param { - - // 1. 手术操作ID - @JSONField(name = "setl_list_oprn_id") - private String setlListOprnId; - - // 2. 手术操作代码 - @JSONField(name = "oprn_code") - private String oprnCode; - - // 3. 手术操作名称 - @JSONField(name = "oprn_name") - private String oprnName; - - // 4. 主手术操作标志 - @JSONField(name = "main_oprn_flag") - private String mainOprnFlag; - - // 5. 手术操作日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "oprn_date") - private Date oprnDate; - - // 6. 麻醉方式 - @JSONField(name = "anst_way") - private String anstWay; - - // 7. 术者医师姓名 - @JSONField(name = "oper_dr_name") - private String operDrName; - - // 8. 术者医师代码 - @JSONField(name = "oper_dr_code") - private String operDrCode; - - // 9. 麻醉医师姓名 - @JSONField(name = "anst_dr_name") - private String anstDrName; - - // 10. 麻醉医师代码 - @JSONField(name = "anst_dr_code") - private String anstDrCode; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java deleted file mode 100644 index 440f86ce..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiOrder3101Param.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【3101】明细审核事前分析服务（输入-处方（医嘱）信息） - * 【3102】明细审核事中分析服务（输入-处方（医嘱）信息） - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiOrder3101Param { - - // 1. 处方(医嘱)标识 - @JSONField(name = "rx_id") - private String rxId; - - // 2. 处方号 - @JSONField(name = "rxno") - private String rxno;//2025/05/05 李要求该字段对应耗材时使用buz_no,药品时使用处方号 - - // 3. 组编号 - @JSONField(name = "grpno") - private String grpno; - - // 4. 是否为长期医嘱 [1=是,0=否] - @JSONField(name = "long_drord_flag") - private String longDrordFlag; - - // 5. 目录类别（参考字典表） - @JSONField(name = "hilist_type") - private String hilistType; - - // 6. 收费类别（参考字典表） - @JSONField(name = "chrg_type") - private String chrgType; - - // 7. 医嘱行为（参考字典表） - @JSONField(name = "drord_bhvr") - private String drordBhvr; - - // 8. 医保目录代码（国家统一标准编码） - @JSONField(name = "hilist_code") - private String hilistCode; - - // 9. 医保目录名称（国家统一标准名称） - @JSONField(name = "hilist_name") - private String hilistName; - - // 10. 医保目录(药品)剂型（国家统一标准药品剂型） - @JSONField(name = "hilist_dosform") - private String hilistDosform; - - // 11. 医保目录等级 - @JSONField(name = "hilist_lv") - private String hilistLv; - - // 12. 医保目录价格 - @JSONField(name = "hilist_pric") - private BigDecimal hilistPric; - - // 13. 一级医院目录价格 - @JSONField(name = "lv1_hosp_item_pric") - private BigDecimal lv1HospItemPric; - - // 14. 二级医院目录价格 - @JSONField(name = "lv2_hosp_item_pric") - private BigDecimal lv2HospItemPric; - - // 15. 三级医院目录价格 - @JSONField(name = "lv3_hosp_item_pric") - private BigDecimal lv3HospItemPric; - - // 16. 医保目录备注 - @JSONField(name = "hilist_memo") - private String hilistMemo; - - // 17. 医院目录代码 - @JSONField(name = "hosplist_code") - private String hosplistCode; - - // 18. 医院目录名称 - @JSONField(name = "hosplist_name") - private String hosplistName; - - // 19. 医院目录(药品)剂型 - @JSONField(name = "hosplist_dosform") - private String hosplistDosform; - - // 20. 数量 - @JSONField(name = "cnt") - private BigDecimal cnt; - - // 21. 单价 - @JSONField(name = "pric") - private BigDecimal pric; - - // 22. 总费用 - @JSONField(name = "sumamt") - private BigDecimal sumamt; - - // 23. 自费金额 - @JSONField(name = "ownpay_amt") - private BigDecimal ownpayAmt; - - // 24. 自付金额 - @JSONField(name = "selfpay_amt") - private BigDecimal selfpayAmt; - - // 25. 规格 - @JSONField(name = "spec") - private String spec; - - // 26. 数量单位 - @JSONField(name = "spec_unt") - private String specUnt; - - // 27. 医嘱开始日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "drord_begn_date") - private Date drordBegnDate; - - // 28. 医嘱停止日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "drord_stop_date") - private Date drordStopDate; - - // 29. 下达医嘱的科室标识 - @JSONField(name = "drord_dept_codg") - private String drordDeptCodg; - - // 30. 下达医嘱科室名称 - @JSONField(name = "drord_dept_name") - private String drordDeptName; - - // 31. 开处方(医嘱)医生标识 - @JSONField(name = "drord_dr_codg") - private String drordDrCodg; - - // 32. 开处方(医嘱)医生姓名 - @JSONField(name = "drord_dr_name") - private String drordDrName; - - // 33. 开处方(医嘱)医职称 - @JSONField(name = "drord_dr_profttl") - private String drordDrProfttl; - - // 34. 是否当前处方(医嘱)[1=是,0=否] - @JSONField(name = "curr_drord_flag") - private String currDrordFlag; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java deleted file mode 100644 index 95de10c1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiPatient3101Param.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - -/** - * 【3101】明细审核事前分析服务（输入-参保人信息） - * 【3102】明细审核事中分析服务（输入-参保人信息） - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiPatient3101Param { - - // 1. 参保人标识 - @JSONField(name = "patn_id") - private String patnId; - - // 2. 姓名 - @JSONField(name = "patn_name") - private String patnName; - - // 3. 性别 - @JSONField(name = "gend") - private String gend; - - // 4. 出生日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "brdy") - private Date brdy; - - // 5. 统筹区编码 - @JSONField(name = "poolarea") - private String poolarea; - - // 6. 当前就诊标识 - @JSONField(name = "curr_mdtrt_id") - private String currMdtrtId; - - // 7. 就诊信息集合 - @JSONField(name = "fsi_encounter_dtos") - private List fsiEncounterDtos; - -// // 8. 医院信息集合（非必填项） -// @JSONField(name = "fsi_his_data_dto") -// private FsiHisData fsiHisDataDto; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java deleted file mode 100644 index 43fde8ff..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolation3101Result.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.List; - -/** - * 【3101】明细审核事前分析服务（输出-违规信息） - * 【3102】明细审核事中分析服务（输出-违规信息） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiViolation3101Result { - // 1. 违规标识 - @JSONField(name = "jr_id") - private String jrId; - - // 2. 规则ID - @JSONField(name = "rule_id") - private String ruleId; - - // 3. 规则名称 - @JSONField(name = "rule_name") - private String ruleName; - - // 4. 违规内容 - @JSONField(name = "vola_cont") - private String volaCont; - - // 5. 参保人ID - @JSONField(name = "patn_id") - private String patnId; - - // 6. 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 7. 违规明细 - @JSONField(name = "judge_result_detail_dtos") - private List judgeResultDetailDtos; - - // 8. 违规金额 - @JSONField(name = "vola_amt") - private BigDecimal volaAmt; - - // 9. 违规金额计算状态 - @JSONField(name = "vola_amt_stas") - private String volaAmtStas; - - // 10. 严重程度 - @JSONField(name = "sev_deg") - private String sevDeg; - - // 11. 违规依据 - @JSONField(name = "vola_evid") - private String volaEvid; - - // 12. 违规行为分类 - @JSONField(name = "vola_bhvr_type") - private String volaBhvrType; - - // 13. 任务ID - @JSONField(name = "task_id") - private String taskId; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java deleted file mode 100644 index 8fee16d6..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/FsiViolationDetail3101Result.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 【3101】明细审核事前分析服务（输出-违规明细信息） - * 【3102】明细审核事中分析服务（输出-违规明细信息） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class FsiViolationDetail3101Result { - // 1. 违规明细标识 - @JSONField(name = "jrd_id") - private String jrdId; - - // 2. 参保人标识 - @JSONField(name = "patn_id") - private String patnId; - - // 3. 就诊标识 - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 4. 处方(医嘱)标识 - @JSONField(name = "rx_id") - private String rxId; - - // 5. 违规明细类型 - @JSONField(name = "vola_item_type") - private String volaItemType; - - // 6. 违规金额 - @JSONField(name = "vola_amt") - private BigDecimal volaAmt; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java deleted file mode 100644 index 4fa77568..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401DiseInfoParam.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【2401】入院办理（输入-入院诊断信息） - * - * @author yuanzs - * @date 2025-05-07 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2401DiseInfoParam { - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 诊断类别 - @JSONField(name = "diag_type") - private String diagType; - - // 3. 主诊断标志 - @JSONField(name = "maindiag_flag") - private String maindiagFlag; - - // 4. 诊断排序号 - @JSONField(name = "diag_srt_no") - private BigDecimal diagSrtNo; - - // 5. 诊断代码 - @JSONField(name = "diag_code") - private String diagCode; - - // 6. 诊断名称 - @JSONField(name = "diag_name") - private String diagName; - - // 7. 入院病情 - @JSONField(name = "adm_cond") - private String admCond; - - // 8. 诊断科室 - @JSONField(name = "diag_dept") - private String diagDept; - - // 9. 诊断医生编码 - @JSONField(name = "dise_dor_no") - private String diseDorNo; - - // 10. 诊断医生姓名 - @JSONField(name = "dise_dor_name") - private String diseDorName; - - // 11. 诊断时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "diag_time") - private Date diagTime; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java deleted file mode 100644 index ae1910b4..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2401MdtInfoParam.java +++ /dev/null @@ -1,191 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【2401】入院办理 - * - * @author yuanzs - * @date 2025-05-07 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2401MdtInfoParam { - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 3. 联系人姓名 - @JSONField(name = "coner_name") - private String conerName; - - // 4. 联系电话 - @JSONField(name = "tel") - private String tel; - - // 5. 开始时间（入院时间） - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "begntime") - private Date begntime; - - // 6. 就诊凭证类型 - @JSONField(name = "mdtrt_cert_type") - private String mdtrtCertType; - - // 7. 就诊凭证编号 - @JSONField(name = "mdtrt_cert_no") - private String mdtrtCertNo; - - // 8. 医疗类别 - @JSONField(name = "med_type") - private String medType; - - // 9. 住院号 - @JSONField(name = "ipt_no") - private String iptNo; - - // 10. 病历号 - @JSONField(name = "medrcdno") - private String medrcdno; - - // 11. 主治医生编码 - @JSONField(name = "atddr_no") - private String atddrNo; - - // 12. 主诊医师姓名 - @JSONField(name = "chfpdr_name") - private String chfpdrName; - - // 13. 入院诊断描述 - @JSONField(name = "adm_diag_dscr") - private String admDiagDscr; - - // 14. 入院科室编码 - @JSONField(name = "adm_dept_codg") - private String admDeptCodg; - - // 15. 入院科室名称 - @JSONField(name = "adm_dept_name") - private String admDeptName; - - // 16. 入院床位 - @JSONField(name = "adm_bed") - private String admBed; - - // 17. 住院主诊断代码 - @JSONField(name = "dscg_maindiag_code") - private String dscgMaindiagCode; - - // 18. 住院主诊断名称 - @JSONField(name = "dscg_maindiag_name") - private String dscgMaindiagName; - - // 19. 主要病情描述 - @JSONField(name = "main_cond_dscr") - private String mainCondDscr; - - // 20. 病种编码 - @JSONField(name = "dise_codg") - private String diseCodg; - - // 21. 病种名称 - @JSONField(name = "dise_name") - private String diseName; - - // 22. 手术操作代码 - @JSONField(name = "oprn_oprt_code") - private String oprnOprtCode; - - // 23. 手术操作名称 - @JSONField(name = "oprn_oprt_name") - private String oprnOprtName; - - // 24. 计划生育服务证号 - @JSONField(name = "fpsc_no") - private String fpscNo; - - // 25. 生育类别 - @JSONField(name = "matn_type") - private String matnType; - - // 26. 计划生育手术类别 - @JSONField(name = "birctrl_type") - private String birctrlType; - - // 27. 晚育标志 - @JSONField(name = "latechb_flag") - private String latechbFlag; - - // 28. 孕周数 - @JSONField(name = "geso_val") - private BigDecimal gesoVal; - - // 29. 胎次 - @JSONField(name = "fetts") - private BigDecimal fetts; - - // 30. 胎儿数 - @JSONField(name = "fetus_cnt") - private BigDecimal fetusCnt; - - // 31. 早产标志 - @JSONField(name = "pret_flag") - private String pretFlag; - - // 32. 计划生育手术或生育日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "birctrl_matn_date") - private Date birctrlMatnDate; - - // 33. 病种类型 - @JSONField(name = "dise_type_code") - private String diseTypeCode; - - // 34. 字段扩展 - @JSONField(name = "exp_content") - private String expContent; - - // 35. 参保地医保区划 - @JSONField(name = "insuplc_admdvs") - private String insuplcAdmdvs; - - // 36. 就医地医保区划 - @JSONField(name = "mdtrtarea_admvs") - private String mdtrtareaAdmvs; - - // 37. 外伤标识（仅对异地根据情况填写） - @JSONField(name = "trum_flag") - private String trumFlag; - - // 38. 涉及第三方标志（仅对异地根据情况填写） - @JSONField(name = "rel_ttp_flag") - private String relTtpFlag; - - // 39. 就诊人群类型（仅对异地根据情况填写） - @JSONField(name = "mdtrt_grp_type") - private String mdtrtGrpType; - - // 40. 入院诊断信息集合 - private List diseInfoParams; - - // 41. 就诊ID（输出） - @JSONField(name = "mdtrtId") - private String mdtrt_id; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java deleted file mode 100644 index 2d95d31f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DiseInfoParam.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【2402】出院办理（输入-出院诊断信息） - * - * @author yuanzs - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2402DiseInfoParam { - - // 1. 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 诊断类别 - @JSONField(name = "diag_type") - private String diagType; - - // 4. 主诊断标志 - @JSONField(name = "maindiag_flag") - private String maindiagFlag; - - // 5. 诊断排序号 - @JSONField(name = "diag_srt_no") - private BigDecimal diagSrtNo; - - // 6. 诊断代码 - @JSONField(name = "diag_code") - private String diagCode; - - // 7. 诊断名称 - @JSONField(name = "diag_name") - private String diagName; - - // 8. 诊断科室 - @JSONField(name = "diag_dept") - private String diagDept; - - // 9. 诊断医生编码 - @JSONField(name = "dise_dor_no") - private String diseDorNo; - - // 10. 诊断医生姓名 - @JSONField(name = "dise_dor_name") - private String diseDorName; - - // 11. 诊断时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "diag_time") - private Date diagTime; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java deleted file mode 100644 index 4242b936..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2402DscgInfoParam.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【2402】出院办理 - * - * @author yuanzs - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2402DscgInfoParam { - // 1. 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 4. 结束时间（出院时间） - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "endtime") - private Date endtime; - - // 5. 病种编码 - @JSONField(name = "dise_codg") - private String diseCodg; - - // 6. 病种名称 - @JSONField(name = "dise_name") - private String diseName; - - // 7. 手术操作代码（日间手术病种时必填） - @JSONField(name = "oprn_oprt_code") - private String oprnOprtCode; - - // 8. 手术操作名称 - @JSONField(name = "oprn_oprt_name") - private String oprnOprtName; - - // 9. 计划生育服务证号 - @JSONField(name = "fpsc_no") - private String fpscNo; - - // 10. 生育类别 - @JSONField(name = "matn_type") - private String matnType; - - // 11. 计划生育手术类别 - @JSONField(name = "birctrl_type") - private String birctrlType; - - // 12. 晚育标志 - @JSONField(name = "latechb_flag") - private String latechbFlag; - - // 13. 孕周数 - @JSONField(name = "esso_val") - private BigDecimal essoVal; - - // 14. 胎次 - @JSONField(name = "fetts") - private BigDecimal fetts; - - // 15. 胎儿数 - @JSONField(name = "fetus_cnt") - private BigDecimal fetusCnt; - - // 16. 早产标志 - @JSONField(name = "pret_flag") - private String pretFlag; - - // 17. 计划生育手术或生育日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "birctrl_matn_date") - private Date birctrlMatnDate; - - // 18. 伴有并发症标志 - @JSONField(name = "cop_flag") - private String copFlag; - - // 19. 出院科室编码 - @JSONField(name = "dscg_dept_codg") - private String dscgDeptCodg; - - // 20. 出院科室名称 - @JSONField(name = "dscg_dept_name") - private String dscgDeptName; - - // 21. 出院床位 - @JSONField(name = "dscg_bed") - private String dscgBed; - - // 22. 离院方式 - @JSONField(name = "dscg_way") - private String dscgWay; - - // 23. 死亡日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "die_date") - private Date dieDate; - - // 24. 字段扩展 - @JSONField(name = "exp_content") - private String expContent; - - // 25. 出院诊断信息 - private List diseInfoParams; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java deleted file mode 100644 index 6e8479f7..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403AdmInfoParam.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - -/** - * 【2403】住院信息变更 - * - * @author yuanzs - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2403AdmInfoParam { - - // 1. 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 联系人姓名 - @JSONField(name = "coner_name") - private String conerName; - - // 4. 联系电话 - @JSONField(name = "tel") - private String tel; - - // 5. 开始时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "begntime") - private Date begntime; - - // 6. 结束时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "endtime") - private Date endtime; - - // 7. 就诊凭证类型 - @JSONField(name = "mdtrt_cert_type") - private String mdtrtCertType; - - // 8. 医疗类别 - @JSONField(name = "med_type") - private String medType; - - // 9. 住院/门诊号 - @JSONField(name = "ipt_otp_no") - private String iptOtpNo; - - // 10. 病历号 - @JSONField(name = "medrcdno") - private String medrcdno; - - // 11. 主治医生编码 - @JSONField(name = "atddr_no") - private String atddrNo; - - // 12. 主诊医师姓名 - @JSONField(name = "chfpdr_name") - private String chfpdrName; - - // 13. 入院诊断描述 - @JSONField(name = "adm_diag_dscr") - private String admDiagDscr; - - // 14. 入院科室编码 - @JSONField(name = "adm_dept_codg") - private String admDeptCodg; - - // 15. 入院科室名称 - @JSONField(name = "adm_dept_name") - private String admDeptName; - - // 16. 入院床位 - @JSONField(name = "adm_bed") - private String admBed; - - // 17. 住院主诊断代码 - @JSONField(name = "dscg_maindiag_code") - private String dscgMaindiagCode; - - // 18. 住院主诊断名称 - @JSONField(name = "dscg_maindiag_name") - private String dscgMaindiagName; - - // 19. 主要病情描述 - @JSONField(name = "main_cond_dscr") - private String mainCondDscr; - - // 20. 病种编码 - @JSONField(name = "dise_codg") - private String diseCodg; - - // 21. 病种名称 - @JSONField(name = "dise_name") - private String diseName; - - // 22. 手术操作代码 - @JSONField(name = "oprn_oprt_code") - private String oprnOprtCode; - - // 23. 手术操作名称 - @JSONField(name = "oprn_oprt_name") - private String oprnOprtName; - - // 24. 计划生育服务证号 - @JSONField(name = "fpsc_no") - private String fpscNo; - - // 25. 生育类别 - @JSONField(name = "matn_type") - private String matnType; - - // 26. 计划生育手术类别 - @JSONField(name = "birctrl_type") - private String birctrlType; - - // 27. 晚育标志 - @JSONField(name = "latechb_flag") - private String latechbFlag; - - // 28. 孕周数 - @JSONField(name = "esso_val") - private Integer essoVal; - - // 29. 胎次 - @JSONField(name = "fetts") - private Integer fetts; - - // 30. 胎儿数 - @JSONField(name = "fetus_cnt") - private Integer fetusCnt; - - // 31. 早产标志 - @JSONField(name = "pret_flag") - private String pretFlag; - - // 32. 计划生育手术或生育日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "birctrl_matn_date") - private Date birctrlMatnDate; - - // 33. 病种编号 - @JSONField(name = "dise_type_code") - private String diseTypeCode; - - // 34. 字段扩展 - @JSONField(name = "exp_content") - private String expContent; - - // 35. 外伤标识（仅对异地根据情况填写） - @JSONField(name = "trum_flag") - private String trumFlag; - - // 36. 涉及第三方标志（仅对异地根据情况填写） - @JSONField(name = "rel_ttp_flag") - private String relTtpFlag; - - // 37. 就诊人群类型（仅对异地根据情况填写） - @JSONField(name = "mdtrt_grp_type") - private String mdtrtGrpType; - - // 38. 入院诊断信息集合 - private List diseInfoParams; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java deleted file mode 100644 index b09e1d73..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2403DiseInfoParam.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【2403】住院信息变更（输入-入院诊断信息） - * - * @author yuanzs - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2403DiseInfoParam { - - // 1. 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 诊断类别 - @JSONField(name = "diag_type") - private String diagType; - - // 4. 主诊断标志 - @JSONField(name = "maindiag_flag") - private String maindiagFlag; - - // 5. 诊断排序号 - @JSONField(name = "diag_srt_no") - private BigDecimal diagSrtNo; - - // 6. 诊断代码 - @JSONField(name = "diag_code") - private String diagCode; - - // 7. 诊断名称 - @JSONField(name = "diag_name") - private String diagName; - - // 8. 入院病情 - @JSONField(name = "adm_cond") - private String admCond; - - // 9. 诊断科室 - @JSONField(name = "diag_dept") - private String diagDept; - - // 10. 诊断医生编码 - @JSONField(name = "dise_dor_no") - private String diseDorNo; - - // 11. 诊断医生姓名 - @JSONField(name = "dise_dor_name") - private String diseDorName; - - // 12. 诊断时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "diag_time") - private Date diagTime; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java deleted file mode 100644 index bafa4284..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2404AdmCnlParam.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【2404】入院撤销 - * 【2405】出院撤销 - * - * @author yuanzs - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2404AdmCnlParam { - - // 1. 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 字段扩展 - @JSONField(name = "exp_content") - private String expContent; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java deleted file mode 100644 index 91ad0909..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2406SmAttrUpParam.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【2401】就医特殊属性上传 - * - * @author yuanzs - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2406SmAttrUpParam { - - // 1. 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 人员证件类型 - @JSONField(name = "psn_cert_type") - private String psnCertType; - - // 4. 证件号码 - @JSONField(name = "certno") - private String certno; - - // 5. 人员姓名 - @JSONField(name = "psn_name") - private String psnName; - - // 6. 住院/门诊号 - @JSONField(name = "ipt_otp_no") - private String iptOtpNo; - - // 7. 就医人员特殊标识类型 - @JSONField(name = "ipt_psn_sp_flag_type") - private String iptPsnSpFlagType; - - // 8. 就医人员特殊标识 - @JSONField(name = "ipt_psn_sp_flag") - private String iptPsnSpFlag; - - // 9. 备注 - @JSONField(name = "memo") - private String memo; - - // 10. 医保区划 - @JSONField(name = "admdvs") - private String admdvs; - - // 11. 就医人员特殊标识明细id（输出） - @JSONField(name = "ipt_psn_sp_flag_detl_id") - private String iptPsnSpFlagDetlId; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java deleted file mode 100644 index 599ef096..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectParam.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 【2407】就医特殊属性查询（输入） - * - * @author yuanzs - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2407SmAttrSelectParam { - - // 1. 分页条数 - @JSONField(name = "page_num") - private BigDecimal pageNum; - - // 2. 分页大小 - @JSONField(name = "page_size") - private BigDecimal pageSize; - - // 3. 就医人员特殊标识明细id - @JSONField(name = "ipt_psn_sp_flag_detl_id") - private String iptPsnSpFlagDetlId; - - // 4. 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 5. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 6. 人员证件类型 - @JSONField(name = "psn_cert_type") - private String psnCertType; - - // 7. 证件号码 - @JSONField(name = "certno") - private String certno; - - // 8. 人员姓名 - @JSONField(name = "psn_name") - private String psnName; - - // 9. 定点医药机构编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - // 10. 定点医药机构名称 - @JSONField(name = "fixmedins_name") - private String fixmedinsName; - - // 11. 住院/门诊号 - @JSONField(name = "ipt_otp_no") - private String iptOtpNo; - - // 12. 就医人员特殊标识类型 - @JSONField(name = "ipt_psn_sp_flag_type") - private String iptPsnSpFlagType; - - // 13. 就医人员特殊标识 - @JSONField(name = "ipt_psn_sp_flag") - private String iptPsnSpFlag; - - // 14. 医保区划 - @JSONField(name = "admdvs") - private String admdvs; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java deleted file mode 100644 index 069c632c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospAdm2407SmAttrSelectResult.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【2407】就医特殊属性查询（输出） - * - * @author yuanzs - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospAdm2407SmAttrSelectResult { - - // 1. 就医人员特殊标识明细id - @JSONField(name = "ipt_psn_sp_flag_detl_id") - private String iptPsnSpFlagDetlId; - - // 2. 就诊ID - @JSONField(name = "mdtrt_id") - private String mdtrtId; - - // 3. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 4. 人员证件类型 - @JSONField(name = "psn_cert_type") - private String psnCertType; - - // 5. 证件号码 - @JSONField(name = "certno") - private String certno; - - // 6. 人员姓名 - @JSONField(name = "psn_name") - private String psnName; - - // 7. 定点医药机构编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - // 8. 定点医药机构名称 - @JSONField(name = "fixmedins_name") - private String fixmedinsName; - - // 9. 住院/门诊号 - @JSONField(name = "ipt_otp_no") - private String iptOtpNo; - - // 10. 就医人员特殊标识类型 - @JSONField(name = "ipt_psn_sp_flag_type") - private String iptPsnSpFlagType; - - // 11. 就医人员特殊标识 - @JSONField(name = "ipt_psn_sp_flag") - private String iptPsnSpFlag; - - // 12. 医保区划 - @JSONField(name = "admdvs") - private String admdvs; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java deleted file mode 100644 index 579ffcdc..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401AParam.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import java.util.List; - -/** - * 【3401A】科室信息上传(批量) - * - * @author SunJQ - * @date 2025-04-28 - */ -public class HospDept3401AParam { - private List deptinfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java deleted file mode 100644 index d8619749..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3401Param.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; - -import java.util.Date; - -/** - * 【3401】科室信息上传 - * - * @author SunJQ - * @date 2025-04-28 - */ -public class HospDept3401Param { - - // 1. 医院科室编码（院内唯一编码） - @JSONField(name = "hosp_dept_codg") // JSON字段名映射 - private String hospDeptCodg; - - // 2. 科别（参照科室代码） - @JSONField(name = "caty") - private String caty; - - // 3. 医院科室名称 - @JSONField(name = "hosp_dept_name") - private String hospDeptName; - - // 4. 开始时间（日期时间格式） - @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss") // 指定时间格式 - private Date begnTime; - - // 5. 结束时间（日期时间格式） - @JSONField(name = "endtime", format = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - - // 6. 科室简介 - @JSONField(name = "itro") - private String itro; - - // 7. 科室负责人姓名 - @JSONField(name = "dept_resper_name") - private String deptResperName; - - // 8. 科室负责人电话 - @JSONField(name = "dept_resper_tel") - private String deptResperTel; - - // 9. 科室医疗服务范围 - @JSONField(name = "dept_med_serv_scp") - private String deptMedServScp; - - // 10. 科室成立日期（日期格式） - @JSONField(name = "dept_estbdat", format = "yyyy-MM-dd") - private Date deptEstbdat; - - // 11. 批准床位数量（长整型） - @JSONField(name = "aprv_bed_cnt") - private Long aprvBedCnt; - - // 12. 医保认可床位数（长整型） - @JSONField(name = "hi_crtf_bed_cnt") - private Long hiCrtfBedCnt; - - // 13. 统筹区编号 - @JSONField(name = "poolarea_no") - private String poolareaNo; - - // 14. 医师人数（整型） - @JSONField(name = "dr_psncnt") - private Integer drPsncnt; - - // 15. 药师人数（整型） - @JSONField(name = "phar_psncnt") - private Integer pharPsncnt; - - // 16. 护士人数（整型） - @JSONField(name = "nurs_psncnt") - private Integer nursPsncnt; - - // 17. 技师人数（整型） - @JSONField(name = "tecn_psncnt") - private Integer tecnPsncnt; - - // 18. 备注 - @JSONField(name = "memo") - private String memo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java deleted file mode 100644 index 53eae8bb..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3402Param.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; - -import java.util.Date; - -/** - * 【3402】科室信息变更 - * - * @author SunJQ - * @date 2025-04-28 - */ -public class HospDept3402Param { - - // 1. 医院科室编码（院内唯一编码） - @JSONField(name = "hosp_dept_codg") - private String hospDeptCodg; - - // 2. 医院科室名称 - @JSONField(name = "hosp_dept_name") - private String hospDeptName; - - // 3. 开始时间（日期时间格式） - @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss") - private Date begnTime; - - // 4. 结束时间（日期时间格式） - @JSONField(name = "endtime", format = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - - // 5. 科室简介 - @JSONField(name = "itro") - private String itro; - - // 6. 科室负责人姓名 - @JSONField(name = "dept_resper_name") - private String deptResperName; - - // 7. 科室负责人电话 - @JSONField(name = "dept_resper_tel") - private String deptResperTel; - - // 8. 科室医疗服务范围 - @JSONField(name = "dept_med_serv_scp") - private String deptMedServScp; - - // 9. 科别（参照科室代码） - @JSONField(name = "caty") - private String caty; - - // 10. 科室成立日期（日期格式） - @JSONField(name = "dept_estbdat", format = "yyyy-MM-dd") - private Date deptEstbdat; - - // 11. 批准床位数量（长整型） - @JSONField(name = "aprv_bed_cnt") - private Long aprvBedCnt; - - // 12. 医保认可床位数（长整型） - @JSONField(name = "hi_crtf_bed_cnt") - private Long hiCrtfBedCnt; - - // 13. 统筹区编号 - @JSONField(name = "poolarea_no") - private String poolareaNo; - - // 14. 医师人数（整型） - @JSONField(name = "dr_psncnt") - private Integer drPsncnt; - - // 15. 药师人数（整型） - @JSONField(name = "phar_psncnt") - private Integer pharPsncnt; - - // 16. 护士人数（整型） - @JSONField(name = "nurs_psncnt") - private Integer nursPsncnt; - - // 17. 技师人数（整型） - @JSONField(name = "tecn_psncnt") - private Integer tecnPsncnt; - - // 18. 备注 - @JSONField(name = "memo") - private String memo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java deleted file mode 100644 index 9fe60c3f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospDept3403Param.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; - -import java.util.Date; - -/** - * 【3403】科室信息撤销 - * - * @author SunJQ - * @date 2025-04-28 - */ -public class HospDept3403Param { - // 1. 医院科室编码（院内唯一编码） - @JSONField(name = "hosp_dept_codg") - private String hospDeptCodg; - - // 2. 医院科室名称 - @JSONField(name = "hosp_dept_name") - private String hospDeptName; - - // 3. 开始时间（日期时间格式） - @JSONField(name = "begntime", format = "yyyy-MM-dd HH:mm:ss") - private Date begnTime; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java deleted file mode 100644 index e49d5417..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501ARefmedinParam.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【2501A】转院备案（输入） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospTrf2501ARefmedinParam { - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 3. 联系电话 - @JSONField(name = "tel") - private String tel; - - // 4. 联系地址 - @JSONField(name = "addr") - private String addr; - - // 5. 参保机构医保区划 - @JSONField(name = "insu_optins") - private String insuOptins; - - // 6. 诊断代码 - @JSONField(name = "diag_code") - private String diagCode; - - // 7. 诊断名称 - @JSONField(name = "diag_name") - private String diagName; - - // 8. 疾病病情描述 - @JSONField(name = "dise_cond_dscr") - private String diseCondDscr; - - // 9. 转往定点医药机构编号 - @JSONField(name = "reflin_medins_no") - private String reflinMedinsNo; - - // 10. 转往医院名称 - @JSONField(name = "reflin_medins_name") - private String reflinMedinsName; - - // 11. 就医地行政区划 - @JSONField(name = "mdtrtarea_admdvs") - private String mdtrtareaAdmdvs; - - // 12. 医院同意转院标志 - @JSONField(name = "hosp_agre_refl_flag") - private String hospAgreReflFlag; - - // 13. 转院类型 - @JSONField(name = "refl_type") - private String reflType; - - // 14. 转院日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "refl_date") - private Date reflDate; - - // 15. 转院原因 - @JSONField(name = "refl_rea") - private String reflRea; - - // 16. 转院意见 - @JSONField(name = "refl_opnn") - private String reflOpnn; - - // 17. 开始日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "begndate") - private Date begndate; - - // 18. 结束日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "enddate") - private Date enddate; - - // 19. 转院前就诊id - @JSONField(name = "refl_old_mdtrt_id") - private String reflOldMdtrtId; - - // 20. 待遇申报明细流水号（输出） - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java deleted file mode 100644 index e89d8831..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrf2501RefmedinParam.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【2501】转院备案（输入） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class HospTrf2501RefmedinParam { - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 3. 联系电话 - @JSONField(name = "tel") - private String tel; - - // 4. 联系地址 - @JSONField(name = "addr") - private String addr; - - // 5. 参保机构医保区划 - @JSONField(name = "insu_optins") - private String insuOptins; - - // 6. 诊断代码 - @JSONField(name = "diag_code") - private String diagCode; - - // 7. 诊断名称 - @JSONField(name = "diag_name") - private String diagName; - - // 8. 疾病病情描述 - @JSONField(name = "dise_cond_dscr") - private String diseCondDscr; - - // 9. 转往定点医药机构编号 - @JSONField(name = "reflin_medins_no") - private String reflinMedinsNo; - - // 10. 转往医院名称 - @JSONField(name = "reflin_medins_name") - private String reflinMedinsName; - - // 11. 就医地行政区划 - @JSONField(name = "mdtrtarea_admdvs") - private String mdtrtareaAdmdvs; - - // 12. 医院同意转院标志 - @JSONField(name = "hosp_agre_refl_flag") - private String hospAgreReflFlag; - - // 13. 转院类型 - @JSONField(name = "refl_type") - private String reflType; - - // 14. 转院日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "refl_date") - private Date reflDate; - - // 15. 转院原因 - @JSONField(name = "refl_rea") - private String reflRea; - - // 16. 转院意见 - @JSONField(name = "refl_opnn") - private String reflOpnn; - - // 17. 开始日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "begndate") - private Date begndate; - - // 18. 结束日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "enddate") - private Date enddate; - - // 19. 转诊使用标志 - @JSONField(name = "refl_used_flag") - private String reflUsedFlag; - - // 20. 待遇申报明细流水号（输出） - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java deleted file mode 100644 index eef7d320..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/HospTrfCxl2502Param.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【2502】转院备案撤销（输入） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) - -public class HospTrfCxl2502Param { - // 1. 待遇申报明细流水号 - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 备注 - @JSONField(name = "memo") - private String memo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java deleted file mode 100644 index f985ba13..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101Output.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.openhis.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - *【1101】获取身份信息 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Info1101Output extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - //人员编号 - private String psnNo; - //人员证件类型 - private String psnCertType; - //证件号码 - private String certno; - //人员姓名 - private String psnName; - //性别 - private String gend; - //民族 - private String naty; - //出生日期 - private Date brdy; - //年龄 - private Double age; - //参保地医保区划 - private String insuplcAdmdvs; - //险种类型 - private String insutype; - //余额 - private String balc; - //人员类别 - @TableField(exist = false) - private String psnType; - - //人员参保状态 - @TableField(exist = false) - private String psnInsuStas; - - //个人参保日期 - @TableField(exist = false) - private String psnInsuDate; - - //公务员标志 - @TableField(exist = false) - private String cvlservFlag; - - //单位名称 - @TableField(exist = false) - private String empName; - //特慢病 - @TableField(exist = false) - private List feedetail; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java deleted file mode 100644 index d0d96767..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101PerinfoResult.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - *【1101】获取身份信息 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Info1101PerinfoResult extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - //人员编号 - @JSONField(name="psn_no") - private String psnNo; - //人员证件类型 - @JSONField(name="psn_cert_type") - private String psnCertType; - //证件号码 - @JSONField(name="certno") - private String certno; - //人员姓名 - @JSONField(name="psn_name") - private String psnName; - //性别 - @JSONField(name="gend") - private String gend; - //民族 - @JSONField(name="naty") - private String naty; - //出生日期 - @JSONField(name="brdy") - private Date brdy; - //年龄 - @JSONField(name="age") - private Double age; - //参保地医保区划 - @JSONField(serialize = false) - private String insuplcAdmdvs; - //险种类型 - @JSONField(serialize = false) - private String insutype; - //余额 - @JSONField(serialize = false) - private String balc; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java deleted file mode 100644 index a645aca1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info1101ReadcardParam.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *【1101】获取身份信息 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Info1101ReadcardParam extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - //就诊凭证类型 - @JSONField(name="mdtrt_cert_type") - private String mdtrtCertType; - //就诊凭证编号 - @JSONField(name="mdtrt_cert_no") - private String mdtrtCertNo; - //卡识别码 - @JSONField(name="card_sn") - private String cardSn; - //开始时间 - @JSONField(name="begntime") - private String begntime; - //人员证件类型 - @JSONField(name="psn_cert_type") - private String psnCertType; - //证件号码 - @JSONField(name="certno") - private String certno; - //人员姓名 - @JSONField(name="psn_name") - private String psnName; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java deleted file mode 100644 index 90353f71..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301Param.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Info5301Param { - @JSONField(name = "psn_no") - private String psnNo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java deleted file mode 100644 index b3eb44ea..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Info5301SpecialConditionResult.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -public class Info5301SpecialConditionResult { - - private static final long serialVersionUID = 1L; - - //门慢门特病种目录代码 - private String opspDiseCode; - //门慢门特病种名称 - private String opspDiseName; - //开始日期 - private String begndate; - //结束日期 - private String enddate; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java deleted file mode 100644 index c6d04213..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/InvoiceBaseInfoDto.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 电子发票基础信息查询实体 - * - * @author SunJQ - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -public class InvoiceBaseInfoDto { - //主键 - @TableId(type = IdType.ASSIGN_ID) - @JSONField(serialize=false) - private String id; - - private String setlId;//结算id - - private String mdtrtId; // 就诊ID - - private String psnName; // 人员姓名 - - private String psnCertType; // 人员证件类型 - - private String certno; // 证件号码 - - private String insutype; // 险种类型 - - private String psnType; // 人员类别 - - private String cvlservFlag; // 公务员标志 - - private Date setlTime; // 结算时间 - - private String mdtrtCertType; // 就诊凭证类型 - - private String medType; // 医疗类别 - - private BigDecimal medfeeSumamt; // 医疗费总额 - - private BigDecimal fulamtOwnpayAmt; // 全自费金额 - - private BigDecimal overlmtSelfpay; // 超限价自费费用 - - private BigDecimal preselfpayAmt; // 先行自付金额 - - private BigDecimal inscpScpAmt; // 符合政策范围金额 - - private BigDecimal actPayDedc; // 实际支付起付线 - - private BigDecimal hifpPay; // 基本医疗保险统筹基金支出 - - private BigDecimal poolPropSelfpay; // 基本医疗保险统筹基金支付比例 - - private BigDecimal cvlservPay; // 公务员医疗补助资金支出 - - private BigDecimal hifesPay; // 企业补充医疗保险基金支出 - - private BigDecimal hifmiPay; // 居民大病保险资金支出 - - private BigDecimal hifobPay; // 职工大额医疗费用补助基金支出 - - private BigDecimal mafPay; // 医疗救助基金支出 - - private BigDecimal othPay; // 其他支出 - - private BigDecimal fundPaySumamt; // 基金支付总额 - - private BigDecimal psnPartAmt; // 个人负担总金额 - - private BigDecimal acctPay; // 个人账户支出 - - private BigDecimal psnCashPay; // 个人现金支出 - - private BigDecimal hospPartAmt; // 医院负担金额 - - private BigDecimal balc; // 余额 - - private BigDecimal acctMulaidPay; // 个人账户共济支付金额 - - private String medinsSetlId; // 医药机构结算ID - - private String clrOptins; // 清算经办机构 - - private String clrWay; // 清算方式 - - private String clrType; // 清算类别 - - private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出 - - private String paymentNo;//结算业务流水号 Payment与ClinicSettle是1：N -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java deleted file mode 100644 index 480d63dd..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/LoginUser.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.openhis.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class LoginUser { - - /** 登录人id */ - private String id; - /** 登录人账号 */ - private String username; - /** 登录人名字 */ - private String realname; - /** 登录人密码 */ - private String password; - /** 当前登录部门code */ - private String orgCode; - /** 头像 */ - private String avatar; - /** 生日 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date birthday; - /** 性别（1：男 2：女） */ - private Integer sex; - /** 电子邮件 */ - private String email; - /** 电话 */ - private String phone; - /** 状态(1：正常 2：冻结 ） */ - private Integer status; - /**逻辑删除标志 */ - private Integer delFlag; - /** 同步工作流引擎1同步0不同步 */ - private Integer activitiSync; - /**创建时间 */ - private Date createTime; - /** 身份（1 普通员工 2 上级）*/ - private Integer userIdentity; - /** 管理部门ids */ - private String departIds; - /** 职务，关联职务表 */ - private String post; - /** 座机号*/ - private String telephone; - /**多租户id配置，编辑用户的时候设置*/ - private String relTenantIds; - /**医保类型，1-市医保，2-省医保，3-省市医保*/ - private String medicareType; - /** 定点医药机构编号 */ - private String fixmedinsCode; - /** 定点医药机构名称 */ - private String fixmedinsName; - /** 统筹区号 */ - private String admvs; - /** 行政区划 */ - private String district; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java deleted file mode 100644 index f3ff5917..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Param.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【25007】生育津贴登记（输入） - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MatAllowReg25007Param { - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 生育类别 - @JSONField(name = "matn_type") - private String matnType; - - // 3. 计划生育手术或生育日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "birctrl_matn_date") - private Date birctrlMatnDate; - - // 4. 孕周数 - @JSONField(name = "geso_val") - private BigDecimal gesoVal; - - // 5. 胎次 - @JSONField(name = "fetts") - private BigDecimal fetts; - - // 6. 胎儿数 - @JSONField(name = "fetus_cnt") - private BigDecimal fetusCnt; - - // 7. 经办人姓名 - @JSONField(name = "opter_name") - private String opterName; - - // 8. 结算ID - @JSONField(name = "setl_id") - private String setlId; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java deleted file mode 100644 index 3377a414..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowReg25007Result.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【25007】生育津贴登记（输出） - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MatAllowReg25007Result { - // 1. 生育津贴登记ID - @JSONField(name = "matn_alwn_reg_id") - private String matnAlwnRegId; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 人员姓名 - @JSONField(name = "psn_name") - private String psnName; - - // 4. 生育类别 - @JSONField(name = "matn_type") - private String matnType; - - // 5. 计划生育手术或生育日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "birctrl_matn_date") - private Date birctrlMatnDate; - - // 6. 孕周数 - @JSONField(name = "geso_val") - private BigDecimal gesoVal; - - // 7. 胎次 - @JSONField(name = "fetts") - private BigDecimal fetts; - - // 8. 胎儿数 - @JSONField(name = "fetus_cnt") - private BigDecimal fetusCnt; - - // 9. 结算ID - @JSONField(name = "setl_id") - private String setlId; - - // 10. 有效标志 - @JSONField(name = "vali_flag") - private String valiFlag; - - // 11. 审核标志 - @JSONField(name = "rchk_flag") - private String rchkFlag; - - // 12. 审核意见 - @JSONField(name = "memo") - private String memo; - - // 13. 经办人姓名 - @JSONField(name = "opter_name") - private String opterName; - - // 14. 经办时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "opt_time") - private Date optTime; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java deleted file mode 100644 index 188a91d7..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MatAllowRegSel25008Param.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【25008】生育津贴登记信息查询（输出） - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MatAllowRegSel25008Param { - // 1. 生育津贴登记ID - @JSONField(name = "matn_alwn_reg_id") - private String matnAlwnRegId; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 人员姓名 - @JSONField(name = "psn_name") - private String psnName; - - // 4. 生育类别 - @JSONField(name = "matn_type") - private String matnType; - - // 5. 计划生育手术或生育日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "birctrl_matn_date") - private Date birctrlMatnDate; - - // 6. 孕周数 - @JSONField(name = "geso_val") - private BigDecimal gesoVal; - - // 7. 胎次 - @JSONField(name = "fetts") - private BigDecimal fetts; - - // 8. 胎儿数 - @JSONField(name = "fetus_cnt") - private BigDecimal fetusCnt; - - // 9. 结算ID - @JSONField(name = "setl_id") - private String setlId; - - // 10. 有效标志 - @JSONField(name = "vali_flag") - private String valiFlag; - - // 11. 审核标志 - @JSONField(name = "rchk_flag") - private String rchkFlag; - - // 12. 审核意见 - @JSONField(name = "memo") - private String memo; - - // 13. 经办人姓名 - @JSONField(name = "opter_name") - private String opterName; - - // 14. 经办时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "opt_time") - private Date optTime; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java deleted file mode 100644 index 6c40d521..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3503Param.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *【3503】商品采购 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Medical3503Param { - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 随货单号（字符型，50位，非必填） - @JSONField(name = "dynt_no") - private String dyntNo; - - // 5. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 6. 供应商名称（字符型，200位，必填） - @JSONField(name = "spler_name") - private String splerName; - - // 7. 供应商许可证号（字符型，50位，非必填） - @JSONField(name = "spler_pmtno") - private String splerPmtno; - - // 8. 生产批号（字符型，30位，必填） - @JSONField(name = "manu_lotnum") - private String manuLotnum; - - // 9. 生产厂家名称（字符型，200位，必填） - @JSONField(name = "prodentp_name") - private String prodentpName; - - // 10. 批准文号（字符型，100位，必填） - @JSONField(name = "aprvno") - private String aprvno; - - // 11. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 12. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 13. 最终成交单价（数值型，16位含6位小数，非必填） - @JSONField(name = "finl_trns_pric") - private BigDecimal finlTrnsPric; - - // 14. 采购/退货数量（数值型，16位含4位小数，必填） - @JSONField(name = "purc_retn_cnt") - private BigDecimal purcRetnCnt; - - // 15. 采购发票编码（字符型，50位，非必填） - @JSONField(name = "purc_invo_codg") - private String purcInvoCodg; - - // 16. 采购发票号（字符型，50位，非必填） - @JSONField(name = "purc_invo_no") - private String purcInvoNo; - - // 17. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 18. 采购/退货入库时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "purc_retn_stoin_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date purcRetnStoinTime; - - // 19. 采购/退货经办人姓名（字符型，50位，必填） - @JSONField(name = "purc_retn_opter_name") - private String purcRetnOpterName; - - // 20. 商品赠送标志（字符型，3位，必填） - @JSONField(name = "prod_geay_flag") - private String prodGeayFlag; - - // 21. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java deleted file mode 100644 index 01de3ee1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Model.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【3505】商品销售 - * - * @author zwh - * @date 2025-05-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Medical3505Model { - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 5. 开方医师证件类型（字符型，6位，非必填） - @JSONField(name = "prsc_dr_cert_type") - private String prscDrCertType; - - // 6. 开方医师证件号码（字符型，50位，非必填） - @JSONField(name = "prsc_dr_certno") - private String prscDrCertno; - - // 7. 开方医师姓名（字符型，50位，必填） - @JSONField(name = "prsc_dr_name") - private String prscDrName; - - // 8. 药师证件类型（字符型，6位，非必填） - @JSONField(name = "phar_cert_type") - private String pharCertType; - - // 9. 药师证件号码（字符型，50位，非必填） - @JSONField(name = "phar_certno") - private String pharCertno; - - // 10. 药师姓名（字符型，50位，必填） - @JSONField(name = "phar_name") - private String pharName; - - // 11. 药师执业资格证号（字符型，50位，必填） - @JSONField(name = "phar_prac_cert_no") - private String pharPracCertNo; - - // 12. 医保费用结算类型（字符型，6位，必填） - @JSONField(name = "hi_feesetl_type") - private String hiFeesetlType; - - // 13. 结算ID（字符型，30位，非必填） - @JSONField(name = "setl_id") - private String setlId; - - // 14. 就医流水号（字符型，30位，必填） - @JSONField(name = "mdtrt_sn") - private String mdtrtSn; - - // 15. 人员编号（字符型，30位，非必填） - @JSONField(name = "psn_no") - private String psnNo; - - // 16. 人员证件类型（字符型，6位，必填） - @JSONField(name = "psn_cert_type") - private String psnCertType; - - // 17. 证件号码（字符型，50位，非必填） - @JSONField(name = "certno") - private String certno; - - // 18. 人员姓名（字符型，50位，非必填） - @JSONField(name = "psn_name") - private String psnName; - - // 19. 生产批号（字符型，30位，必填） - @JSONField(name = "manu_lotnum") - private String manuLotnum; - - // 20. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 21. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 22. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 23. 拆零标志（字符型，3位，必填） - @JSONField(name = "trdn_flag") - private String trdnFlag; - - // 24. 最终成交单价（数值型，16位含6位小数，非必填） - @JSONField(name = "finl_trns_pric") - private BigDecimal finlTrnsPric; - - // 25. 处方号（字符型，40位，非必填） - @JSONField(name = "rxno") - private String rxno; - - // 26. 外购处方标志（字符型，3位，必填） - @JSONField(name = "rx_circ_flag") - private String rxCircFlag; - - // 27. 零售单据号（字符型，40位，必填） - @JSONField(name = "rtal_docno") - private String rtalDocno; - - // 29. 销售出库单据号（字符型，40位，非必填） - @JSONField(name = "stoout_no") - private String stooutNo; - - // 30. 批次号（字符型，30位，非必填） - @JSONField(name = "bchno") - private String bchno; - - // 32. 药品条形码（字符型，30位，非必填） - @JSONField(name = "drug_prod_barc") - private String drugProdBarc; - - // 33. 货架位（字符型，20位，非必填） - @JSONField(name = "shelf_posi") - private String shelfPosi; - - // 34. 销售/退货数量（数值型，16位含4位小数，必填） - @JSONField(name = "sel_retn_cnt") - private BigDecimal selRetnCnt; - - // 35. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "sel_retn_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date selRetnTime; - - // 36. 销售/退货经办人姓名（字符型，50位，必填） - @JSONField(name = "sel_retn_opter_name") - private String selRetnOpterName; - - // 37. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 38. 就诊结算类型（字符型，6位，非必填） - @JSONField(name = "mdtrt_setl_type") - private String mdtrtSetlType; - - @JSONField(name = "drugtracinfo") - private String drugtracinfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java deleted file mode 100644 index 80ceb83d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Param.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【3505】商品销售 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Medical3505Param { - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 5. 开方医师证件类型（字符型，6位，非必填） - @JSONField(name = "prsc_dr_cert_type") - private String prscDrCertType; - - // 6. 开方医师证件号码（字符型，50位，非必填） - @JSONField(name = "prsc_dr_certno") - private String prscDrCertno; - - // 7. 开方医师姓名（字符型，50位，必填） - @JSONField(name = "prsc_dr_name") - private String prscDrName; - - // 8. 药师证件类型（字符型，6位，非必填） - @JSONField(name = "phar_cert_type") - private String pharCertType; - - // 9. 药师证件号码（字符型，50位，非必填） - @JSONField(name = "phar_certno") - private String pharCertno; - - // 10. 药师姓名（字符型，50位，必填） - @JSONField(name = "phar_name") - private String pharName; - - // 11. 药师执业资格证号（字符型，50位，必填） - @JSONField(name = "phar_prac_cert_no") - private String pharPracCertNo; - - // 12. 医保费用结算类型（字符型，6位，必填） - @JSONField(name = "hi_feesetl_type") - private String hiFeesetlType; - - // 13. 结算ID（字符型，30位，非必填） - @JSONField(name = "setl_id") - private String setlId; - - // 14. 就医流水号（字符型，30位，必填） - @JSONField(name = "mdtrt_sn") - private String mdtrtSn; - - // 15. 人员编号（字符型，30位，非必填） - @JSONField(name = "psn_no") - private String psnNo; - - // 16. 人员证件类型（字符型，6位，必填） - @JSONField(name = "psn_cert_type") - private String psnCertType; - - // 17. 证件号码（字符型，50位，非必填） - @JSONField(name = "certno") - private String certno; - - // 18. 人员姓名（字符型，50位，非必填） - @JSONField(name = "psn_name") - private String psnName; - - // 19. 生产批号（字符型，30位，必填） - @JSONField(name = "manu_lotnum") - private String manuLotnum; - - // 20. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 21. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 22. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 23. 拆零标志（字符型，3位，必填） - @JSONField(name = "trdn_flag") - private String trdnFlag; - - // 24. 最终成交单价（数值型，16位含6位小数，非必填） - @JSONField(name = "finl_trns_pric") - private BigDecimal finlTrnsPric; - - // 25. 处方号（字符型，40位，非必填） - @JSONField(name = "rxno") - private String rxno; - - // 26. 外购处方标志（字符型，3位，必填） - @JSONField(name = "rx_circ_flag") - private String rxCircFlag; - - // 27. 零售单据号（字符型，40位，必填） - @JSONField(name = "rtal_docno") - private String rtalDocno; - - // 29. 销售出库单据号（字符型，40位，非必填） - @JSONField(name = "stoout_no") - private String stooutNo; - - // 30. 批次号（字符型，30位，非必填） - @JSONField(name = "bchno") - private String bchno; - - // 32. 药品条形码（字符型，30位，非必填） - @JSONField(name = "drug_prod_barc") - private String drugProdBarc; - - // 33. 货架位（字符型，20位，非必填） - @JSONField(name = "shelf_posi") - private String shelfPosi; - - // 34. 销售/退货数量（数值型，16位含4位小数，必填） - @JSONField(name = "sel_retn_cnt") - private BigDecimal selRetnCnt; - - // 35. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "sel_retn_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date selRetnTime; - - // 36. 销售/退货经办人姓名（字符型，50位，必填） - @JSONField(name = "sel_retn_opter_name") - private String selRetnOpterName; - - // 37. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 38. 就诊结算类型（字符型，6位，非必填） - @JSONField(name = "mdtrt_setl_type") - private String mdtrtSetlType; - - // 39. 溯源码节点信息（字符型，长度未明确，暂定500位） - @JSONField(name = "drugtracinfo") - private JSONArray drugtracinfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java deleted file mode 100644 index 6b3df3a0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3505Result.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【3505】【3506】商品销售 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Medical3505Result { - - // 返回结果 - @JSONField(name = "retRslt") - private String retRslt; - - // 返回信息 - @JSONField(name = "msgRslt") - private String msgRslt; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java deleted file mode 100644 index 360358b4..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3506Param.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 【3506】商品销售退货 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Medical3506Param { - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 5. 结算ID（字符型，30位，非必填） - @JSONField(name = "setl_id") - private String setlId; - - // 6. 人员编号（字符型，30位，非必填） - @JSONField(name = "psn_no") - private String psnNo; - - // 7. 人员证件类型（字符型，6位，必填） - @JSONField(name = "psn_cert_type") - private String psnCertType; - - // 8. 证件号码（字符型，50位，非必填） - @JSONField(name = "certno") - private String certno; - - // 9. 人员姓名（字符型，50位，非必填） - @JSONField(name = "psn_name") - private String psnName; - - // 10. 生产批号（字符型，30位，必填） - @JSONField(name = "manu_lotnum") - private String manuLotnum; - - // 11. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 12. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 13. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 14. 拆零标志（字符型，3位，必填） - @JSONField(name = "trdn_flag") - private String trdnFlag; - - // 15. 最终成交单价（数值型，16位含6位小数，非必填） - @JSONField(name = "finl_trns_pric") - private BigDecimal finlTrnsPric; - - // 16. 销售/退货数量（数值型，16位含4位小数，必填） - @JSONField(name = "sel_retn_cnt") - private BigDecimal selRetnCnt; - - // 17. 销售/退货时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "sel_retn_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date selRetnTime; - - // 18. 销售/退货经办人姓名（字符型，50位，必填） - @JSONField(name = "sel_retn_opter_name") - private String selRetnOpterName; - - // 19. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 20. 商品销售流水号（字符型，50位，非必填） - @JSONField(name = "medins_prod_sel_no") - private String medinsProdSelNo; - - // 21. 就医流水号（字符型，30位，必填） - @JSONField(name = "mdtrt_sn") - private String mdtrtSn; - - // 22. 溯源码节点信息（字符型，长度未明确，暂定500位） - @JSONField(name = "drugtracinfo") - private JSONArray drugtracinfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java deleted file mode 100644 index b81f2321..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3507Param.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *【3507】商品信息删除 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Medical3507Param { - - // 定点医药机构批次流水号 - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 进销存数据类型 - @JSONField(name = "inv_data_type") - private String invDataType; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java deleted file mode 100644 index c1622648..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Param.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - *【3508】定点医药机构商品库存信息查询 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Medical3508Param { - // 定点医药机构编号 - private String fixmedinsCode; - - // 医药机构目录编码 - private String medinsListCodg; - - // 定点医药机构批次流水号 - private String fixmedinsBchno; - - // 开始日期 - private Date begndate; - - // 结束日期 - private Date enddate; - - // 定点医药机构商品库存流水号 - private String medinsProdInvNo; - - // 医疗目录编码 - private String medListCodg; - - // 医药机构目录名称 - private String medinsListName; - - // 处方药标志 - private String rxFlag; - - // 目录特项标志 - private String listSpItemFlag; - - // 拆零标志 - private String trdnFlag; - - // 库存日期 - private Date invdate; - - // 生产批号 - private String manuLotnum; - - // 生产日期 - private Date manuDate; - - // 有效期止 - private Date expyEnd; - - // 备注 - private String memo; - - // 有效标志 - private String valiFlag; - - // 数据唯一记录号 - private String rid; - - // 创建人ID - private String crterId; - - // 创建人姓名 - private String crterName; - - // 创建机构编号 - private String crteOptinsNo; - - // 经办人ID - private String opterId; - - // 经办人姓名 - private String opterName; - - // 经办机构编号 - private String optinsNo; - - // 统筹区编号 - private String poolareaNo; - - // 说明：medins_list_codg和fixmedins_bchno为互斥必填项，至少传其中一个字段 -} - diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java deleted file mode 100644 index 29d550cb..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Medical3508Result.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *【3508】定点医药机构商品库存信息查询 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Medical3508Result { - - // 有效期止 - private Date expyEnd; - - // 医疗目录编码 - private String medListCodg; - - // 统筹区编号 - private String poolareaNo; - - // 创建机构编号 - private String crteOptinsNo; - - // 库存数量 - private BigDecimal invCnt; - - // 医药机构目录编码 - private String medinsListCodg; - - // 备注 - private String memo; - - // 数据更新时间 - private Date updtTime; - - // 生产日期 - private Date manuDate; - - // 经办人姓名 - private String opterName; - - // 数据唯一记录号 - private String rid; - - // 数据创建时间 - private Date crteTime; - - // 库存日期 - private Date invdate; - - // 有效标志 - private String valiFlag; - - // 定点医药机构编号 - private String fixmedinsCode; - - // 处方药标志 - private String rxFlag; - - // 目录特项标志 - private String listSpItemFlag; - - // 定点医药机构批次流水号 - private String fixmedinsBchno; - - // 经办时间 - private Date optTime; - - // 经办人ID - private String opterId; - - // 生产批号 - private String manuLotnum; - - // 医药机构目录名称 - private String medinsListName; - - // 创建人姓名 - private String crterName; - - // 定点医药机构商品库存流水号 - private String medinsProdInvNo; - - // 创建人ID - private String crterId; - - // 经办机构编号 - private String optinsNo; - - // 拆零标志 - private String trdnFlag; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java deleted file mode 100644 index be4cc2a5..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301ListParam.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.openhis.vo; - -import lombok.Data; - -import java.util.List; - -/** - * MedicalDirectory3301ListParam - * - * @author Wuser - * @date 2025/5/24 - */ -@Data -public class MedicalDirectory3301ListParam { - List data; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java deleted file mode 100644 index f13948b0..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3301Param.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *【3301】目录对照上传 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MedicalDirectory3301Param { - - // 定点医药机构目录编号 - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 定点医药机构目录名称 - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 目录类别 - @JSONField(name = "list_type") - private String listType; - - // 医疗目录编码 - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 开始日期 - @JSONField(name = "begndate") - private String begndate; - - // 结束日期 - @JSONField(name = "enddate") - private String enddate; - - // 批准文号 - private String aprvno; - - // 剂型 - private String dosform; - - // 除外内容 - private String exctCont; - - // 项目内涵 - private String itemCont; - - // 计价单位 - private String prcunt; - - // 规格 - private String spec; - - // 包装规格 - private String pacspec; - - // 备注 - private String memo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java deleted file mode 100644 index 398587cf..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302Param.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MedicalDirectory3302Param { - // 定点医药机构编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - // 定点医药机构目录编号 - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 目录类别 - @JSONField(name = "list_type") - private String listType; - - // 医疗目录编码 - @JSONField(name = "med_list_codg") - private String medListCodg; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java deleted file mode 100644 index c3c4df05..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalDirectory3302ParamDto.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *【3302】目录对照撤销 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MedicalDirectory3302ParamDto { - - // 定点医药机构编号 - private String fixmedinsCode; - - // 定点医药机构目录编号 - private String fixmedinsHilistId; - - // 目录类别 - private String listType; - - // 医疗目录编码 - private String medListCodg; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java deleted file mode 100644 index c95b7477..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3501Param.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *【3501】商品盘存上传 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MedicalInventory3501Param { - - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 5. 盘存日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "invdate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date invdate; - - // 6. 库存数量（数值型，16位含2位小数，必填） - @JSONField(name = "inv_cnt") - private BigDecimal invCnt; - - // 7. 生产批号（字符型，30位，非必填） - @JSONField(name = "manu_lotnum") - private String manuLotnum; - - // 8. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 9. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 10. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 11. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java deleted file mode 100644 index a7b67da5..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalInventory3502Param.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【3502】商品库存变更 - * - * @author SunJQ - * @date 2025-04-16 - */ - -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MedicalInventory3502Param { - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 库存变更类型（字符型，6位，必填） - @JSONField(name = "inv_chg_type") - private String invChgType; - - // 3. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 4. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 5. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 6. 单价（数值型，16位含6位小数，必填） - @JSONField(name = "pric") - private BigDecimal pric; - - // 7. 数量（数值型，16位含4位小数，必填） - @JSONField(name = "cnt") - private BigDecimal cnt; - - // 8. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 9. 库存变更时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "inv_chg_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date invChgTime; - - // 10. 库存变更经办人姓名（字符型，50位，非必填） - @JSONField(name = "inv_chg_opter_name") - private String invChgOpterName; - - // 11. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 12. 拆零标志（字符型，2位，必填） - @JSONField(name = "trdn_flag") - private String trdnFlag; - - // 13. 溯源码节点信息（字符型，长度未明确，暂定500位） - @JSONField(name = "drugtracinfo") - private JSONArray drugtracinfo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java deleted file mode 100644 index be8d63b8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalPurchase3504Param.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *【3504】商品采购退货 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MedicalPurchase3504Param { - // 1. 医疗目录编码（字符型，50位，必填） - @JSONField(name = "med_list_codg") - private String medListCodg; - - // 2. 定点医药机构目录编号（字符型，30位，必填） - @JSONField(name = "fixmedins_hilist_id") - private String fixmedinsHilistId; - - // 3. 定点医药机构目录名称（字符型，200位，必填） - @JSONField(name = "fixmedins_hilist_name") - private String fixmedinsHilistName; - - // 4. 定点医药机构批次流水号（字符型，30位，必填） - @JSONField(name = "fixmedins_bchno") - private String fixmedinsBchno; - - // 5. 供应商名称（字符型，200位，必填） - @JSONField(name = "spler_name") - private String splerName; - - // 6. 供应商许可证号（字符型，50位，非必填） - @JSONField(name = "spler_pmtno") - private String splerPmtno; - - // 7. 生产日期（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "manu_date") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date manuDate; - - // 8. 有效期止（日期型，必填，格式：yyyy-MM-dd） - @JSONField(name = "expy_end") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date expyEnd; - - // 9. 最终成交单价（数值型，16位含6位小数，非必填） - @JSONField(name = "finl_trns_pric") - private BigDecimal finlTrnsPric; - - // 10. 采购/退货数量（数值型，16位含4位小数，必填） - @JSONField(name = "purc_retn_cnt") - private BigDecimal purcRetnCnt; - - // 11. 采购发票编码（字符型，50位，非必填） - @JSONField(name = "purc_invo_codg") - private String purcInvoCodg; - - // 12. 采购发票号（字符型，50位，必填） - @JSONField(name = "purc_invo_no") - private String purcInvoNo; - - // 13. 处方药标志（字符型，3位，必填） - @JSONField(name = "rx_flag") - private String rxFlag; - - // 14. 采购/退货入库时间（日期时间型，必填，格式：yyyy-MM-dd HH:mm:ss） - @JSONField(name = "purc_retn_stoin_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date purcRetnStoinTime; - - // 15. 采购/退货经办人姓名（字符型，50位，必填） - @JSONField(name = "purc_retn_opter_name") - private String purcRetnOpterName; - - // 16. 备注（字符型，500位，非必填） - @JSONField(name = "memo") - private String memo; - - // 20. 商品采购流水号（字符型，50位，非必填） - @JSONField(name = "medins_prod_purc_no") - private String medinsProdPurcNo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java deleted file mode 100644 index d2a61415..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/MedicalTraceNoDto.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 药品追溯码dto - * - * @author zwh - * @date 2025-05-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class MedicalTraceNoDto { - - // 药品追溯码（字符型，100） - @JSONField(name = "drug_trac_codg") - private String drugTracCodg; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java deleted file mode 100644 index 402a849b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PatientInfoDto.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.openhis.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; -import java.util.List; - -@Data -@Accessors(chain = true) -public class PatientInfoDto { - - //患者信息 - /** ID */ - @TableId(type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** 活动标记 */ - private Integer activeFlag; - - /** 临时标识 */ - private Integer tempFlag; - - /** 患者姓名 */ - private String name; - - /** 患者院内编码/病历号 */ - private String busNo; - - /** 性别编码 */ - private Integer genderEnum; - - /** 生日 */ - private Date birthDate; - - /** 民族 */ - private String nationalityCode; - - /** 身份证号 */ - private String idCard; - - /** 拼音码 */ - private String pyStr; - - /** 五笔码 */ - private String wbStr; - - /** 机构Id */ - private Long organizationId; - - /** 特慢病等 */ - private List feedetail; - - //医保信息 2025/05/23 弃用，费用性质固定，如农大只有省医保，费用性质只显示省医保和自费即可，由@GetMapping(value = "/contract-list")接口提供数据 - /** 合同Id */ - private Long contractId;//弃用 2025/05/23 - - /** 合同名称 */ - private String contractName;//弃用 2025/05/23 - - /** 状态 */ - private Integer statusEnum;//弃用 2025/05/23 - - /** 合同的类别 */ - private Integer categoryEnum;//弃用 2025/05/23 - - /** 合同编码 */ - private String contractBusNo;//弃用 2025/05/23 - - /** 机构 */ - private Long contractOrgId;//弃用 2025/05/23 - - /** 是否医保 */ - private Integer ybFlag;//弃用 2025/05/23 - - /** 医保区划 */ - private String admVs;//弃用 2025/05/23 - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java deleted file mode 100644 index 9ec1ebed..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDetailDto.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; - -/** - * 支付详情 - * - * @author SunJQ - * @date 2025-03-29 - */ -@Data -@Accessors(chain = true) -public class PaymentDetailDto { - - - /** 支付类型 */ - private Integer payEnum; - - /** 支付类型等级 */ - private Integer payLevelEnum; - - /** 金额 */ - private BigDecimal amount; - - /** 找零 */ - private BigDecimal returnAmount; - - /** 交款 */ - private BigDecimal chargeAmount; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java deleted file mode 100644 index bef21285..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentDto.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.math.BigDecimal; -import java.util.List; - -/** - * 付款入参 - * - * @author SunJQ - * @date 2025-03-29 - */ -@Data -@Accessors(chain = true) -public class PaymentDto { - - /** - * id - */ - private Long id; - - /** 收款员 */ - private Long entererId; - - /** 支付的患者ID */ - @NotNull - private Long patientId; - - /** 应收金额 */ - private BigDecimal tenderedAmount; - - /** 找零金额 */ - private BigDecimal returnedAmount; - - /** 付款总额 */ - private BigDecimal displayAmount; - - /** 就诊ID */ - @JsonSerialize(using = ToStringSerializer.class) - private Long encounterId; - - /** 收费项 */ - private List chargeItemIds;//收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合 - - /** 支付详细 */ - @NotEmpty - private List paymentDetails; - - /** 支付批次号 */ - private List chrgBchnoList;//医保预结算时返回，医保结算时必传，否则结算时一直预结算 - - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java deleted file mode 100644 index eed99e0e..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentSettleDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -@Data -@Accessors(chain = true) -public class PaymentSettleDto { - - private Date endTime; - - private Date startTime; - - private Long enterId; - - private String contractNo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java deleted file mode 100644 index 80af764c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PaymentVO.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 映射对象 - * - * @author SunJQ - * @date 2025-05-06 - */ -@Data -public class PaymentVO { - - /** ID */ - private Long id; - - /** 状态 */ - private Integer statusEnum; - - /** 关联ID */ - private Long relationId; - - /** 支付的业务标识符 */ - private String paymentNo; - - /** 付款类别 */ - private Integer paymentEnum; - - /** 付款实体ID */ - private Long paymentReconciliationId; - - /** 发起支付的工作流程类别 */ - private Integer kindEnum; - - /** 收款员 */ - private Long entererId; - - /** 支付发起人类型 */ - private Integer issuerEnum; - - /** 支付的患者ID */ - private Long patientId; - - /** 请求支付责任人ID */ - private Long practitionerId; - - /** 付款结果 */ - private Integer outcomeEnum; - - /** 支付位置 */ - private Long locationId; - - /** 到期时间 */ - private Date expirationDate; - - /** 应收金额 */ - private BigDecimal tenderedAmount; - - /** 找零金额 */ - private BigDecimal returnedAmount; - - /** 付款总额 */ - private BigDecimal displayAmount; - - /** 打印标识 */ - private Integer printCount; - - /** 合同编码 */ - private String contractNo; - - /** 处方号集合 */ - private String chargeItemIds; - - /** 就诊ID */ - private Long encounterId; - - /** 结算时间 */ - private Date billDate; - - /** 发票编号 */ - private Long invoiceId; - - /** 关联账户Id */ - private Long accountId; - - /** 医保清算标志 */ - private Integer ybClearFlag; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java deleted file mode 100644 index a44b91d4..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalCnl25004Param.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【25004】人员生育审批撤销 - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersBirthApprovalCnl25004Param { - - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 待遇申报明细流水号 - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java deleted file mode 100644 index 84c5f0b4..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthApprovalSel25005Param.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【25005】人员生育审批查询 - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersBirthApprovalSel25005Param { - // 1. 人员编号（既是输入参数也是输出参数） - @JSONField(name = "psn_no") - private String psnNo; - - // --- 输出参数 --- - - // 1. 待遇申报明细流水号（字符型，30位，必填） - @JSONField(name = "trtDclaDetlSn") - private String trtDclaDetlSn; - - // 2. 险种类型（字符型，6位，必填） - @JSONField(name = "insutype") - private String insutype; - - // 3. 人员证件号码（字符型，30位，必填） - @JSONField(name = "certno") - private String certno; - - // 4. 审批定点医药机构编号（字符型，30位，必填） - @JSONField(name = "fixmedinscode") - private String fixmedinscode; - - // 5. 审批定点医药机构名称（字符型，200位，必填） - @JSONField(name = "fixmedinsname") - private String fixmedinsname; - - // 6. 人员姓名（字符型，50位，必填） - @JSONField(name = "psn_name") - private String psnName; - - // 7. 开始时间（日期型，必填） - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "begndate") - private Date begndate; - - // 8. 终止时间（日期型，必填） - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "enddate") - private Date enddate; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java deleted file mode 100644 index ae5cbb1d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersBirthRecord25003Param.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【25003】人员生育备案 - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersBirthRecord25003Param { - - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 联系电话 - @JSONField(name = "tel") - private String tel; - - // 3. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 4. 参保机构医保区划 - @JSONField(name = "insu_admdvs") - private String insuAdmdvs; - - // 5. 定点医药机构编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - // 6. 定点医药机构名称 - @JSONField(name = "fixmedins_name") - private String fixmedinsName; - - // 7. 孕周数 - @JSONField(name = "esso_val") - private Integer essoVal; - - // 8. 生育待遇申报人类别 - @JSONField(name = "matn_trt_dclaer_type") - private String matnTrtDclaerType; - - // 9. 末次月经日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "last_mena_date") - private Date lastMenaDate; - - // 10. 预计生育日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "plan_matn_date") - private Date planMatnDate; - - // 11. 申报日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "dcla_date") - private Date dclaDate; - - // 12. 配偶姓名 - @JSONField(name = "spus_name") - private String spusName; - - // 13. 配偶证件类型 - @JSONField(name = "spus_cert_type") - private String spusCertType; - - // 14. 配偶证件号码 - @JSONField(name = "spus_certno") - private String spusCertno; - - // 15. 生育类别 - @JSONField(name = "matn_type") - private String matnType; - - // 16. 胎次 - @JSONField(name = "fetts") - private BigDecimal fetts; - - // 17. 计划生育服务证号 - @JSONField(name = "fpsc_no") - private String fpscNo; - - // 18. 开始日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "begndate") - private Date begndate; - - // 19. 结束日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "enddate") - private Date enddate; - - // 20. 联系地址 - @JSONField(name = "addr") - private String addr; - - // --- 输出参数 --- - - // 1. 待遇申报明细流水号 - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String outputPsnNo; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java deleted file mode 100644 index 294edd80..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDis2503Param.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【2503】人员慢特病备案（输入） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersChrDis2503Param { - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 3. 门慢门特病种目录代码 - @JSONField(name = "opsp_dise_code") - private String opspDiseCode; - - // 4. 门慢门特病种名称 - @JSONField(name = "opsp_dise_name") - private String opspDiseName; - - // 5. 联系电话 - @JSONField(name = "tel") - private String tel; - - // 6. 联系地址 - @JSONField(name = "addr") - private String addr; - - // 7. 参保机构医保区划 - @JSONField(name = "insu_optins") - private String insuOptins; - - // 8. 鉴定定点医药机构编号 - @JSONField(name = "ide_fixmedins_no") - private String ideFixmedinsNo; - - // 9. 鉴定定点医药机构名称 - @JSONField(name = "ide_fixmedins_name") - private String ideFixmedinsName; - - // 10. 医院鉴定日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "hosp_ide_date") - private Date hospIdeDate; - - // 11. 诊断医师编码 - @JSONField(name = "diag_dr_codg") - private String diagDrCodg; - - // 12. 诊断医师姓名 - @JSONField(name = "diag_dr_name") - private String diagDrName; - - // 13. 开始日期 - @JSONField(name = "begndate", format = "yyyy-MM-dd") - private Date begndate; - - // 15. 结束日期 - @JSONField(name = "enddate", format = "yyyy-MM-dd") - private Date enddate; - - // 16. 待遇申报明细流水号（输出） - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java deleted file mode 100644 index 0d001129..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersChrDisCxl2504Param.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【2504】人员慢特病备案撤销（输入） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersChrDisCxl2504Param { - // 1. 待遇申报明细流水号 - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 备注 - @JSONField(name = "memo") - private String memo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java deleted file mode 100644 index b32fad03..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPt2505Param.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【2505】人员定点备案（输入） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersDesigPt2505Param { - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 联系电话 - @JSONField(name = "tel") - private String tel; - - // 3. 联系地址 - @JSONField(name = "addr") - private String addr; - - // 4. 业务申请类型 - @JSONField(name = "biz_appy_type") - private String bizAppyType; - - // 5. 开始日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "begndate") - private Date begndate; - - // 6. 结束日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "enddate") - private Date enddate; - - // 7. 代办人姓名 - @JSONField(name = "agnter_name") - private String agnterName; - - // 8. 代办人证件类型 - @JSONField(name = "agnter_cert_type") - private String agnterCertType; - - // 9. 代办人证件号码 - @JSONField(name = "agnter_certno") - private String agnterCertno; - - // 10. 代办人联系方式 - @JSONField(name = "agnter_tel") - private String agnterTel; - - // 11. 代办人联系地址 - @JSONField(name = "agnter_addr") - private String agnterAddr; - - // 12. 代办人关系 - @JSONField(name = "agnter_rlts") - private String agnterRlts; - - // 13. 定点排序号 - @JSONField(name = "fix_srt_no") - private String fixSrtNo; - - // 14. 定点医药机构编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - // 15. 定点医药机构名称 - @JSONField(name = "fixmedins_name") - private String fixmedinsName; - - // 16. 备注 - @JSONField(name = "memo") - private String memo; - - // 17. 扩展字段 - @JSONField(name = "extData") - private JSONObject extData; - - // 18. 待遇申报明细流水号（输出） - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java deleted file mode 100644 index 5433db09..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersDesigPtCxl2506Param.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【2506】人员定点备案撤销（输入） - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersDesigPtCxl2506Param { - // 1. 待遇申报明细流水号 - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 备注（填写撤销原因） - @JSONField(name = "memo") - private String memo; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java deleted file mode 100644 index f596bda2..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedApprovalCnl25006Param.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【25006】人员特药审批撤销 - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersMedApprovalCnl25006Param { - // 1. 人员编号（字符型，30位，必填） - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 待遇申报明细流水号（字符型，30位，必填） - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java deleted file mode 100644 index 429ae193..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedRecord25001Param.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 【25001】人员特药备案 - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersMedRecord25001Param { - - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 3. 参保机构医保区划 - @JSONField(name = "insu_admdv") - private String insuAdmdv; - - // 4. 定点医药机构编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - // 5. 定点医药机构名称 - @JSONField(name = "fixmedins_name") - private String fixmedinsName; - - // 6. 目录类别 - @JSONField(name = "list_type") - private String listType; - - // 7. 医保目录编码 - @JSONField(name = "hilist_code") - private String hilistCode; - - // 8. 医保目录名称 - @JSONField(name = "hilist_name") - private String hilistName; - - // 9. 数量 - @JSONField(name = "cnt") - private BigDecimal cnt; - - // 10. 数量单位 - @JSONField(name = "cnt_prcunt") - private String cntPrcunt; - - // 11. 开始日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "begndate") - private Date begndate; - - // 12. 结束日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "enddate") - private Date enddate; - - // 13. 诊断代码 - @JSONField(name = "diag_code") - private String diagCode; - - // 14. 诊断名称 - @JSONField(name = "diag_name") - private String diagName; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java deleted file mode 100644 index eacaa84b..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Param.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【25002】人员特药备案查询（输入） - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersMedSelect25002Param { - - // 1. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 2. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 3. 用作比较的时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "compare_date") - private Date compareDate; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java deleted file mode 100644 index 98ec3dd8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersMedSelect25002Result.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【25002】人员特药备案查询（输出） - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersMedSelect25002Result { - - // 1. 待遇申报明细流水号 - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; - - // 2. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 3. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 4. 参保地医保区划 - @JSONField(name = "insu_admdv") - private String insuAdmdv; - - // 5. 定点医药机构编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - // 6. 定点医药机构名称 - @JSONField(name = "fixmedins_name") - private String fixmedinsName; - - // 7. 目录类别 - @JSONField(name = "list_type") - private String listType; - - // 8. 医保目录编码 - @JSONField(name = "hilist_code") - private String hilistCode; - - // 9. 医保目录名称 - @JSONField(name = "hilist_name") - private String hilistName; - - // 10. 人员姓名 - @JSONField(name = "psn_name") - private String psnName; - - // 11. 开始时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "begndate") - private Date begndate; - - // 12. 终止时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "enddate") - private Date enddate; - - // 13. 经办人id - @JSONField(name = "opter_id") - private String opterId; - - // 14. 经办人姓名 - @JSONField(name = "opter_name") - private String opterName; - - // 15. 经办时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "opt_time") - private Date optTime; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java deleted file mode 100644 index b46995ba..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PersUnintInj2507Param.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 【2507】人员意外伤害备案（输入） - * - * @author gaoyy - * @date 2025-05-09 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class PersUnintInj2507Param { - // 1. 申报来源 - @JSONField(name = "dcla_souc") - private String dclaSouc; - - // 2. 险种类型 - @JSONField(name = "insutype") - private String insutype; - - // 3. 人员编号 - @JSONField(name = "psn_no") - private String psnNo; - - // 4. 人员参保关系ID - @JSONField(name = "psn_insu_rlts_id") - private String psnInsuRltsId; - - // 5. 人员证件类型 - @JSONField(name = "psn_cert_type") - private String psnCertType; - - // 6. 证件号码 - @JSONField(name = "certno") - private String certno; - - // 7. 人员姓名 - @JSONField(name = "psn_name") - private String psnName; - - // 8. 性别 - @JSONField(name = "gend") - private String gend; - - // 9. 民族 - @JSONField(name = "naty") - private String naty; - - // 10. 出生日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "brdy") - private Date brdy; - - // 11. 联系电话 - @JSONField(name = "tel") - private String tel; - - // 12. 联系地址 - @JSONField(name = "addr") - private String addr; - - // 13. 参保所属医保区划 - @JSONField(name = "insu_admdvs") - private String insuAdmdvs; - - // 14. 单位编号 - @JSONField(name = "emp_no") - private String empNo; - - // 15. 单位名称 - @JSONField(name = "emp_name") - private String empName; - - // 16. 就医地医保区划 - @JSONField(name = "mdtrtarea_admdvs") - private String mdtrtareaAdmdvs; - - // 17. 定点医药机构编号 - @JSONField(name = "fixmedins_code") - private String fixmedinsCode; - - // 18. 定点医药机构名称 - @JSONField(name = "fixmedins_name") - private String fixmedinsName; - - // 19. 医院等级 - @JSONField(name = "hosp_lv") - private String hospLv; - - // 20. 入院时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "adm_time") - private Date admTime; - - // 21. 受伤时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JSONField(name = "trum_time") - private Date trumTime; - - // 22. 受伤地点 - @JSONField(name = "trum_site") - private String trumSite; - - // 23. 致伤原因 - @JSONField(name = "trum_rea") - private String trumRea; - - // 24. 审核支付标志 - @JSONField(name = "chk_pay_flag") - private String chkPayFlag; - - // 25. 代办人姓名 - @JSONField(name = "agnter_name") - private String agnterName; - - // 26. 代办人证件类型 - @JSONField(name = "agnter_cert_type") - private String agnterCertType; - - // 27. 代办人证件号码 - @JSONField(name = "agnter_certno") - private String agnterCertno; - - // 28. 代办人联系方式 - @JSONField(name = "agnter_tel") - private String agnterTel; - - // 29. 代办人联系地址 - @JSONField(name = "agnter_addr") - private String agnterAddr; - - // 30. 代办人关系 - @JSONField(name = "agnter_rlts") - private String agnterRlts; - - // 31. 开始日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "begndate") - private Date begndate; - - // 32. 结束日期 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JSONField(name = "enddate") - private Date enddate; - - // 33. 备注 - @JSONField(name = "memo") - private String memo; - - // 34. 待遇申报明细流水号（输出） - @JSONField(name = "trt_dcla_detl_sn") - private String trtDclaDetlSn; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java deleted file mode 100644 index 80e2382c..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/PrePaymentDto.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * 预结算入参 - * - * @author SunJQ - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -public class PrePaymentDto { - - /** 收款员 */ - private Long entererId; - - /** 支付的患者ID */ - @NotNull - private Long patientId; - - /** 就诊ID */ - private Long encounterId; - - /** 收费项 */ - @NotEmpty - private List chargeItemIds;// - - private String busiCardInfo;//社保卡号/身份证号/ecToken -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Result.java deleted file mode 100644 index 7edfbbd1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Result.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.openhis.vo; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - - -@Data -@ApiModel(value="接口返回对象", description="接口返回对象") -@JsonIgnoreProperties(ignoreUnknown = true) -public class Result implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 成功标志 - */ - @ApiModelProperty(value = "成功标志") - private boolean success = true; - - /** - * 返回处理消息 - */ - @ApiModelProperty(value = "返回处理消息") - private String message = "操作成功！"; - - /** - * 返回代码 - */ - @ApiModelProperty(value = "返回代码") - private Integer code = 0; - - /** - * 返回数据对象 data - */ - @ApiModelProperty(value = "返回数据对象") - private T result; - - /** - * 时间戳 - */ - @ApiModelProperty(value = "时间戳") - private long timestamp ; - - /** - * 创建一个错误响应 - * @param message 错误消息 - * @return Result 对象 - */ - public static Result error(String message) { - Result result = new Result<>(); - result.setSuccess(false); - result.setMessage(message); - result.setCode(500); // 通常用非零表示错误 - result.setTimestamp(System.currentTimeMillis()); - return result; - } - /** - * 创建一个错误响应 - * @param message 错误消息 - * @return Result 对象 - */ - public static Result error(String message,T data) { - Result result = new Result<>(); - result.result = data; - result.setSuccess(false); - result.setMessage(message); - result.setCode(500); // 通常用非零表示错误 - result.setTimestamp(System.currentTimeMillis()); - return result; - } - - public static Result okMsg(String message) { - Result result = new Result<>(); - result.setSuccess(true); - result.setMessage(message); - result.setCode(200); // 通常用非零表示错误 - result.setTimestamp(System.currentTimeMillis()); - return result; - } - - /** - * 创建一个成功响应 - * @param result 数据对象 - * @return Result 对象 - */ - public static Result success(T result) { - Result resultObj = new Result<>(); - resultObj.result = result; - resultObj.setSuccess(true); - resultObj.setMessage("操作成功！"); - resultObj.setCode(200); - resultObj.setResult(result); - resultObj.setTimestamp(System.currentTimeMillis()); - return resultObj; - } - - /** - * 创建一个成功响应 - * @param result 数据对象 - * @return Result 对象 - */ - public static Result ok(T result) { - Result resultObj = new Result<>(); - resultObj.result = result; - resultObj.setSuccess(true); - resultObj.setMessage("操作成功！"); - resultObj.setCode(200); - resultObj.setResult(result); - resultObj.setTimestamp(System.currentTimeMillis()); - return resultObj; - } - - /** - * 创建一个成功响应 - * @param result 数据对象 - * @return Result 对象 - */ - public static Result ok(String msg, T result) { - Result resultObj = new Result<>(); - resultObj.setSuccess(true); - resultObj.setMessage(msg); - resultObj.setCode(200); - resultObj.setResult(result); - resultObj.setTimestamp(System.currentTimeMillis()); - return resultObj; - } - -} \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java deleted file mode 100644 index f7d0faf5..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/ResultBody.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; - -/** - * 医保结果 - */ -@Data -public class ResultBody { - - /** 交易状态码 */ - @JSONField(name="infcode") - private String infcode; - /** 发送方报文ID */ - @JSONField(name="warnMsg") - private String warn_msg; - /** 数字签名信息 */ - @JSONField(name="cainfo") - private String cainfo; - /** 错误信息 */ - @JSONField(name="err_msg") - private String errMsg; - /** 接收报文时间 */ - @JSONField(name="refmsg_time") - private String refmsgTime; - /** 签名类型 */ - @JSONField(name="signtype") - private String signtype; - /** 响应报文时间 */ - @JSONField(name="respond_time") - private String respondTime; - /** 接收方报文ID */ - @JSONField(name="inf_refmsgid") - private String infRefmsgid; - /** 交易输出 */ - @JSONField(name="output") - private String output; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java deleted file mode 100644 index b6de1e25..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201DetailVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.openhis.vo; - -import java.math.BigDecimal; - -public class Settlement3201DetailVO { - - /** 医疗费用总额 */ - private BigDecimal medFeeSumAmt; - /** 基金支付总额 */ - private BigDecimal fundPaySumAmt; - /** 个人账户支付总额 */ - private BigDecimal acctPay; - /** 个人账户支付总额 */ - private BigDecimal acctGjPay; - /** 定点医药机构结算笔数 */ - private Integer fixMedInsSetlCnt; - - private String contractNo; - - private Integer insutype; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java deleted file mode 100644 index aaafd7dd..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201VO.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 【3201】后台计算结果 DB映射实体 - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -public class Settlement3201VO { - /** 医疗费用总额 */ - private BigDecimal medFeeSumAmt; - /** 基金支付总额 */ - private BigDecimal fundPaySumAmt; - /** 个人账户支付总额 */ - private BigDecimal acctPay; - /** 个人账户支付总额 */ - private BigDecimal acctGjPay; - /** 定点医药机构结算笔数 */ - private Integer fixMedInsSetlCnt; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java deleted file mode 100644 index 353b8c2d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3201WebParam.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 【3201】前台入参 - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -public class Settlement3201WebParam { - - /** 险种 */ - @NotNull - private String insuType; - /** 清算类别 */ - @NotNull - private String clrType;//住院或门诊 - /** 合同id */ - @NotNull - private Long contractId; - /** 医院id */ - @NotNull - private Long orgId; - /** 开始时间 */ - @NotNull - private String stmtBegnDate; - /** 结束时间 */ - @NotNull - private String stmtEndDate; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java deleted file mode 100644 index 955b1456..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202VO.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 【3201】后台计算结果 DB映射实体 - * - * @author SunJQ - * @date 2025-04-15 - */ -@Data -public class Settlement3202VO { - /** 医疗费用总额 */ - - private BigDecimal medFeeSumAmt; - /** 基金支付总额 */ - - private BigDecimal fundPaySumAmt; - /** 个人账户支付总额 */ - - private BigDecimal acctPay; - /** 个人账户支付总额 */ - - private BigDecimal acctGjPay; - /** 现金支付总额 */ - - private BigDecimal selfPayCash; - /** 微信支付总额 */ - - private BigDecimal selfPayVX; - /** 阿里支付总额 */ - - private BigDecimal selfPayALI; - /** 银行卡支付总额 */ - - private BigDecimal selfPayUNION; - /** 定点医药机构结算笔数 */ - - private Integer fixMedInsSetlCnt; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java deleted file mode 100644 index 033bb8a8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3202WebParam.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 【3202】前台入参 - * - * @author SunJQ - * @date 2025-04-17 - */ -@Data -public class Settlement3202WebParam { - /** 结算经办机构 */ - @NotNull - private String setlOptins;//前台传入,注意:先上传文件后核对明细的 - /** 清算类别 */ - private String clrType; - /** 文件查询号 */ - @NotNull - private String fileQuryNo; - /** 开始时间 */ - @NotNull - private String stmtBegnDate; - /** 结束时间 */ - @NotNull - private String stmtEndDate; - /** 医院id */ - private Long orgId; -// /** 医疗费用总额 */ -// @NotNull -// private BigDecimal medFeeSumAmt; -// /** 基金支付总额 */ -// @NotNull -// private BigDecimal fundPaySumAmt; -// /** 现金支付金额 */ -// @NotNull -// private BigDecimal cashPayAmt; -// /** 定点医药机构结算笔数 */ -// @NotNull -// private Integer fixMedInsSetlCnt; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java deleted file mode 100644 index 6974d35a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Settlement3209AWebParam.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; - -import java.util.Date; - -/** - * [3209A]前台传参 - * - * @author SunJQ - * @date 2025-04-29 - */ -@Data -public class Settlement3209AWebParam { - - // 清算类别 - @JSONField(name = "clr_type") - private String clrType; - - // 开始日期 - @JSONField(name = "begndate") - private Date begndate; - - // 结束日期 - @JSONField(name = "enddate") - private Date enddate; - - // 清算机构 - @JSONField(name = "clr_optins") - private String clrOptins; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java deleted file mode 100644 index cb42987a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; - -/** - *【9001】【9002】签到 签退 - * - * @author SunJQ - * @date 2025-04-16 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class Sign extends HisBaseEntity implements Serializable { - private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_UUID) - @JSONField(serialize=false) - private String id; - /**操作员编号*/ - @JSONField(name="opter_no") - private String opterNo; - /**签到编号*/ - @JSONField(name="sign_no") - private String signNo; - /**签到时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(serialize=false) - private java.util.Date signTime; - /**签退时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JSONField(serialize=false) - private java.util.Date signOutTime; - /**状态，0-新建，1-签到，2-签退*/ - @JSONField(serialize=false) - private String status; - /** 签到MAC地址 */ - @JSONField(name="mac") - private String mac; - /** 签到IP地址 */ - @JSONField(name="ip") - private String ip; -// -// /**租户ID*/ -// private String tenantId; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java deleted file mode 100644 index 08ff0454..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign1101Param.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -public class Sign1101Param { - /**操作员编号*/ - @JSONField(name="opter_no") - private String opterNo; - /** 签到MAC地址 */ - @JSONField(name="mac") - private String mac; - /** 签到IP地址 */ - @JSONField(name="ip") - private String ip; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java deleted file mode 100644 index 4ea0103a..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/Sign9001Result.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -public class Sign9001Result { - /**签到编号*/ - @JSONField(name="signNo") - private String signNo; - - /**操作员编号*/ - @JSONField(name="opterNo") - private String opterNo; - - @JSONField(name="signTime") - private java.util.Date signTime; - - @JSONField(name="status") - private String status; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java deleted file mode 100644 index 2ec5d3dc..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/SupplyItemDetail3503Dto.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 供应单据及供应项相关详细信息 dto - * - * @author zwh - * @date 2025-03-06 - */ -@Data -@Accessors(chain = true) -public class SupplyItemDetail3503Dto { - - /** ID */ - @JsonSerialize(using = ToStringSerializer.class) - private Long supplyId; - - /** 项目 */ - private String itemTable; - - /** 物品编码 */ - private Long itemId; - - /** 数量 */ - private BigDecimal itemQuantity; - - /** 项目单位 */ - private String itemUnit; - - /** 单价 */ - private BigDecimal price; - - /** 总价 */ - private BigDecimal totalPrice; - - /** 审批人 */ - private Long approverId; - - /** 源仓库 */ - private Long sourceLocationId; - - /** 源仓位 */ - private Long sourceLocationStoreId; - - /** 目的仓库 */ - private Long purposeLocationId; - - /** 目的仓位 */ - private Long purposeLocationStoreId; - - /** 供应商id */ - private Long supplierId; - - /** 供应商 */ - private String supplierName; - - /** 经手人 */ - private String practitionerName; - - /** 产品批号 */ - private String lotNumber; - - /** 追溯码 */ - private String traceNo; - - /** 发票码 */ - private String invoiceNo; - - /** 项目医保码 */ - private String ybNo; - - /** 单据号 */ - private String busNo; - - /** 项目编号 */ - private String itemBusNo; - - /** 开始时间 */ - private Date startTime; - - /** 结束时间 */ - private Date endTime; - - /** 服务id */ - private Long serviceId; - - /** 项目名称 */ - private String name; - - /** 拼音码 */ - private String pyStr; - - /** 五笔码 */ - private String wbStr; - - /** 常规单位 */ - private String unitCode; - - /** 最小单位 */ - private String minUnitCode; - - /** 拆零比 */ - private BigDecimal partPercent; - - /** 项目类型 */ - private String itemCategory; - - /** 处方标志 */ - private Integer rxFlag; - - /** 批准文号 */ - private String approvalNumber; - - /** 生产厂商文本 */ - private String manufacturerText; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java deleted file mode 100644 index a563e7f4..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionDetailInfoDto.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 医保电子处方信息 - * - * @author yuxj - * @date 2025-05-06 - */ -@Data -@Accessors(chain = true) -public class VeriPrescriptionDetailInfoDto { - - /** 处方号 */ - private String prescriptionNo; - /** 门诊号 */ - private String iptOtpNo; - /** 请求数量 */ - private Integer quantity; - /** 请求单位 */ - @Dict(dictCode = "unit_code") - private String unitCode; - private String unitCode_dictText; - /** 审核状态 */ - private Integer statusEnum; - private String statusEnum_enumText; - - /* --处方信息-- */ - /** 药品名 */ - private String medicationName; - /** 药品规格 */ - private String drugSpecification; - /** 药品剂量 */ - private BigDecimal medDosage; - /** 药品剂量单位 */ - @Dict(dictCode = "unit_code") - private String medDosageUnitCode; - private String medDosageUnitCode_dictText; - /** 使用频次 */ - @Dict(dictCode = "rate_code") - private String medFrequency; - private String medFrequency_dictText; - /** 途径 */ - @Dict(dictCode = "method_code") - private String medRoute; - private String medRoute_dictText; - /** 取药状态 */ - private String medStatus; - /** 处方状态 */ - private String prescriptionStatus; - /** 处方类别 */ - private Integer rxTypeCode; - private String rxTypeCode_enumText; - /** 支持用药信息 */ - private String supportInfo; - /** 服药时间(开始) */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDoseStart; - /** 服药时间(结束) */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") - private Date effectiveDoseEnd; - /** 给药间隔 */ - private String dispenseInterval; - /** 单次发药数 */ - private Integer dispensePerQuantity; - /** 每次发药供应天数 */ - private Integer dispensePerDuration; - - /* --就诊信息-- */ - /** 患者姓名 */ - private String patnName; - /** 身份证号 */ - private String certno; - /** 开方医生名 */ - private String practitionerName; - /** 挂号科室 */ - private String mdtrtDeptName; - /** 开单科室 */ - private String prscDeptName; - /** 挂号日期 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") - private Date mdtrtTime; - /** 处方开立日期 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") - private Date prscTime; - - /* --诊断信息-- */ - /** 诊断名 */ - private String conditionName; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java deleted file mode 100644 index 920f3f6f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionInfoDto.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * 医保电子处方信息 - * - * @author yuxj - * @date 2025-05-06 - */ -@Data -@Accessors(chain = true) -public class VeriPrescriptionInfoDto { - - /** 处方号 */ - private String prescriptionNo; - /** 门诊号 */ - private String iptOtpNo; - /** 姓名 */ - private String patientName; - /** 证件号 */ - private String certno; - /** 取药状态 */ - private String medStatus; - /** 状态 */ - private Integer statusEnum; - private String statusEnum_enumText; - /** 开单科室 */ - private String prscDeptName; - /** 挂号日期 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") - private Date mdtrtTime; - /** 处方开立日期 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") - private Date prscTime; - - /** 租户ID */ - private Integer tenantId; - /** 电子凭证线上身份核验流水号 */ - private String authNo; - /** 电子凭证令牌 */ - private String ecToken; - /** 医保处方编号 */ - private String hiRxno; - -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java deleted file mode 100644 index 0ec9554f..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/VeriPrescriptionParam.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright ©2023 CJB-CNIT Team. All rights reserved - */ -package com.openhis.vo; - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 医保电子处方信息查询条件 - * - * @author yuxj - * @date 2025-05-06 - */ -@Data -@Accessors(chain = true) -public class VeriPrescriptionParam { - - /** 门诊号/姓名 */ - private String name; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/extData.java b/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/extData.java deleted file mode 100644 index c470c437..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/java/com/openhis/vo/extData.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.openhis.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * 【吉林省本地化】输入补充字段 - * - * @author gaoyy - * @date 2025-05-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -public class extData { - // 1. 就医地分中心 - @JSONField(name = "mdtrtarea_subcent") - private String mdtrtareaSubcent; - - // 2. 参保地分中心 - @JSONField(name = "insuplc_subcent") - private String insuplcSubcent; - - // 3. 急诊核定流水号 - @JSONField(name = "er_crtf_evtsn") - private String erCrtfEvtsn; - - // 4. 就诊科室 - @JSONField(name = "dept_name") - private String deptName; - - // 5. 使用方法 - @JSONField(name = "used_mtd") - private String usedMtd; - - // 6. 现病史 - @JSONField(name = "psndisehis") - private String psndisehis; - - // 7. 生命体征 - @JSONField(name = "life_symptom") - private String lifeSymptom; - - // 8. 临床病症 - @JSONField(name = "clnc_cond") - private String clncCond; - - // 9. 门（急）诊诊断 - @JSONField(name = "disediag") - private String disediag; - - // 10. 入院诊断 - @JSONField(name = "adm_disediag_name") - private String admDisediagName; - - // 11. 判定依据 - @JSONField(name = "evid") - private String evid; - - // 12. 首诊医生 - @JSONField(name = "fst_doctor") - private String fstDoctor; - - // 13. 科主任 - @JSONField(name = "deptort") - private String deptort; - - // 14. 就诊时间（入院时间）（表示：YYYYMMDDHH24MISS） - @JSONField(name = "adm_date") - private String admDate; - - // 15. 姓名 - @JSONField(name = "name") - private String name; - - // 16. 身份证 - @JSONField(name = "certno") - private String certno; - - // 17. 年龄 - @JSONField(name = "age") - private String age; - - // 18. 性别（1：男，2：女） - @JSONField(name = "gend") - private String gend; -} diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml b/openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml deleted file mode 100644 index e9db5da4..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/application-druid.yml +++ /dev/null @@ -1,64 +0,0 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: org.postgresql.Driver - druid: - # 主库数据源 - master: - # url: jdbc:postgresql://localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8 - #url: jdbc:postgresql://192.168.10.240:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8 - # url: jdbc:postgresql://localhost:8020/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8 - url: jdbc:postgresql://192.168.30.199:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8 - username: postgres - password: root - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置连接超时时间 - connectTimeout: 30000 - # 配置网络超时时间 - socketTimeout: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 # FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: openhis - login-password: 123456 - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml b/openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml deleted file mode 100644 index 59aa507d..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/application-prod.yml +++ /dev/null @@ -1,61 +0,0 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: org.postgresql.Driver - druid: - # 主库数据源 - master: - url: jdbc:postgresql://localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8 - username: postgres - password: root - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置连接超时时间 - connectTimeout: 30000 - # 配置网络超时时间 - socketTimeout: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 # FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: openhis - login-password: 123456 - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/application.yml b/openhis-server-new/openhis-ybapp/src/main/resources/application.yml deleted file mode 100644 index 30217665..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/application.yml +++ /dev/null @@ -1,159 +0,0 @@ -# 项目相关配置 -core: - # 名称 - name: OpenHis_YB - # 版本 - version: 0.0.1 - # 版权年份 - copyrightYear: 2025 - # 文件路径 - profile: D:/home/uploadPath - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数字计算 char 字符验证 - captchaType: math - -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为18080 - port: 18079 - servlet: - # 应用的访问路径 - context-path: /openhis/yb - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 - -# 日志配置 -logging: - level: - com.openhis: debug - org.springframework: warn - -# 用户配置 -user: - password: - # 密码最大错误次数 - maxRetryCount: 5 - # 密码锁定时间（默认10分钟） - lockTime: 10 - -# Spring配置 -spring: - main: - allow-circular-references: true - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n/messages - profiles: - active: prod #生产 prod #本地 druid - # 文件上传 - servlet: - multipart: - # 单个文件大小 - max-file-size: 10MB - # 设置总上传的文件大小 - max-request-size: 20MB - # 服务模块 - devtools: - restart: - # 热部署开关 - enabled: true - # redis 配置 - redis: - # 地址 - # host: 127.0.0.1 - host: 127.0.0.1 - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 1 - # 密码 - password: redis - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms - # 文言 - messages: - basename: i18n/general_message/messages - encoding: utf-8 - -# token配置 -token: - # 令牌自定义标识 - header: Authorization - # 令牌密钥 - secret: abcdefghijklmnopqrstuvwxyz - # 令牌有效期（默认30分钟） - expireTime: 30 - -# MyBatis配置 -mybatis-plus: - # 搜索指定包别名 - typeAliasesPackage: com.core.**.domain,com.openhis.**.domain - # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mapper/**/*Mapper.xml - # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml - -# PageHelper分页插件 -pagehelper: - #helperDialect: mysql - supportMethodsArguments: true - params: count=countSql - # 分页插件会自动检测当前的数据库链接，自动选择合适的分页方式 - auto-dialect: true - # 默认值为 false。设置为 true 时，允许在运行时根据多数据源自动识别对应方言的分页 - auto-runtime-dialect: true - -# Swagger配置 -swagger: - # 是否开启swagger - enabled: true - # 请求前缀 - pathMapping: /dev-api - -# 防止XSS攻击 -xss: - # 过滤开关 - enabled: true - # 排除链接（多个用逗号分隔） - excludes: /system/notice - # 匹配链接 - urlPatterns: /system/*,/monitor/*,/tool/* - -# flowable相关表 -flowable: - # true 会对数据库中所有表进行更新操作。如果表不存在，则自动创建(建议开发时使用) - database-schema-update: false - # 关闭定时任务JOB - async-executor-activate: false - -## liteflow配置 -#liteflow: -# #规则文件路径 -# rule-source: config/flow.el.xml -# #liteflow是否开启，默认为true -# enable: true -# #liteflow的banner打印是否开启，默认为true -# print-banner: false - - - diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/banner.txt b/openhis-server-new/openhis-ybapp/src/main/resources/banner.txt deleted file mode 100644 index f95701d8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ - - :::::::: ::::::::: :::::::::: :::: ::: ::: ::: ::::::::::: :::::::: - :+: :+: :+: :+: :+: :+:+: :+: :+: :+: :+: :+: :+: - +:+ +:+ +:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+ - +#+ +:+ +#++:++#+ +#++:++# +#+ +:+ +#+ +#++:++#++ +#+ +#++:++#++ - +#+ +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+ -#+# #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+# -######## ### ########## ### #### ### ### ########### ######## - -Application Version: ${core.version} diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config.properties deleted file mode 100644 index 747827ca..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/config.properties +++ /dev/null @@ -1,10 +0,0 @@ -hospital.fixmedinsCode= -hospital.fixmedinsName= -hospital.infVer= -hospital.mdtrtAreaAdmvs= -hospital.mdtrtAreaAdmvsName= -hospital.recerSysCode= -hospital.caInfo= -hospital.defaultOpterType= -hospital.fixmedinsSoftFcty= -hospital.hospitalLevel= \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml b/openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml deleted file mode 100644 index 049210cf..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/config/flow.el.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - THEN(a, b, c); - - \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/hospital-config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config/hospital-config.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties deleted file mode 100644 index b57fd4e8..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/config/sys-config.properties +++ /dev/null @@ -1,21 +0,0 @@ -# ???????? -dev.address=http://88.9.0.126:8080 -dev.time=600 -dev.isEncrypt=false - -# ???????? -prod.address=http://ddjk.jlhs.gov.cn:20215 -prod.time=600 -prod.isEncrypt=true - - -dev.cliPubKey=PubKey -dev.cliPrvKey=PrvKey -dev.clientId=Id -dev.filePath="C:/Users/user/Desktop/" - -prod.cliPubKey=PubKey2 -prod.cliPrvKey=PrvKey2 -prod.clientId=Id2 -prod.filePath="C:/Users/user/Desktop/" -prod.eleAddress=http://10.49.24.194:8080/epc/api/ diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/config/tenant-config.properties b/openhis-server-new/openhis-ybapp/src/main/resources/config/tenant-config.properties deleted file mode 100644 index bf3f0cf5..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/config/tenant-config.properties +++ /dev/null @@ -1,12 +0,0 @@ -pr.cliPrvKey=AIJ6s5v7q54NOBVo5lrO1il+bPQt/m2pHU8GDODQZzG4 -pr.cliPubKey=OvwSdUUS3E9c9DtcEZ87jDTbKiw3k6dEZ9oeS1 -pr.serverPubKey= -pr.fixmedinsName=吉林农业大学医院 -pr.fixmedinsCode=H22017200667 -pr.admvs=229900 -pr.scope=server -pr.grantType=password -pr.password=Pwd1241320!^#F424 -pr.username=XZdd241224004 -pr.clientSecret=ACC10563D7382BF6 -pr.clientId=ACC10563D7382BF6 \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/logback.xml b/openhis-server-new/openhis-ybapp/src/main/resources/logback.xml deleted file mode 100644 index 3f9706f1..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/logback.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/sys-info.log - - - - ${log.path}/sys-info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/sys-error.log - - - - ${log.path}/sys-error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - ${log.path}/sys-user.log - - - ${log.path}/sys-user.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - - - - ${log.path}/yb-app-service.log - - - ${log.path}/yb-app-service.%d{yyyy-MM-dd}.log - 60 - - - ${log.pattern} - - - - - - - - - - - - - - ${log.path}/yb-app-ele-service.log - - - ${log.path}/yb-app-ele-service.%d{yyyy-MM-dd}.log - 60 - - - ${log.pattern} - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml b/openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml deleted file mode 100644 index c39d4382..00000000 --- a/openhis-server-new/openhis-ybapp/src/main/resources/mybatis/mybatis-config.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - -