feat(all): init HisTask Success

ruoyi-admin/pom.xml

@@ -67,6 +67,50 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <!--一下是新增的依赖-->
+        <!-- oracle -->
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.easyproject</groupId>
+            <artifactId>orai18n</artifactId>
+            <version>12.1.0.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.11.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.33</version>
+        </dependency>
+        <!--JWT -->
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <!--Charset获取文件原来编码方式的-->
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>59.1</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -0,0 +1,46 @@
+package com.neuhis.his.app.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.neuhis.his.domain.entity.BizProcedure;
+import com.neuhis.his.service.IBizProcedureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 存储过程Controller
+ * 
+ * @author zhangbin
+ * @date 2023-08-23
+ */
+@Controller
+@RequestMapping("/app/procedure")
+public class AppProcedureController extends BaseController
+{
+    @Autowired
+    private IBizProcedureService bizProcedureService;
+
+    /**
+     * 执行存储过程（页面）
+     */
+    @GetMapping("run/{id}")
+    public String run(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        BizProcedure bizProcedure = bizProcedureService.selectBizProcedureById(id);
+        mmap.put("bizProcedure", bizProcedure);
+        return "app/procedure" + "/run";
+    }
+
+    /**
+     * 执行存储过程
+     */
+    @PostMapping("run")
+    @ResponseBody
+    public AjaxResult runSave(BizProcedure bizProcedureParam)
+    {
+        bizProcedureService.runProcedure(bizProcedureParam);
+        return AjaxResult.success();
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.neuhis.his.app.controller;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.json.JSONUtil;
+import com.neuhis.quartz.task.common.JobService;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.IpUtils;
+import com.neuhis.utils.JWTUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.neuhis.his.service.*;
+import com.ruoyi.framework.shiro.service.SysPasswordService;
+import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 存储过程Controller
+ *
+ * @author zhangbin
+ * @date 2023-08-23
+ */
+@Api(value = "/open", tags = "免授权统一接口")
+@RestController
+@RequestMapping("/open/common")
+@Slf4j
+public class AppUnauthController extends BaseController {
+
+    @Autowired
+    ISysUserService sysUserService;
+    @Autowired
+    private SysPasswordService passwordService;
+
+    @Autowired
+    IComDictionaryService comDictionaryService;
+
+    @GetMapping("/getIp")
+    public AjaxResult getIp() {
+        String hostIp = IpUtils.getHostIp();
+        return AjaxResult.success(hostIp);
+    }
+
+    @RepeatSubmit(interval = 1000, message = "请求过于频繁")
+    @ApiOperation(value = "获取token",
+            notes = "1、获取授权token，在请求其他需要鉴权的接口时，需要将token携带在请求头中，格式：authorization:Bearer token值<br/>" +
+                    "2、token有效期为24小时，请及时刷新token<br/>" +
+                    "3、也可根据调用接口返回值信息判断token过期时进行刷新，过期消息返回格式：{\"code\"：500，\"msg\"：\"token失效\"},{\"code\"：500，\"msg\"：\"token错误\"}",
+            httpMethod = "POST",
+            produces = "application/json")
+    @PostMapping("/getAccessToken")
+    public AjaxResult getToken(String userName, String pwd) throws UnsupportedEncodingException {
+        if (StringUtils.isBlank(userName) || StringUtils.isBlank(pwd)) {
+            return AjaxResult.warn("用户名密码不能为空");
+        }
+        SysUser sysUser = sysUserService.selectUserByLoginName(userName);
+        if (sysUser != null) {
+            String password = passwordService.encryptPassword(sysUser.getLoginName(), pwd, sysUser.getSalt());
+            if (!password.equals(sysUser.getPassword())) {
+                return AjaxResult.warn("用户名或密码错误");
+            }
+            String access_token = JWTUtil.createToken(sysUser.getUserId());
+            return AjaxResult.success("成功", access_token);
+        }
+        return AjaxResult.warn("失败");
+    }
+
+    @Autowired
+    JobService jobService;
+    @Autowired
+    IBizProcedureService bizProcedureService;
+    @Autowired
+    IPhaComBaseinfoService phaComBaseinfoService;
+
+    @ApiOperation(value = "测试",
+            notes = "",
+            httpMethod = "POST",
+            produces = "application/json")
+    @GetMapping("/test")
+    public AjaxResult runScript() {
+        log.info("测试开始" + DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss"));
+        List<Map<String, String>> list = phaComBaseinfoService.selectDrugListCache();
+        FileUtil.writeString(JSONUtil.toJsonStr(AjaxResult.success(list)),FileUtil.newFile("E:\\test\\test.json"),"utf-8");
+        log.info("测试结束" + DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss"));
+        return AjaxResult.success("end");
+    }
+
+}

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

@@ -0,0 +1,44 @@
+package com.neuhis.his.app.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdcardUtil;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.neuhis.his.common.ComDictionaryTypeEnum;
+import com.neuhis.his.domain.entity.ComEmployee;
+import com.neuhis.his.domain.entity.ComPatientinfo;
+import com.neuhis.his.domain.vo.EmployeeVO;
+import com.neuhis.his.domain.vo.FeeConfirmVO;
+import com.neuhis.his.domain.vo.JZComPatientInfoVO;
+import com.neuhis.his.service.IComDictionaryService;
+import com.neuhis.his.service.IComEmployeeService;
+import com.neuhis.his.service.IComPatientinfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 存储过程Controller
+ *
+ * @author zhangbin
+ * @date 2023-08-23
+ */
+@Api(value = "/app", tags = "app统一接口")
+@RestController
+@RequestMapping("/app/ws")
+@Slf4j
+public class AppWebServiceController extends BaseController {
+    @Autowired
+    IComPatientinfoService comPatientinfoService;
+
+    @Autowired
+    IComDictionaryService comDictionaryService;
+
+}

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

@@ -0,0 +1,15 @@
+package com.neuhis.his.app.controller;
+
+import cn.hutool.core.util.IdcardUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
+import cn.hutool.json.JSONUtil;
+import org.apache.commons.lang3.StringUtils;
+
+public class TestMain {
+    public static void main(String[] args) throws Exception {
+        String a="abc";
+        String s = StringUtils.leftPad(a, 12, "0");
+        System.out.println(s);
+
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.neuhis.his.common;
+
+public enum ComDictionaryTypeEnum {
+
+    //患者
+    MET_MRS_COUNTRY("MET_MRS_COUNTRY","国家"),
+    PROVINCE("PROVINCE","省"),
+    CITY("CITY","市"),
+    DISTRICT("DISTRICT","区"),
+    NATION("NATION","民族"),
+    PROFESSION("PROFESSION","职业"),
+    MARRY_STATE("MARRY_STATE","婚姻状况,已婚03"),
+    DCP_MARRY_STATE("DCP_MARRY_STATE","婚姻状况,已婚20"),
+    MET_MRS_AREAZIP("MET_MRS_AREAZIP","邮编"),
+    RELATIVE("RELATIVE","联系人关系"),
+
+    IDCard("IDCard","证件类型"),
+
+
+    //职工
+    POSITION("POSITION","职务"),
+
+    //医嘱
+    USAGE("USAGE","用法"),
+    DOSAGEFORM("DOSAGEFORM","剂型"),
+
+    OTHER("",""),
+
+    //手术
+    OPSLevl("OPSLevl","手术级别"),
+    ANESTYPE("ANESTYPE","麻醉类型"),
+    OPSIncision("OPSIncision","切口类型"),
+    OPEPOS("OPEPOS","手术部位");
+
+    private String value;
+    private String msg;
+
+    private ComDictionaryTypeEnum(String value,String msg){
+        this.value=value;
+        this.msg=msg;
+    }
+
+    public String value() {
+        return value;
+    }
+}

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

@@ -0,0 +1,79 @@
+package com.neuhis.his.common;
+
+import com.neuhis.his.domain.entity.FinIpbMedicinelist;
+
+public class GlobalConstants {
+
+    //推送状态缓存
+    public static final String REDIS_PUSHSTATUS_PushRequestService = "neuhis:pushStatus:PushRequestService:isPushing";
+    public static final String REDIS_PUSHSTATUS_PushRequestMysqlService = "neuhis:pushStatus:PushRequestMysqlService:isPushing";
+    public static final String REDIS_PUSHSTATUS_ShfRequestService = "neuhis:pushStatus:ShfRequestService:isPushing";
+    //支付信息推送状态
+    public static final String REDIS_PUSHSTATUS_DftPayConfirmMzRequestService = "neuhis:pushStatus:DftPayConfirmMzRequestService:isPushing";
+    public static final String REDIS_PUSHSTATUS_DftPayConfirmZyFeiYaoRequestService = "neuhis:pushStatus:DftPayConfirmZyFeiYaoRequestService:isPushing";
+    public static final String REDIS_PUSHSTATUS_DftPayConfirmZyYaoRequestService = "neuhis:pushStatus:DftPayConfirmZyYaoRequestService:isPushing";
+    //第三方支付信息推送状态
+    public static final String REDIS_PUSHSTATUS_ThirdPayConfirmMzRequestService = "neuhis:pushStatus:ThirdPayConfirmMzRequestService:isPushing";
+    public static final String REDIS_PUSHSTATUS_ThirdPayConfirmZyFeiYaoRequestService = "neuhis:pushStatus:ThirdPayConfirmZyFeiYaoRequestService:isPushing";
+    public static final String REDIS_PUSHSTATUS_ThirdPayConfirmZyYaoRequestService = "neuhis:pushStatus:ThirdPayConfirmZyYaoRequestService:isPushing";
+    //患者建档
+    public static final String REDIS_PUSHSTATUS_AdtPatientRequestService = "neuhis:pushStatus:AdtPatientRequestService:isPushing";
+
+    //支付确认时间缓存
+    public static final String REDIS_PUSHCONTROLARG_CURRENTTIME_PAYCONFIRM_MENZHEN = "neuhis:pushControlArg:currentTime:payConfirm:menzhen:";
+    public static final String REDIS_PUSHCONTROLARG_CURRENTTIME_PAYCONFIRM_ZHUYUAN_YAOPIN = "neuhis:pushControlArg:currentTime:payConfirm:zhuyuan:yaopin:";
+    public static final String REDIS_PUSHCONTROLARG_CURRENTTIME_PAYCONFIRM_ZHUYUAN_FEIYAOPIN = "neuhis:pushControlArg:currentTime:payConfirm:zhuyuan:feiyaopin:";
+
+    //第三方支付确认时间缓存
+    public static final String REDIS_PUSHCONTROLARG_CURRENTTIME_THIRDPAYCONFIRM_MENZHEN = "neuhis:pushControlArg:currentTime:thirdPayConfirm:menzhen:";
+    public static final String REDIS_PUSHCONTROLARG_CURRENTTIME_THIRDPAYCONFIRM_ZHUYUAN_YAOPIN = "neuhis:pushControlArg:currentTime:thirdPayConfirm:zhuyuan:yaopin:";
+    public static final String REDIS_PUSHCONTROLARG_CURRENTTIME_THIRDPAYCONFIRM_ZHUYUAN_FEIYAOPIN = "neuhis:pushControlArg:currentTime:thirdPayConfirm:zhuyuan:feiyaopin:";
+
+    //患者建档
+    public static final String REDIS_PUSHCONTROLARG_CURRENTTIME_PATIENT_CREATE = "neuhis:pushControlArg:currentTime:patient:create:";
+
+    /**
+     * redis缓存数据
+     */
+    //部门基本信息缓存
+    public static final String REDIS_DEPARTMENT = "neuhis:department:";
+    //字典表缓存
+    public static final String REDIS_DICTIONARY = "neuhis:dictionary:";
+
+    //患者基本信息缓存（All）
+    public static final String REDIS_PATIENTINFO = "neuhis:patientinfo:";
+    //职工基本信息缓存（All）
+    public static final String REDIS_EMPLOYEE = "neuhis:employee:";
+
+    //挂号记录缓存
+    public static final String REDIS_REGISTER = "neuhis:register:";
+    //住院记录缓存
+    public static final String REDIS_INMAININFO = "neuhis:inmaininfo:";
+
+    //门诊医嘱缓存
+    public static final String REDIS_METORDOORDER = "neuhis:metOrdoOrder:";
+    //住院医嘱缓存
+    public static final String REDIS_METORDIORDER = "neuhis:metOrdiOrder:";//住院医嘱缓存
+    public static final String REDIS_METIPMORDER= "neuhis:metIpmOrder:";
+
+    //药品信息
+    public static final String REDIS_DRUGINFO = "neuhis:druginfo:";
+    public static final String REDIS_DRUGINFO2 = "neuhis:druginfo2:";
+
+    //非药品信息
+    public static final String REDIS_UNDRUGINFO = "neuhis:undruginfo:";
+
+    //住院药品缓存
+    public static final String REDIS_FinIpbMedicinelist = "neuhis:FinIpbMedicinelist:";
+    //住院非药品缓存
+    public static final String REDIS_FinIpbItemlist = "neuhis:FinIpbItemlist:";
+
+    //生命体征缓存
+    public static final String REDIS_NsrNisRecordDetailList = "neuhis:NsrNisRecordDetailList:";
+
+    //Oralce数据库SQL执行记录日志缓存
+    public static final String REDIS_SQL_LOG = "neuhis:sqllog:";
+
+    //生成电子发票错误数缓存
+    public static final String REDIS_INVOICE_GENERATE_ERRORNUM = "neuhis:invoice:generate:errorNum:";
+}

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

@@ -0,0 +1,44 @@
+package com.neuhis.his.common;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+public class PushControlArg {
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date currentTime;
+
+    private String currentTimeStr;
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getCurrentTime() {
+        return currentTime;
+    }
+
+    public void setCurrentTime(Date currentTime) {
+        this.currentTime = currentTime;
+        this.currentTimeStr = DateUtil.format(this.currentTime,"yyyy-MM-dd HH:mm:ss");
+    }
+
+    public String getCurrentTimeStr() {
+        return currentTimeStr;
+    }
+
+    public void setCurrentTimeStr(String currentTimeStr) {
+        this.currentTimeStr = currentTimeStr;
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.neuhis.his.common;
+
+public enum SexEnum {
+    U("U","未知"),
+    M("M","男"),
+    F("F","女"),
+    O("O","其他"),
+    A("A","全部");
+
+    private String value;
+    private String msg;
+
+    private SexEnum(String value, String msg){
+        this.value=value;
+        this.msg=msg;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public String msg() {
+        return msg;
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.neuhis.his.common.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(
+        prefix = "task"
+)
+public class TaskConfig {
+    public TaskConfig() {
+    }
+
+
+    private static boolean updateSexComPatientinfo;
+    private static boolean killDeadLockSession;
+    //互联互通消息推送
+    private static boolean pushMessageToHl7;
+    //互联互通消息推送Mysql
+    private static boolean pushMessageToHl7Mysql;
+    //审方消息推送
+    private static boolean pushMessageToShf;
+    //联互通消息推送(支付状态)
+    private static boolean pushMessagePayConfirmDft;
+    //删除数据推送历史日志
+    private static boolean deleteLogPushRecordHis;
+
+    public static boolean isUpdateSexComPatientinfo() {
+        return updateSexComPatientinfo;
+    }
+
+    public void setUpdateSexComPatientinfo(boolean updateSexComPatientinfo) {
+        TaskConfig.updateSexComPatientinfo = updateSexComPatientinfo;
+    }
+
+    public static boolean isKillDeadLockSession() {
+        return killDeadLockSession;
+    }
+
+    public void setKillDeadLockSession(boolean killDeadLockSession) {
+        TaskConfig.killDeadLockSession = killDeadLockSession;
+    }
+
+    public static boolean isPushMessageToHl7() {
+        return pushMessageToHl7;
+    }
+
+    public void setPushMessageToHl7(boolean pushMessageToHl7) {
+        TaskConfig.pushMessageToHl7 = pushMessageToHl7;
+    }
+
+    public static boolean isPushMessageToHl7Mysql() {
+        return pushMessageToHl7Mysql;
+    }
+
+    public void setPushMessageToHl7Mysql(boolean pushMessageToHl7Mysql) {
+        TaskConfig.pushMessageToHl7Mysql = pushMessageToHl7Mysql;
+    }
+
+    public static boolean isPushMessageToShf() {
+        return pushMessageToShf;
+    }
+
+    public void setPushMessageToShf(boolean pushMessageToShf) {
+        TaskConfig.pushMessageToShf = pushMessageToShf;
+    }
+
+    public static boolean isPushMessagePayConfirmDft() {
+        return pushMessagePayConfirmDft;
+    }
+
+    public void setPushMessagePayConfirmDft(boolean pushMessagePayConfirmDft) {
+        TaskConfig.pushMessagePayConfirmDft = pushMessagePayConfirmDft;
+    }
+
+    public static boolean isDeleteLogPushRecordHis() {
+        return deleteLogPushRecordHis;
+    }
+
+    public void setDeleteLogPushRecordHis(boolean deleteLogPushRecordHis) {
+        TaskConfig.deleteLogPushRecordHis = deleteLogPushRecordHis;
+    }
+}

ruoyi-admin/src/main/java/com/neuhis/his/common/handler/Blob2StringTypeHandler.java

@@ -0,0 +1,87 @@
+package com.neuhis.his.common.handler;
+
+import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import com.neuhis.utils.ZHS16GBKUtils;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+/**
+ * Blob转String类型转换器
+ */
+public class Blob2StringTypeHandler extends BaseTypeHandler<String> {
+
+    private static final String DEFAULT_CHARSET = "GBK";
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i,
+                                    String parameter, JdbcType jdbcType) throws SQLException {
+        if (jdbcType == JdbcType.BLOB) {
+            ByteArrayInputStream bis;
+            try {
+                byte[] b = parameter.getBytes(DEFAULT_CHARSET);
+                bis = new ByteArrayInputStream(b);
+                ps.setBinaryStream(i, bis, b.length);
+            } catch (UnsupportedEncodingException e) {
+                throw new RuntimeException("Blob Encoding Error!", e);
+            }
+        } else {
+            ps.setString(i, parameter);
+        }
+    }
+
+    @Override
+    public String getNullableResult(ResultSet rs, String columnName)
+            throws SQLException {
+        try {
+            Blob blob = rs.getBlob(columnName);
+            byte[] returnValue = new byte[0];
+            if (null != blob) {
+                returnValue = blob.getBytes(1, (int) blob.length());
+            }
+//            return new String(returnValue, DEFAULT_CHARSET);
+            return ZHS16GBKUtils.decode(returnValue);
+        } catch (Exception e) {
+            return rs.getString(columnName);
+        }
+    }
+
+    @Override
+    public String getNullableResult(ResultSet rs, int columnIndex)
+            throws SQLException {
+        try {
+            Blob blob = rs.getBlob(columnIndex);
+            byte[] returnValue = new byte[0];
+            if (null != blob) {
+                returnValue = blob.getBytes(1, (int) blob.length());
+            }
+//            return new String(returnValue, DEFAULT_CHARSET);
+            return ZHS16GBKUtils.decode(returnValue);
+        } catch (Exception e) {
+            return rs.getString(columnIndex);
+        }
+    }
+
+    @Override
+    public String getNullableResult(CallableStatement cs, int columnIndex)
+            throws SQLException {
+        Blob blob = cs.getBlob(columnIndex);
+        byte[] returnValue = new byte[0];
+        if (null != blob) {
+            returnValue = blob.getBytes(1, (int) blob.length());
+        }
+        try {
+//            return new String(returnValue, DEFAULT_CHARSET);
+            return ZHS16GBKUtils.decode(returnValue);
+        } catch (Exception e) {
+            throw new RuntimeException("Blob Encoding Error!", e);
+        }
+    }
+
+}

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

@@ -0,0 +1,127 @@
+package com.neuhis.his.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.neuhis.his.domain.BizApi;
+import com.neuhis.his.service.IBizApiService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 接口信息Controller
+ * 
+ * @author zhangbin
+ * @date 2024-06-13
+ */
+@Controller
+@RequestMapping("/his/api")
+public class BizApiController extends BaseController
+{
+    private String prefix = "his/api";
+
+    @Autowired
+    private IBizApiService bizApiService;
+
+    @RequiresPermissions("his:api:view")
+    @GetMapping()
+    public String api()
+    {
+        return prefix + "/api";
+    }
+
+    /**
+     * 查询接口信息列表
+     */
+    @RequiresPermissions("his:api:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BizApi bizApi)
+    {
+        startPage();
+        List<BizApi> list = bizApiService.selectBizApiList(bizApi);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出接口信息列表
+     */
+    @RequiresPermissions("his:api:export")
+    @Log(title = "接口信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BizApi bizApi)
+    {
+        List<BizApi> list = bizApiService.selectBizApiList(bizApi);
+        ExcelUtil<BizApi> util = new ExcelUtil<BizApi>(BizApi.class);
+        return util.exportExcel(list, "接口信息数据");
+    }
+
+    /**
+     * 新增接口信息
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存接口信息
+     */
+    @RequiresPermissions("his:api:add")
+    @Log(title = "接口信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BizApi bizApi)
+    {
+        return toAjax(bizApiService.insertBizApi(bizApi));
+    }
+
+    /**
+     * 修改接口信息
+     */
+    @RequiresPermissions("his:api:edit")
+    @GetMapping("/edit/{apiId}")
+    public String edit(@PathVariable("apiId") Long apiId, ModelMap mmap)
+    {
+        BizApi bizApi = bizApiService.selectBizApiByApiId(apiId);
+        mmap.put("bizApi", bizApi);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存接口信息
+     */
+    @RequiresPermissions("his:api:edit")
+    @Log(title = "接口信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BizApi bizApi)
+    {
+        return toAjax(bizApiService.updateBizApi(bizApi));
+    }
+
+    /**
+     * 删除接口信息
+     */
+    @RequiresPermissions("his:api:remove")
+    @Log(title = "接口信息", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(bizApiService.deleteBizApiByApiIds(ids));
+    }
+}

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

@@ -0,0 +1,127 @@
+package com.neuhis.his.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.neuhis.his.domain.BizApiFieldMapping;
+import com.neuhis.his.service.IBizApiFieldMappingService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 接口字段引射关系Controller
+ * 
+ * @author zhangbin
+ * @date 2024-06-13
+ */
+@Controller
+@RequestMapping("/his/fiedlmapping")
+public class BizApiFieldMappingController extends BaseController
+{
+    private String prefix = "his/fiedlmapping";
+
+    @Autowired
+    private IBizApiFieldMappingService bizApiFieldMappingService;
+
+    @RequiresPermissions("his:fiedlmapping:view")
+    @GetMapping()
+    public String fiedlmapping()
+    {
+        return prefix + "/fiedlmapping";
+    }
+
+    /**
+     * 查询接口字段引射关系列表
+     */
+    @RequiresPermissions("his:fiedlmapping:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BizApiFieldMapping bizApiFieldMapping)
+    {
+        startPage();
+        List<BizApiFieldMapping> list = bizApiFieldMappingService.selectBizApiFieldMappingList(bizApiFieldMapping);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出接口字段引射关系列表
+     */
+    @RequiresPermissions("his:fiedlmapping:export")
+    @Log(title = "接口字段引射关系", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BizApiFieldMapping bizApiFieldMapping)
+    {
+        List<BizApiFieldMapping> list = bizApiFieldMappingService.selectBizApiFieldMappingList(bizApiFieldMapping);
+        ExcelUtil<BizApiFieldMapping> util = new ExcelUtil<BizApiFieldMapping>(BizApiFieldMapping.class);
+        return util.exportExcel(list, "接口字段引射关系数据");
+    }
+
+    /**
+     * 新增接口字段引射关系
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存接口字段引射关系
+     */
+    @RequiresPermissions("his:fiedlmapping:add")
+    @Log(title = "接口字段引射关系", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BizApiFieldMapping bizApiFieldMapping)
+    {
+        return toAjax(bizApiFieldMappingService.insertBizApiFieldMapping(bizApiFieldMapping));
+    }
+
+    /**
+     * 修改接口字段引射关系
+     */
+    @RequiresPermissions("his:fiedlmapping:edit")
+    @GetMapping("/edit/{mappingId}")
+    public String edit(@PathVariable("mappingId") Long mappingId, ModelMap mmap)
+    {
+        BizApiFieldMapping bizApiFieldMapping = bizApiFieldMappingService.selectBizApiFieldMappingByMappingId(mappingId);
+        mmap.put("bizApiFieldMapping", bizApiFieldMapping);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存接口字段引射关系
+     */
+    @RequiresPermissions("his:fiedlmapping:edit")
+    @Log(title = "接口字段引射关系", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BizApiFieldMapping bizApiFieldMapping)
+    {
+        return toAjax(bizApiFieldMappingService.updateBizApiFieldMapping(bizApiFieldMapping));
+    }
+
+    /**
+     * 删除接口字段引射关系
+     */
+    @RequiresPermissions("his:fiedlmapping:remove")
+    @Log(title = "接口字段引射关系", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(bizApiFieldMappingService.deleteBizApiFieldMappingByMappingIds(ids));
+    }
+}

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

@@ -0,0 +1,127 @@
+package com.neuhis.his.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.neuhis.his.domain.entity.BizDict;
+import com.neuhis.his.service.IBizDictService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 字典数据Controller
+ * 
+ * @author zhangbin
+ * @date 2023-11-29
+ */
+@Controller
+@RequestMapping("/his/bizdict")
+public class BizDictController extends BaseController
+{
+    private String prefix = "his/bizdict";
+
+    @Autowired
+    private IBizDictService bizDictService;
+
+    @RequiresPermissions("his:bizdict:view")
+    @GetMapping()
+    public String bizdict()
+    {
+        return prefix + "/bizdict";
+    }
+
+    /**
+     * 查询字典数据列表
+     */
+    @RequiresPermissions("his:bizdict:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BizDict bizDict)
+    {
+        startPage();
+        List<BizDict> list = bizDictService.selectBizDictList(bizDict);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出字典数据列表
+     */
+    @RequiresPermissions("his:bizdict:export")
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BizDict bizDict)
+    {
+        List<BizDict> list = bizDictService.selectBizDictList(bizDict);
+        ExcelUtil<BizDict> util = new ExcelUtil<BizDict>(BizDict.class);
+        return util.exportExcel(list, "字典数据数据");
+    }
+
+    /**
+     * 新增字典数据
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存字典数据
+     */
+    @RequiresPermissions("his:bizdict:add")
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BizDict bizDict)
+    {
+        return toAjax(bizDictService.insertBizDict(bizDict));
+    }
+
+    /**
+     * 修改字典数据
+     */
+    @RequiresPermissions("his:bizdict:edit")
+    @GetMapping("/edit/{dictCode}")
+    public String edit(@PathVariable("dictCode") Long dictCode, ModelMap mmap)
+    {
+        BizDict bizDict = bizDictService.selectBizDictByDictCode(dictCode);
+        mmap.put("bizDict", bizDict);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存字典数据
+     */
+    @RequiresPermissions("his:bizdict:edit")
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BizDict bizDict)
+    {
+        return toAjax(bizDictService.updateBizDict(bizDict));
+    }
+
+    /**
+     * 删除字典数据
+     */
+    @RequiresPermissions("his:bizdict:remove")
+    @Log(title = "字典数据", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(bizDictService.deleteBizDictByDictCodes(ids));
+    }
+}

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

@@ -0,0 +1,127 @@
+package com.neuhis.his.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.neuhis.his.domain.entity.BizJobSwitch;
+import com.neuhis.his.service.IBizJobSwitchService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 任务开关管理Controller
+ * 
+ * @author zhangbin
+ * @date 2024-05-10
+ */
+@Controller
+@RequestMapping("/his/jobswitch")
+public class BizJobSwitchController extends BaseController
+{
+    private String prefix = "his/jobswitch";
+
+    @Autowired
+    private IBizJobSwitchService bizJobSwitchService;
+
+    @RequiresPermissions("his:jobswitch:view")
+    @GetMapping()
+    public String jobswitch()
+    {
+        return prefix + "/jobswitch";
+    }
+
+    /**
+     * 查询任务开关管理列表
+     */
+    @RequiresPermissions("his:jobswitch:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BizJobSwitch bizJobSwitch)
+    {
+        startPage();
+        List<BizJobSwitch> list = bizJobSwitchService.selectBizJobSwitchList(bizJobSwitch);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出任务开关管理列表
+     */
+    @RequiresPermissions("his:jobswitch:export")
+    @Log(title = "任务开关管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BizJobSwitch bizJobSwitch)
+    {
+        List<BizJobSwitch> list = bizJobSwitchService.selectBizJobSwitchList(bizJobSwitch);
+        ExcelUtil<BizJobSwitch> util = new ExcelUtil<BizJobSwitch>(BizJobSwitch.class);
+        return util.exportExcel(list, "任务开关管理数据");
+    }
+
+    /**
+     * 新增任务开关管理
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存任务开关管理
+     */
+    @RequiresPermissions("his:jobswitch:add")
+    @Log(title = "任务开关管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BizJobSwitch bizJobSwitch)
+    {
+        return toAjax(bizJobSwitchService.insertBizJobSwitch(bizJobSwitch));
+    }
+
+    /**
+     * 修改任务开关管理
+     */
+    @RequiresPermissions("his:jobswitch:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        BizJobSwitch bizJobSwitch = bizJobSwitchService.selectBizJobSwitchById(id);
+        mmap.put("bizJobSwitch", bizJobSwitch);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存任务开关管理
+     */
+    @RequiresPermissions("his:jobswitch:edit")
+    @Log(title = "任务开关管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BizJobSwitch bizJobSwitch)
+    {
+        return toAjax(bizJobSwitchService.updateBizJobSwitch(bizJobSwitch));
+    }
+
+    /**
+     * 删除任务开关管理
+     */
+    @RequiresPermissions("his:jobswitch:remove")
+    @Log(title = "任务开关管理", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(bizJobSwitchService.deleteBizJobSwitchByIds(ids));
+    }
+}

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

@@ -0,0 +1,155 @@
+package com.neuhis.his.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.neuhis.his.domain.entity.BizProcedure;
+import com.neuhis.his.service.IBizProcedureService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 存储过程Controller
+ * 
+ * @author zhangbin
+ * @date 2023-08-23
+ */
+@Controller
+@RequestMapping("/his/procedure")
+public class BizProcedureController extends BaseController
+{
+    private String prefix = "his/procedure";
+
+    @Autowired
+    private IBizProcedureService bizProcedureService;
+
+    @RequiresPermissions("his:procedure:view")
+    @GetMapping()
+    public String procedure()
+    {
+        return prefix + "/procedure";
+    }
+
+    /**
+     * 查询存储过程列表
+     */
+    @RequiresPermissions("his:procedure:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BizProcedure bizProcedure)
+    {
+        startPage();
+        List<BizProcedure> list = bizProcedureService.selectBizProcedureList(bizProcedure);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出存储过程列表
+     */
+    @RequiresPermissions("his:procedure:export")
+    @Log(title = "存储过程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BizProcedure bizProcedure)
+    {
+        List<BizProcedure> list = bizProcedureService.selectBizProcedureList(bizProcedure);
+        ExcelUtil<BizProcedure> util = new ExcelUtil<BizProcedure>(BizProcedure.class);
+        return util.exportExcel(list, "存储过程数据");
+    }
+
+    /**
+     * 新增存储过程
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存存储过程
+     */
+    @RequiresPermissions("his:procedure:add")
+    @Log(title = "存储过程", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BizProcedure bizProcedure)
+    {
+        return toAjax(bizProcedureService.insertBizProcedure(bizProcedure));
+    }
+
+    /**
+     * 修改存储过程
+     */
+    @RequiresPermissions("his:procedure:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        BizProcedure bizProcedure = bizProcedureService.selectBizProcedureById(id);
+        mmap.put("bizProcedure", bizProcedure);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存存储过程
+     */
+    @RequiresPermissions("his:procedure:edit")
+    @Log(title = "存储过程", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BizProcedure bizProcedure)
+    {
+        return toAjax(bizProcedureService.updateBizProcedure(bizProcedure));
+    }
+
+    /**
+     * 删除存储过程
+     */
+    @RequiresPermissions("his:procedure:remove")
+    @Log(title = "存储过程", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(bizProcedureService.deleteBizProcedureByIds(ids));
+    }
+
+    /**
+     * 执行存储过程（页面）
+     */
+    @RequiresPermissions("his:procedure:edit")
+    @GetMapping("/run/{id}")
+    public String run(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        BizProcedure bizProcedure = bizProcedureService.selectBizProcedureById(id);
+        mmap.put("bizProcedure", bizProcedure);
+        return prefix + "/run";
+    }
+
+    /**
+     * 执行存储过程
+     */
+    @RequiresPermissions("his:procedure:edit")
+    @PostMapping("/run")
+    @ResponseBody
+    public AjaxResult runSave(BizProcedure bizProcedureParam)
+    {
+        String msg = bizProcedureService.runProcedureV2(bizProcedureParam);
+        if(msg.indexOf("成功")>-1){
+            return AjaxResult.success(msg);
+        }else{
+            return AjaxResult.warn(msg);
+        }
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.neuhis.his.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.StringUtils;
+import com.neuhis.his.domain.entity.ComEmployee;
+import com.neuhis.his.domain.entity.ComPatientinfo;
+import com.neuhis.his.service.IComEmployeeService;
+import com.neuhis.his.service.IComPatientinfoService;
+import com.neuhis.utils.IdcardUtil;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/his/comEmployee")
+public class ComEmployeeController extends BaseController {
+
+    private String prefix = "his/comEmployee";
+
+    @Autowired
+    private IComEmployeeService comEmployeeService;
+
+    @GetMapping()
+    public String procedure()
+    {
+        return prefix + "/list";
+    }
+
+    /**
+     * 列表
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ComEmployee record)
+    {
+        List<ComEmployee> list = comEmployeeService.selectList(record);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 修改
+     */
+    @RequiresPermissions("his:procedure:edit")
+    @GetMapping("/edit/{emplCode}")
+    public String edit(@PathVariable("emplCode") String emplCode, ModelMap mmap)
+    {
+        ComEmployee comEmployee = comEmployeeService.selectByPrimaryKey(emplCode);
+        mmap.put("comEmployee", comEmployee);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存
+     */
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ComEmployee record)
+    {
+        ComEmployee comEmployee = new ComEmployee();
+        if(StringUtils.isNotBlank(record.getEmplCode())){
+            comEmployee.setEmplCode(record.getEmplCode());
+        }else{
+            return AjaxResult.warn("员工代码不能为空");
+        }
+        if(StringUtils.isNotBlank(record.getIdenno())){
+            if(IdcardUtil.isValidCard(record.getIdenno())){
+                comEmployee.setIdenno(record.getIdenno());
+                comEmployee.setSexCode(IdcardUtil.getSexMF(record.getIdenno()));
+            }else{
+//                return AjaxResult.warn("身份证号校验未通过");
+            }
+        }
+        if(StringUtils.isNotBlank(record.getRelationTel())){
+            comEmployee.setRelationTel(record.getRelationTel());
+        }
+        return toAjax(comEmployeeService.updateByPrimaryKeySelective(comEmployee));
+    }
+}

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

@@ -0,0 +1,123 @@
+package com.neuhis.his.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.StringUtils;
+import com.neuhis.his.domain.entity.ComPatientinfo;
+import com.neuhis.his.service.IComPatientinfoService;
+import com.neuhis.utils.IdcardUtil;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 存储过程Controller
+ * 
+ * @author zhangbin
+ * @date 2023-08-23
+ */
+@Controller
+@RequestMapping("/his/comPatientinfo")
+public class ComPatientinfoController extends BaseController
+{
+    private String prefix = "his/comPatientinfo";
+
+    @Autowired
+    private IComPatientinfoService IComPatientinfoService;
+
+    @GetMapping()
+    public String procedure()
+    {
+        return prefix + "/list";
+    }
+
+    /**
+     * 列表
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ComPatientinfo comPatientinfo)
+    {
+//        if(StringUtils.isBlank(comPatientinfo.getCardNo())&&StringUtils.isBlank(comPatientinfo.getIdenno())&&StringUtils.isBlank(comPatientinfo.getName())){
+//            comPatientinfo.setCardNo("neusoft");
+//        }
+        List<ComPatientinfo> list = IComPatientinfoService.selectListLimit10(comPatientinfo);
+//        list.forEach(obj->{
+//                    if(!IdcardUtil.isValidCard(obj.getIdenno())){
+//                        System.out.println("身份证号校验未通过："+obj.getIdenno());
+//                    }
+//        });
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 修改
+     */
+    @RequiresPermissions("his:procedure:edit")
+    @GetMapping("/edit/{cardNo}")
+    public String edit(@PathVariable("cardNo") String cardNo, ModelMap mmap)
+    {
+        ComPatientinfo comPatientinfo = IComPatientinfoService.selectByPrimaryKey(cardNo);
+        mmap.put("comPatientinfo", comPatientinfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存
+     */
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ComPatientinfo comPatientinfoParam)
+    {
+        ComPatientinfo comPatientinfo = new ComPatientinfo();
+        if(StringUtils.isNotBlank(comPatientinfoParam.getCardNo())){
+            comPatientinfo.setCardNo(comPatientinfoParam.getCardNo());
+        }else{
+            return AjaxResult.warn("就诊卡号不能为空");
+        }
+        if(StringUtils.isNotBlank(comPatientinfoParam.getIdenno())){
+            if(IdcardUtil.isValidCard(comPatientinfoParam.getIdenno())){
+                comPatientinfo.setIdenno(comPatientinfoParam.getIdenno());
+                comPatientinfo.setSexCode(IdcardUtil.getSexMF(comPatientinfoParam.getIdenno()));
+            }else{
+//                return AjaxResult.warn("身份证号校验未通过");
+            }
+        }
+        if(StringUtils.isNotBlank(comPatientinfoParam.getHomeTel())){
+            comPatientinfo.setHomeTel(comPatientinfoParam.getHomeTel());
+        }
+        return toAjax(IComPatientinfoService.updateByPrimaryKeySelective(comPatientinfo));
+    }
+
+    /**
+     * 更新性别
+     */
+    @PostMapping("/updateSex")
+    @ResponseBody
+    public AjaxResult updateSex(ComPatientinfo comPatientinfoParam)
+    {
+        ComPatientinfo comPatientinfo = new ComPatientinfo();
+        if(StringUtils.isNotBlank(comPatientinfoParam.getCardNo())){
+            comPatientinfo.setCardNo(comPatientinfoParam.getCardNo());
+        }else{
+            return AjaxResult.warn("就诊卡号不能为空");
+        }
+        if(StringUtils.isNotBlank(comPatientinfoParam.getIdenno())){
+            if(IdcardUtil.isValidCard(comPatientinfoParam.getIdenno())){
+                comPatientinfo.setIdenno(comPatientinfoParam.getIdenno());
+                comPatientinfo.setSexCode(IdcardUtil.getSexMF(comPatientinfoParam.getIdenno()));
+            }else{
+                return AjaxResult.warn("身份证号校验未通过");
+            }
+        }else{
+            return AjaxResult.warn("身份证号不能为空");
+        }
+        return toAjax(IComPatientinfoService.updateSex(comPatientinfo));
+    }
+}

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

@@ -0,0 +1,142 @@
+package com.neuhis.his.controller;
+
+import java.util.List;
+
+import cn.hutool.core.date.DateUtil;
+import com.ruoyi.common.utils.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.neuhis.his.domain.entity.LogPushRecord;
+import com.neuhis.his.service.ILogPushRecordService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 推送日志Controller
+ * 
+ * @author zhangbin
+ * @date 2023-12-04
+ */
+@Controller
+@RequestMapping("/his/pushrecord")
+public class LogPushRecordController extends BaseController
+{
+    private String prefix = "his/pushrecord";
+
+    @Autowired
+    private ILogPushRecordService logPushRecordService;
+
+    @RequiresPermissions("his:pushrecord:view")
+    @GetMapping()
+    public String pushrecord()
+    {
+        return prefix + "/pushrecord";
+    }
+
+    /**
+     * 查询推送日志列表
+     */
+    @RequiresPermissions("his:pushrecord:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(LogPushRecord logPushRecord)
+    {
+        String beginTime = (String) logPushRecord.getParams().get("beginTime");
+        if(StringUtils.isBlank(beginTime)){
+            logPushRecord.getParams().put("beginTime", DateUtil.beginOfDay(DateUtil.date()).toString());
+        }else{
+            logPushRecord.getParams().put("beginTime",DateUtil.beginOfDay(DateUtil.parseDate(beginTime)).toString());
+        }
+        String endTime = (String) logPushRecord.getParams().get("endTime");
+        if(StringUtils.isBlank(endTime)){
+            logPushRecord.getParams().put("endTime",DateUtil.endOfDay(DateUtil.date()).toString());
+        }else{
+            logPushRecord.getParams().put("endTime",DateUtil.endOfDay(DateUtil.parseDate(endTime)).toString());
+        }
+        startPage();
+        List<LogPushRecord> list = logPushRecordService.selectLogPushRecordList(logPushRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出推送日志列表
+     */
+    @RequiresPermissions("his:pushrecord:export")
+    @Log(title = "推送日志", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(LogPushRecord logPushRecord)
+    {
+        List<LogPushRecord> list = logPushRecordService.selectLogPushRecordList(logPushRecord);
+        ExcelUtil<LogPushRecord> util = new ExcelUtil<LogPushRecord>(LogPushRecord.class);
+        return util.exportExcel(list, "推送日志数据");
+    }
+
+    /**
+     * 新增推送日志
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存推送日志
+     */
+    @RequiresPermissions("his:pushrecord:add")
+    @Log(title = "推送日志", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(LogPushRecord logPushRecord)
+    {
+        return toAjax(logPushRecordService.insertLogPushRecord(logPushRecord));
+    }
+
+    /**
+     * 修改推送日志
+     */
+    @RequiresPermissions("his:pushrecord:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        LogPushRecord logPushRecord = logPushRecordService.selectLogPushRecordById(id);
+        mmap.put("logPushRecord", logPushRecord);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存推送日志
+     */
+    @RequiresPermissions("his:pushrecord:edit")
+    @Log(title = "推送日志", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(LogPushRecord logPushRecord)
+    {
+        return toAjax(logPushRecordService.updateLogPushRecord(logPushRecord));
+    }
+
+    /**
+     * 删除推送日志
+     */
+    @RequiresPermissions("his:pushrecord:remove")
+    @Log(title = "推送日志", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(logPushRecordService.deleteLogPushRecordByIds(ids));
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.neuhis.his.controller;
+
+import com.neuhis.his.domain.entity.LicenseEntity;
+import com.neuhis.his.service.Db1DataService;
+import com.neuhis.his.service.OracleSlaveDataService;
+import com.neuhis.his.service.impl.LicenseServiceImpl;
+import io.swagger.annotations.Api;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.neuhis.his.domain.dto.Response;
+import springfox.documentation.spring.web.json.Json;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import com.alibaba.fastjson.JSON;
+
+@Api(value = "/api", tags = "免授权统一接口")
+@RestController
+@RequestMapping(value = "/api/test")
+public class MyTestController  {
+    @Resource
+    Db1DataService db1DataService;
+    @Resource
+    OracleSlaveDataService oracleSlaveDataService;
+
+    @GetMapping("test")
+    public String test(){
+
+        return "test1";
+    }
+
+    @GetMapping("test1")
+    public List<Map<String,Object>> test1(){
+        List<Map<String,Object>> data = db1DataService.execQuery("select * from neuhis.closeloop_nodeinfo");
+        return data;
+    }
+
+
+    @GetMapping("test3")
+    public List<Map<String,Object>> test3(){
+        List<Map<String,Object>> data = oracleSlaveDataService.execQuery("select * from hit_app.closeloop_nodeinfo");
+        return data;
+    }
+    @GetMapping("License")
+    public static String LicenseCreate(LicenseEntity entity) throws Exception {
+        return LicenseServiceImpl.encrypt(JSON.toJSONString(entity));
+    }
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/BizApi.java

@@ -0,0 +1,80 @@
+package com.neuhis.his.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 接口信息对象 biz_api
+ * 
+ * @author zhangbin
+ * @date 2024-06-13
+ */
+@Data
+public class BizApi extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long apiId;
+
+    /** 系统 */
+    @Excel(name = "系统编码")
+    private String systemCode;
+
+    /** 系统 */
+    @Excel(name = "系统名称")
+    private String systemName;
+
+    /** API编码 */
+    @Excel(name = "API编码")
+    private String apiCode;
+
+    /** API名称 */
+    @Excel(name = "API名称")
+    private String apiName;
+
+    /** API请求URL */
+    @Excel(name = "API请求URL")
+    private String apiUrl;
+
+    /** 表名称 */
+    @Excel(name = "表名称")
+    private String apiTableName;
+
+    /** 主键字段 */
+    @Excel(name = "主键字段")
+    private String apiPkColumn;
+
+    /** SQL */
+    @Excel(name = "SQL")
+    private String apiSql;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sortNum;
+
+    /** 有效性 */
+    @Excel(name = "有效性")
+    private Integer validFlag;
+
+    /** 有效性 */
+    @Excel(name = "是否自动推送")
+    private Integer isAutoPush;
+
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date operDate;
+
+    // Robin 2024-7-3
+    private String Db;
+
+    /** 是否业务主表 */
+    @Excel(name = "是否业务主表")
+    private String IsRelatedMasterTable;
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/BizApiFieldMapping.java

@@ -0,0 +1,64 @@
+package com.neuhis.his.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 接口字段引射关系对象 biz_api_field_mapping
+ * 
+ * @author zhangbin
+ * @date 2024-06-13
+ */
+@Data
+public class BizApiFieldMapping extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long mappingId;
+
+    /** API */
+    @Excel(name = "API名称")
+    private String apiName;
+
+    /** API */
+    @Excel(name = "API编码")
+    private String apiCode;
+
+    /** 字段编码 */
+    @Excel(name = "字段编码")
+    private String fieldCode;
+
+    /** 字段名称 */
+    @Excel(name = "字段名称")
+    private String fieldName;
+
+    /** 字段说明 */
+    private String fieldComment;
+
+    /** 数据库字段 */
+    private String dbColumn;
+
+    /** 数据库字段类型 */
+    private String dbColumnType;
+
+    /** 字段排序 */
+    @Excel(name = "字段排序")
+    private Long sortNum;
+
+    /** 操作日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "操作日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date operDate;
+
+    /** 有效性 */
+    @Excel(name = "有效性")
+    private Integer validFlag;
+
+
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/Accredit.java

@@ -0,0 +1,183 @@
+package com.neuhis.his.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+
+import java.util.Date;
+
+public class Accredit {
+
+
+    /**  */
+    private Long postId;
+
+    /** 授权平台编码 */
+    @Excel(name = "授权平台编码")
+    private String postPlatformCode;
+
+    /** 授权平台名称 */
+    @Excel(name = "授权平台名称")
+    private String postPlatformName;
+
+    /** 授权平台地址 */
+    @Excel(name = "授权平台地址")
+    private String postPlatformUrl;
+
+    /** 授权单位编码 */
+    @Excel(name = "授权单位编码")
+    private String postCompanyCode;
+
+    /** 授权单位名称 */
+    @Excel(name = "授权单位名称")
+    private String postCompanyName;
+
+    /** 授权码 */
+    @Excel(name = "授权码")
+    private String licenseCode;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long postSort;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh24:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd hh24:mm:ss")
+    private Date createTime;
+
+    /** 创建者 */
+    @Excel(name = "创建者")
+    private String createBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh24:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd hh24:mm:ss")
+    private Date updateTime;
+
+    /** 更新者 */
+    @Excel(name = "更新者")
+    private String updateBy;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    public Long getPostId() {
+        return postId;
+    }
+
+    public void setPostId(Long postId) {
+        this.postId = postId;
+    }
+
+    public String getPostPlatformCode() {
+        return postPlatformCode;
+    }
+
+    public void setPostPlatformCode(String postPlatformCode) {
+        this.postPlatformCode = postPlatformCode;
+    }
+
+    public String getPostPlatformName() {
+        return postPlatformName;
+    }
+
+    public void setPostPlatformName(String postPlatformName) {
+        this.postPlatformName = postPlatformName;
+    }
+
+    public String getPostCompanyCode() {
+        return postCompanyCode;
+    }
+
+    public void setPostCompanyCode(String postCompanyCode) {
+        this.postCompanyCode = postCompanyCode;
+    }
+
+    public String getPostCompanyName() {
+        return postCompanyName;
+    }
+
+    public void setPostCompanyName(String postCompanyName) {
+        this.postCompanyName = postCompanyName;
+    }
+
+    public String getLicenseCode() {
+        return licenseCode;
+    }
+
+    public void setLicenseCode(String licenseCode) {
+        this.licenseCode = licenseCode;
+    }
+
+    public Long getPostSort() {
+        return postSort;
+    }
+
+    public void setPostSort(Long postSort) {
+        this.postSort = postSort;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+
+    public String getRemark() {
+        return remark;
+    }
+
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/ComUndrugZtFeeGroupItem.java

@@ -0,0 +1,16 @@
+package com.neuhis.his.domain.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ComUndrugZtFeeGroupItem {
+
+    private String packageCode;
+
+    private String feeCode;
+
+    private BigDecimal feeCodePrice;
+
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/DeadLock.java

@@ -0,0 +1,32 @@
+package com.neuhis.his.domain.dto;
+
+public class DeadLock {
+
+    private String sid;
+    private String serial;
+    private String sessionStr;
+
+    public String getSid() {
+        return sid;
+    }
+
+    public void setSid(String sid) {
+        this.sid = sid;
+    }
+
+    public String getSerial() {
+        return serial;
+    }
+
+    public void setSerial(String serial) {
+        this.serial = serial;
+    }
+
+    public String getSessionStr() {
+        return sessionStr;
+    }
+
+    public void setSessionStr(String sessionStr) {
+        this.sessionStr = sessionStr;
+    }
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/ProdureParam.java

@@ -0,0 +1,40 @@
+package com.neuhis.his.domain.dto;
+
+public class ProdureParam {
+
+    private  ProdureParamTypeEnum paramTypeEnum;
+
+    private String paramType;
+
+    private String paramValue;
+
+    public ProdureParamTypeEnum getParamTypeEnum() {
+        return paramTypeEnum;
+    }
+
+    public void setParamTypeEnum(ProdureParamTypeEnum paramTypeEnum) {
+        this.paramTypeEnum = paramTypeEnum;
+    }
+
+    public String getParamType() {
+        return paramType;
+    }
+
+    public void setParamType(String paramType) {
+        this.paramType = paramType;
+    }
+
+    public String getParamValue() {
+        return paramValue;
+    }
+
+    public void setParamValue(String paramValue) {
+        this.paramValue = paramValue;
+    }
+
+    public ProdureParam(ProdureParamTypeEnum paramTypeEnum, String paramType,String paramValue){
+        this.paramTypeEnum=paramTypeEnum;
+        this.paramType=paramType;
+        this.paramValue=paramValue;
+    }
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/ProdureParamTypeEnum.java

@@ -0,0 +1,5 @@
+package com.neuhis.his.domain.dto;
+
+public enum ProdureParamTypeEnum {
+    IN,OUT;
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/dto/Response.java

@@ -0,0 +1,22 @@
+package com.neuhis.his.domain.dto;
+
+public class Response {
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String result;
+    public String desc;
+}

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

@@ -0,0 +1,182 @@
+package com.neuhis.his.domain.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 字典数据对象 biz_dict
+ * 
+ * @author zhangbin
+ * @date 2023-11-29
+ */
+public class BizDict extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 字典编码 */
+    private Long dictCode;
+
+    /** 字典类型名称 */
+    @Excel(name = "字典类型名称")
+    private String dictTypeName;
+
+    /** 字典类型 */
+    @Excel(name = "字典类型")
+    private String dictType;
+
+    /** 字典标签 */
+    @Excel(name = "字典标签")
+    private String dictLabel;
+
+    /** 字典键值 */
+    @Excel(name = "字典键值")
+    private String dictValue;
+
+    /** 是否默认（Y是 N否） */
+    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+    private String isDefault;
+
+    /** 字典排序 */
+    @Excel(name = "字典排序")
+    private Integer dictSort;
+
+    /** 状态（1正常 0停用） */
+    @Excel(name = "状态", readConverterExp = "1=正常,0=停用")
+    private String status;
+
+    /**  */
+    @Excel(name = "")
+    private String ext1;
+
+    /**  */
+    @Excel(name = "")
+    private String ext2;
+
+    /**  */
+    @Excel(name = "")
+    private String ext3;
+
+    public void setDictCode(Long dictCode) 
+    {
+        this.dictCode = dictCode;
+    }
+
+    public Long getDictCode() 
+    {
+        return dictCode;
+    }
+    public void setDictTypeName(String dictTypeName) 
+    {
+        this.dictTypeName = dictTypeName;
+    }
+
+    public String getDictTypeName() 
+    {
+        return dictTypeName;
+    }
+    public void setDictType(String dictType) 
+    {
+        this.dictType = dictType;
+    }
+
+    public String getDictType() 
+    {
+        return dictType;
+    }
+    public void setDictLabel(String dictLabel) 
+    {
+        this.dictLabel = dictLabel;
+    }
+
+    public String getDictLabel() 
+    {
+        return dictLabel;
+    }
+    public void setDictValue(String dictValue) 
+    {
+        this.dictValue = dictValue;
+    }
+
+    public String getDictValue() 
+    {
+        return dictValue;
+    }
+    public void setIsDefault(String isDefault) 
+    {
+        this.isDefault = isDefault;
+    }
+
+    public String getIsDefault() 
+    {
+        return isDefault;
+    }
+    public void setDictSort(Integer dictSort) 
+    {
+        this.dictSort = dictSort;
+    }
+
+    public Integer getDictSort() 
+    {
+        return dictSort;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setExt1(String ext1) 
+    {
+        this.ext1 = ext1;
+    }
+
+    public String getExt1() 
+    {
+        return ext1;
+    }
+    public void setExt2(String ext2) 
+    {
+        this.ext2 = ext2;
+    }
+
+    public String getExt2() 
+    {
+        return ext2;
+    }
+    public void setExt3(String ext3) 
+    {
+        this.ext3 = ext3;
+    }
+
+    public String getExt3() 
+    {
+        return ext3;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("dictCode", getDictCode())
+            .append("dictTypeName", getDictTypeName())
+            .append("dictType", getDictType())
+            .append("dictLabel", getDictLabel())
+            .append("dictValue", getDictValue())
+            .append("isDefault", getIsDefault())
+            .append("dictSort", getDictSort())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("ext1", getExt1())
+            .append("ext2", getExt2())
+            .append("ext3", getExt3())
+            .toString();
+    }
+}

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

@@ -0,0 +1,122 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 电子申请单对象 biz_elec_app
+ * 
+ * @author zhangbin
+ * @date 2024-05-27
+ */
+@Data
+public class BizElecApp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @Excel(name = "ID")
+    private Long id;
+
+    /** 科室 */
+    @Excel(name = "科室")
+    private String depttype;
+
+    /** 术语名称 */
+    @Excel(name = "术语编码")
+    private String shuyuCode;
+
+    /** 复合项目 */
+    private Integer ztFlag;
+
+    /** 术语名称 */
+    @Excel(name = "术语名称")
+    private String shuyu;
+
+    /** 物价编码 */
+    @Excel(name = "物价编码")
+    private String wujiaCode;
+
+    /** 物价名称 */
+    @Excel(name = "物价名称")
+    private String wujia;
+
+    /** 物价数量 */
+    private String wujiaNum;
+
+    /** 价格 */
+    private String price;
+
+    /** 价格2 */
+    @Excel(name = "价格")
+    private BigDecimal price2;
+
+    /** 电子申请单类型编码 */
+    private String billTypeCode;
+
+    /** 电子申请单类型 */
+    @Excel(name = "电子申请单类型")
+    private String billtype;
+
+    /** 检查方法编码 */
+    @Excel(name = "检查方法编码")
+    private String methodCode;
+
+    /** 检查方法 */
+    @Excel(name = "检查方法")
+    private String method;
+
+    /** 大部位编码 */
+    @Excel(name = "大部位编码")
+    private String bigCode;
+
+    /** 大部位 */
+    @Excel(name = "大部位")
+    private String big;
+
+    /** 执行部位编码 */
+    @Excel(name = "执行部位编码")
+    private String smallCode;
+
+    /** 小部位 */
+    @Excel(name = "小部位")
+    private String small;
+
+    /** 自定义编码 */
+    @Excel(name = "自定义编码")
+    private String zdyCode;
+
+    /** 最小费用编码 */
+    @Excel(name = "最小费用编码")
+    private String minFeeCode;
+
+    /** 最小费用 */
+    @Excel(name = "最小费用")
+    private String minFee;
+
+    /** 自定义编码 */
+    @Excel(name = "执行科室")
+    private String execDept;
+
+    /** 审核状态：1：通过，0：未通过 */
+    @Excel(name = "审核状态")
+    private Integer validFlag;
+
+    /** 状态 */
+    private Integer status;
+
+    /** 是否上线 */
+    @Excel(name = "是否上线")
+    private Integer onLine;
+
+    private Integer searchCode;
+
+    private Integer smallNum=0;
+
+    private Integer methodNum=0;
+}

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

@@ -0,0 +1,198 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 任务调度记录对象 biz_handle_record
+ * 
+ * @author zhangbin
+ * @date 2023-08-25
+ */
+public class BizHandleRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long handleId;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String handleType;
+
+    /** 处理日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "处理日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date handleDate;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 处理状态，0：未处理。1：已处理，2：处理出错 */
+    @Excel(name = "处理状态，0：未处理。1：已处理，2：处理出错")
+    private Integer handleStatus;
+
+    /** 处理结果描述 */
+    @Excel(name = "处理结果描述")
+    private String handleMsg;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    private String ext1;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    private String ext2;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    private String ext3;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    private String ext4;
+
+    /** 扩展字段 */
+    @Excel(name = "扩展字段")
+    private String ext5;
+
+    public void setHandleId(Long handleId) 
+    {
+        this.handleId = handleId;
+    }
+
+    public Long getHandleId() 
+    {
+        return handleId;
+    }
+    public void setHandleType(String handleType) 
+    {
+        this.handleType = handleType;
+    }
+
+    public String getHandleType() 
+    {
+        return handleType;
+    }
+    public void setHandleDate(Date handleDate) 
+    {
+        this.handleDate = handleDate;
+    }
+
+    public Date getHandleDate() 
+    {
+        return handleDate;
+    }
+    public void setStartTime(Date startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setHandleStatus(Integer handleStatus)
+    {
+        this.handleStatus = handleStatus;
+    }
+
+    public Integer getHandleStatus()
+    {
+        return handleStatus;
+    }
+    public void setHandleMsg(String handleMsg) 
+    {
+        this.handleMsg = handleMsg;
+    }
+
+    public String getHandleMsg() 
+    {
+        return handleMsg;
+    }
+    public void setExt1(String ext1) 
+    {
+        this.ext1 = ext1;
+    }
+
+    public String getExt1() 
+    {
+        return ext1;
+    }
+    public void setExt2(String ext2) 
+    {
+        this.ext2 = ext2;
+    }
+
+    public String getExt2() 
+    {
+        return ext2;
+    }
+    public void setExt3(String ext3) 
+    {
+        this.ext3 = ext3;
+    }
+
+    public String getExt3() 
+    {
+        return ext3;
+    }
+    public void setExt4(String ext4) 
+    {
+        this.ext4 = ext4;
+    }
+
+    public String getExt4() 
+    {
+        return ext4;
+    }
+    public void setExt5(String ext5) 
+    {
+        this.ext5 = ext5;
+    }
+
+    public String getExt5() 
+    {
+        return ext5;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("handleId", getHandleId())
+            .append("handleType", getHandleType())
+            .append("handleDate", getHandleDate())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("handleStatus", getHandleStatus())
+            .append("handleMsg", getHandleMsg())
+            .append("ext1", getExt1())
+            .append("ext2", getExt2())
+            .append("ext3", getExt3())
+            .append("ext4", getExt4())
+            .append("ext5", getExt5())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 任务开关管理对象 biz_job_switch
+ * 
+ * @author zhangbin
+ * @date 2024-05-10
+ */
+@Data
+public class BizJobSwitch extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 开关名称 */
+    @Excel(name = "开关名称")
+    private String switchName;
+
+    /**  */
+    @Excel(name = "")
+    private String switchCode;
+
+    /** 是否开启，1：开启，0：未开启 */
+    @Excel(name = "是否开启，1：开启，0：未开启")
+    private Boolean enable;
+
+    /**  */
+    @Excel(name = "")
+    private String evn;
+}

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

@@ -0,0 +1,79 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 存储过程对象 biz_procedure
+ * 
+ * @author zhangbin
+ * @date 2023-08-23
+ */
+@Data
+public class BizProcedure extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 存储过程用户 */
+    @Excel(name = "存储过程用户")
+    private String procedureUser;
+
+    /** 存储过程名称(中) */
+    @Excel(name = "存储过程名称(中)")
+    private String procedureName;
+
+    /** 存储过程名称(英) */
+    @Excel(name = "存储过程名称(英)")
+    private String procedureNameEn;
+
+    /** 存储过程描述 */
+    private String procedureDesc;
+
+    /** 参数1 */
+    private String param1;
+
+    /** 参数类型1 */
+    private String paramType1;
+
+    /** 参数2 */
+    private String param2;
+
+    /** 参数类型2 */
+    private String paramType2;
+
+    /** 参数3 */
+    private String param3;
+
+    /** 参数类型3 */
+    private String paramType3;
+
+    /** 参数4 */
+    private String param4;
+
+    /** 参数类型4 */
+    private String paramType4;
+
+    /** 参数5 */
+    private String param5;
+
+    /** 参数类型5 */
+    private String paramType5;
+
+    /** 出参数1 */
+    private String outParam1;
+
+    /** 出参数类型1 */
+    private String outParamType1;
+
+    /** 排序 */
+    private Long orderNum;
+
+}

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

@@ -0,0 +1,112 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+/**
+    * 控制参数表
+    */
+public class ComControlargument {
+    /**
+    * 控制参数代码
+    */
+    private String controlCode;
+
+    /**
+    * 控制参数名称
+    */
+    private String controlName;
+
+    /**
+    * 控制参数值
+    */
+    private String controlValue;
+
+    /**
+    * 是否显示 0 显示 1 不显示
+    */
+    private String visibleFlag;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 操作时间
+    */
+    private Date operDate;
+
+    /**
+    * 业务线分类
+    */
+    private String kind;
+
+    /**
+    * 医院编号
+    */
+    private String hosCode;
+
+    public String getControlCode() {
+        return controlCode;
+    }
+
+    public void setControlCode(String controlCode) {
+        this.controlCode = controlCode;
+    }
+
+    public String getControlName() {
+        return controlName;
+    }
+
+    public void setControlName(String controlName) {
+        this.controlName = controlName;
+    }
+
+    public String getControlValue() {
+        return controlValue;
+    }
+
+    public void setControlValue(String controlValue) {
+        this.controlValue = controlValue;
+    }
+
+    public String getVisibleFlag() {
+        return visibleFlag;
+    }
+
+    public void setVisibleFlag(String visibleFlag) {
+        this.visibleFlag = visibleFlag;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    public String getHosCode() {
+        return hosCode;
+    }
+
+    public void setHosCode(String hosCode) {
+        this.hosCode = hosCode;
+    }
+}

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

@@ -0,0 +1,370 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 科室表
+    */
+public class ComDepartment {
+    /**
+    * 科室编码
+    */
+    private String deptCode;
+
+    /**
+    * 科室名称
+    */
+    private String deptName;
+
+    /**
+    * 拼音
+    */
+    private String spellCode;
+
+    /**
+    * 五笔
+    */
+    private String wbCode;
+
+    /**
+    * 科室英文
+    */
+    private String deptEname;
+
+    /**
+    * C 门诊  I  住院  F  财务 L  后勤(logistics)  PI  药库 T 医技(terminal)  O  其它 D  机关(department)P  药房   N 护士站
+    */
+    private String deptType;
+
+    /**
+    * 发药时间
+    */
+    private BigDecimal mediTime;
+
+    /**
+    * 周期开始
+    */
+    private BigDecimal cycleBegin;
+
+    /**
+    * 周期结束
+    */
+    private BigDecimal cycleEnd;
+
+    /**
+    * 是否挂号科室 0 假 1 真
+    */
+    private String regdeptFlag;
+
+    /**
+    * 是否核算科室 0 假 1 真
+    */
+    private String tatdeptFlag;
+
+    /**
+    * 特殊科室属性 0 普通, 1 手术,  2 麻醉, 3 ICU,  4 CCU, C 产科(中山一需求),E急诊留观,T特诊
+    */
+    private String deptPro;
+
+    /**
+    * 警戒线
+    */
+    private BigDecimal alterMoney;
+
+    /**
+    * 扩展标志 －是否已经集中发送 0 未,1 已
+    */
+    private String extFlag;
+
+    /**
+    * 扩展标志1
+    */
+    private String ext1Flag;
+
+    /**
+    * 有效性标志 1在用 0 停用 2 废弃
+    */
+    private String validState;
+
+    /**
+    * 顺序号
+    */
+    private BigDecimal sortId;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 操作时间
+    */
+    private Date operDate;
+
+    /**
+    * 自定义码
+    */
+    private String userCode;
+
+    /**
+    * 科室简称
+    */
+    private String simpleName;
+
+    /**
+    * 住院药房科室排序
+    */
+    private BigDecimal ipbSortId;
+
+    /**
+    * 是否住院科室
+    */
+    private String isPreinpatient;
+
+    /**
+    * 主数据科室编码
+    */
+    private String mainDeptcode;
+
+    /**
+    * 主数据科室名称
+    */
+    private String mainDeptname;
+
+    /**
+    * 核定床位数
+    */
+    private BigDecimal bedNum;
+
+    /**
+    * 科室所属院区（对应常数BrachCode）
+    */
+    private String brachCode;
+
+    private String gbCode;
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getSpellCode() {
+        return spellCode;
+    }
+
+    public void setSpellCode(String spellCode) {
+        this.spellCode = spellCode;
+    }
+
+    public String getWbCode() {
+        return wbCode;
+    }
+
+    public void setWbCode(String wbCode) {
+        this.wbCode = wbCode;
+    }
+
+    public String getDeptEname() {
+        return deptEname;
+    }
+
+    public void setDeptEname(String deptEname) {
+        this.deptEname = deptEname;
+    }
+
+    public String getDeptType() {
+        return deptType;
+    }
+
+    public void setDeptType(String deptType) {
+        this.deptType = deptType;
+    }
+
+    public BigDecimal getMediTime() {
+        return mediTime;
+    }
+
+    public void setMediTime(BigDecimal mediTime) {
+        this.mediTime = mediTime;
+    }
+
+    public BigDecimal getCycleBegin() {
+        return cycleBegin;
+    }
+
+    public void setCycleBegin(BigDecimal cycleBegin) {
+        this.cycleBegin = cycleBegin;
+    }
+
+    public BigDecimal getCycleEnd() {
+        return cycleEnd;
+    }
+
+    public void setCycleEnd(BigDecimal cycleEnd) {
+        this.cycleEnd = cycleEnd;
+    }
+
+    public String getRegdeptFlag() {
+        return regdeptFlag;
+    }
+
+    public void setRegdeptFlag(String regdeptFlag) {
+        this.regdeptFlag = regdeptFlag;
+    }
+
+    public String getTatdeptFlag() {
+        return tatdeptFlag;
+    }
+
+    public void setTatdeptFlag(String tatdeptFlag) {
+        this.tatdeptFlag = tatdeptFlag;
+    }
+
+    public String getDeptPro() {
+        return deptPro;
+    }
+
+    public void setDeptPro(String deptPro) {
+        this.deptPro = deptPro;
+    }
+
+    public BigDecimal getAlterMoney() {
+        return alterMoney;
+    }
+
+    public void setAlterMoney(BigDecimal alterMoney) {
+        this.alterMoney = alterMoney;
+    }
+
+    public String getExtFlag() {
+        return extFlag;
+    }
+
+    public void setExtFlag(String extFlag) {
+        this.extFlag = extFlag;
+    }
+
+    public String getExt1Flag() {
+        return ext1Flag;
+    }
+
+    public void setExt1Flag(String ext1Flag) {
+        this.ext1Flag = ext1Flag;
+    }
+
+    public String getValidState() {
+        return validState;
+    }
+
+    public void setValidState(String validState) {
+        this.validState = validState;
+    }
+
+    public BigDecimal getSortId() {
+        return sortId;
+    }
+
+    public void setSortId(BigDecimal sortId) {
+        this.sortId = sortId;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getSimpleName() {
+        return simpleName;
+    }
+
+    public void setSimpleName(String simpleName) {
+        this.simpleName = simpleName;
+    }
+
+    public BigDecimal getIpbSortId() {
+        return ipbSortId;
+    }
+
+    public void setIpbSortId(BigDecimal ipbSortId) {
+        this.ipbSortId = ipbSortId;
+    }
+
+    public String getIsPreinpatient() {
+        return isPreinpatient;
+    }
+
+    public void setIsPreinpatient(String isPreinpatient) {
+        this.isPreinpatient = isPreinpatient;
+    }
+
+    public String getMainDeptcode() {
+        return mainDeptcode;
+    }
+
+    public void setMainDeptcode(String mainDeptcode) {
+        this.mainDeptcode = mainDeptcode;
+    }
+
+    public String getMainDeptname() {
+        return mainDeptname;
+    }
+
+    public void setMainDeptname(String mainDeptname) {
+        this.mainDeptname = mainDeptname;
+    }
+
+    public BigDecimal getBedNum() {
+        return bedNum;
+    }
+
+    public void setBedNum(BigDecimal bedNum) {
+        this.bedNum = bedNum;
+    }
+
+    public String getBrachCode() {
+        return brachCode;
+    }
+
+    public void setBrachCode(String brachCode) {
+        this.brachCode = brachCode;
+    }
+
+    public String getGbCode() {
+        return gbCode;
+    }
+
+    public void setGbCode(String gbCode) {
+        this.gbCode = gbCode;
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 公共_常数表
+    */
+@Data
+public class ComDictionary {
+    /**
+    * 常数类型
+    */
+    private String type;
+
+    /**
+    * 编码
+    */
+    private String code;
+
+    /**
+    * 名称
+    */
+    private String name;
+
+    /**
+    * 备注
+    */
+    private String mark;
+
+    /**
+    * 拼音码
+    */
+    private String spellCode;
+
+    /**
+    * 五笔码
+    */
+    private String wbCode;
+
+    /**
+    * 输入
+    */
+    private String inputCode;
+
+    /**
+    * 顺序号
+    */
+    private BigDecimal sortId;
+
+    /**
+    * 有效性标志 1 在用 0 停用
+    */
+    private String validState;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 操作时间
+    */
+    private Date operDate;
+
+    /**
+    * 父级医疗机构编码
+    */
+    private String parentCode;
+
+    /**
+    * 本机医疗机构编码
+    */
+    private String currentCode;
+
+    /**
+    * 分类名 或者 分值 或者其他额外信息 （xwx添加）
+    */
+    private String kindId;
+
+    /**
+    * (xwx添加） 只在院感模块 使用了
+    */
+    private String isCommon;
+
+}

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

@@ -0,0 +1,371 @@
+package com.neuhis.his.domain.entity;
+
+import com.neuhis.his.domain.entity.items.PVisit;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 病人基本信息表
+    */
+@Data
+public class ComPatientinfo{
+    /**
+    * 就诊卡号
+    */
+    private String cardNo;
+
+    /**
+    * 电脑号
+    */
+    private String icCardno;
+
+    /**
+    * 姓名
+    */
+    private String name;
+
+    /**
+    * 拼音码
+    */
+    private String spellCode;
+
+    /**
+    * 五笔
+    */
+    private String wbCode;
+
+    /**
+    * 出生日期
+    */
+    private Date birthday;
+
+    /**
+    * 性别
+    */
+    private String sexCode;
+
+    /**
+    * 身份证号
+    */
+    private String idenno;
+
+    /**
+    * 血型
+    */
+    private String bloodCode;
+
+    /**
+    * 职业
+    */
+    private String profCode;
+
+    /**
+    * 工作单位
+    */
+    private String workHome;
+
+    /**
+    * 单位电话
+    */
+    private String workTel;
+
+    /**
+    * 单位邮编
+    */
+    private String workZip;
+
+    /**
+    * 户口或家庭所在
+    */
+    private String home;
+
+    /**
+    * 家庭电话
+    */
+    private String homeTel;
+
+    /**
+    * 户口或家庭邮政编码
+    */
+    private String homeZip;
+
+    /**
+    * 籍贯
+    */
+    private String district;
+
+    /**
+    * 民族
+    */
+    private String nationCode;
+
+    /**
+    * 联系人姓名
+    */
+    private String linkmanName;
+
+    /**
+    * 联系人电话
+    */
+    private String linkmanTel;
+
+    /**
+    * 联系人住址
+    */
+    private String linkmanAdd;
+
+    /**
+    * 联系人关系
+    */
+    private String relaCode;
+
+    /**
+    * 婚姻状况
+    */
+    private String mari;
+
+    /**
+    * 国籍
+    */
+    private String counCode;
+
+    /**
+    * 结算类别
+    */
+    private String paykindCode;
+
+    /**
+    * 结算类别名称
+    */
+    private String paykindName;
+
+    /**
+    * 合同代码
+    */
+    private String pactCode;
+
+    /**
+    * 合同单位名称
+    */
+    private String pactName;
+
+    /**
+    * 医疗证号
+    */
+    private String mcardNo;
+
+    /**
+    * 出生地
+    */
+    private String areaCode;
+
+    /**
+    * 医疗费用
+    */
+    private BigDecimal framt;
+
+    /**
+    * 药物过敏
+    */
+    private String anaphyFlag;
+
+    /**
+    * 重要疾病
+    */
+    private String hepatitisFlag;
+
+    /**
+    * 帐户密码
+    */
+    private String actCode;
+
+    /**
+    * 帐户总额
+    */
+    private BigDecimal actAmt;
+
+    /**
+    * 上期帐户余额
+    */
+    private BigDecimal lactSum;
+
+    /**
+    * 上期银行余额
+    */
+    private BigDecimal lbankSum;
+
+    /**
+    * 欠费次数
+    */
+    private Short arrearTimes;
+
+    /**
+    * 欠费金额
+    */
+    private BigDecimal arrearSum;
+
+    /**
+    * 住院来源
+    */
+    private String inhosSource;
+
+    /**
+    * 最近住院日期
+    */
+    private Date lihosDate;
+
+    /**
+    * 住院次数
+    */
+    private Short inhosTimes;
+
+    /**
+    * 最近出院日期
+    */
+    private Date louthosDate;
+
+    /**
+    * 初诊日期
+    */
+    private Date firSeeDate;
+
+    /**
+    * 最近挂号日期
+    */
+    private Date lregDate;
+
+    /**
+    * 违约次数
+    */
+    private BigDecimal disobyCnt;
+
+    /**
+    * 结束日期
+    */
+    private Date endDate;
+
+    /**
+    * 备注
+    */
+    private String mark;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 操作日期
+    */
+    private Date operDate;
+
+    /**
+    * 是否有效1有效0无效2作废
+    */
+    private String isValid;
+
+    /**
+    * 算法类别  0 全部
+    */
+    private String feeKind;
+
+    /**
+    * 旧卡号,新老数据切换用
+    */
+    private String oldCardno;
+
+    /**
+    * 是否加密姓名
+    */
+    private String isEncryptname;
+
+    /**
+    * 密文
+    */
+    private String normalname;
+
+    /**
+    * 证件类型
+    */
+    private String idcardtype;
+
+    private String vipFlag;
+
+    private String montherName;
+
+    private String isTreatment;
+
+    private String caseNo;
+
+    private String insuranceId;
+
+    private String insuranceName;
+
+    private String homeDoorNo;
+
+    private String linkmanDoorNo;
+
+    private String email;
+
+    /**
+    * 合疗证号
+    */
+    private String heliao;
+
+    private String shouxing;
+
+    private String staff;
+
+    private String isbankcard;
+
+    /**
+    * 现住址
+    */
+    private String nowhome;
+
+    /**
+    * 现住址邮编
+    */
+    private String nowhomeZip;
+
+    /**
+    * 联系人身份证号码
+    */
+    private String linkIdeno;
+
+    /**
+    * 合疗城市编码
+    */
+    private String contycode;
+
+    /**
+    * MPI索引
+    */
+    private String mpi;
+
+    /**
+    * 患者主索引
+    */
+    private String hisGuid;
+
+    /**
+    * 是否临时卡 1是  其他否
+    */
+    private String tempcard;
+
+    private SearchEntity searchEntity;
+
+    private FinOpbAccount finOpbAccount =new FinOpbAccount();
+
+    /**
+     * 患者住院记录
+     */
+    private PVisit pVisit = new PVisit();
+
+    /**
+     * 患者住院记录
+     */
+    private PVisit pVisit2 = new PVisit();
+}

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

@@ -0,0 +1,216 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DawnCodeInfo {
+    private String consInfoId;
+
+    private String consTypeId;
+
+    private String consInfoParentId;
+
+    private String consInfoCode;
+
+    private String consInfoName;
+
+    private BigDecimal sortNo;
+
+    private String validState;
+
+    private String spellCode;
+
+    private String wbCode;
+
+    private String customCode;
+
+    private String remark;
+
+    private Date createDate;
+
+    private String operCode;
+
+    private Date operDate;
+
+    private String isCommon;
+
+    private String kindId;
+
+    private String parentCode;
+
+    private String currentCode;
+
+    private String consEname;
+
+    private String syncFlag;
+
+    private String distCode;
+
+    public String getConsInfoId() {
+        return consInfoId;
+    }
+
+    public void setConsInfoId(String consInfoId) {
+        this.consInfoId = consInfoId;
+    }
+
+    public String getConsTypeId() {
+        return consTypeId;
+    }
+
+    public void setConsTypeId(String consTypeId) {
+        this.consTypeId = consTypeId;
+    }
+
+    public String getConsInfoParentId() {
+        return consInfoParentId;
+    }
+
+    public void setConsInfoParentId(String consInfoParentId) {
+        this.consInfoParentId = consInfoParentId;
+    }
+
+    public String getConsInfoCode() {
+        return consInfoCode;
+    }
+
+    public void setConsInfoCode(String consInfoCode) {
+        this.consInfoCode = consInfoCode;
+    }
+
+    public String getConsInfoName() {
+        return consInfoName;
+    }
+
+    public void setConsInfoName(String consInfoName) {
+        this.consInfoName = consInfoName;
+    }
+
+    public BigDecimal getSortNo() {
+        return sortNo;
+    }
+
+    public void setSortNo(BigDecimal sortNo) {
+        this.sortNo = sortNo;
+    }
+
+    public String getValidState() {
+        return validState;
+    }
+
+    public void setValidState(String validState) {
+        this.validState = validState;
+    }
+
+    public String getSpellCode() {
+        return spellCode;
+    }
+
+    public void setSpellCode(String spellCode) {
+        this.spellCode = spellCode;
+    }
+
+    public String getWbCode() {
+        return wbCode;
+    }
+
+    public void setWbCode(String wbCode) {
+        this.wbCode = wbCode;
+    }
+
+    public String getCustomCode() {
+        return customCode;
+    }
+
+    public void setCustomCode(String customCode) {
+        this.customCode = customCode;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getIsCommon() {
+        return isCommon;
+    }
+
+    public void setIsCommon(String isCommon) {
+        this.isCommon = isCommon;
+    }
+
+    public String getKindId() {
+        return kindId;
+    }
+
+    public void setKindId(String kindId) {
+        this.kindId = kindId;
+    }
+
+    public String getParentCode() {
+        return parentCode;
+    }
+
+    public void setParentCode(String parentCode) {
+        this.parentCode = parentCode;
+    }
+
+    public String getCurrentCode() {
+        return currentCode;
+    }
+
+    public void setCurrentCode(String currentCode) {
+        this.currentCode = currentCode;
+    }
+
+    public String getConsEname() {
+        return consEname;
+    }
+
+    public void setConsEname(String consEname) {
+        this.consEname = consEname;
+    }
+
+    public String getSyncFlag() {
+        return syncFlag;
+    }
+
+    public void setSyncFlag(String syncFlag) {
+        this.syncFlag = syncFlag;
+    }
+
+    public String getDistCode() {
+        return distCode;
+    }
+
+    public void setDistCode(String distCode) {
+        this.distCode = distCode;
+    }
+}

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

@@ -0,0 +1,9 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+@Data
+public class DvDataRecord {
+
+    private Long dataId;
+}

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

@@ -0,0 +1,71 @@
+package com.neuhis.his.domain.entity;
+
+/**
+ * 需填写检查申请单医嘱配置表
+ */
+public class FinComExamorder {
+    /**
+    * 主键
+    */
+    private String id;
+
+    /**
+    * 项目类型
+    */
+    private String itemtype;
+
+    /**
+    * 项目编码
+    */
+    private String itemcode;
+
+    /**
+    * 是否有效 "0"禁用 "1"有效
+    */
+    private String isvaild;
+
+    /**
+    * 关联注意事项
+    */
+    private String linkattention;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getItemtype() {
+        return itemtype;
+    }
+
+    public void setItemtype(String itemtype) {
+        this.itemtype = itemtype;
+    }
+
+    public String getItemcode() {
+        return itemcode;
+    }
+
+    public void setItemcode(String itemcode) {
+        this.itemcode = itemcode;
+    }
+
+    public String getIsvaild() {
+        return isvaild;
+    }
+
+    public void setIsvaild(String isvaild) {
+        this.isvaild = isvaild;
+    }
+
+    public String getLinkattention() {
+        return linkattention;
+    }
+
+    public void setLinkattention(String linkattention) {
+        this.linkattention = linkattention;
+    }
+}

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

@@ -0,0 +1,341 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 非药品信息表
+    */
+@Data
+public class FinComUndruginfo {
+    /**
+    * 非药品编码
+    */
+    private String itemCode;
+
+    /**
+    * 非药品名称
+    */
+    private String itemName;
+
+    /**
+    * 系统类别
+    */
+    private String sysClass;
+
+    /**
+    * 最小费用代码
+    */
+    private String feeCode;
+
+    /**
+    * 输入码
+    */
+    private String inputCode;
+
+    /**
+    * 拼音码
+    */
+    private String spellCode;
+
+    /**
+    * 五笔
+    */
+    private String wbCode;
+
+    /**
+    * 国家编码
+    */
+    private String gbCode;
+
+    /**
+    * 国际标准代码
+    */
+    private String internationalCode;
+
+    /**
+    * 三甲价
+    */
+    private BigDecimal unitPrice;
+
+    /**
+    * 儿童价
+    */
+    private BigDecimal unitPrice1;
+
+    /**
+    * 特诊价
+    */
+    private BigDecimal unitPrice2;
+
+    /**
+    * 单价2
+    */
+    private BigDecimal unitPrice3;
+
+    /**
+    * 单价2
+    */
+    private BigDecimal unitPrice4;
+
+    /**
+    * 急诊加成比例
+    */
+    private BigDecimal emergScale;
+
+    /**
+    * 单位
+    */
+    private String stockUnit;
+
+    /**
+    * 省限制          0不限制 1限制
+    */
+    private String specialFlag;
+
+    /**
+    * 市限制          0不限制 1限制
+    */
+    private String specialFlag1;
+
+    /**
+    * 自费项目        0假 1真
+    */
+    private String specialFlag2;
+
+    /**
+    * 特定治疗项目        0假 1真
+    */
+    private String specialFlag3;
+
+    /**
+    * 中山一：是否强制出单
+    */
+    private String specialFlag4;
+
+    /**
+    * 计划生育标记 0假 1真
+    */
+    private String familyPlane;
+
+    /**
+    * 禁止开立项目
+    */
+    private String specialItem;
+
+    /**
+    * 甲乙类标志 1 甲 2 乙
+    */
+    private String itemGrade;
+
+    /**
+    * 确认标志  0 不需要确认 1 需要确认
+    */
+    private String confirmFlag;
+
+    /**
+    * 有效性标识 1 在用 0停用 2 废弃
+    */
+    private String validState;
+
+    /**
+    * 规格
+    */
+    private String specs;
+
+    /**
+    * 执行科室
+    */
+    private String exedeptCode;
+
+    /**
+    * 设备编号 用 | 区分
+    */
+    private String facilityNo;
+
+    /**
+    * 默认检查部位
+    */
+    private String defaultSample;
+
+    /**
+    * 手术编码
+    */
+    private String operateCode;
+
+    /**
+    * 手术分类
+    */
+    private String operateKind;
+
+    /**
+    * 手术规模
+    */
+    private String operateType;
+
+    /**
+    * 是否有物资项目与之对照(1有，0没有)
+    */
+    private String collateFlag;
+
+    /**
+    * 备注
+    */
+    private String mark;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 操作日期
+    */
+    private Date operDate;
+
+    /**
+    * 样本分类(开立检验项目时使用)
+    */
+    private String diseaseClass;
+
+    /**
+    * 专科名称(开立检验项目时使用)
+    */
+    private String specialDept;
+
+    /**
+    * 是否需要打印知情同意书（0需要，1不需要）
+    */
+    private String consentFlag;
+
+    /**
+    * 病史及检查(开立检查申请单时使用)
+    */
+    private String mark1;
+
+    /**
+    * 检查要求(开立检查申请单时使用)
+    */
+    private String mark2;
+
+    /**
+    * 注意事项(开立检查申请单时使用)
+    */
+    private String mark3;
+
+    /**
+    * 检查申请单名称
+    */
+    private String mark4;
+
+    /**
+    * 是否需要预约 1 需要 0 不需要
+    */
+    private String needbespeak;
+
+    /**
+    * 项目范围
+    */
+    private String itemArea;
+
+    /**
+    * 项目例外
+    */
+    private String itemNoarea;
+
+    /**
+    * 单位标识(0,明细; 1,组套)
+    */
+    private String unitflag;
+
+    /**
+    * 适用范围 0 全部  1 门诊 2住院   具体解释看常数维护 APPLICABILITYAREA
+    */
+    private String applicabilityarea;
+
+    /**
+    * 医保类型  - 西安
+    */
+    private String siType;
+
+    /**
+    * 医保限量  - 西安
+    */
+    private BigDecimal siLimit;
+
+    /**
+    * 特殊手术
+    */
+    private String specOperation;
+
+    /**
+    * 合疗类型
+    */
+    private String hlType;
+
+    /**
+    * 合疗限量
+    */
+    private BigDecimal hlLimit;
+
+    /**
+    * 是否急诊
+    */
+    private String specialFlag5;
+
+    private String uploadFlag;
+
+    /**
+    * 注意事项(检查、检验项目说明信息)
+    */
+    private String mark5;
+
+    /**
+    * 适应症(检查、检验项目说明信息)
+    */
+    private String mark6;
+
+    /**
+    * 作用(检查、检验项目说明信息)
+    */
+    private String mark7;
+
+    /**
+    * 手术级别(对应常数OPSLevl)
+    */
+    private String operateLevel;
+
+    /**
+    * 手术切口类型(对应常数OPSIncision)
+    */
+    private String operateIncision;
+
+    /**
+    * 手术麻醉方式
+    */
+    private String operateAnestype;
+
+    /**
+    * 允许开立科室
+    */
+    private String opsapplydept;
+
+    /**
+    * 适用年龄范围
+    */
+    private String agerange;
+
+    /**
+    * 适用性别范围
+    */
+    private String sexrange;
+
+    /**
+    * 温馨提示，用做门诊计费清单小票给患者提示
+    */
+    private String tips;
+
+
+}

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

@@ -0,0 +1,39 @@
+package com.neuhis.his.domain.entity;
+
+import com.neuhis.his.domain.dto.ComUndrugZtFeeGroupItem;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class FinComUndrugztinfo {
+    private String packageCode;
+
+    private String itemCode;
+
+    private BigDecimal sortId;
+
+    private String operCode;
+
+    private Date operDate;
+
+    private String spellCode;
+
+    private String wbCode;
+
+    private String inputCode;
+
+    private String validState;
+
+    private BigDecimal qty;
+
+    private String packageName;
+
+    private String itemName;
+
+    private String inputCodeNew;
+
+    private FinComUndruginfo finComUndruginfo;
+}

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

@@ -0,0 +1,516 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 住院费用汇总表
+ */
+public class FinIpbFeeinfo {
+    /**
+    * 处方号
+    */
+    private String recipeNo;
+
+    /**
+    * 最小费用代码
+    */
+    private String feeCode;
+
+    /**
+    * 执行科室代码
+    */
+    private String executeDeptcode;
+
+    /**
+    * 结算序号
+    */
+    private Short balanceNo;
+
+    /**
+    * 交易类型,1正交易，2反交易
+    */
+    private String transType;
+
+    /**
+    * 住院流水号
+    */
+    private String inpatientNo;
+
+    /**
+    * 姓名
+    */
+    private String name;
+
+    /**
+    * 结算类别 01-自费  02-保险 03-公费在职 04-公费退休 05-公费高干
+    */
+    private String paykindCode;
+
+    /**
+    * 合同单位
+    */
+    private String pactCode;
+
+    /**
+    * 在院科室代码
+    */
+    private String inhosDeptcode;
+
+    /**
+    * 护士站代码
+    */
+    private String nurseCellCode;
+
+    /**
+    * 开立科室代码
+    */
+    private String recipeDeptcode;
+
+    /**
+    * 扣库科室代码
+    */
+    private String stockDeptcode;
+
+    /**
+    * 开立医师代码
+    */
+    private String recipeDoccode;
+
+    /**
+    * 费用金额
+    */
+    private BigDecimal totCost;
+
+    /**
+    * 自费金额
+    */
+    private BigDecimal ownCost;
+
+    /**
+    * 自付金额
+    */
+    private BigDecimal payCost;
+
+    /**
+    * 公费金额
+    */
+    private BigDecimal pubCost;
+
+    /**
+    * 优惠金额
+    */
+    private BigDecimal ecoCost;
+
+    /**
+    * 划价人
+    */
+    private String chargeOpercode;
+
+    /**
+    * 划价日期
+    */
+    private Date chargeDate;
+
+    /**
+    * 计费人
+    */
+    private String feeOpercode;
+
+    /**
+    * 计费日期
+    */
+    private Date feeDate;
+
+    /**
+    * 结算人代码
+    */
+    private String balanceOpercode;
+
+    /**
+    * 结算时间
+    */
+    private Date balanceDate;
+
+    /**
+    * 结算发票号
+    */
+    private String invoiceNo;
+
+    /**
+    * 结算标志 0:未结算；1:已结算 2:已结转
+    */
+    private String balanceState;
+
+    /**
+    * 审核序号
+    */
+    private String checkNo;
+
+    /**
+    * 婴儿标记1：是，0：否(初始值为0)
+    */
+    private String babyFlag;
+
+    /**
+    * 扩展标志(公费患者是否使用了自费的项目0否,1是)
+    */
+    private String extFlag;
+
+    /**
+    * 扩展代码(中山一：保存退费原记录的处方号)
+    */
+    private String extCode;
+
+    /**
+    * 扩展日期
+    */
+    private Date extDate;
+
+    /**
+    * 扩展操作员
+    */
+    private String extOpercode;
+
+    /**
+    * 收费员科室
+    */
+    private String feeoperDeptcode;
+
+    /**
+    * 扩展标志1
+    */
+    private String extFlag1;
+
+    /**
+    * 扩展标志2(收费方式0住院处直接收费,1护士站医嘱收费,2确认收费,3身份变更,4比例调整)
+    */
+    private String extFlag2;
+
+    /**
+    * 开方医师组别号
+    */
+    private String groupCode;
+
+    /**
+    * 患者所属亚专科编码
+    */
+    private String subspecialtyCode;
+
+    /**
+    * 患者所属亚专科名称
+    */
+    private String subspecialtyName;
+
+    public String getRecipeNo() {
+        return recipeNo;
+    }
+
+    public void setRecipeNo(String recipeNo) {
+        this.recipeNo = recipeNo;
+    }
+
+    public String getFeeCode() {
+        return feeCode;
+    }
+
+    public void setFeeCode(String feeCode) {
+        this.feeCode = feeCode;
+    }
+
+    public String getExecuteDeptcode() {
+        return executeDeptcode;
+    }
+
+    public void setExecuteDeptcode(String executeDeptcode) {
+        this.executeDeptcode = executeDeptcode;
+    }
+
+    public Short getBalanceNo() {
+        return balanceNo;
+    }
+
+    public void setBalanceNo(Short balanceNo) {
+        this.balanceNo = balanceNo;
+    }
+
+    public String getTransType() {
+        return transType;
+    }
+
+    public void setTransType(String transType) {
+        this.transType = transType;
+    }
+
+    public String getInpatientNo() {
+        return inpatientNo;
+    }
+
+    public void setInpatientNo(String inpatientNo) {
+        this.inpatientNo = inpatientNo;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPaykindCode() {
+        return paykindCode;
+    }
+
+    public void setPaykindCode(String paykindCode) {
+        this.paykindCode = paykindCode;
+    }
+
+    public String getPactCode() {
+        return pactCode;
+    }
+
+    public void setPactCode(String pactCode) {
+        this.pactCode = pactCode;
+    }
+
+    public String getInhosDeptcode() {
+        return inhosDeptcode;
+    }
+
+    public void setInhosDeptcode(String inhosDeptcode) {
+        this.inhosDeptcode = inhosDeptcode;
+    }
+
+    public String getNurseCellCode() {
+        return nurseCellCode;
+    }
+
+    public void setNurseCellCode(String nurseCellCode) {
+        this.nurseCellCode = nurseCellCode;
+    }
+
+    public String getRecipeDeptcode() {
+        return recipeDeptcode;
+    }
+
+    public void setRecipeDeptcode(String recipeDeptcode) {
+        this.recipeDeptcode = recipeDeptcode;
+    }
+
+    public String getStockDeptcode() {
+        return stockDeptcode;
+    }
+
+    public void setStockDeptcode(String stockDeptcode) {
+        this.stockDeptcode = stockDeptcode;
+    }
+
+    public String getRecipeDoccode() {
+        return recipeDoccode;
+    }
+
+    public void setRecipeDoccode(String recipeDoccode) {
+        this.recipeDoccode = recipeDoccode;
+    }
+
+    public BigDecimal getTotCost() {
+        return totCost;
+    }
+
+    public void setTotCost(BigDecimal totCost) {
+        this.totCost = totCost;
+    }
+
+    public BigDecimal getOwnCost() {
+        return ownCost;
+    }
+
+    public void setOwnCost(BigDecimal ownCost) {
+        this.ownCost = ownCost;
+    }
+
+    public BigDecimal getPayCost() {
+        return payCost;
+    }
+
+    public void setPayCost(BigDecimal payCost) {
+        this.payCost = payCost;
+    }
+
+    public BigDecimal getPubCost() {
+        return pubCost;
+    }
+
+    public void setPubCost(BigDecimal pubCost) {
+        this.pubCost = pubCost;
+    }
+
+    public BigDecimal getEcoCost() {
+        return ecoCost;
+    }
+
+    public void setEcoCost(BigDecimal ecoCost) {
+        this.ecoCost = ecoCost;
+    }
+
+    public String getChargeOpercode() {
+        return chargeOpercode;
+    }
+
+    public void setChargeOpercode(String chargeOpercode) {
+        this.chargeOpercode = chargeOpercode;
+    }
+
+    public Date getChargeDate() {
+        return chargeDate;
+    }
+
+    public void setChargeDate(Date chargeDate) {
+        this.chargeDate = chargeDate;
+    }
+
+    public String getFeeOpercode() {
+        return feeOpercode;
+    }
+
+    public void setFeeOpercode(String feeOpercode) {
+        this.feeOpercode = feeOpercode;
+    }
+
+    public Date getFeeDate() {
+        return feeDate;
+    }
+
+    public void setFeeDate(Date feeDate) {
+        this.feeDate = feeDate;
+    }
+
+    public String getBalanceOpercode() {
+        return balanceOpercode;
+    }
+
+    public void setBalanceOpercode(String balanceOpercode) {
+        this.balanceOpercode = balanceOpercode;
+    }
+
+    public Date getBalanceDate() {
+        return balanceDate;
+    }
+
+    public void setBalanceDate(Date balanceDate) {
+        this.balanceDate = balanceDate;
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public String getBalanceState() {
+        return balanceState;
+    }
+
+    public void setBalanceState(String balanceState) {
+        this.balanceState = balanceState;
+    }
+
+    public String getCheckNo() {
+        return checkNo;
+    }
+
+    public void setCheckNo(String checkNo) {
+        this.checkNo = checkNo;
+    }
+
+    public String getBabyFlag() {
+        return babyFlag;
+    }
+
+    public void setBabyFlag(String babyFlag) {
+        this.babyFlag = babyFlag;
+    }
+
+    public String getExtFlag() {
+        return extFlag;
+    }
+
+    public void setExtFlag(String extFlag) {
+        this.extFlag = extFlag;
+    }
+
+    public String getExtCode() {
+        return extCode;
+    }
+
+    public void setExtCode(String extCode) {
+        this.extCode = extCode;
+    }
+
+    public Date getExtDate() {
+        return extDate;
+    }
+
+    public void setExtDate(Date extDate) {
+        this.extDate = extDate;
+    }
+
+    public String getExtOpercode() {
+        return extOpercode;
+    }
+
+    public void setExtOpercode(String extOpercode) {
+        this.extOpercode = extOpercode;
+    }
+
+    public String getFeeoperDeptcode() {
+        return feeoperDeptcode;
+    }
+
+    public void setFeeoperDeptcode(String feeoperDeptcode) {
+        this.feeoperDeptcode = feeoperDeptcode;
+    }
+
+    public String getExtFlag1() {
+        return extFlag1;
+    }
+
+    public void setExtFlag1(String extFlag1) {
+        this.extFlag1 = extFlag1;
+    }
+
+    public String getExtFlag2() {
+        return extFlag2;
+    }
+
+    public void setExtFlag2(String extFlag2) {
+        this.extFlag2 = extFlag2;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getSubspecialtyCode() {
+        return subspecialtyCode;
+    }
+
+    public void setSubspecialtyCode(String subspecialtyCode) {
+        this.subspecialtyCode = subspecialtyCode;
+    }
+
+    public String getSubspecialtyName() {
+        return subspecialtyName;
+    }
+
+    public void setSubspecialtyName(String subspecialtyName) {
+        this.subspecialtyName = subspecialtyName;
+    }
+}

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

@@ -0,0 +1,926 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 住院非药品明细表
+    */
+public class FinIpbItemlist {
+    /**
+    * 处方号
+    */
+    private String recipeNo;
+
+    /**
+    * 交易类型,1正交易，2反交易
+    */
+    private String transType;
+
+    /**
+    * 处方内项目流水号
+    */
+    private Short sequenceNo;
+
+    /**
+    * 住院流水号
+    */
+    private String inpatientNo;
+
+    /**
+    * 姓名
+    */
+    private String name;
+
+    /**
+    * 结算类别 01-自费  02-保险 03-公费在职 04-公费退休 05-公费高干
+    */
+    private String paykindCode;
+
+    /**
+    * 合同单位
+    */
+    private String pactCode;
+
+    /**
+    * 更新库存的流水号(物资)
+    */
+    private Long updateSequenceno;
+
+    /**
+    * 在院科室代码
+    */
+    private String inhosDeptcode;
+
+    /**
+    * 护士站代码
+    */
+    private String nurseCellCode;
+
+    /**
+    * 开立科室代码
+    */
+    private String recipeDeptcode;
+
+    /**
+    * 执行科室代码
+    */
+    private String executeDeptcode;
+
+    /**
+    * 扣库科室代码
+    */
+    private String stockDeptcode;
+
+    /**
+    * 开立医师代码
+    */
+    private String recipeDoccode;
+
+    /**
+    * 项目代码
+    */
+    private String itemCode;
+
+    /**
+    * 最小费用代码
+    */
+    private String feeCode;
+
+    /**
+    * 中心代码
+    */
+    private String centerCode;
+
+    /**
+    * 项目名称
+    */
+    private String itemName;
+
+    /**
+    * 单价
+    */
+    private BigDecimal unitPrice;
+
+    /**
+    * 数量
+    */
+    private BigDecimal qty;
+
+    /**
+    * 当前单位
+    */
+    private String currentUnit;
+
+    /**
+    * 组套代码
+    */
+    private String packageCode;
+
+    /**
+    * 组套名称
+    */
+    private String packageName;
+
+    /**
+    * 费用金额
+    */
+    private BigDecimal totCost;
+
+    /**
+    * 自费金额
+    */
+    private BigDecimal ownCost;
+
+    /**
+    * 自付金额
+    */
+    private BigDecimal payCost;
+
+    /**
+    * 公费金额
+    */
+    private BigDecimal pubCost;
+
+    /**
+    * 优惠金额
+    */
+    private BigDecimal ecoCost;
+
+    /**
+    * 出库单序列号
+    */
+    private Long sendmatSequence;
+
+    /**
+    * 发放状态（0 划价 2发放（执行） 1 批费）
+    */
+    private String sendFlag;
+
+    /**
+    * 是否婴儿用 0 不是 1 是
+    */
+    private String babyFlag;
+
+    /**
+    * 急诊抢救标志
+    */
+    private String jzqjFlag;
+
+    /**
+    * 出院带疗标记 0 否 1 是
+    */
+    private String broughtFlag;
+
+    /**
+    * 扩展标志(公费患者是否使用了自费的项目0否,1是)
+    */
+    private String extFlag;
+
+    /**
+    * 结算发票号
+    */
+    private String invoiceNo;
+
+    /**
+    * 结算序号
+    */
+    private Short balanceNo;
+
+    /**
+    * 结算状态
+    */
+    private String balanceState;
+
+    /**
+    * 可退数量
+    */
+    private BigDecimal nobackNum;
+
+    /**
+    * 扩展代码(中山一：保存退费原记录的处方号)
+    */
+    private String extCode;
+
+    /**
+    * 扩展操作员
+    */
+    private String extOpercode;
+
+    /**
+    * 扩展日期
+    */
+    private Date extDate;
+
+    /**
+    * 审批号(中山一：退费时保存退费申请单号)
+    */
+    private String apprno;
+
+    /**
+    * 划价人
+    */
+    private String chargeOpercode;
+
+    /**
+    * 划价日期
+    */
+    private Date chargeDate;
+
+    /**
+    * 已确认数
+    */
+    private BigDecimal confirmNum;
+
+    /**
+    * 设备号
+    */
+    private String machineNo;
+
+    /**
+    * 执行人代码
+    */
+    private String execOpercode;
+
+    /**
+    * 执行日期
+    */
+    private Date execDate;
+
+    /**
+    * 发放人
+    */
+    private String sendOpercode;
+
+    /**
+    * 计费人
+    */
+    private String feeOpercode;
+
+    /**
+    * 计费日期
+    */
+    private Date feeDate;
+
+    /**
+    * 发放日期
+    */
+    private Date sendDate;
+
+    /**
+    * 审核人
+    */
+    private String checkOpercode;
+
+    /**
+    * 审核序号
+    */
+    private String checkNo;
+
+    /**
+    * 医嘱流水号
+    */
+    private String moOrder;
+
+    /**
+    * 医嘱执行单流水号
+    */
+    private String moExecSqn;
+
+    /**
+    * 收费比率
+    */
+    private BigDecimal feeRate;
+
+    /**
+    * 收费员科室
+    */
+    private String feeoperDeptcode;
+
+    /**
+    * 上传标志
+    */
+    private String uploadFlag;
+
+    /**
+    * 扩展标志1
+    */
+    private String extFlag1;
+
+    /**
+    * 扩展标志2(收费方式0住院处直接收费,1护士站医嘱收费,2确认收费,3身份变更,4比例调整) 5 终端确认收费 6终端取消
+    */
+    private String extFlag2;
+
+    /**
+    * 聊城市医保新增(记录凭单号)
+    */
+    private String extFlag3;
+
+    /**
+    * 开方医师组别号
+    */
+    private String groupCode;
+
+    /**
+    * 门诊处方
+    */
+    private String extFlag4;
+
+    /**
+    * 退费原始处方序列号
+    */
+    private Short backRecipeSeq;
+
+    private String extFlag5;
+
+    private String extFlag6;
+
+    /**
+    * 患者所属亚专科编码
+    */
+    private String subspecialtyCode;
+
+    /**
+    * 患者所属亚专科名称
+    */
+    private String subspecialtyName;
+
+    /**
+    * 医生所属亚专科编码
+    */
+    private String docSubspecialtyCode;
+
+    /**
+    * 医生所属亚专科名称
+    */
+    private String docSubspecialtyName;
+
+    public String getRecipeNo() {
+        return recipeNo;
+    }
+
+    public void setRecipeNo(String recipeNo) {
+        this.recipeNo = recipeNo;
+    }
+
+    public String getTransType() {
+        return transType;
+    }
+
+    public void setTransType(String transType) {
+        this.transType = transType;
+    }
+
+    public Short getSequenceNo() {
+        return sequenceNo;
+    }
+
+    public void setSequenceNo(Short sequenceNo) {
+        this.sequenceNo = sequenceNo;
+    }
+
+    public String getInpatientNo() {
+        return inpatientNo;
+    }
+
+    public void setInpatientNo(String inpatientNo) {
+        this.inpatientNo = inpatientNo;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPaykindCode() {
+        return paykindCode;
+    }
+
+    public void setPaykindCode(String paykindCode) {
+        this.paykindCode = paykindCode;
+    }
+
+    public String getPactCode() {
+        return pactCode;
+    }
+
+    public void setPactCode(String pactCode) {
+        this.pactCode = pactCode;
+    }
+
+    public Long getUpdateSequenceno() {
+        return updateSequenceno;
+    }
+
+    public void setUpdateSequenceno(Long updateSequenceno) {
+        this.updateSequenceno = updateSequenceno;
+    }
+
+    public String getInhosDeptcode() {
+        return inhosDeptcode;
+    }
+
+    public void setInhosDeptcode(String inhosDeptcode) {
+        this.inhosDeptcode = inhosDeptcode;
+    }
+
+    public String getNurseCellCode() {
+        return nurseCellCode;
+    }
+
+    public void setNurseCellCode(String nurseCellCode) {
+        this.nurseCellCode = nurseCellCode;
+    }
+
+    public String getRecipeDeptcode() {
+        return recipeDeptcode;
+    }
+
+    public void setRecipeDeptcode(String recipeDeptcode) {
+        this.recipeDeptcode = recipeDeptcode;
+    }
+
+    public String getExecuteDeptcode() {
+        return executeDeptcode;
+    }
+
+    public void setExecuteDeptcode(String executeDeptcode) {
+        this.executeDeptcode = executeDeptcode;
+    }
+
+    public String getStockDeptcode() {
+        return stockDeptcode;
+    }
+
+    public void setStockDeptcode(String stockDeptcode) {
+        this.stockDeptcode = stockDeptcode;
+    }
+
+    public String getRecipeDoccode() {
+        return recipeDoccode;
+    }
+
+    public void setRecipeDoccode(String recipeDoccode) {
+        this.recipeDoccode = recipeDoccode;
+    }
+
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+    }
+
+    public String getFeeCode() {
+        return feeCode;
+    }
+
+    public void setFeeCode(String feeCode) {
+        this.feeCode = feeCode;
+    }
+
+    public String getCenterCode() {
+        return centerCode;
+    }
+
+    public void setCenterCode(String centerCode) {
+        this.centerCode = centerCode;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public BigDecimal getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(BigDecimal unitPrice) {
+        this.unitPrice = unitPrice;
+    }
+
+    public BigDecimal getQty() {
+        return qty;
+    }
+
+    public void setQty(BigDecimal qty) {
+        this.qty = qty;
+    }
+
+    public String getCurrentUnit() {
+        return currentUnit;
+    }
+
+    public void setCurrentUnit(String currentUnit) {
+        this.currentUnit = currentUnit;
+    }
+
+    public String getPackageCode() {
+        return packageCode;
+    }
+
+    public void setPackageCode(String packageCode) {
+        this.packageCode = packageCode;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public BigDecimal getTotCost() {
+        return totCost;
+    }
+
+    public void setTotCost(BigDecimal totCost) {
+        this.totCost = totCost;
+    }
+
+    public BigDecimal getOwnCost() {
+        return ownCost;
+    }
+
+    public void setOwnCost(BigDecimal ownCost) {
+        this.ownCost = ownCost;
+    }
+
+    public BigDecimal getPayCost() {
+        return payCost;
+    }
+
+    public void setPayCost(BigDecimal payCost) {
+        this.payCost = payCost;
+    }
+
+    public BigDecimal getPubCost() {
+        return pubCost;
+    }
+
+    public void setPubCost(BigDecimal pubCost) {
+        this.pubCost = pubCost;
+    }
+
+    public BigDecimal getEcoCost() {
+        return ecoCost;
+    }
+
+    public void setEcoCost(BigDecimal ecoCost) {
+        this.ecoCost = ecoCost;
+    }
+
+    public Long getSendmatSequence() {
+        return sendmatSequence;
+    }
+
+    public void setSendmatSequence(Long sendmatSequence) {
+        this.sendmatSequence = sendmatSequence;
+    }
+
+    public String getSendFlag() {
+        return sendFlag;
+    }
+
+    public void setSendFlag(String sendFlag) {
+        this.sendFlag = sendFlag;
+    }
+
+    public String getBabyFlag() {
+        return babyFlag;
+    }
+
+    public void setBabyFlag(String babyFlag) {
+        this.babyFlag = babyFlag;
+    }
+
+    public String getJzqjFlag() {
+        return jzqjFlag;
+    }
+
+    public void setJzqjFlag(String jzqjFlag) {
+        this.jzqjFlag = jzqjFlag;
+    }
+
+    public String getBroughtFlag() {
+        return broughtFlag;
+    }
+
+    public void setBroughtFlag(String broughtFlag) {
+        this.broughtFlag = broughtFlag;
+    }
+
+    public String getExtFlag() {
+        return extFlag;
+    }
+
+    public void setExtFlag(String extFlag) {
+        this.extFlag = extFlag;
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public Short getBalanceNo() {
+        return balanceNo;
+    }
+
+    public void setBalanceNo(Short balanceNo) {
+        this.balanceNo = balanceNo;
+    }
+
+    public String getBalanceState() {
+        return balanceState;
+    }
+
+    public void setBalanceState(String balanceState) {
+        this.balanceState = balanceState;
+    }
+
+    public BigDecimal getNobackNum() {
+        return nobackNum;
+    }
+
+    public void setNobackNum(BigDecimal nobackNum) {
+        this.nobackNum = nobackNum;
+    }
+
+    public String getExtCode() {
+        return extCode;
+    }
+
+    public void setExtCode(String extCode) {
+        this.extCode = extCode;
+    }
+
+    public String getExtOpercode() {
+        return extOpercode;
+    }
+
+    public void setExtOpercode(String extOpercode) {
+        this.extOpercode = extOpercode;
+    }
+
+    public Date getExtDate() {
+        return extDate;
+    }
+
+    public void setExtDate(Date extDate) {
+        this.extDate = extDate;
+    }
+
+    public String getApprno() {
+        return apprno;
+    }
+
+    public void setApprno(String apprno) {
+        this.apprno = apprno;
+    }
+
+    public String getChargeOpercode() {
+        return chargeOpercode;
+    }
+
+    public void setChargeOpercode(String chargeOpercode) {
+        this.chargeOpercode = chargeOpercode;
+    }
+
+    public Date getChargeDate() {
+        return chargeDate;
+    }
+
+    public void setChargeDate(Date chargeDate) {
+        this.chargeDate = chargeDate;
+    }
+
+    public BigDecimal getConfirmNum() {
+        return confirmNum;
+    }
+
+    public void setConfirmNum(BigDecimal confirmNum) {
+        this.confirmNum = confirmNum;
+    }
+
+    public String getMachineNo() {
+        return machineNo;
+    }
+
+    public void setMachineNo(String machineNo) {
+        this.machineNo = machineNo;
+    }
+
+    public String getExecOpercode() {
+        return execOpercode;
+    }
+
+    public void setExecOpercode(String execOpercode) {
+        this.execOpercode = execOpercode;
+    }
+
+    public Date getExecDate() {
+        return execDate;
+    }
+
+    public void setExecDate(Date execDate) {
+        this.execDate = execDate;
+    }
+
+    public String getSendOpercode() {
+        return sendOpercode;
+    }
+
+    public void setSendOpercode(String sendOpercode) {
+        this.sendOpercode = sendOpercode;
+    }
+
+    public String getFeeOpercode() {
+        return feeOpercode;
+    }
+
+    public void setFeeOpercode(String feeOpercode) {
+        this.feeOpercode = feeOpercode;
+    }
+
+    public Date getFeeDate() {
+        return feeDate;
+    }
+
+    public void setFeeDate(Date feeDate) {
+        this.feeDate = feeDate;
+    }
+
+    public Date getSendDate() {
+        return sendDate;
+    }
+
+    public void setSendDate(Date sendDate) {
+        this.sendDate = sendDate;
+    }
+
+    public String getCheckOpercode() {
+        return checkOpercode;
+    }
+
+    public void setCheckOpercode(String checkOpercode) {
+        this.checkOpercode = checkOpercode;
+    }
+
+    public String getCheckNo() {
+        return checkNo;
+    }
+
+    public void setCheckNo(String checkNo) {
+        this.checkNo = checkNo;
+    }
+
+    public String getMoOrder() {
+        return moOrder;
+    }
+
+    public void setMoOrder(String moOrder) {
+        this.moOrder = moOrder;
+    }
+
+    public String getMoExecSqn() {
+        return moExecSqn;
+    }
+
+    public void setMoExecSqn(String moExecSqn) {
+        this.moExecSqn = moExecSqn;
+    }
+
+    public BigDecimal getFeeRate() {
+        return feeRate;
+    }
+
+    public void setFeeRate(BigDecimal feeRate) {
+        this.feeRate = feeRate;
+    }
+
+    public String getFeeoperDeptcode() {
+        return feeoperDeptcode;
+    }
+
+    public void setFeeoperDeptcode(String feeoperDeptcode) {
+        this.feeoperDeptcode = feeoperDeptcode;
+    }
+
+    public String getUploadFlag() {
+        return uploadFlag;
+    }
+
+    public void setUploadFlag(String uploadFlag) {
+        this.uploadFlag = uploadFlag;
+    }
+
+    public String getExtFlag1() {
+        return extFlag1;
+    }
+
+    public void setExtFlag1(String extFlag1) {
+        this.extFlag1 = extFlag1;
+    }
+
+    public String getExtFlag2() {
+        return extFlag2;
+    }
+
+    public void setExtFlag2(String extFlag2) {
+        this.extFlag2 = extFlag2;
+    }
+
+    public String getExtFlag3() {
+        return extFlag3;
+    }
+
+    public void setExtFlag3(String extFlag3) {
+        this.extFlag3 = extFlag3;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getExtFlag4() {
+        return extFlag4;
+    }
+
+    public void setExtFlag4(String extFlag4) {
+        this.extFlag4 = extFlag4;
+    }
+
+    public Short getBackRecipeSeq() {
+        return backRecipeSeq;
+    }
+
+    public void setBackRecipeSeq(Short backRecipeSeq) {
+        this.backRecipeSeq = backRecipeSeq;
+    }
+
+    public String getExtFlag5() {
+        return extFlag5;
+    }
+
+    public void setExtFlag5(String extFlag5) {
+        this.extFlag5 = extFlag5;
+    }
+
+    public String getExtFlag6() {
+        return extFlag6;
+    }
+
+    public void setExtFlag6(String extFlag6) {
+        this.extFlag6 = extFlag6;
+    }
+
+    public String getSubspecialtyCode() {
+        return subspecialtyCode;
+    }
+
+    public void setSubspecialtyCode(String subspecialtyCode) {
+        this.subspecialtyCode = subspecialtyCode;
+    }
+
+    public String getSubspecialtyName() {
+        return subspecialtyName;
+    }
+
+    public void setSubspecialtyName(String subspecialtyName) {
+        this.subspecialtyName = subspecialtyName;
+    }
+
+    public String getDocSubspecialtyCode() {
+        return docSubspecialtyCode;
+    }
+
+    public void setDocSubspecialtyCode(String docSubspecialtyCode) {
+        this.docSubspecialtyCode = docSubspecialtyCode;
+    }
+
+    public String getDocSubspecialtyName() {
+        return docSubspecialtyName;
+    }
+
+    public void setDocSubspecialtyName(String docSubspecialtyName) {
+        this.docSubspecialtyName = docSubspecialtyName;
+    }
+}

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

@@ -0,0 +1,939 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 住院药品明细表
+    */
+public class FinIpbMedicinelist {
+    /**
+    * 处方号
+    */
+    private String recipeNo;
+
+    /**
+    * 交易类型,1正交易，2反交易
+    */
+    private String transType;
+
+    /**
+    * 处方内项目流水号
+    */
+    private Short sequenceNo;
+
+    /**
+    * 住院流水号
+    */
+    private String inpatientNo;
+
+    /**
+    * 姓名
+    */
+    private String name;
+
+    /**
+    * 结算类别 01-自费  02-保险 03-公费在职 04-公费退休 05-公费高干
+    */
+    private String paykindCode;
+
+    /**
+    * 合同单位
+    */
+    private String pactCode;
+
+    /**
+    * 在院科室代码
+    */
+    private String inhosDeptcode;
+
+    /**
+    * 护士站代码
+    */
+    private String nurseCellCode;
+
+    /**
+    * 开立科室代码
+    */
+    private String recipeDeptcode;
+
+    /**
+    * 执行科室代码
+    */
+    private String executeDeptcode;
+
+    /**
+    * 取药科室代码
+    */
+    private String medicineDeptcode;
+
+    /**
+    * 开立医师代码
+    */
+    private String recipeDoccode;
+
+    /**
+    * 药品编码
+    */
+    private String drugCode;
+
+    /**
+    * 最小费用代码
+    */
+    private String feeCode;
+
+    /**
+    * 医疗中心项目代码
+    */
+    private String centerCode;
+
+    /**
+    * 药品名称
+    */
+    private String drugName;
+
+    /**
+    * 规格
+    */
+    private String specs;
+
+    /**
+    * 药品类别
+    */
+    private String drugType;
+
+    /**
+    * 药品性质
+    */
+    private String drugQuality;
+
+    /**
+    * 自制标识
+    */
+    private String homeMadeFlag;
+
+    /**
+    * 单价
+    */
+    private BigDecimal unitPrice;
+
+    /**
+    * 当前单位
+    */
+    private String currentUnit;
+
+    /**
+    * 包装数
+    */
+    private Short packQty;
+
+    /**
+    * 数量
+    */
+    private BigDecimal qty;
+
+    /**
+    * 付数
+    */
+    private Short days;
+
+    /**
+    * 费用金额
+    */
+    private BigDecimal totCost;
+
+    /**
+    * 自费金额
+    */
+    private BigDecimal ownCost;
+
+    /**
+    * 自付金额
+    */
+    private BigDecimal payCost;
+
+    /**
+    * 公费金额
+    */
+    private BigDecimal pubCost;
+
+    /**
+    * 优惠金额
+    */
+    private BigDecimal ecoCost;
+
+    /**
+    * 更新库存的流水号
+    */
+    private Long updateSequenceno;
+
+    /**
+    * 发药单序列号
+    */
+    private Long senddrugSequence;
+
+    /**
+    * 发药状态（0 划价 2摆药 1批费）
+    */
+    private String senddrugFlag;
+
+    /**
+    * 是否婴儿用药 0 不是 1 是
+    */
+    private String babyFlag;
+
+    /**
+    * 急诊抢救标志
+    */
+    private String jzqjFlag;
+
+    /**
+    * 出院带药标记 0 否 1 是(Change as OrderType)
+    */
+    private String broughtFlag;
+
+    /**
+    * 扩展标志(公费患者是否使用了自费的项目0否,1是)
+    */
+    private String extFlag;
+
+    /**
+    * 结算发票号
+    */
+    private String invoiceNo;
+
+    /**
+    * 结算序号
+    */
+    private Short balanceNo;
+
+    /**
+    * 结算状态
+    */
+    private String balanceState;
+
+    /**
+    * 可退数量
+    */
+    private BigDecimal nobackNum;
+
+    /**
+    * 扩展代码(中山一：保存退费原记录的处方号)
+    */
+    private String extCode;
+
+    /**
+    * 扩展操作员
+    */
+    private String extOpercode;
+
+    /**
+    * 扩展日期
+    */
+    private Date extDate;
+
+    /**
+    * 审批号(中山一：退费时保存退费申请单号)
+    */
+    private String apprno;
+
+    /**
+    * 划价人
+    */
+    private String chargeOpercode;
+
+    /**
+    * 划价日期
+    */
+    private Date chargeDate;
+
+    /**
+    * 计费人
+    */
+    private String feeOpercode;
+
+    /**
+    * 计费时间
+    */
+    private Date feeDate;
+
+    /**
+    * 执行人代码
+    */
+    private String execOpercode;
+
+    /**
+    * 执行日期
+    */
+    private Date execDate;
+
+    /**
+    * 发药人
+    */
+    private String senddrugOpercode;
+
+    /**
+    * 发药日期
+    */
+    private Date senddrugDate;
+
+    /**
+    * 审核人
+    */
+    private String checkOpercode;
+
+    /**
+    * 审核序号
+    */
+    private String checkNo;
+
+    /**
+    * 医嘱流水号
+    */
+    private String moOrder;
+
+    /**
+    * 医嘱执行单流水号
+    */
+    private String moExecSqn;
+
+    /**
+    * 收费比率
+    */
+    private BigDecimal feeRate;
+
+    /**
+    * 收费员科室
+    */
+    private String feeoperDeptcode;
+
+    /**
+    * 上传标志
+    */
+    private String uploadFlag;
+
+    /**
+    * 扩展标志2(收费方式0住院处直接收费,1护士站医嘱收费,2确认收费,3身份变更,4比例调整)
+    */
+    private String extFlag2;
+
+    /**
+    * 扩展标志1
+    */
+    private String extFlag1;
+
+    /**
+    * 聊城市医保新增(记录凭单号)
+    */
+    private String extFlag3;
+
+    /**
+    * 开方医师组别号
+    */
+    private String groupCode;
+
+    /**
+    * 退费原始处方序列号
+    */
+    private Short backRecipeSeq;
+
+    private String extFlag5;
+
+    private String extFlag6;
+
+    /**
+    * 患者所属亚专科编码
+    */
+    private String subspecialtyCode;
+
+    /**
+    * 患者所属亚专科名称
+    */
+    private String subspecialtyName;
+
+    /**
+    * 医生所属亚专科编码
+    */
+    private String docSubspecialtyCode;
+
+    /**
+    * 医生所属亚专科名称
+    */
+    private String docSubspecialtyName;
+
+    public String getRecipeNo() {
+        return recipeNo;
+    }
+
+    public void setRecipeNo(String recipeNo) {
+        this.recipeNo = recipeNo;
+    }
+
+    public String getTransType() {
+        return transType;
+    }
+
+    public void setTransType(String transType) {
+        this.transType = transType;
+    }
+
+    public Short getSequenceNo() {
+        return sequenceNo;
+    }
+
+    public void setSequenceNo(Short sequenceNo) {
+        this.sequenceNo = sequenceNo;
+    }
+
+    public String getInpatientNo() {
+        return inpatientNo;
+    }
+
+    public void setInpatientNo(String inpatientNo) {
+        this.inpatientNo = inpatientNo;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPaykindCode() {
+        return paykindCode;
+    }
+
+    public void setPaykindCode(String paykindCode) {
+        this.paykindCode = paykindCode;
+    }
+
+    public String getPactCode() {
+        return pactCode;
+    }
+
+    public void setPactCode(String pactCode) {
+        this.pactCode = pactCode;
+    }
+
+    public String getInhosDeptcode() {
+        return inhosDeptcode;
+    }
+
+    public void setInhosDeptcode(String inhosDeptcode) {
+        this.inhosDeptcode = inhosDeptcode;
+    }
+
+    public String getNurseCellCode() {
+        return nurseCellCode;
+    }
+
+    public void setNurseCellCode(String nurseCellCode) {
+        this.nurseCellCode = nurseCellCode;
+    }
+
+    public String getRecipeDeptcode() {
+        return recipeDeptcode;
+    }
+
+    public void setRecipeDeptcode(String recipeDeptcode) {
+        this.recipeDeptcode = recipeDeptcode;
+    }
+
+    public String getExecuteDeptcode() {
+        return executeDeptcode;
+    }
+
+    public void setExecuteDeptcode(String executeDeptcode) {
+        this.executeDeptcode = executeDeptcode;
+    }
+
+    public String getMedicineDeptcode() {
+        return medicineDeptcode;
+    }
+
+    public void setMedicineDeptcode(String medicineDeptcode) {
+        this.medicineDeptcode = medicineDeptcode;
+    }
+
+    public String getRecipeDoccode() {
+        return recipeDoccode;
+    }
+
+    public void setRecipeDoccode(String recipeDoccode) {
+        this.recipeDoccode = recipeDoccode;
+    }
+
+    public String getDrugCode() {
+        return drugCode;
+    }
+
+    public void setDrugCode(String drugCode) {
+        this.drugCode = drugCode;
+    }
+
+    public String getFeeCode() {
+        return feeCode;
+    }
+
+    public void setFeeCode(String feeCode) {
+        this.feeCode = feeCode;
+    }
+
+    public String getCenterCode() {
+        return centerCode;
+    }
+
+    public void setCenterCode(String centerCode) {
+        this.centerCode = centerCode;
+    }
+
+    public String getDrugName() {
+        return drugName;
+    }
+
+    public void setDrugName(String drugName) {
+        this.drugName = drugName;
+    }
+
+    public String getSpecs() {
+        return specs;
+    }
+
+    public void setSpecs(String specs) {
+        this.specs = specs;
+    }
+
+    public String getDrugType() {
+        return drugType;
+    }
+
+    public void setDrugType(String drugType) {
+        this.drugType = drugType;
+    }
+
+    public String getDrugQuality() {
+        return drugQuality;
+    }
+
+    public void setDrugQuality(String drugQuality) {
+        this.drugQuality = drugQuality;
+    }
+
+    public String getHomeMadeFlag() {
+        return homeMadeFlag;
+    }
+
+    public void setHomeMadeFlag(String homeMadeFlag) {
+        this.homeMadeFlag = homeMadeFlag;
+    }
+
+    public BigDecimal getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(BigDecimal unitPrice) {
+        this.unitPrice = unitPrice;
+    }
+
+    public String getCurrentUnit() {
+        return currentUnit;
+    }
+
+    public void setCurrentUnit(String currentUnit) {
+        this.currentUnit = currentUnit;
+    }
+
+    public Short getPackQty() {
+        return packQty;
+    }
+
+    public void setPackQty(Short packQty) {
+        this.packQty = packQty;
+    }
+
+    public BigDecimal getQty() {
+        return qty;
+    }
+
+    public void setQty(BigDecimal qty) {
+        this.qty = qty;
+    }
+
+    public Short getDays() {
+        return days;
+    }
+
+    public void setDays(Short days) {
+        this.days = days;
+    }
+
+    public BigDecimal getTotCost() {
+        return totCost;
+    }
+
+    public void setTotCost(BigDecimal totCost) {
+        this.totCost = totCost;
+    }
+
+    public BigDecimal getOwnCost() {
+        return ownCost;
+    }
+
+    public void setOwnCost(BigDecimal ownCost) {
+        this.ownCost = ownCost;
+    }
+
+    public BigDecimal getPayCost() {
+        return payCost;
+    }
+
+    public void setPayCost(BigDecimal payCost) {
+        this.payCost = payCost;
+    }
+
+    public BigDecimal getPubCost() {
+        return pubCost;
+    }
+
+    public void setPubCost(BigDecimal pubCost) {
+        this.pubCost = pubCost;
+    }
+
+    public BigDecimal getEcoCost() {
+        return ecoCost;
+    }
+
+    public void setEcoCost(BigDecimal ecoCost) {
+        this.ecoCost = ecoCost;
+    }
+
+    public Long getUpdateSequenceno() {
+        return updateSequenceno;
+    }
+
+    public void setUpdateSequenceno(Long updateSequenceno) {
+        this.updateSequenceno = updateSequenceno;
+    }
+
+    public Long getSenddrugSequence() {
+        return senddrugSequence;
+    }
+
+    public void setSenddrugSequence(Long senddrugSequence) {
+        this.senddrugSequence = senddrugSequence;
+    }
+
+    public String getSenddrugFlag() {
+        return senddrugFlag;
+    }
+
+    public void setSenddrugFlag(String senddrugFlag) {
+        this.senddrugFlag = senddrugFlag;
+    }
+
+    public String getBabyFlag() {
+        return babyFlag;
+    }
+
+    public void setBabyFlag(String babyFlag) {
+        this.babyFlag = babyFlag;
+    }
+
+    public String getJzqjFlag() {
+        return jzqjFlag;
+    }
+
+    public void setJzqjFlag(String jzqjFlag) {
+        this.jzqjFlag = jzqjFlag;
+    }
+
+    public String getBroughtFlag() {
+        return broughtFlag;
+    }
+
+    public void setBroughtFlag(String broughtFlag) {
+        this.broughtFlag = broughtFlag;
+    }
+
+    public String getExtFlag() {
+        return extFlag;
+    }
+
+    public void setExtFlag(String extFlag) {
+        this.extFlag = extFlag;
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public Short getBalanceNo() {
+        return balanceNo;
+    }
+
+    public void setBalanceNo(Short balanceNo) {
+        this.balanceNo = balanceNo;
+    }
+
+    public String getBalanceState() {
+        return balanceState;
+    }
+
+    public void setBalanceState(String balanceState) {
+        this.balanceState = balanceState;
+    }
+
+    public BigDecimal getNobackNum() {
+        return nobackNum;
+    }
+
+    public void setNobackNum(BigDecimal nobackNum) {
+        this.nobackNum = nobackNum;
+    }
+
+    public String getExtCode() {
+        return extCode;
+    }
+
+    public void setExtCode(String extCode) {
+        this.extCode = extCode;
+    }
+
+    public String getExtOpercode() {
+        return extOpercode;
+    }
+
+    public void setExtOpercode(String extOpercode) {
+        this.extOpercode = extOpercode;
+    }
+
+    public Date getExtDate() {
+        return extDate;
+    }
+
+    public void setExtDate(Date extDate) {
+        this.extDate = extDate;
+    }
+
+    public String getApprno() {
+        return apprno;
+    }
+
+    public void setApprno(String apprno) {
+        this.apprno = apprno;
+    }
+
+    public String getChargeOpercode() {
+        return chargeOpercode;
+    }
+
+    public void setChargeOpercode(String chargeOpercode) {
+        this.chargeOpercode = chargeOpercode;
+    }
+
+    public Date getChargeDate() {
+        return chargeDate;
+    }
+
+    public void setChargeDate(Date chargeDate) {
+        this.chargeDate = chargeDate;
+    }
+
+    public String getFeeOpercode() {
+        return feeOpercode;
+    }
+
+    public void setFeeOpercode(String feeOpercode) {
+        this.feeOpercode = feeOpercode;
+    }
+
+    public Date getFeeDate() {
+        return feeDate;
+    }
+
+    public void setFeeDate(Date feeDate) {
+        this.feeDate = feeDate;
+    }
+
+    public String getExecOpercode() {
+        return execOpercode;
+    }
+
+    public void setExecOpercode(String execOpercode) {
+        this.execOpercode = execOpercode;
+    }
+
+    public Date getExecDate() {
+        return execDate;
+    }
+
+    public void setExecDate(Date execDate) {
+        this.execDate = execDate;
+    }
+
+    public String getSenddrugOpercode() {
+        return senddrugOpercode;
+    }
+
+    public void setSenddrugOpercode(String senddrugOpercode) {
+        this.senddrugOpercode = senddrugOpercode;
+    }
+
+    public Date getSenddrugDate() {
+        return senddrugDate;
+    }
+
+    public void setSenddrugDate(Date senddrugDate) {
+        this.senddrugDate = senddrugDate;
+    }
+
+    public String getCheckOpercode() {
+        return checkOpercode;
+    }
+
+    public void setCheckOpercode(String checkOpercode) {
+        this.checkOpercode = checkOpercode;
+    }
+
+    public String getCheckNo() {
+        return checkNo;
+    }
+
+    public void setCheckNo(String checkNo) {
+        this.checkNo = checkNo;
+    }
+
+    public String getMoOrder() {
+        return moOrder;
+    }
+
+    public void setMoOrder(String moOrder) {
+        this.moOrder = moOrder;
+    }
+
+    public String getMoExecSqn() {
+        return moExecSqn;
+    }
+
+    public void setMoExecSqn(String moExecSqn) {
+        this.moExecSqn = moExecSqn;
+    }
+
+    public BigDecimal getFeeRate() {
+        return feeRate;
+    }
+
+    public void setFeeRate(BigDecimal feeRate) {
+        this.feeRate = feeRate;
+    }
+
+    public String getFeeoperDeptcode() {
+        return feeoperDeptcode;
+    }
+
+    public void setFeeoperDeptcode(String feeoperDeptcode) {
+        this.feeoperDeptcode = feeoperDeptcode;
+    }
+
+    public String getUploadFlag() {
+        return uploadFlag;
+    }
+
+    public void setUploadFlag(String uploadFlag) {
+        this.uploadFlag = uploadFlag;
+    }
+
+    public String getExtFlag2() {
+        return extFlag2;
+    }
+
+    public void setExtFlag2(String extFlag2) {
+        this.extFlag2 = extFlag2;
+    }
+
+    public String getExtFlag1() {
+        return extFlag1;
+    }
+
+    public void setExtFlag1(String extFlag1) {
+        this.extFlag1 = extFlag1;
+    }
+
+    public String getExtFlag3() {
+        return extFlag3;
+    }
+
+    public void setExtFlag3(String extFlag3) {
+        this.extFlag3 = extFlag3;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public Short getBackRecipeSeq() {
+        return backRecipeSeq;
+    }
+
+    public void setBackRecipeSeq(Short backRecipeSeq) {
+        this.backRecipeSeq = backRecipeSeq;
+    }
+
+    public String getExtFlag5() {
+        return extFlag5;
+    }
+
+    public void setExtFlag5(String extFlag5) {
+        this.extFlag5 = extFlag5;
+    }
+
+    public String getExtFlag6() {
+        return extFlag6;
+    }
+
+    public void setExtFlag6(String extFlag6) {
+        this.extFlag6 = extFlag6;
+    }
+
+    public String getSubspecialtyCode() {
+        return subspecialtyCode;
+    }
+
+    public void setSubspecialtyCode(String subspecialtyCode) {
+        this.subspecialtyCode = subspecialtyCode;
+    }
+
+    public String getSubspecialtyName() {
+        return subspecialtyName;
+    }
+
+    public void setSubspecialtyName(String subspecialtyName) {
+        this.subspecialtyName = subspecialtyName;
+    }
+
+    public String getDocSubspecialtyCode() {
+        return docSubspecialtyCode;
+    }
+
+    public void setDocSubspecialtyCode(String docSubspecialtyCode) {
+        this.docSubspecialtyCode = docSubspecialtyCode;
+    }
+
+    public String getDocSubspecialtyName() {
+        return docSubspecialtyName;
+    }
+
+    public void setDocSubspecialtyName(String docSubspecialtyName) {
+        this.docSubspecialtyName = docSubspecialtyName;
+    }
+}

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

@@ -0,0 +1,477 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 婴儿住院主表
+ */
+public class FinIprBabyinfo {
+    /**
+    * 住院流水号
+    */
+    private String inpatientNo;
+
+    /**
+    * 发生序号
+    */
+    private Integer happenNo;
+
+    /**
+    * 姓名
+    */
+    private String name;
+
+    /**
+    * 性别
+    */
+    private String sexCode;
+
+    /**
+    * 生日
+    */
+    private Date birthday;
+
+    /**
+    * 身高
+    */
+    private BigDecimal height;
+
+    /**
+    * 体重
+    */
+    private BigDecimal weight;
+
+    /**
+    * 血型编码
+    */
+    private String bloodCode;
+
+    /**
+    * 入院日期
+    */
+    private Date inDate;
+
+    /**
+    * 出院日期(预约)
+    */
+    private Date prepayOutdate;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 操作日期
+    */
+    private Date operDate;
+
+    /**
+    * 取消标志
+    */
+    private String cancelFlag;
+
+    /**
+    * 婴儿住院流水号
+    */
+    private String babyInpatientNo;
+
+    /**
+    * 母亲住院流水号
+    */
+    private String motherInpatientNo;
+
+    /**
+    * 出生证编号
+    */
+    private String birthCertificateNo;
+
+    /**
+    * 健康状况 0--良好 1--一般 2--差
+    */
+    private String healthStatus;
+
+    /**
+    * 出生地点分类  0--医院 1--妇幼保健院 2--家庭 3--其他
+    */
+    private String placeType;
+
+    /**
+    * 签发日期
+    */
+    private Date issueDate;
+
+    /**
+    * 接生机构名称
+    */
+    private String facility;
+
+    /**
+    * 家庭住址
+    */
+    private String home;
+
+    /**
+    * 父亲姓名
+    */
+    private String fatherName;
+
+    /**
+    * 父亲年龄
+    */
+    private String fatherAge;
+
+    /**
+    * 父亲民族
+    */
+    private String fatherNation;
+
+    /**
+    * 父亲国籍
+    */
+    private String fatherNationality;
+
+    /**
+    * 父亲身份证号
+    */
+    private String fatherCardnNo;
+
+    /**
+    * 母亲姓名
+    */
+    private String motherName;
+
+    /**
+    * 母亲年龄
+    */
+    private String motherAge;
+
+    /**
+    * 母亲民族
+    */
+    private String motherNation;
+
+    /**
+    * 母亲国籍
+    */
+    private String motherNationality;
+
+    /**
+    * 母亲身份证号
+    */
+    private String motherCardNo;
+
+    /**
+    * 出生孕周
+    */
+    private String gestation;
+
+    /**
+    * 出生地点
+    */
+    private String birtPlace;
+
+    /**
+    * 出生证状态 1有效 2 作废
+    */
+    private String status;
+
+    /**
+    * 接生人
+    */
+    private String receiver;
+
+    /**
+    * 出生地
+    */
+    private String birthAddress;
+
+    public String getInpatientNo() {
+        return inpatientNo;
+    }
+
+    public void setInpatientNo(String inpatientNo) {
+        this.inpatientNo = inpatientNo;
+    }
+
+    public Integer getHappenNo() {
+        return happenNo;
+    }
+
+    public void setHappenNo(Integer happenNo) {
+        this.happenNo = happenNo;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSexCode() {
+        return sexCode;
+    }
+
+    public void setSexCode(String sexCode) {
+        this.sexCode = sexCode;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public BigDecimal getHeight() {
+        return height;
+    }
+
+    public void setHeight(BigDecimal height) {
+        this.height = height;
+    }
+
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+
+    public String getBloodCode() {
+        return bloodCode;
+    }
+
+    public void setBloodCode(String bloodCode) {
+        this.bloodCode = bloodCode;
+    }
+
+    public Date getInDate() {
+        return inDate;
+    }
+
+    public void setInDate(Date inDate) {
+        this.inDate = inDate;
+    }
+
+    public Date getPrepayOutdate() {
+        return prepayOutdate;
+    }
+
+    public void setPrepayOutdate(Date prepayOutdate) {
+        this.prepayOutdate = prepayOutdate;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getCancelFlag() {
+        return cancelFlag;
+    }
+
+    public void setCancelFlag(String cancelFlag) {
+        this.cancelFlag = cancelFlag;
+    }
+
+    public String getBabyInpatientNo() {
+        return babyInpatientNo;
+    }
+
+    public void setBabyInpatientNo(String babyInpatientNo) {
+        this.babyInpatientNo = babyInpatientNo;
+    }
+
+    public String getMotherInpatientNo() {
+        return motherInpatientNo;
+    }
+
+    public void setMotherInpatientNo(String motherInpatientNo) {
+        this.motherInpatientNo = motherInpatientNo;
+    }
+
+    public String getBirthCertificateNo() {
+        return birthCertificateNo;
+    }
+
+    public void setBirthCertificateNo(String birthCertificateNo) {
+        this.birthCertificateNo = birthCertificateNo;
+    }
+
+    public String getHealthStatus() {
+        return healthStatus;
+    }
+
+    public void setHealthStatus(String healthStatus) {
+        this.healthStatus = healthStatus;
+    }
+
+    public String getPlaceType() {
+        return placeType;
+    }
+
+    public void setPlaceType(String placeType) {
+        this.placeType = placeType;
+    }
+
+    public Date getIssueDate() {
+        return issueDate;
+    }
+
+    public void setIssueDate(Date issueDate) {
+        this.issueDate = issueDate;
+    }
+
+    public String getFacility() {
+        return facility;
+    }
+
+    public void setFacility(String facility) {
+        this.facility = facility;
+    }
+
+    public String getHome() {
+        return home;
+    }
+
+    public void setHome(String home) {
+        this.home = home;
+    }
+
+    public String getFatherName() {
+        return fatherName;
+    }
+
+    public void setFatherName(String fatherName) {
+        this.fatherName = fatherName;
+    }
+
+    public String getFatherAge() {
+        return fatherAge;
+    }
+
+    public void setFatherAge(String fatherAge) {
+        this.fatherAge = fatherAge;
+    }
+
+    public String getFatherNation() {
+        return fatherNation;
+    }
+
+    public void setFatherNation(String fatherNation) {
+        this.fatherNation = fatherNation;
+    }
+
+    public String getFatherNationality() {
+        return fatherNationality;
+    }
+
+    public void setFatherNationality(String fatherNationality) {
+        this.fatherNationality = fatherNationality;
+    }
+
+    public String getFatherCardnNo() {
+        return fatherCardnNo;
+    }
+
+    public void setFatherCardnNo(String fatherCardnNo) {
+        this.fatherCardnNo = fatherCardnNo;
+    }
+
+    public String getMotherName() {
+        return motherName;
+    }
+
+    public void setMotherName(String motherName) {
+        this.motherName = motherName;
+    }
+
+    public String getMotherAge() {
+        return motherAge;
+    }
+
+    public void setMotherAge(String motherAge) {
+        this.motherAge = motherAge;
+    }
+
+    public String getMotherNation() {
+        return motherNation;
+    }
+
+    public void setMotherNation(String motherNation) {
+        this.motherNation = motherNation;
+    }
+
+    public String getMotherNationality() {
+        return motherNationality;
+    }
+
+    public void setMotherNationality(String motherNationality) {
+        this.motherNationality = motherNationality;
+    }
+
+    public String getMotherCardNo() {
+        return motherCardNo;
+    }
+
+    public void setMotherCardNo(String motherCardNo) {
+        this.motherCardNo = motherCardNo;
+    }
+
+    public String getGestation() {
+        return gestation;
+    }
+
+    public void setGestation(String gestation) {
+        this.gestation = gestation;
+    }
+
+    public String getBirtPlace() {
+        return birtPlace;
+    }
+
+    public void setBirtPlace(String birtPlace) {
+        this.birtPlace = birtPlace;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public String getBirthAddress() {
+        return birthAddress;
+    }
+
+    public void setBirthAddress(String birthAddress) {
+        this.birthAddress = birthAddress;
+    }
+}

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

@@ -0,0 +1,673 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 住院主表
+ */
+@Data
+public class FinIprInmaininfo {
+    /**
+     * 住院流水号
+     */
+    private String inpatientNo;
+
+    /**
+     * 医疗类别
+     */
+    private String medicalType;
+
+    /**
+     * 住院号
+     */
+    private String patientNo;
+
+    /**
+     * 就诊卡号
+     */
+    private String cardNo;
+
+    /**
+     * 医疗证号
+     */
+    private String mcardNo;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sexCode;
+
+    /**
+     * 身份证号
+     */
+    private String idenno;
+
+    /**
+     * 拼音
+     */
+    private String spellCode;
+
+    /**
+     * 生日
+     */
+    private Date birthday;
+
+    /**
+     * 职业代码
+     */
+    private String profCode;
+
+    /**
+     * 工作单位
+     */
+    private String workName;
+
+    /**
+     * 工作单位电话
+     */
+    private String workTel;
+
+    /**
+     * 单位邮编
+     */
+    private String workZip;
+
+    /**
+     * 户口或家庭地址
+     */
+    private String home;
+
+    /**
+     * 家庭电话
+     */
+    private String homeTel;
+
+    /**
+     * 户口或家庭邮编
+     */
+    private String homeZip;
+
+    /**
+     * 籍贯
+     */
+    private String dist;
+
+    /**
+     * 出生地代码
+     */
+    private String birthArea;
+
+    /**
+     * 民族
+     */
+    private String nationCode;
+
+    /**
+     * 联系人姓名
+     */
+    private String linkmanName;
+
+    /**
+     * 联系人电话
+     */
+    private String linkmanTel;
+
+    /**
+     * 联系人地址
+     */
+    private String linkmanAdd;
+
+    /**
+     * 联系人关系
+     */
+    private String relaCode;
+
+    /**
+     * 婚姻状况
+     */
+    private String mari;
+
+    /**
+     * 国籍
+     */
+    private String counCode;
+
+    /**
+     * 身高
+     */
+    private BigDecimal height;
+
+    /**
+     * 体重
+     */
+    private BigDecimal weight;
+
+    /**
+     * 血压
+     */
+    private String bloodDress;
+
+    /**
+     * 血型编码
+     */
+    private String bloodCode;
+
+    /**
+     * 重大疾病标志Y:有  N:无
+     */
+    private String hepatitisFlag;
+
+    /**
+     * 过敏标志Y:有  N:无
+     */
+    private String anaphyFlag;
+
+    /**
+     * 入院日期
+     */
+    private Date inDate;
+
+    /**
+     * 科室代码
+     */
+    private String deptCode;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
+
+    /**
+     * 结算类别 1-自费  2-保险 3-公费在职 4-公费退休 5-公费高干
+     */
+    private String paykindCode;
+
+    /**
+     * 合同代码
+     */
+    private String pactCode;
+
+    /**
+     * 合同单位名称
+     */
+    private String pactName;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 护理单元代码
+     */
+    private String nurseCellCode;
+
+    /**
+     * 护理单元名称
+     */
+    private String nurseCellName;
+
+    /**
+     * 医师代码(住院)
+     */
+    private String houseDocCode;
+
+    /**
+     * 医师姓名(住院)
+     */
+    private String houseDocName;
+
+    /**
+     * 医师代码(主治)
+     */
+    private String chargeDocCode;
+
+    /**
+     * 医师姓名(主治)
+     */
+    private String chargeDocName;
+
+    /**
+     * 医师代码(主任)
+     */
+    private String chiefDocCode;
+
+    /**
+     * 医师姓名(主任)
+     */
+    private String chiefDocName;
+
+    /**
+     * 护士代码(责任)
+     */
+    private String dutyNurseCode;
+
+    /**
+     * 护士姓名(责任)
+     */
+    private String dutyNurseName;
+
+    /**
+     * 入院情况
+     */
+    private String inCircs;
+
+    /**
+     * 入院途径
+     */
+    private String inAvenue;
+
+    /**
+     * 入院来源 1:门诊，2:急诊，3:转科，4:转院
+     */
+    private String inSource;
+
+    /**
+     * 住院次数
+     */
+    private Short inTimes;
+
+    /**
+     * 预交金额(未结)
+     */
+    private BigDecimal prepayCost;
+
+    /**
+     * 转入预交金额（未结)
+     */
+    private BigDecimal changePrepaycost;
+
+    /**
+     * 警戒线
+     */
+    private BigDecimal moneyAlert;
+
+    /**
+     * 费用金额(未结)
+     */
+    private BigDecimal totCost;
+
+    /**
+     * 自费金额(未结)
+     */
+    private BigDecimal ownCost;
+
+    /**
+     * 自付金额(未结)
+     */
+    private BigDecimal payCost;
+
+    /**
+     * 公费金额(未结)
+     */
+    private BigDecimal pubCost;
+
+    /**
+     * 优惠金额(未结)
+     */
+    private BigDecimal ecoCost;
+
+    /**
+     * 余额(未结)
+     */
+    private BigDecimal freeCost;
+
+    /**
+     * 转入费用金额(未结)
+     */
+    private BigDecimal changeTotcost;
+
+    /**
+     * 待遇上限
+     */
+    private BigDecimal upperLimit;
+
+    /**
+     * 固定费用间隔天数
+     */
+    private Short feeInterval;
+
+    /**
+     * 结算序号
+     */
+    private Short balanceNo;
+
+    /**
+     * 费用金额(已结)
+     */
+    private BigDecimal balanceCost;
+
+    /**
+     * 预交金额(已结)
+     */
+    private BigDecimal balancePrepay;
+
+    /**
+     * 结算日期(上次)
+     */
+    private Date balanceDate;
+
+    /**
+     * 是否关帐
+     */
+    private String stopAcount;
+
+    /**
+     * 婴儿标志 1:有婴儿；0:无婴儿
+     */
+    private String babyFlag;
+
+    /**
+     * 病案状态: 0 无需病案 1 需要病案 2 医生站形成病案 3 病案室形成病案 4病案封存
+     */
+    private String caseFlag;
+
+    /**
+     * R-住院登记  I-病房接诊 B-出院登记 O-出院结算 P-预约出院,N-无费退院
+     */
+    private String inState;
+
+    /**
+     * 是否请假 0 非 1是
+     */
+    private String leaveFlag;
+
+    /**
+     * 出院日期(预约)
+     */
+    private Date prepayOutdate;
+
+    /**
+     * 出院日期
+     */
+    private Date outDate;
+
+    /**
+     * 转归代号
+     */
+    private String zg;
+
+    /**
+     * 开据医师
+     */
+    private String emplCode;
+
+    /**
+     * 是否在ICU 0 no 1 yes
+     */
+    private String inIcu;
+
+    /**
+     * 病案送入病案室否0未1送
+     */
+    private String casesendFlag;
+
+    /**
+     * 护理级别(TEND):名称显示护理级别名称(一级护理，二级护理，三级护理)
+     */
+    private String tend;
+
+    /**
+     * 病危：0 普通 1 病重 2 病危
+     */
+    private String criticalFlag;
+
+    /**
+     * 上次固定费用时间
+     */
+    private Date prefixfeeDate;
+
+    /**
+     * 操作员
+     */
+    private String operCode;
+
+    /**
+     * 操作时间
+     */
+    private Date operDate;
+
+    /**
+     * 血滞纳金
+     */
+    private BigDecimal bloodLatefee;
+
+    /**
+     * 公费患者日限额
+     */
+    private BigDecimal dayLimit;
+
+    /**
+     * 公费患者日限额累计
+     */
+    private BigDecimal limitTot;
+
+    /**
+     * 公费患者日限额超标部分金额
+     */
+    private BigDecimal limitOvertop;
+
+    /**
+     * 门诊诊断
+     */
+    private String clinicDiagnose;
+
+    /**
+     * 生育保险患者电脑号
+     */
+    private String procreatePcno;
+
+    /**
+     * 饮食
+     */
+    private String dieteticMark;
+
+    /**
+     * 公费患者公费药品累计(日限额)
+     */
+    private BigDecimal bursaryTotmedfee;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    /**
+     * 床位上限
+     */
+    private BigDecimal bedLimit;
+
+    /**
+     * 空调上限
+     */
+    private BigDecimal airLimit;
+
+    /**
+     * 床费超标处理 0超标不限 1超标自理 2超标不计
+     */
+    private String bedoverdeal;
+
+    /**
+     * 扩展标记（公医超日限额是否同意：0不同意，1同意）
+     */
+    private String extFlag;
+
+    /**
+     * 扩展标记1
+     */
+    private String extFlag1;
+
+    /**
+     * 扩展标记2
+     */
+    private String extFlag2;
+
+    /**
+     * 膳食花费总额
+     */
+    private BigDecimal boardCost;
+
+    /**
+     * 膳食预交金额
+     */
+    private BigDecimal boardPrepay;
+
+    /**
+     * 膳食结算状态：0在院 1出院
+     */
+    private String boardState;
+
+    /**
+     * 自费比例
+     */
+    private BigDecimal ownRate;
+
+    /**
+     * 自付比例
+     */
+    private BigDecimal payRate;
+
+    /**
+     * 扩展数值（交大一用作－差异金额）
+     */
+    private BigDecimal extNumber;
+
+    /**
+     * 扩展编码（）
+     */
+    private String extCode;
+
+    /**
+     * 诊断名称（建议用此保存主诊断）
+     */
+    private String diagName;
+
+    /**
+     * 是否加密
+     */
+    private String isEncryptname;
+
+    /**
+     * 密文
+     */
+    private String normalname;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 补办时间
+     */
+    private Date patchDate;
+
+    /**
+     * 补办人
+     */
+    private String patchor;
+
+    /**
+     * 合疗审核说明
+     */
+    private String remark;
+
+    /**
+     * 审核人
+     */
+    private String assessor;
+
+    /**
+     * 现住址
+     */
+    private String nowhome;
+
+    /**
+     * 现住址邮编
+     */
+    private String nowhomeZip;
+
+    private String inhosDeptcode;
+
+    /**
+     * 审核人
+     */
+    private String auditOpercode;
+
+    /**
+     * 审核时间
+     */
+    private Date auditCofirmdate;
+
+    /**
+     * 基金支付标识
+     */
+    private String fundflag;
+
+    /**
+     * 是否打印
+     */
+    private String printflag;
+
+    /**
+     * 日间病房
+     */
+    private String daycareunit;
+
+    /**
+     * 预住院
+     */
+    private String preregister;
+
+    /**
+     * 省
+     */
+    private String swprovince;
+
+    /**
+     * 市
+     */
+    private String swcity;
+
+    /**
+     * 区域
+     */
+    private String swquy;
+
+    /**
+     * 原因
+     */
+    private String dayremark;
+
+    /**
+     * realone标志
+     */
+    private String realoneflag;
+
+    /**
+     * 患者所属亚专科编码
+     */
+    private String subspecialtyCode;
+
+    /**
+     * 患者所属亚专科名称
+     */
+    private String subspecialtyName;
+
+    /**
+     * 1 新 空 老
+     */
+    private String nisflag;
+
+    private List<MdcDiPath> diagnosisList;
+
+}

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

@@ -0,0 +1,133 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 帐户信息表
+    */
+public class FinOpbAccount {
+    /**
+    * 帐号
+    */
+    private String accountNo;
+
+    /**
+    * 病历卡号
+    */
+    private String cardNo;
+
+    /**
+    * 帐户状态0停用 1正常 2注销
+    */
+    private String state;
+
+    /**
+    * 余额
+    */
+    private BigDecimal vacancy;
+
+    /**
+    * 密码
+    */
+    private String password;
+
+    /**
+    * 单日消费限制
+    */
+    private BigDecimal daylimit;
+
+    /**
+    * 1是 0否
+    */
+    private String isEmpower;
+
+    /**
+    * 账户类型
+    */
+    private String accountType;
+
+    private BigDecimal moneyalter;
+
+    private Date validtime;
+
+    public String getAccountNo() {
+        return accountNo;
+    }
+
+    public void setAccountNo(String accountNo) {
+        this.accountNo = accountNo;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public BigDecimal getVacancy() {
+        return vacancy;
+    }
+
+    public void setVacancy(BigDecimal vacancy) {
+        this.vacancy = vacancy;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public BigDecimal getDaylimit() {
+        return daylimit;
+    }
+
+    public void setDaylimit(BigDecimal daylimit) {
+        this.daylimit = daylimit;
+    }
+
+    public String getIsEmpower() {
+        return isEmpower;
+    }
+
+    public void setIsEmpower(String isEmpower) {
+        this.isEmpower = isEmpower;
+    }
+
+    public String getAccountType() {
+        return accountType;
+    }
+
+    public void setAccountType(String accountType) {
+        this.accountType = accountType;
+    }
+
+    public BigDecimal getMoneyalter() {
+        return moneyalter;
+    }
+
+    public void setMoneyalter(BigDecimal moneyalter) {
+        this.moneyalter = moneyalter;
+    }
+
+    public Date getValidtime() {
+        return validtime;
+    }
+
+    public void setValidtime(Date validtime) {
+        this.validtime = validtime;
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+
+public class FinOpbAccountlist {
+    private String idenno;
+
+    private String name;
+
+    private BigDecimal shul;
+
+    private String maincardno;
+
+    private String flag;
+
+    private String mergeOper;
+
+    public String getIdenno() {
+        return idenno;
+    }
+
+    public void setIdenno(String idenno) {
+        this.idenno = idenno;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigDecimal getShul() {
+        return shul;
+    }
+
+    public void setShul(BigDecimal shul) {
+        this.shul = shul;
+    }
+
+    public String getMaincardno() {
+        return maincardno;
+    }
+
+    public void setMaincardno(String maincardno) {
+        this.maincardno = maincardno;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    public String getMergeOper() {
+        return mergeOper;
+    }
+
+    public void setMergeOper(String mergeOper) {
+        this.mergeOper = mergeOper;
+    }
+}

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

@@ -0,0 +1,227 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 帐户操作流水表
+    */
+public class FinOpbAccountrecord {
+    /**
+    * 交易流水号
+    */
+    private String sequenceNo;
+
+    /**
+    * 病历卡号
+    */
+    private String cardNo;
+
+    /**
+    * 帐号
+    */
+    private String accountNo;
+
+    /**
+    * 0 预交金 1新建帐户 2停帐户 3重启帐户 4支付 5退费入户 6注销帐户 7授权支付 8退预交金 9修改密码 10结清余额
+    */
+    private String opertype;
+
+    /**
+    * 金额
+    */
+    private BigDecimal money;
+
+    /**
+    * 相关科室
+    */
+    private String deptCode;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 操作时间
+    */
+    private Date operDate;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 是否有效0有效1无效
+    */
+    private String valid;
+
+    /**
+    * 交易后余额
+    */
+    private BigDecimal vacancy;
+
+    /**
+    * 被授权门诊卡号
+    */
+    private String empowerCardno;
+
+    /**
+    * 被授权人姓名
+    */
+    private String empowerName;
+
+    /**
+    * 授权人姓名
+    */
+    private String name;
+
+    /**
+    * 授权金额
+    */
+    private BigDecimal empowerCost;
+
+    /**
+    * 发票类型
+    */
+    private String invoiceType;
+
+    private String anticode;
+
+    public String getSequenceNo() {
+        return sequenceNo;
+    }
+
+    public void setSequenceNo(String sequenceNo) {
+        this.sequenceNo = sequenceNo;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getAccountNo() {
+        return accountNo;
+    }
+
+    public void setAccountNo(String accountNo) {
+        this.accountNo = accountNo;
+    }
+
+    public String getOpertype() {
+        return opertype;
+    }
+
+    public void setOpertype(String opertype) {
+        this.opertype = opertype;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getValid() {
+        return valid;
+    }
+
+    public void setValid(String valid) {
+        this.valid = valid;
+    }
+
+    public BigDecimal getVacancy() {
+        return vacancy;
+    }
+
+    public void setVacancy(BigDecimal vacancy) {
+        this.vacancy = vacancy;
+    }
+
+    public String getEmpowerCardno() {
+        return empowerCardno;
+    }
+
+    public void setEmpowerCardno(String empowerCardno) {
+        this.empowerCardno = empowerCardno;
+    }
+
+    public String getEmpowerName() {
+        return empowerName;
+    }
+
+    public void setEmpowerName(String empowerName) {
+        this.empowerName = empowerName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigDecimal getEmpowerCost() {
+        return empowerCost;
+    }
+
+    public void setEmpowerCost(BigDecimal empowerCost) {
+        this.empowerCost = empowerCost;
+    }
+
+    public String getInvoiceType() {
+        return invoiceType;
+    }
+
+    public void setInvoiceType(String invoiceType) {
+        this.invoiceType = invoiceType;
+    }
+
+    public String getAnticode() {
+        return anticode;
+    }
+
+    public void setAnticode(String anticode) {
+        this.anticode = anticode;
+    }
+}

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

@@ -0,0 +1,581 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 发票信息表(结算信息表)
+ */
+public class FinOpbInvoiceinfo {
+    /**
+    * 发票号
+    */
+    private String invoiceNo;
+
+    /**
+    * 交易类型,1正，2反
+    */
+    private String transType;
+
+    /**
+    * 发票序号，一次结算产生多张发票的combNo
+    */
+    private String invoiceSeq;
+
+    /**
+    * 病历卡号
+    */
+    private String cardNo;
+
+    /**
+    * 挂号日期
+    */
+    private Date regDate;
+
+    /**
+    * 患者姓名
+    */
+    private String name;
+
+    /**
+    * 结算类别代码
+    */
+    private String paykindCode;
+
+    /**
+    * 合同单位代码
+    */
+    private String pactCode;
+
+    /**
+    * 合同单位名称
+    */
+    private String pactName;
+
+    /**
+    * 个人编号
+    */
+    private String mcardNo;
+
+    /**
+    * 医疗类别
+    */
+    private String medicalType;
+
+    /**
+    * 总额
+    */
+    private BigDecimal totCost;
+
+    /**
+    * 可报效金额
+    */
+    private BigDecimal pubCost;
+
+    /**
+    * 不可报效金额
+    */
+    private BigDecimal ownCost;
+
+    /**
+    * 自付金额
+    */
+    private BigDecimal payCost;
+
+    /**
+    * 预留1
+    */
+    private BigDecimal back1;
+
+    /**
+    * 预留2(门诊账户集中打印发票标志）
+    */
+    private BigDecimal back2;
+
+    /**
+    * 预留3
+    */
+    private String back3;
+
+    /**
+    * 实付金额
+    */
+    private BigDecimal realCost;
+
+    /**
+    * 结算人
+    */
+    private String operCode;
+
+    /**
+    * 结算时间
+    */
+    private Date operDate;
+
+    /**
+    * 0不是体检/1个人体检/2团体体检
+    */
+    private String examineFlag;
+
+    /**
+    * "0" 退费 "1" 有效 "2" 重打 "3" 注销
+    */
+    private String cancelFlag;
+
+    /**
+    * 作废票据号
+    */
+    private String cancelInvoice;
+
+    /**
+    * 作废操作员
+    */
+    private String cancelCode;
+
+    /**
+    * 作废时间
+    */
+    private Date cancelDate;
+
+    /**
+    * 0未核查/1已核查
+    */
+    private String checkFlag;
+
+    /**
+    * 核查人
+    */
+    private String checkOpcd;
+
+    /**
+    * 核查时间
+    */
+    private Date checkDate;
+
+    /**
+    * 0未日结/1已日结
+    */
+    private String balanceFlag;
+
+    /**
+    * 日结标识号
+    */
+    private String balanceNo;
+
+    /**
+    * 日结人
+    */
+    private String balanceOpcd;
+
+    /**
+    * 日结时间
+    */
+    private Date balanceDate;
+
+    /**
+    * 扩展标志 1 自费 2 记帐 3 特殊
+    */
+    private String extFlag;
+
+    /**
+    * 挂号流水号
+    */
+    private String clinicCode;
+
+    /**
+    * 实际发票打印号码
+    */
+    private String printInvoiceno;
+
+    /**
+    * 本张发票发药窗口信息
+    */
+    private String drugWindow;
+
+    /**
+    * 是否账户集中打印发票（门诊账户支付标志)
+    */
+    private String accountFlag;
+
+    /**
+    * 一次收费序号
+    */
+    private String invoiceComb;
+
+    /**
+    * 打印人
+    */
+    private String printOpcd;
+
+    /**
+    * 打印时间
+    */
+    private Date printDate;
+
+    /**
+    * 线上支付操作员
+    */
+    private String zfCode;
+
+    /**
+    * 是否是电子发票
+    */
+    private String isElectronic;
+
+    /**
+    * 电子发票是否开具
+    */
+    private String electStatus;
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public String getTransType() {
+        return transType;
+    }
+
+    public void setTransType(String transType) {
+        this.transType = transType;
+    }
+
+    public String getInvoiceSeq() {
+        return invoiceSeq;
+    }
+
+    public void setInvoiceSeq(String invoiceSeq) {
+        this.invoiceSeq = invoiceSeq;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public Date getRegDate() {
+        return regDate;
+    }
+
+    public void setRegDate(Date regDate) {
+        this.regDate = regDate;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPaykindCode() {
+        return paykindCode;
+    }
+
+    public void setPaykindCode(String paykindCode) {
+        this.paykindCode = paykindCode;
+    }
+
+    public String getPactCode() {
+        return pactCode;
+    }
+
+    public void setPactCode(String pactCode) {
+        this.pactCode = pactCode;
+    }
+
+    public String getPactName() {
+        return pactName;
+    }
+
+    public void setPactName(String pactName) {
+        this.pactName = pactName;
+    }
+
+    public String getMcardNo() {
+        return mcardNo;
+    }
+
+    public void setMcardNo(String mcardNo) {
+        this.mcardNo = mcardNo;
+    }
+
+    public String getMedicalType() {
+        return medicalType;
+    }
+
+    public void setMedicalType(String medicalType) {
+        this.medicalType = medicalType;
+    }
+
+    public BigDecimal getTotCost() {
+        return totCost;
+    }
+
+    public void setTotCost(BigDecimal totCost) {
+        this.totCost = totCost;
+    }
+
+    public BigDecimal getPubCost() {
+        return pubCost;
+    }
+
+    public void setPubCost(BigDecimal pubCost) {
+        this.pubCost = pubCost;
+    }
+
+    public BigDecimal getOwnCost() {
+        return ownCost;
+    }
+
+    public void setOwnCost(BigDecimal ownCost) {
+        this.ownCost = ownCost;
+    }
+
+    public BigDecimal getPayCost() {
+        return payCost;
+    }
+
+    public void setPayCost(BigDecimal payCost) {
+        this.payCost = payCost;
+    }
+
+    public BigDecimal getBack1() {
+        return back1;
+    }
+
+    public void setBack1(BigDecimal back1) {
+        this.back1 = back1;
+    }
+
+    public BigDecimal getBack2() {
+        return back2;
+    }
+
+    public void setBack2(BigDecimal back2) {
+        this.back2 = back2;
+    }
+
+    public String getBack3() {
+        return back3;
+    }
+
+    public void setBack3(String back3) {
+        this.back3 = back3;
+    }
+
+    public BigDecimal getRealCost() {
+        return realCost;
+    }
+
+    public void setRealCost(BigDecimal realCost) {
+        this.realCost = realCost;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getExamineFlag() {
+        return examineFlag;
+    }
+
+    public void setExamineFlag(String examineFlag) {
+        this.examineFlag = examineFlag;
+    }
+
+    public String getCancelFlag() {
+        return cancelFlag;
+    }
+
+    public void setCancelFlag(String cancelFlag) {
+        this.cancelFlag = cancelFlag;
+    }
+
+    public String getCancelInvoice() {
+        return cancelInvoice;
+    }
+
+    public void setCancelInvoice(String cancelInvoice) {
+        this.cancelInvoice = cancelInvoice;
+    }
+
+    public String getCancelCode() {
+        return cancelCode;
+    }
+
+    public void setCancelCode(String cancelCode) {
+        this.cancelCode = cancelCode;
+    }
+
+    public Date getCancelDate() {
+        return cancelDate;
+    }
+
+    public void setCancelDate(Date cancelDate) {
+        this.cancelDate = cancelDate;
+    }
+
+    public String getCheckFlag() {
+        return checkFlag;
+    }
+
+    public void setCheckFlag(String checkFlag) {
+        this.checkFlag = checkFlag;
+    }
+
+    public String getCheckOpcd() {
+        return checkOpcd;
+    }
+
+    public void setCheckOpcd(String checkOpcd) {
+        this.checkOpcd = checkOpcd;
+    }
+
+    public Date getCheckDate() {
+        return checkDate;
+    }
+
+    public void setCheckDate(Date checkDate) {
+        this.checkDate = checkDate;
+    }
+
+    public String getBalanceFlag() {
+        return balanceFlag;
+    }
+
+    public void setBalanceFlag(String balanceFlag) {
+        this.balanceFlag = balanceFlag;
+    }
+
+    public String getBalanceNo() {
+        return balanceNo;
+    }
+
+    public void setBalanceNo(String balanceNo) {
+        this.balanceNo = balanceNo;
+    }
+
+    public String getBalanceOpcd() {
+        return balanceOpcd;
+    }
+
+    public void setBalanceOpcd(String balanceOpcd) {
+        this.balanceOpcd = balanceOpcd;
+    }
+
+    public Date getBalanceDate() {
+        return balanceDate;
+    }
+
+    public void setBalanceDate(Date balanceDate) {
+        this.balanceDate = balanceDate;
+    }
+
+    public String getExtFlag() {
+        return extFlag;
+    }
+
+    public void setExtFlag(String extFlag) {
+        this.extFlag = extFlag;
+    }
+
+    public String getClinicCode() {
+        return clinicCode;
+    }
+
+    public void setClinicCode(String clinicCode) {
+        this.clinicCode = clinicCode;
+    }
+
+    public String getPrintInvoiceno() {
+        return printInvoiceno;
+    }
+
+    public void setPrintInvoiceno(String printInvoiceno) {
+        this.printInvoiceno = printInvoiceno;
+    }
+
+    public String getDrugWindow() {
+        return drugWindow;
+    }
+
+    public void setDrugWindow(String drugWindow) {
+        this.drugWindow = drugWindow;
+    }
+
+    public String getAccountFlag() {
+        return accountFlag;
+    }
+
+    public void setAccountFlag(String accountFlag) {
+        this.accountFlag = accountFlag;
+    }
+
+    public String getInvoiceComb() {
+        return invoiceComb;
+    }
+
+    public void setInvoiceComb(String invoiceComb) {
+        this.invoiceComb = invoiceComb;
+    }
+
+    public String getPrintOpcd() {
+        return printOpcd;
+    }
+
+    public void setPrintOpcd(String printOpcd) {
+        this.printOpcd = printOpcd;
+    }
+
+    public Date getPrintDate() {
+        return printDate;
+    }
+
+    public void setPrintDate(Date printDate) {
+        this.printDate = printDate;
+    }
+
+    public String getZfCode() {
+        return zfCode;
+    }
+
+    public void setZfCode(String zfCode) {
+        this.zfCode = zfCode;
+    }
+
+    public String getIsElectronic() {
+        return isElectronic;
+    }
+
+    public void setIsElectronic(String isElectronic) {
+        this.isElectronic = isElectronic;
+    }
+
+    public String getElectStatus() {
+        return electStatus;
+    }
+
+    public void setElectStatus(String electStatus) {
+        this.electStatus = electStatus;
+    }
+}

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

@@ -0,0 +1,452 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 挂号主表
+ */
+@Data
+public class FinOprRegister {
+    /**
+     * 门诊号/发票号
+     */
+    private String clinicCode;
+
+    /**
+     * 交易类型,1正交易，2反交易
+     */
+    private String transType;
+
+    /**
+     * 就诊卡号
+     */
+    private String cardNo;
+
+    /**
+     * 挂号日期
+     */
+    private Date regDate;
+
+    /**
+     * 午别
+     */
+    private String noonCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    private String idenno;
+
+    /**
+     * 性别
+     */
+    private String sexCode;
+
+    /**
+     * 出生日
+     */
+    private Date birthday;
+
+    /**
+     * 联系电话
+     */
+    private String relaPhone;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 证件类型
+     */
+    private String cardType;
+
+    /**
+     * 结算类别号
+     */
+    private String paykindCode;
+
+    /**
+     * 结算类别名称
+     */
+    private String paykindName;
+
+    /**
+     * 合同号
+     */
+    private String pactCode;
+
+    /**
+     * 合同单位名称
+     */
+    private String pactName;
+
+    /**
+     * 医疗证号
+     */
+    private String mcardNo;
+
+    /**
+     * 挂号级别
+     */
+    private String reglevlCode;
+
+    /**
+     * 挂号级别名称
+     */
+    private String reglevlName;
+
+    /**
+     * 科室号
+     */
+    private String deptCode;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
+
+    /**
+     * 排班序号
+     */
+    private String schemaNo;
+
+    /**
+     * 每日顺序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 看诊序号
+     */
+    private Integer seeno;
+
+    /**
+     * 看诊开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 看诊结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 医师代号
+     */
+    private String doctCode;
+
+    /**
+     * 医师姓名
+     */
+    private String doctName;
+
+    /**
+     * 挂号收费标志 1是/0否
+     */
+    private String ynregchrg;
+
+    /**
+     * 发票号
+     */
+    private String invoiceNo;
+
+    /**
+     * 处方号
+     */
+    private String recipeNo;
+
+    /**
+     * 0现场挂号/1预约挂号/2特诊挂号
+     */
+    private String ynbook;
+
+    /**
+     * 1初诊/0复诊
+     */
+    private String ynfr;
+
+    /**
+     * 1加号/0正常
+     */
+    private String appendFlag;
+
+    /**
+     * 挂号费
+     */
+    private BigDecimal regFee;
+
+    /**
+     * 检查费
+     */
+    private BigDecimal chckFee;
+
+    /**
+     * 诊察费
+     */
+    private BigDecimal diagFee;
+
+    /**
+     * 附加费
+     */
+    private BigDecimal othFee;
+
+    /**
+     * 自费金额
+     */
+    private BigDecimal ownCost;
+
+    /**
+     * 报销金额
+     */
+    private BigDecimal pubCost;
+
+    /**
+     * 自付金额
+     */
+    private BigDecimal payCost;
+
+    /**
+     * 0退费,1有效,2作废
+     */
+    private String validFlag;
+
+    /**
+     * 操作员代码
+     */
+    private String operCode;
+
+    /**
+     * 操作时间
+     */
+    private Date operDate;
+
+    /**
+     * 作废人
+     */
+    private String cancelOpcd;
+
+    /**
+     * 作废时间
+     */
+    private Date cancelDate;
+
+    /**
+     * 医疗类别：0 职工，1居民
+     */
+    private String medicalType;
+
+    /**
+     * 疾病代码
+     */
+    private String icdCode;
+
+    /**
+     * 审批人
+     */
+    private String examCode;
+
+    /**
+     * 审批时间
+     */
+    private Date examDate;
+
+    /**
+     * 0未核查/1已核查
+     */
+    private String checkFlag;
+
+    /**
+     * 核查人
+     */
+    private String checkOpcd;
+
+    /**
+     * 核查时间
+     */
+    private Date checkDate;
+
+    /**
+     * 1已日结/0未日结
+     */
+    private String balanceFlag;
+
+    /**
+     * 日结标识号
+     */
+    private String balanceNo;
+
+    /**
+     * 日结人
+     */
+    private String balanceOpcd;
+
+    /**
+     * 日结时间
+     */
+    private Date balanceDate;
+
+    /**
+     * 是否看诊 1是/0否
+     */
+    private String ynsee;
+
+    /**
+     * 看诊日期
+     */
+    private Date seeDate;
+
+    /**
+     * 分诊标志,0未分/1已分
+     */
+    private String triageFlag;
+
+    /**
+     * 分诊护士代码
+     */
+    private String triageOpcd;
+
+    /**
+     * 分诊时间
+     */
+    private Date triageDate;
+
+    /**
+     * 打印发票数量
+     */
+    private Short printInvoicecnt;
+
+    /**
+     * 看诊科室代码
+     */
+    private String seeDpcd;
+
+    /**
+     * 看诊医生代码
+     */
+    private String seeDocd;
+
+    /**
+     * 患者来源
+     */
+    private String inSource;
+
+    /**
+     * 1：需要提取病案0：不需要提取病案
+     */
+    private String isSendinhoscase;
+
+    /**
+     * 是否加密姓名
+     */
+    private String isEncryptname;
+
+    /**
+     * 密文（用来存储退号原因代码）
+     */
+    private String normalname;
+
+    /**
+     * 开始留观日期
+     */
+    private Date inDate;
+
+    /**
+     * 留观结束日期
+     */
+    private Date outDate;
+
+    /**
+     * 转归代号
+     */
+    private String zg;
+
+    private String inState;
+
+    /**
+     * 西安交大专用(存储症状、联系人姓名、性别)
+     */
+    private String remark;
+
+    private String isAccount;
+
+    private BigDecimal ecoCost;
+
+    private String operseq;
+
+    private String icdName;
+
+    private String siCard;
+
+    private String siNo;
+
+    private String corporationId;
+
+    private String accountNo;
+
+    private String ipAddress;
+
+    /**
+     * 就诊时合同编码
+     */
+    private String oldPactcode;
+
+    private String contycode;
+
+    private String contyname;
+
+    private BigDecimal contyconfirm;
+
+    private String invoicePrintopercode;
+
+    private Date invoicePrintdate;
+
+    private String contypactcode;
+
+    private String contypactname;
+
+    private String regWay;
+
+    /**
+     * 是否是电子发票
+     */
+    private String isElectronic;
+
+    private Date mzinDate;
+
+    private Date mzoutDate;
+
+    private Date banlanceDate;
+
+    private String banlanceCode;
+
+    private BigDecimal banlanceOwncost;
+
+    private BigDecimal banlancePaycost;
+
+    private BigDecimal banlancePubcost;
+
+    private String oldinvoiceno;
+
+    private String balanceState;
+
+    private String modeCode;
+
+    /**
+     * 急诊米健系统患者就诊主索引
+     */
+    private String mjclinicCode;
+
+    private List<MdcDiPath> diagnosisList;
+
+}

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

@@ -0,0 +1,421 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+/**
+ * 医师出诊表
+ */
+public class FinOprSchema {
+    /**
+    * 序号
+    */
+    private String id;
+
+    /**
+    * 排班类型，0科室/1医生
+    */
+    private String schemaType;
+
+    /**
+    * 看诊日期
+    */
+    private Date seeDate;
+
+    /**
+    * 星期
+    */
+    private String week;
+
+    /**
+    * 午别
+    */
+    private String noonCode;
+
+    /**
+    * 开始时间
+    */
+    private Date beginTime;
+
+    /**
+    * 结束时间
+    */
+    private Date endTime;
+
+    /**
+    * 科室代号
+    */
+    private String deptCode;
+
+    /**
+    * 科室名称
+    */
+    private String deptName;
+
+    /**
+    * 医师代号,当为科室排班时,值为None
+    */
+    private String doctCode;
+
+    /**
+    * 医生姓名
+    */
+    private String doctName;
+
+    /**
+    * 1在职/2返聘
+    */
+    private String doctType;
+
+    /**
+    * 来人挂号限额
+    */
+    private Integer regLmt;
+
+    /**
+    * 挂号已挂
+    */
+    private Integer reged;
+
+    /**
+    * 来电挂号限额
+    */
+    private Integer telLmt;
+
+    /**
+    * 来电已挂
+    */
+    private Integer telReged;
+
+    /**
+    * 来电已预约
+    */
+    private Integer telReging;
+
+    /**
+    * 特诊挂号限额
+    */
+    private Integer speLmt;
+
+    /**
+    * 特诊已挂
+    */
+    private Integer speReged;
+
+    /**
+    * 1正常/0停诊
+    */
+    private String validFlag;
+
+    /**
+    * 1加号/0否
+    */
+    private String appendFlag;
+
+    /**
+    * 停诊原因
+    */
+    private String reasonNo;
+
+    /**
+    * 停诊原因名称
+    */
+    private String reasonName;
+
+    /**
+    * 停止人
+    */
+    private String stopOpcd;
+
+    /**
+    * 停止时间
+    */
+    private Date stopDate;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 最近改动日期
+    */
+    private Date operDate;
+
+    private Integer orderNo;
+
+    /**
+    * 挂号级别代码
+    */
+    private String reglevlCode;
+
+    /**
+    * 挂号级别name
+    */
+    private String reglevlName;
+
+    /**
+    * 专病门诊名称
+    */
+    private String specialPatientName;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getSchemaType() {
+        return schemaType;
+    }
+
+    public void setSchemaType(String schemaType) {
+        this.schemaType = schemaType;
+    }
+
+    public Date getSeeDate() {
+        return seeDate;
+    }
+
+    public void setSeeDate(Date seeDate) {
+        this.seeDate = seeDate;
+    }
+
+    public String getWeek() {
+        return week;
+    }
+
+    public void setWeek(String week) {
+        this.week = week;
+    }
+
+    public String getNoonCode() {
+        return noonCode;
+    }
+
+    public void setNoonCode(String noonCode) {
+        this.noonCode = noonCode;
+    }
+
+    public Date getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Date beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getDoctCode() {
+        return doctCode;
+    }
+
+    public void setDoctCode(String doctCode) {
+        this.doctCode = doctCode;
+    }
+
+    public String getDoctName() {
+        return doctName;
+    }
+
+    public void setDoctName(String doctName) {
+        this.doctName = doctName;
+    }
+
+    public String getDoctType() {
+        return doctType;
+    }
+
+    public void setDoctType(String doctType) {
+        this.doctType = doctType;
+    }
+
+    public Integer getRegLmt() {
+        return regLmt;
+    }
+
+    public void setRegLmt(Integer regLmt) {
+        this.regLmt = regLmt;
+    }
+
+    public Integer getReged() {
+        return reged;
+    }
+
+    public void setReged(Integer reged) {
+        this.reged = reged;
+    }
+
+    public Integer getTelLmt() {
+        return telLmt;
+    }
+
+    public void setTelLmt(Integer telLmt) {
+        this.telLmt = telLmt;
+    }
+
+    public Integer getTelReged() {
+        return telReged;
+    }
+
+    public void setTelReged(Integer telReged) {
+        this.telReged = telReged;
+    }
+
+    public Integer getTelReging() {
+        return telReging;
+    }
+
+    public void setTelReging(Integer telReging) {
+        this.telReging = telReging;
+    }
+
+    public Integer getSpeLmt() {
+        return speLmt;
+    }
+
+    public void setSpeLmt(Integer speLmt) {
+        this.speLmt = speLmt;
+    }
+
+    public Integer getSpeReged() {
+        return speReged;
+    }
+
+    public void setSpeReged(Integer speReged) {
+        this.speReged = speReged;
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getAppendFlag() {
+        return appendFlag;
+    }
+
+    public void setAppendFlag(String appendFlag) {
+        this.appendFlag = appendFlag;
+    }
+
+    public String getReasonNo() {
+        return reasonNo;
+    }
+
+    public void setReasonNo(String reasonNo) {
+        this.reasonNo = reasonNo;
+    }
+
+    public String getReasonName() {
+        return reasonName;
+    }
+
+    public void setReasonName(String reasonName) {
+        this.reasonName = reasonName;
+    }
+
+    public String getStopOpcd() {
+        return stopOpcd;
+    }
+
+    public void setStopOpcd(String stopOpcd) {
+        this.stopOpcd = stopOpcd;
+    }
+
+    public Date getStopDate() {
+        return stopDate;
+    }
+
+    public void setStopDate(Date stopDate) {
+        this.stopDate = stopDate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getReglevlCode() {
+        return reglevlCode;
+    }
+
+    public void setReglevlCode(String reglevlCode) {
+        this.reglevlCode = reglevlCode;
+    }
+
+    public String getReglevlName() {
+        return reglevlName;
+    }
+
+    public void setReglevlName(String reglevlName) {
+        this.reglevlName = reglevlName;
+    }
+
+    public String getSpecialPatientName() {
+        return specialPatientName;
+    }
+
+    public void setSpecialPatientName(String specialPatientName) {
+        this.specialPatientName = specialPatientName;
+    }
+}

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

@@ -0,0 +1,349 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 压疮评分记录对象 his_pda_psr_rating_record
+ * 
+ * @author zhangbin
+ * @date 2024-03-12
+ */
+public class HisPdaPsrRatingRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 评分记录ID */
+    private String ratingRecordId;
+
+    /** 科室编码 */
+    @Excel(name = "科室编码")
+    private String deptCode;
+
+    /** 科室名称 */
+    @Excel(name = "科室名称")
+    private String deptName;
+
+    /** 病区编码 */
+    @Excel(name = "病区编码")
+    private String nurseCellCode;
+
+    /** 病区名称 */
+    @Excel(name = "病区名称")
+    private String nurseCellName;
+
+    /** 住院号 */
+    @Excel(name = "住院号")
+    private String inpatientNo;
+
+    /** 患者姓名 */
+    @Excel(name = "患者姓名")
+    private String patientName;
+
+    /** 评分日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "评分日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date ratingDate;
+
+    /** 评分 */
+    @Excel(name = "评分")
+    private BigDecimal rating;
+
+    /**  */
+    private String measure;
+
+    /**  */
+    private String ratingType;
+
+    /**  */
+    private String ratingResources;
+
+    /**  */
+    private String signPersonName;
+
+    /**  */
+    private BigDecimal minPointNoting;
+
+    /**  */
+    private String operCode;
+
+    /**  */
+    private String operName;
+
+    /**  */
+    private Date operTime;
+
+    /**  */
+    private String bedNo;
+
+    /**  */
+    private String operNurseCellCode;
+
+    /**  */
+    private String operNurseCellName;
+
+    /**  */
+    private String operDeptCode;
+
+    /**  */
+    private String operDeptName;
+
+    /**  */
+    private String ratingTypeId;
+
+    /**  */
+    private String recordId;
+
+    public void setRatingRecordId(String ratingRecordId) 
+    {
+        this.ratingRecordId = ratingRecordId;
+    }
+
+    public String getRatingRecordId() 
+    {
+        return ratingRecordId;
+    }
+    public void setDeptCode(String deptCode) 
+    {
+        this.deptCode = deptCode;
+    }
+
+    public String getDeptCode() 
+    {
+        return deptCode;
+    }
+    public void setDeptName(String deptName) 
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName() 
+    {
+        return deptName;
+    }
+    public void setNurseCellCode(String nurseCellCode) 
+    {
+        this.nurseCellCode = nurseCellCode;
+    }
+
+    public String getNurseCellCode() 
+    {
+        return nurseCellCode;
+    }
+    public void setNurseCellName(String nurseCellName) 
+    {
+        this.nurseCellName = nurseCellName;
+    }
+
+    public String getNurseCellName() 
+    {
+        return nurseCellName;
+    }
+    public void setInpatientNo(String inpatientNo) 
+    {
+        this.inpatientNo = inpatientNo;
+    }
+
+    public String getInpatientNo() 
+    {
+        return inpatientNo;
+    }
+    public void setPatientName(String patientName) 
+    {
+        this.patientName = patientName;
+    }
+
+    public String getPatientName() 
+    {
+        return patientName;
+    }
+    public void setRatingDate(Date ratingDate) 
+    {
+        this.ratingDate = ratingDate;
+    }
+
+    public Date getRatingDate() 
+    {
+        return ratingDate;
+    }
+    public void setRating(BigDecimal rating) 
+    {
+        this.rating = rating;
+    }
+
+    public BigDecimal getRating() 
+    {
+        return rating;
+    }
+    public void setMeasure(String measure) 
+    {
+        this.measure = measure;
+    }
+
+    public String getMeasure() 
+    {
+        return measure;
+    }
+    public void setRatingType(String ratingType) 
+    {
+        this.ratingType = ratingType;
+    }
+
+    public String getRatingType() 
+    {
+        return ratingType;
+    }
+    public void setRatingResources(String ratingResources) 
+    {
+        this.ratingResources = ratingResources;
+    }
+
+    public String getRatingResources() 
+    {
+        return ratingResources;
+    }
+    public void setSignPersonName(String signPersonName) 
+    {
+        this.signPersonName = signPersonName;
+    }
+
+    public String getSignPersonName() 
+    {
+        return signPersonName;
+    }
+    public void setMinPointNoting(BigDecimal minPointNoting) 
+    {
+        this.minPointNoting = minPointNoting;
+    }
+
+    public BigDecimal getMinPointNoting() 
+    {
+        return minPointNoting;
+    }
+    public void setOperCode(String operCode) 
+    {
+        this.operCode = operCode;
+    }
+
+    public String getOperCode() 
+    {
+        return operCode;
+    }
+    public void setOperName(String operName) 
+    {
+        this.operName = operName;
+    }
+
+    public String getOperName() 
+    {
+        return operName;
+    }
+    public void setOperTime(Date operTime) 
+    {
+        this.operTime = operTime;
+    }
+
+    public Date getOperTime() 
+    {
+        return operTime;
+    }
+    public void setBedNo(String bedNo) 
+    {
+        this.bedNo = bedNo;
+    }
+
+    public String getBedNo() 
+    {
+        return bedNo;
+    }
+    public void setOperNurseCellCode(String operNurseCellCode) 
+    {
+        this.operNurseCellCode = operNurseCellCode;
+    }
+
+    public String getOperNurseCellCode() 
+    {
+        return operNurseCellCode;
+    }
+    public void setOperNurseCellName(String operNurseCellName) 
+    {
+        this.operNurseCellName = operNurseCellName;
+    }
+
+    public String getOperNurseCellName() 
+    {
+        return operNurseCellName;
+    }
+    public void setOperDeptCode(String operDeptCode) 
+    {
+        this.operDeptCode = operDeptCode;
+    }
+
+    public String getOperDeptCode() 
+    {
+        return operDeptCode;
+    }
+    public void setOperDeptName(String operDeptName) 
+    {
+        this.operDeptName = operDeptName;
+    }
+
+    public String getOperDeptName() 
+    {
+        return operDeptName;
+    }
+    public void setRatingTypeId(String ratingTypeId) 
+    {
+        this.ratingTypeId = ratingTypeId;
+    }
+
+    public String getRatingTypeId() 
+    {
+        return ratingTypeId;
+    }
+    public void setRecordId(String recordId) 
+    {
+        this.recordId = recordId;
+    }
+
+    public String getRecordId() 
+    {
+        return recordId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("ratingRecordId", getRatingRecordId())
+            .append("deptCode", getDeptCode())
+            .append("deptName", getDeptName())
+            .append("nurseCellCode", getNurseCellCode())
+            .append("nurseCellName", getNurseCellName())
+            .append("inpatientNo", getInpatientNo())
+            .append("patientName", getPatientName())
+            .append("ratingDate", getRatingDate())
+            .append("rating", getRating())
+            .append("measure", getMeasure())
+            .append("ratingType", getRatingType())
+            .append("ratingResources", getRatingResources())
+            .append("signPersonName", getSignPersonName())
+            .append("minPointNoting", getMinPointNoting())
+            .append("operCode", getOperCode())
+            .append("operName", getOperName())
+            .append("operTime", getOperTime())
+            .append("remark", getRemark())
+            .append("bedNo", getBedNo())
+            .append("operNurseCellCode", getOperNurseCellCode())
+            .append("operNurseCellName", getOperNurseCellName())
+            .append("operDeptCode", getOperDeptCode())
+            .append("operDeptName", getOperDeptName())
+            .append("ratingTypeId", getRatingTypeId())
+            .append("recordId", getRecordId())
+            .toString();
+    }
+}

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

@@ -0,0 +1,139 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * His系统Sql历史记录对象 his_sql_log_his
+ * 
+ * @author zhangbin
+ * @date 2024-05-08
+ */
+public class HisSqlLogHis extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private String sqlId;
+
+    /** SQL文本 */
+    @Excel(name = "SQL文本")
+    private String sqlText;
+
+    /**  */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastActiveTime;
+
+    /**  */
+    @Excel(name = "")
+    private String parsingSchemaName;
+
+    /**  */
+    @Excel(name = "")
+    private String MODULE;
+
+    /**  */
+    @Excel(name = "")
+    private String MACHINE;
+
+    /**  */
+    @Excel(name = "")
+    private String TERMINAL;
+
+    /**  */
+    @Excel(name = "")
+    private String PROGRAM;
+
+    public void setSqlId(String sqlId)
+    {
+        this.sqlId = sqlId;
+    }
+
+    public String getSqlId()
+    {
+        return sqlId;
+    }
+    public void setSqlText(String sqlText) 
+    {
+        this.sqlText = sqlText;
+    }
+
+    public String getSqlText() 
+    {
+        return sqlText;
+    }
+    public void setLastActiveTime(Date lastActiveTime) 
+    {
+        this.lastActiveTime = lastActiveTime;
+    }
+
+    public Date getLastActiveTime() 
+    {
+        return lastActiveTime;
+    }
+    public void setParsingSchemaName(String parsingSchemaName) 
+    {
+        this.parsingSchemaName = parsingSchemaName;
+    }
+
+    public String getParsingSchemaName() 
+    {
+        return parsingSchemaName;
+    }
+    public void setMODULE(String MODULE) 
+    {
+        this.MODULE = MODULE;
+    }
+
+    public String getMODULE() 
+    {
+        return MODULE;
+    }
+    public void setMACHINE(String MACHINE) 
+    {
+        this.MACHINE = MACHINE;
+    }
+
+    public String getMACHINE() 
+    {
+        return MACHINE;
+    }
+    public void setTERMINAL(String TERMINAL) 
+    {
+        this.TERMINAL = TERMINAL;
+    }
+
+    public String getTERMINAL() 
+    {
+        return TERMINAL;
+    }
+    public void setPROGRAM(String PROGRAM) 
+    {
+        this.PROGRAM = PROGRAM;
+    }
+
+    public String getPROGRAM() 
+    {
+        return PROGRAM;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("sqlId", getSqlId())
+            .append("sqlText", getSqlText())
+            .append("lastActiveTime", getLastActiveTime())
+            .append("parsingSchemaName", getParsingSchemaName())
+            .append("MODULE", getMODULE())
+            .append("MACHINE", getMACHINE())
+            .append("TERMINAL", getTERMINAL())
+            .append("PROGRAM", getPROGRAM())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,153 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class Hl7MessageRecord {
+    /**
+    * ID
+    */
+    private String msgId;
+
+    /**
+    * 消息类型，1：系统，2：职工，3：患者
+    */
+    private int msgType;
+
+    /**
+    * 业务类型，0：默认，1：门诊，2：住院
+    */
+    private int clinicType;
+
+    /**
+    * 业务流水号1：门诊流水好，2：住院流水号
+    */
+    private String clinicNo;
+
+    /**
+     * 主档消息名称
+     */
+    private String messageName;
+
+    /**
+    * 主档消息类型编码
+    */
+    private String messageType;
+
+    /**
+    * 主档消息类型编码
+    */
+    private String messageStructure;
+
+    /**
+     * 操作类型
+     */
+    private String messageAction;
+
+    /**
+    * 表名
+    */
+    private String tableName1;
+
+    /**
+    * 条件
+    */
+    private String tableWhere1;
+
+    /**
+    * 表名
+    */
+    private String tableName2;
+
+    /**
+    * 条件
+    */
+    private String tableWhere2;
+
+    /**
+    * 表名
+    */
+    private String tableName3;
+
+    /**
+    * 条件
+    */
+    private String tableWhere3;
+
+    /**
+    * 表名
+    */
+    private String tableName4;
+
+    /**
+    * 条件
+    */
+    private String tableWhere4;
+
+    /**
+    * 表名
+    */
+    private String tableName5;
+
+    /**
+    * 条件
+    */
+    private String tableWhere5;
+
+    /**
+    * 推送状态0：未推送，1：推送成功，2：推送失败
+    */
+    private int pushStatus;
+
+
+    private int errorNum;
+
+    /**
+    * 推送返回值
+    */
+    private String pushMsg;
+
+    /**
+    * 操作时间
+    */
+    private Date operDate;
+
+    /**
+     * 操作时间
+     */
+    private Date operDateStart;
+
+    /**
+     * 操作时间
+     */
+    private Date operDateEnd;
+
+    /**
+    * 扩展字段1
+    */
+    private String ext1;
+
+    /**
+    * 扩展字段2
+    */
+    private String ext2;
+
+    /**
+    * 扩展字段3
+    */
+    private String ext3;
+
+    /**
+    * 扩展字段4
+    */
+    private String ext4;
+
+    /**
+    * 扩展字段5
+    */
+    private String ext5;
+
+}

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

@@ -0,0 +1,115 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 互联互通消息记录对象 hl7_message_record_mysql
+ * 
+ * @author zhangbin
+ * @date 2024-01-29
+ */
+@Data
+public class Hl7MessageRecordMysql extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 消息ID */
+    private Long msgId;
+
+    /** 消息类型，1：系统，2：职工，3：患者 */
+    @Excel(name = "消息类型，1：系统，2：职工，3：患者")
+    private Long msgType;
+
+    /** 业务类型，0：默认，1：门诊，2：住院 */
+    @Excel(name = "业务类型，0：默认，1：门诊，2：住院")
+    private Long clinicType;
+
+    /** 业务流水号1：门诊流水好，2：住院流水号 */
+    @Excel(name = "业务流水号1：门诊流水好，2：住院流水号")
+    private String clinicNo;
+
+    /** 主档消息名称 */
+    @Excel(name = "主档消息名称")
+    private String messageName;
+
+    /** 主档消息类型编码 */
+    @Excel(name = "主档消息类型编码")
+    private String messageType;
+
+    /** 主档消息类型编码 */
+    @Excel(name = "主档消息类型编码")
+    private String messageStructure;
+
+    /** 动作，MAD新增，MUP修改，MDL删除 */
+    @Excel(name = "动作，MAD新增，MUP修改，MDL删除")
+    private String messageAction;
+
+    /** 表名 */
+    @Excel(name = "表名")
+    private String tableName1;
+
+    /** 条件 */
+    @Excel(name = "条件")
+    private String tableWhere1;
+
+    /** 表名 */
+    @Excel(name = "表名")
+    private String tableName2;
+
+    /** 条件 */
+    @Excel(name = "条件")
+    private String tableWhere2;
+
+    /** 表名 */
+    private String tableName3;
+
+    /** 条件 */
+    private String tableWhere3;
+
+    /** 表名 */
+    private String tableName4;
+
+    /** 条件 */
+    private String tableWhere4;
+
+    /** 表名 */
+    private String tableName5;
+
+    /** 条件 */
+    private String tableWhere5;
+
+    /** 推送状态0：未推送，1：推送成功，2：推送失败 */
+    @Excel(name = "推送状态0：未推送，1：推送成功，2：推送失败")
+    private Integer pushStatus;
+
+    /** 推送返回值 */
+    private String pushMsg;
+
+    /** 客户端IP */
+    private String clientIp;
+
+    /** JSON数据 */
+    private String jsonData;
+
+    /** 错误次数 */
+    private Integer errorNum;
+
+    /** 扩展字段 */
+    private String ext1;
+
+    /** 扩展字段 */
+    private String ext2;
+
+    /** 扩展字段 */
+    private String ext3;
+
+    /** 扩展字段 */
+    private String ext4;
+
+    /** 扩展字段 */
+    private String ext5;
+}

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

@@ -0,0 +1,63 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+/**
+ * Robin 2024-7-24
+ */
+public class LicenseEntity {
+    private String cpuId;
+    private Date expireDate;
+    private String hospitalId;
+    private String hospitalName;
+    private String platformCode;
+
+    private String platformUrl;
+    public String getCpuId() {
+        return cpuId;
+    }
+
+    public void setCpuId(String cpuId) {
+        this.cpuId = cpuId;
+    }
+
+    public Date getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpiredDate(Date expiredDate) {
+        this.expireDate = expiredDate;
+    }
+
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getHospitalName() {
+        return hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName;
+    }
+
+    public String getPlatformCode() {
+        return platformCode;
+    }
+
+    public void setPlatformCode(String platformCode) {
+        this.platformCode = platformCode;
+    }
+
+    public String getPlatformUrl() {
+        return platformUrl;
+    }
+
+    public void setPlatformUrl(String platformUrl) {
+        this.platformUrl = platformUrl;
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 日志互联互通对象 log_hl7_push_record
+ *
+ * @author zhangbin
+ * @date 2023-11-27
+ */
+@Data
+public class LogHl7PushRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 消息类型 */
+    @Excel(name = "消息类型")
+    private String pushType;
+
+    /** 关联信息ID */
+    @Excel(name = "关联信息ID")
+    private String pushRalationId;
+
+    /** 推送信息 */
+    @Excel(name = "推送信息")
+    private String pushMsg;
+
+    /** 推送状态0：未推送，1：推送成功，2：推送失败 */
+    @Excel(name = "推送状态0：未推送，1：推送成功，2：推送失败")
+    private Integer pushStatus;
+
+    /** 返回信息 */
+    @Excel(name = "返回信息")
+    private String returnMsg;
+
+    /** 推送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "推送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTime;
+
+}

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

@@ -0,0 +1,53 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 推送日志对象 log_push_record
+ * 
+ * @author zhangbin
+ * @date 2023-12-04
+ */
+@Data
+public class LogPushRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 消息类型 */
+    @Excel(name = "消息类型")
+    private String pushType;
+
+    /** 关联信息ID */
+    @Excel(name = "关联信息ID")
+    private String pushRalationId;
+
+    /**  */
+    @Excel(name = "")
+    private String clinicNo;
+
+    /** 推送信息 */
+    @Excel(name = "推送信息")
+    private String pushMsg;
+
+    /** 推送状态0：未推送，1：推送成功，2：推送失败 */
+    @Excel(name = "推送状态0：未推送，1：推送成功，2：推送失败")
+    private Integer pushStatus;
+
+    /**  */
+    @Excel(name = "")
+    private String returnMsg;
+
+    /** 推送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "推送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTime;
+}

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

@@ -0,0 +1,51 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 日志审方对象 log_shf_push_record
+ *
+ * @author zhangbin
+ * @date 2023-11-27
+ */
+@Data
+public class LogShfPushRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 消息类型 */
+    @Excel(name = "消息类型")
+    private String pushType;
+
+    /** 关联信息ID */
+    @Excel(name = "关联信息ID")
+    private String pushRalationId;
+
+    private String clinicNo;
+
+    /** 推送信息 */
+    @Excel(name = "推送信息")
+    private String pushMsg;
+
+    /** 推送状态0：未推送，1：推送成功，2：推送失败 */
+    @Excel(name = "推送状态0：未推送，1：推送成功，2：推送失败")
+    private Integer pushStatus;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String returnMsg;
+
+    /** 推送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "推送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTime;
+}

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

@@ -0,0 +1,255 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 患者诊断信息表
+ */
+@Data
+public class MdcDiPath {
+    private Long id;
+
+    /**
+     * 患者号
+     */
+    private String patientno;
+
+    /**
+     * 就诊卡号
+     */
+    private String cardno;
+
+    /**
+     * 就诊类型:1住院 2门诊
+     */
+    private String visittype;
+
+    /**
+     * 是否是主诊断
+     */
+    private Short isMaindiag;
+
+    /**
+     * 诊断类型编码
+     */
+    private String diagtypecode;
+
+    /**
+     * 诊断类型名称
+     */
+    private String diagtype;
+
+    /**
+     * ICD10编码
+     */
+    private String icd10code;
+
+    /**
+     * 诊断名称
+     */
+    private String diagcontent;
+
+    /**
+     * 操作人编码
+     */
+    private String opercode;
+
+    /**
+     * 操作人姓名
+     */
+    private String opername;
+
+    /**
+     * 科室编码
+     */
+    private String deptcode;
+
+    /**
+     * 科室姓名
+     */
+    private String deptname;
+
+    /**
+     * 开立日期
+     */
+    private Date createdate;
+
+    /**
+     * 是否有效
+     */
+    private Short isValid;
+
+    /**
+     * 患者就诊日期
+     */
+    private Date seedate;
+
+    /**
+     * 住院/门诊患者流水号
+     */
+    private String serialNum;
+
+    /**
+     * 转归状态
+     */
+    private String sequelaeState;
+
+    /**
+     * 顺序号
+     */
+    private Integer sortNum;
+
+    /**
+     * 诊断开立id
+     */
+    private Long creationId;
+
+    /**
+     * 转归日期
+     */
+    private Date sequelaeDate;
+
+    /**
+     * 入院病情（1.有，2.临床未确定，3.情况不明，4.无）
+     */
+    private Long inState;
+
+    /**
+     * 是否传染病(0:False 1:True)
+     */
+    private Short isInfection;
+
+    /**
+     * 诊断备注
+     */
+    private String remarkText;
+
+    /**
+     * 是否中医诊断
+     */
+    private Short isTraditional;
+
+    /**
+     * 是否子诊断
+     */
+    private Short isChild;
+
+    /**
+     * 最后修改人编码
+     */
+    private String updateCode;
+
+    /**
+     * 最后修改人名称
+     */
+    private String updateName;
+
+    /**
+     * 最后修改日期
+     */
+    private Date updateDate;
+
+    /**
+     * 是否疑似(0:False 1:True)
+     */
+    private Short isDoubtful;
+
+    /**
+     * 西医疾病ID
+     */
+    private Long diseaseId;
+
+    /**
+     * 前缀名称
+     */
+    private String prefixName;
+
+    /**
+     * 后缀名称
+     */
+    private String postfixName;
+
+    /**
+     * 中医证候ID
+     */
+    private Long syndromeId;
+
+    /**
+     * 中医症候名称
+     */
+    private String syndromeName;
+
+    /**
+     * 中医治疗阶段ID
+     */
+    private Long stageId;
+
+    /**
+     * 中医治疗阶段名
+     */
+    private String stageName;
+
+    /**
+     * 中医治则ID
+     */
+    private Long treatmentId;
+
+    /**
+     * 中医治则名
+     */
+    private String treatmentName;
+
+    /**
+     * 肿瘤形态学编码
+     */
+    private String tumorCode;
+
+    /**
+     * TNM分期
+     */
+    private String tnmStages;
+
+    /**
+     * 专科分期
+     */
+    private String specialtyStages;
+
+    /**
+     * 1西医2中医3肿瘤
+     */
+    private String diseaseType;
+
+    /**
+     * 是否保密(0:False 1:True)
+     */
+    private Short isSecret;
+
+    /**
+     * 是否傳入OMR(0:False 1:True)
+     */
+    private Short isUpload;
+
+    /**
+     * 是否DC后傳入OMR(0:False 1:True)
+     */
+    private Short isDcupload;
+
+    /**
+     * 未格式化的诊断名称
+     */
+    private String diagName;
+
+    /**
+     * 作废原因
+     */
+    private String invalidReason;
+
+    /**
+     * 子诊断层级
+     */
+    private Short childDiagLevel;
+
+
+}

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

@@ -0,0 +1,320 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+/**
+    * 病案患者诊断库
+    */
+public class MetCasDiagnose {
+    /**
+    * 住院流水号
+    */
+    private String inpatientNo;
+
+    /**
+    * 发生序号
+    */
+    private Long happenNo;
+
+    /**
+    * 类别 1 医生站录入诊断  2 病案室录入诊断
+    */
+    private String operType;
+
+    /**
+    * 住院诊断类型 1 主要诊断 2 其他诊断 3 并发症 4 院内感染 5 损伤 6 病理诊断 7 过敏药 8 新生儿疾病 9 新生儿院感
+    */
+    private String diagKind;
+
+    /**
+    * 诊断级别
+    */
+    private String levelCode;
+
+    /**
+    * 诊断分期
+    */
+    private String periorCode;
+
+    /**
+    * 诊断ICD码
+    */
+    private String icdCode;
+
+    /**
+    * 诊断名称
+    */
+    private String diagName;
+
+    /**
+    * 诊断日期
+    */
+    private Date diagDate;
+
+    /**
+    * 医师代号
+    */
+    private String doctCode;
+
+    /**
+    * 医师姓名(诊断)
+    */
+    private String doctName;
+
+    /**
+    * 入院日期
+    */
+    private Date inDate;
+
+    /**
+    * 出院日期
+    */
+    private Date outDate;
+
+    /**
+    * 治疗情况 0 治愈1 好转 2 未愈3 死亡 4 其他
+    */
+    private String diagOutstate;
+
+    /**
+    * 第二ICD
+    */
+    private String secondIcd;
+
+    /**
+    * 并发症类别
+    */
+    private String syndromeId;
+
+    /**
+    * 病理符合
+    */
+    private String clPa;
+
+    /**
+    * 是否疑诊
+    */
+    private String dubdiagFlag;
+
+    /**
+    * 是否主诊断
+    */
+    private String mainFlag;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 操作时间
+    */
+    private Date operDate;
+
+    /**
+    * 手术标志
+    */
+    private String operationFlag;
+
+    /**
+    * 是否是30种疾病
+    */
+    private String is30disease;
+
+    public String getInpatientNo() {
+        return inpatientNo;
+    }
+
+    public void setInpatientNo(String inpatientNo) {
+        this.inpatientNo = inpatientNo;
+    }
+
+    public Long getHappenNo() {
+        return happenNo;
+    }
+
+    public void setHappenNo(Long happenNo) {
+        this.happenNo = happenNo;
+    }
+
+    public String getOperType() {
+        return operType;
+    }
+
+    public void setOperType(String operType) {
+        this.operType = operType;
+    }
+
+    public String getDiagKind() {
+        return diagKind;
+    }
+
+    public void setDiagKind(String diagKind) {
+        this.diagKind = diagKind;
+    }
+
+    public String getLevelCode() {
+        return levelCode;
+    }
+
+    public void setLevelCode(String levelCode) {
+        this.levelCode = levelCode;
+    }
+
+    public String getPeriorCode() {
+        return periorCode;
+    }
+
+    public void setPeriorCode(String periorCode) {
+        this.periorCode = periorCode;
+    }
+
+    public String getIcdCode() {
+        return icdCode;
+    }
+
+    public void setIcdCode(String icdCode) {
+        this.icdCode = icdCode;
+    }
+
+    public String getDiagName() {
+        return diagName;
+    }
+
+    public void setDiagName(String diagName) {
+        this.diagName = diagName;
+    }
+
+    public Date getDiagDate() {
+        return diagDate;
+    }
+
+    public void setDiagDate(Date diagDate) {
+        this.diagDate = diagDate;
+    }
+
+    public String getDoctCode() {
+        return doctCode;
+    }
+
+    public void setDoctCode(String doctCode) {
+        this.doctCode = doctCode;
+    }
+
+    public String getDoctName() {
+        return doctName;
+    }
+
+    public void setDoctName(String doctName) {
+        this.doctName = doctName;
+    }
+
+    public Date getInDate() {
+        return inDate;
+    }
+
+    public void setInDate(Date inDate) {
+        this.inDate = inDate;
+    }
+
+    public Date getOutDate() {
+        return outDate;
+    }
+
+    public void setOutDate(Date outDate) {
+        this.outDate = outDate;
+    }
+
+    public String getDiagOutstate() {
+        return diagOutstate;
+    }
+
+    public void setDiagOutstate(String diagOutstate) {
+        this.diagOutstate = diagOutstate;
+    }
+
+    public String getSecondIcd() {
+        return secondIcd;
+    }
+
+    public void setSecondIcd(String secondIcd) {
+        this.secondIcd = secondIcd;
+    }
+
+    public String getSyndromeId() {
+        return syndromeId;
+    }
+
+    public void setSyndromeId(String syndromeId) {
+        this.syndromeId = syndromeId;
+    }
+
+    public String getClPa() {
+        return clPa;
+    }
+
+    public void setClPa(String clPa) {
+        this.clPa = clPa;
+    }
+
+    public String getDubdiagFlag() {
+        return dubdiagFlag;
+    }
+
+    public void setDubdiagFlag(String dubdiagFlag) {
+        this.dubdiagFlag = dubdiagFlag;
+    }
+
+    public String getMainFlag() {
+        return mainFlag;
+    }
+
+    public void setMainFlag(String mainFlag) {
+        this.mainFlag = mainFlag;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getOperationFlag() {
+        return operationFlag;
+    }
+
+    public void setOperationFlag(String operationFlag) {
+        this.operationFlag = operationFlag;
+    }
+
+    public String getIs30disease() {
+        return is30disease;
+    }
+
+    public void setIs30disease(String is30disease) {
+        this.is30disease = is30disease;
+    }
+}

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

@@ -0,0 +1,406 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+public class MetComIcd10 {
+    private String sequenceNo;
+
+    /**
+     * icd10主诊断码
+     */
+    private String icdCode;
+
+    /**
+     * 医保中心代码
+     */
+    private String sicd;
+
+    /**
+     * 统计代码
+     */
+    private String statCode;
+
+    /**
+     * 拼音码
+     */
+    private String spellCode;
+
+    /**
+     * 五笔
+     */
+    private String wbCode;
+
+    /**
+     * 中文疾病名称
+     */
+    private String icdName;
+
+    /**
+     * 疾病名称1
+     */
+    private String icdName1;
+
+    /**
+     * 疾病名称2
+     */
+    private String icdName2;
+
+    /**
+     * 疾病死亡原因
+     */
+    private String dieReason;
+
+    /**
+     * 疾病分类码
+     */
+    private String diseaseCode;
+
+    /**
+     * 标准住院日
+     */
+    private Short standardDate;
+
+    /**
+     * 30种疾病标志 0 假 1 真
+     */
+    private String disease30Flag;
+
+    /**
+     * 传染病标志 0 假 1 真
+     */
+    private String infectFlag;
+
+    /**
+     * 肿瘤标志 0 假 1 真
+     */
+    private String cancerFlag;
+
+    /**
+     * 住院等级
+     */
+    private String inpGrade;
+
+    /**
+     * 有效性标志
+     */
+    private String validState;
+
+    /**
+     * 序号
+     */
+    private String sortId;
+
+    /**
+     * 操作员
+     */
+    private String operCode;
+
+    /**
+     * 操作时间
+     */
+    private Date operDate;
+
+    /**
+     * icd10 诊断码 星键互查
+     */
+    private String sicdCode;
+
+    /**
+     * 适用性别    A 适用于所有性别  M 只 适用于男性 F 只适用于女性
+     */
+    private String sextype;
+
+    /**
+     * 中医诊断
+     */
+    private String traditionalflag;
+
+    private String isStandard;
+
+    private String standardIcdCode;
+
+    private String cureType;
+
+    private String icdTypeNo;
+
+    /**
+     * 年龄限制(0.无1.有)
+     */
+    private String ageType;
+
+    /**
+     * 适用年龄范围(格式XX-XX)
+     */
+    private String ageRange;
+
+    /**
+     * 手术级别
+     */
+    private String opsLevel;
+
+    /**
+     * 是否是特异性编码。即非特异性编码原则上不应直接在临床使用
+     */
+    private String isSpecific;
+
+    /**
+     * 使用范围 ALL:使用于所有诊断填写 NOM 不适用做主诊断 ANOM 坚决不适用于主诊断
+     */
+    private String icdrange;
+
+    public String getSequenceNo() {
+        return sequenceNo;
+    }
+
+    public void setSequenceNo(String sequenceNo) {
+        this.sequenceNo = sequenceNo;
+    }
+
+    public String getIcdCode() {
+        return icdCode;
+    }
+
+    public void setIcdCode(String icdCode) {
+        this.icdCode = icdCode;
+    }
+
+    public String getSicd() {
+        return sicd;
+    }
+
+    public void setSicd(String sicd) {
+        this.sicd = sicd;
+    }
+
+    public String getStatCode() {
+        return statCode;
+    }
+
+    public void setStatCode(String statCode) {
+        this.statCode = statCode;
+    }
+
+    public String getSpellCode() {
+        return spellCode;
+    }
+
+    public void setSpellCode(String spellCode) {
+        this.spellCode = spellCode;
+    }
+
+    public String getWbCode() {
+        return wbCode;
+    }
+
+    public void setWbCode(String wbCode) {
+        this.wbCode = wbCode;
+    }
+
+    public String getIcdName() {
+        return icdName;
+    }
+
+    public void setIcdName(String icdName) {
+        this.icdName = icdName;
+    }
+
+    public String getIcdName1() {
+        return icdName1;
+    }
+
+    public void setIcdName1(String icdName1) {
+        this.icdName1 = icdName1;
+    }
+
+    public String getIcdName2() {
+        return icdName2;
+    }
+
+    public void setIcdName2(String icdName2) {
+        this.icdName2 = icdName2;
+    }
+
+    public String getDieReason() {
+        return dieReason;
+    }
+
+    public void setDieReason(String dieReason) {
+        this.dieReason = dieReason;
+    }
+
+    public String getDiseaseCode() {
+        return diseaseCode;
+    }
+
+    public void setDiseaseCode(String diseaseCode) {
+        this.diseaseCode = diseaseCode;
+    }
+
+    public Short getStandardDate() {
+        return standardDate;
+    }
+
+    public void setStandardDate(Short standardDate) {
+        this.standardDate = standardDate;
+    }
+
+    public String getDisease30Flag() {
+        return disease30Flag;
+    }
+
+    public void setDisease30Flag(String disease30Flag) {
+        this.disease30Flag = disease30Flag;
+    }
+
+    public String getInfectFlag() {
+        return infectFlag;
+    }
+
+    public void setInfectFlag(String infectFlag) {
+        this.infectFlag = infectFlag;
+    }
+
+    public String getCancerFlag() {
+        return cancerFlag;
+    }
+
+    public void setCancerFlag(String cancerFlag) {
+        this.cancerFlag = cancerFlag;
+    }
+
+    public String getInpGrade() {
+        return inpGrade;
+    }
+
+    public void setInpGrade(String inpGrade) {
+        this.inpGrade = inpGrade;
+    }
+
+    public String getValidState() {
+        return validState;
+    }
+
+    public void setValidState(String validState) {
+        this.validState = validState;
+    }
+
+    public String getSortId() {
+        return sortId;
+    }
+
+    public void setSortId(String sortId) {
+        this.sortId = sortId;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getSicdCode() {
+        return sicdCode;
+    }
+
+    public void setSicdCode(String sicdCode) {
+        this.sicdCode = sicdCode;
+    }
+
+    public String getSextype() {
+        return sextype;
+    }
+
+    public void setSextype(String sextype) {
+        this.sextype = sextype;
+    }
+
+    public String getTraditionalflag() {
+        return traditionalflag;
+    }
+
+    public void setTraditionalflag(String traditionalflag) {
+        this.traditionalflag = traditionalflag;
+    }
+
+    public String getIsStandard() {
+        return isStandard;
+    }
+
+    public void setIsStandard(String isStandard) {
+        this.isStandard = isStandard;
+    }
+
+    public String getStandardIcdCode() {
+        return standardIcdCode;
+    }
+
+    public void setStandardIcdCode(String standardIcdCode) {
+        this.standardIcdCode = standardIcdCode;
+    }
+
+    public String getCureType() {
+        return cureType;
+    }
+
+    public void setCureType(String cureType) {
+        this.cureType = cureType;
+    }
+
+    public String getIcdTypeNo() {
+        return icdTypeNo;
+    }
+
+    public void setIcdTypeNo(String icdTypeNo) {
+        this.icdTypeNo = icdTypeNo;
+    }
+
+    public String getAgeType() {
+        return ageType;
+    }
+
+    public void setAgeType(String ageType) {
+        this.ageType = ageType;
+    }
+
+    public String getAgeRange() {
+        return ageRange;
+    }
+
+    public void setAgeRange(String ageRange) {
+        this.ageRange = ageRange;
+    }
+
+    public String getOpsLevel() {
+        return opsLevel;
+    }
+
+    public void setOpsLevel(String opsLevel) {
+        this.opsLevel = opsLevel;
+    }
+
+    public String getIsSpecific() {
+        return isSpecific;
+    }
+
+    public void setIsSpecific(String isSpecific) {
+        this.isSpecific = isSpecific;
+    }
+
+    public String getIcdrange() {
+        return icdrange;
+    }
+
+    public void setIcdrange(String icdrange) {
+        this.icdrange = icdrange;
+    }
+}

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

@@ -0,0 +1,213 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+public class MetComOperationLocal {
+    private String sequenceNo;
+
+    private String localName;
+
+    private String icdCode;
+
+    private String icdName;
+
+    private String diseaseCode;
+
+    private String spellCode;
+
+    private String wbCode;
+
+    private String standardIcdCode;
+
+    private String validState;
+
+    private Date startDate;
+
+    private Date stopDate;
+
+    private String operCode;
+
+    private Date operDate;
+
+    /**
+    * 院内级别
+    */
+    private String localOpsLevel;
+
+    /**
+    * 国家四级，导入后更新成0和1
+    */
+    private String opsNationlevel;
+
+    /**
+    * 微创标识
+    */
+    private String isMiniinvasive;
+
+    /**
+    * 微创名称
+    */
+    private String isMiniinvasive2;
+
+    /**
+    * 附加码
+    */
+    private String fjm;
+
+    /**
+    * 手术类别
+    */
+    private String oprationAttribute;
+
+    public String getSequenceNo() {
+        return sequenceNo;
+    }
+
+    public void setSequenceNo(String sequenceNo) {
+        this.sequenceNo = sequenceNo;
+    }
+
+    public String getLocalName() {
+        return localName;
+    }
+
+    public void setLocalName(String localName) {
+        this.localName = localName;
+    }
+
+    public String getIcdCode() {
+        return icdCode;
+    }
+
+    public void setIcdCode(String icdCode) {
+        this.icdCode = icdCode;
+    }
+
+    public String getIcdName() {
+        return icdName;
+    }
+
+    public void setIcdName(String icdName) {
+        this.icdName = icdName;
+    }
+
+    public String getDiseaseCode() {
+        return diseaseCode;
+    }
+
+    public void setDiseaseCode(String diseaseCode) {
+        this.diseaseCode = diseaseCode;
+    }
+
+    public String getSpellCode() {
+        return spellCode;
+    }
+
+    public void setSpellCode(String spellCode) {
+        this.spellCode = spellCode;
+    }
+
+    public String getWbCode() {
+        return wbCode;
+    }
+
+    public void setWbCode(String wbCode) {
+        this.wbCode = wbCode;
+    }
+
+    public String getStandardIcdCode() {
+        return standardIcdCode;
+    }
+
+    public void setStandardIcdCode(String standardIcdCode) {
+        this.standardIcdCode = standardIcdCode;
+    }
+
+    public String getValidState() {
+        return validState;
+    }
+
+    public void setValidState(String validState) {
+        this.validState = validState;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getStopDate() {
+        return stopDate;
+    }
+
+    public void setStopDate(Date stopDate) {
+        this.stopDate = stopDate;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getLocalOpsLevel() {
+        return localOpsLevel;
+    }
+
+    public void setLocalOpsLevel(String localOpsLevel) {
+        this.localOpsLevel = localOpsLevel;
+    }
+
+    public String getOpsNationlevel() {
+        return opsNationlevel;
+    }
+
+    public void setOpsNationlevel(String opsNationlevel) {
+        this.opsNationlevel = opsNationlevel;
+    }
+
+    public String getIsMiniinvasive() {
+        return isMiniinvasive;
+    }
+
+    public void setIsMiniinvasive(String isMiniinvasive) {
+        this.isMiniinvasive = isMiniinvasive;
+    }
+
+    public String getIsMiniinvasive2() {
+        return isMiniinvasive2;
+    }
+
+    public void setIsMiniinvasive2(String isMiniinvasive2) {
+        this.isMiniinvasive2 = isMiniinvasive2;
+    }
+
+    public String getFjm() {
+        return fjm;
+    }
+
+    public void setFjm(String fjm) {
+        this.fjm = fjm;
+    }
+
+    public String getOprationAttribute() {
+        return oprationAttribute;
+    }
+
+    public void setOprationAttribute(String oprationAttribute) {
+        this.oprationAttribute = oprationAttribute;
+    }
+}

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

@@ -0,0 +1,275 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+public class MetIpmBooked {
+    private String bookedSqn;
+
+    private String execSqn;
+
+    private String moOrder;
+
+    private String orderSqn;
+
+    private String nurseCellCode;
+
+    private String inpatientNo;
+
+    private String illnessstate;
+
+    private String medicalhistory;
+
+    private String disease;
+
+    private String examfunction;
+
+    private String exampurpose;
+
+    private String orderstate;
+
+    private String orderattention;
+
+    private Date bookingDate;
+
+    private String bookingUsercd;
+
+    private String examdate;
+
+    private String examroom;
+
+    private String attention;
+
+    private String printFlag;
+
+    private Date printDate;
+
+    private String printUsercd;
+
+    private String examsortno;
+
+    private String exampacsno;
+
+    private String needprintflag;
+
+    private String emecType;
+
+    private String readFlag;
+
+    private String patientNo;
+
+    public String getBookedSqn() {
+        return bookedSqn;
+    }
+
+    public void setBookedSqn(String bookedSqn) {
+        this.bookedSqn = bookedSqn;
+    }
+
+    public String getExecSqn() {
+        return execSqn;
+    }
+
+    public void setExecSqn(String execSqn) {
+        this.execSqn = execSqn;
+    }
+
+    public String getMoOrder() {
+        return moOrder;
+    }
+
+    public void setMoOrder(String moOrder) {
+        this.moOrder = moOrder;
+    }
+
+    public String getOrderSqn() {
+        return orderSqn;
+    }
+
+    public void setOrderSqn(String orderSqn) {
+        this.orderSqn = orderSqn;
+    }
+
+    public String getNurseCellCode() {
+        return nurseCellCode;
+    }
+
+    public void setNurseCellCode(String nurseCellCode) {
+        this.nurseCellCode = nurseCellCode;
+    }
+
+    public String getInpatientNo() {
+        return inpatientNo;
+    }
+
+    public void setInpatientNo(String inpatientNo) {
+        this.inpatientNo = inpatientNo;
+    }
+
+    public String getIllnessstate() {
+        return illnessstate;
+    }
+
+    public void setIllnessstate(String illnessstate) {
+        this.illnessstate = illnessstate;
+    }
+
+    public String getMedicalhistory() {
+        return medicalhistory;
+    }
+
+    public void setMedicalhistory(String medicalhistory) {
+        this.medicalhistory = medicalhistory;
+    }
+
+    public String getDisease() {
+        return disease;
+    }
+
+    public void setDisease(String disease) {
+        this.disease = disease;
+    }
+
+    public String getExamfunction() {
+        return examfunction;
+    }
+
+    public void setExamfunction(String examfunction) {
+        this.examfunction = examfunction;
+    }
+
+    public String getExampurpose() {
+        return exampurpose;
+    }
+
+    public void setExampurpose(String exampurpose) {
+        this.exampurpose = exampurpose;
+    }
+
+    public String getOrderstate() {
+        return orderstate;
+    }
+
+    public void setOrderstate(String orderstate) {
+        this.orderstate = orderstate;
+    }
+
+    public String getOrderattention() {
+        return orderattention;
+    }
+
+    public void setOrderattention(String orderattention) {
+        this.orderattention = orderattention;
+    }
+
+    public Date getBookingDate() {
+        return bookingDate;
+    }
+
+    public void setBookingDate(Date bookingDate) {
+        this.bookingDate = bookingDate;
+    }
+
+    public String getBookingUsercd() {
+        return bookingUsercd;
+    }
+
+    public void setBookingUsercd(String bookingUsercd) {
+        this.bookingUsercd = bookingUsercd;
+    }
+
+    public String getExamdate() {
+        return examdate;
+    }
+
+    public void setExamdate(String examdate) {
+        this.examdate = examdate;
+    }
+
+    public String getExamroom() {
+        return examroom;
+    }
+
+    public void setExamroom(String examroom) {
+        this.examroom = examroom;
+    }
+
+    public String getAttention() {
+        return attention;
+    }
+
+    public void setAttention(String attention) {
+        this.attention = attention;
+    }
+
+    public String getPrintFlag() {
+        return printFlag;
+    }
+
+    public void setPrintFlag(String printFlag) {
+        this.printFlag = printFlag;
+    }
+
+    public Date getPrintDate() {
+        return printDate;
+    }
+
+    public void setPrintDate(Date printDate) {
+        this.printDate = printDate;
+    }
+
+    public String getPrintUsercd() {
+        return printUsercd;
+    }
+
+    public void setPrintUsercd(String printUsercd) {
+        this.printUsercd = printUsercd;
+    }
+
+    public String getExamsortno() {
+        return examsortno;
+    }
+
+    public void setExamsortno(String examsortno) {
+        this.examsortno = examsortno;
+    }
+
+    public String getExampacsno() {
+        return exampacsno;
+    }
+
+    public void setExampacsno(String exampacsno) {
+        this.exampacsno = exampacsno;
+    }
+
+    public String getNeedprintflag() {
+        return needprintflag;
+    }
+
+    public void setNeedprintflag(String needprintflag) {
+        this.needprintflag = needprintflag;
+    }
+
+    public String getEmecType() {
+        return emecType;
+    }
+
+    public void setEmecType(String emecType) {
+        this.emecType = emecType;
+    }
+
+    public String getReadFlag() {
+        return readFlag;
+    }
+
+    public void setReadFlag(String readFlag) {
+        this.readFlag = readFlag;
+    }
+
+    public String getPatientNo() {
+        return patientNo;
+    }
+
+    public void setPatientNo(String patientNo) {
+        this.patientNo = patientNo;
+    }
+}

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

@@ -0,0 +1,438 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 药品医嘱执行档
+    */
+@Data
+public class MetIpmExecdrug {
+    /**
+    * 执行单流水号
+    */
+    private String execSqn;
+
+    /**
+    * 住院科室代码
+    */
+    private String deptCode;
+
+    /**
+    * 医嘱护理站代码
+    */
+    private String nurseCellCode;
+
+    /**
+    * 开立科室代码
+    */
+    private String listDpcd;
+
+    /**
+    * 住院流水号
+    */
+    private String inpatientNo;
+
+    /**
+    * 住院病历号
+    */
+    private String patientNo;
+
+    /**
+    * 医嘱流水号
+    */
+    private String moOrder;
+
+    /**
+    * 医嘱医师代号
+    */
+    private String docCode;
+
+    /**
+    * 医嘱医师姓名
+    */
+    private String docName;
+
+    /**
+    * 医嘱日期
+    */
+    private Date moDate;
+
+    /**
+    * 是否婴儿医嘱
+    */
+    private String babyFlag;
+
+    /**
+    * 婴儿序号
+    */
+    private Integer happenNo;
+
+    /**
+    * 项目属性
+    */
+    private String setItmattr;
+
+    /**
+    * 是否包含附材
+    */
+    private String setSubtbl;
+
+    /**
+    * 医嘱类别代码
+    */
+    private String typeCode;
+
+    /**
+    * 医嘱是否分解
+    */
+    private String decmpsState;
+
+    /**
+    * 是否计费
+    */
+    private String chargeState;
+
+    /**
+    * 药房是否配药
+    */
+    private String needDrug;
+
+    /**
+    * 打印执行单
+    */
+    private String prnExelist;
+
+    /**
+    * 是否打印医嘱单
+    */
+    private String prnMorlist;
+
+    /**
+    * 是否需要确认
+    */
+    private String needConfirm;
+
+    /**
+    * 药品编码
+    */
+    private String drugCode;
+
+    /**
+    * 药品名称
+    */
+    private String drugName;
+
+    /**
+    * 药品基本剂量
+    */
+    private BigDecimal baseDose;
+
+    /**
+    * 剂量单位
+    */
+    private String doseUnit;
+
+    /**
+    * 最小单位
+    */
+    private String minUnit;
+
+    /**
+    * 计价单位
+    */
+    private String priceUnit;
+
+    /**
+    * 包装数量
+    */
+    private Short packQty;
+
+    /**
+    * 规格
+    */
+    private String specs;
+
+    /**
+    * 剂型代码
+    */
+    private String doseModelCode;
+
+    /**
+    * 1西药/2中成/3草
+    */
+    private String drugType;
+
+    /**
+    * 药品性质
+    */
+    private String drugQuality;
+
+    /**
+    * 零售价
+    */
+    private BigDecimal itemPrice;
+
+    /**
+    * 1护士站常备/2扣药房
+    */
+    private String stockMin;
+
+    /**
+    * 组合序号
+    */
+    private String combNo;
+
+    /**
+    * 主药标记
+    */
+    private String mainDrug;
+
+    /**
+    * 用法代码
+    */
+    private String usageCode;
+
+    /**
+    * 用法名称
+    */
+    private String useName;
+
+    /**
+    * 用法英文缩写
+    */
+    private String englishAb;
+
+    /**
+    * 频次代码
+    */
+    private String frequencyCode;
+
+    /**
+    * 频次名称
+    */
+    private String frequencyName;
+
+    /**
+    * 每次剂量
+    */
+    private BigDecimal doseOnce;
+
+    /**
+    * 付数
+    */
+    private BigDecimal useDays;
+
+    /**
+    * 药品用量
+    */
+    private BigDecimal qtyTot;
+
+    /**
+    * 要求执行时间
+    */
+    private Date useTime;
+
+    /**
+    * 取药药房
+    */
+    private String pharmacyCode;
+
+    /**
+    * 执行科室
+    */
+    private String execDpcd;
+
+    /**
+    * 1有效/0作废
+    */
+    private String validFlag;
+
+    /**
+    * 作废时间
+    */
+    private Date validDate;
+
+    /**
+    * 作废人代码
+    */
+    private String validUsercd;
+
+    /**
+    * 0不需发送/1集中发送/2分散发送/3已配药
+    */
+    private String drugedFlag;
+
+    /**
+    * 配药时间
+    */
+    private Date drugedDate;
+
+    /**
+    * 配药人员代码
+    */
+    private String drugedUsercd;
+
+    /**
+    * 配药科室代码
+    */
+    private String drugedDeptcd;
+
+    /**
+    * 0未打印/1已打印
+    */
+    private String prnFlag;
+
+    /**
+    * 打印日期
+    */
+    private Date prnDate;
+
+    /**
+    * 打印人员代码
+    */
+    private String prnUsercd;
+
+    /**
+    * 打印科室代码
+    */
+    private String prnDeptcd;
+
+    /**
+    * 配药单组别代码
+    */
+    private String setCode;
+
+    /**
+    * 配药单号
+    */
+    private String setSeqn;
+
+    /**
+    * 0待执行/1已
+    */
+    private String execFlag;
+
+    /**
+    * 执行时间
+    */
+    private Date execDate;
+
+    /**
+    * 执行护士代码
+    */
+    private String execUsercd;
+
+    /**
+    * 执行科室代码
+    */
+    private String execDeptcd;
+
+    /**
+    * 0未打印/1已 - 输液卡
+    */
+    private String execPrnflag;
+
+    /**
+    * 执行单打印时间
+    */
+    private Date execPrndate;
+
+    /**
+    * 执行单打印人员
+    */
+    private String execPrnusercd;
+
+    /**
+    * 记账标记
+    */
+    private String chargeFlag;
+
+    /**
+    * 记账时间
+    */
+    private Date chargeDate;
+
+    /**
+    * 记账人代码
+    */
+    private String chargeUsercd;
+
+    /**
+    * 记账科室代码
+    */
+    private String chargeDeptcd;
+
+    /**
+    * 处方流水号
+    */
+    private String recipeNo;
+
+    /**
+    * 处方内流水号
+    */
+    private Integer sequenceNo;
+
+    /**
+    * 医嘱说明
+    */
+    private String moNote1;
+
+    /**
+    * 备注
+    */
+    private String moNote2;
+
+    /**
+    * 分解时间
+    */
+    private Date decoDate;
+
+    /**
+    * 收费发送单打印标记
+    */
+    private String chargePrnflag;
+
+    /**
+    * 收费发送单打印日期
+    */
+    private Date chargePrndate;
+
+    /**
+    * 收费发送单打印人员
+    */
+    private String chargePrnusercd;
+
+    /**
+    * 巡回卡打印标记
+    */
+    private String circultPrnflag;
+
+    /**
+    * 是否需配液 ‘1’ 是 0 否
+    */
+    private String compoundFlag;
+
+    /**
+    * 是否配液已执行 1 是 0 否
+    */
+    private String compoundExec;
+
+    /**
+    * 配液执行人
+    */
+    private String compoundOper;
+
+    /**
+    * 配液科室
+    */
+    private String compoundDept;
+
+    /**
+    * 配液时间
+    */
+    private Date compoundDate;
+
+}

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

@@ -0,0 +1,352 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+    * 非药品医嘱执行档
+    */
+@Data
+public class MetIpmExecundrug {
+    /**
+    * 执行单流水号
+    */
+    private String execSqn;
+
+    /**
+    * 住院科室代码
+    */
+    private String deptCode;
+
+    /**
+    * 住院护理站代码
+    */
+    private String nurseCellCode;
+
+    /**
+    * 开立科室代码
+    */
+    private String listDpcd;
+
+    /**
+    * 住院流水号
+    */
+    private String inpatientNo;
+
+    /**
+    * 住院病历号
+    */
+    private String patientNo;
+
+    /**
+    * 医嘱流水号
+    */
+    private String moOrder;
+
+    /**
+    * 医嘱医师代号
+    */
+    private String docCode;
+
+    /**
+    * 医嘱医师姓名
+    */
+    private String docName;
+
+    /**
+    * 医嘱日期
+    */
+    private Date moDate;
+
+    /**
+    * 是否婴儿医嘱
+    */
+    private String babyFlag;
+
+    /**
+    * 婴儿序号
+    */
+    private Integer happenNo;
+
+    /**
+    * 项目属性
+    */
+    private String setItmattr;
+
+    /**
+    * 是否包含附材
+    */
+    private String setSubtbl;
+
+    /**
+    * 医嘱类别代码
+    */
+    private String typeCode;
+
+    /**
+    * 医嘱是否分解
+    */
+    private String decmpsState;
+
+    /**
+    * 是否计费
+    */
+    private String chargeState;
+
+    /**
+    * 打印执行单
+    */
+    private String prnExelist;
+
+    /**
+    * 是否打印医嘱单
+    */
+    private String prnMorlist;
+
+    /**
+    * 是否需要确认
+    */
+    private String needConfirm;
+
+    /**
+    * 项目代码
+    */
+    private String undrugCode;
+
+    /**
+    * 项目名称
+    */
+    private String undrugName;
+
+    /**
+    * 项目类别代码
+    */
+    private String classCode;
+
+    /**
+    * 项目类别名称
+    */
+    private String className;
+
+    /**
+    * 项目执行科室代码
+    */
+    private String execDpcd;
+
+    /**
+    * 项目执行科室名称
+    */
+    private String execDpnm;
+
+    /**
+    * 组合序号
+    */
+    private String combNo;
+
+    /**
+    * 主项标记
+    */
+    private String mainDrug;
+
+    /**
+    * 频次代码
+    */
+    private String dfqFreq;
+
+    /**
+    * 频次名称
+    */
+    private String dfqCexp;
+
+    /**
+    * 项目数量
+    */
+    private BigDecimal qtyTot;
+
+    /**
+    * 项目单位
+    */
+    private String stockUnit;
+
+    /**
+    * 项目单价
+    */
+    private BigDecimal unitPrice;
+
+    /**
+    * 要求执行时间
+    */
+    private Date useTime;
+
+    /**
+    * 加急标记0普通/1加急
+    */
+    private String emcFlag;
+
+    /**
+    * 1有效/0作废
+    */
+    private String validFlag;
+
+    /**
+    * 作废时间
+    */
+    private Date validDate;
+
+    /**
+    * 作废人代码
+    */
+    private String validUsercd;
+
+    /**
+    * 确认标记 0未确认/1已确认
+    */
+    private String confirmFlag;
+
+    /**
+    * 确认时间
+    */
+    private Date confirmDate;
+
+    /**
+    * 确认人员代码
+    */
+    private String confirmUsercd;
+
+    /**
+    * 确认科室代码
+    */
+    private String confirmDeptcd;
+
+    /**
+    * 执行标记 0未执行/1已执行2终端确认科室打回护士站
+    */
+    private String execFlag;
+
+    /**
+    * 执行时间
+    */
+    private Date execDate;
+
+    /**
+    * 执行人员代码
+    */
+    private String execUsercd;
+
+    /**
+    * 执行科室代码
+    */
+    private String execDeptcd;
+
+    /**
+    * 记账标记0待记账/1已
+    */
+    private String chargeFlag;
+
+    /**
+    * 记账时间
+    */
+    private Date chargeDate;
+
+    /**
+    * 记账人代码
+    */
+    private String chargeUsercd;
+
+    /**
+    * 记账科室代码
+    */
+    private String chargeDeptcd;
+
+    /**
+    * 检查部位检体
+    */
+    private String itemNote;
+
+    /**
+    * 申请单号
+    */
+    private String applyNo;
+
+    /**
+    * 医嘱说明
+    */
+    private String moNote1;
+
+    /**
+    * 备注
+    */
+    private String moNote2;
+
+    /**
+    * 分解时间
+    */
+    private Date decoDate;
+
+    /**
+    * 首日量标记1是/0否/2节假日
+    */
+    private String firstDay;
+
+    /**
+    * 执行单打印标记 0未打印/1已
+    */
+    private String execPrnflag;
+
+    /**
+    * 执行单打印时间
+    */
+    private Date execPrndate;
+
+    /**
+    * 执行单打印人员
+    */
+    private String execPrnusercd;
+
+    /**
+    * 处方流水号
+    */
+    private String recipeNo;
+
+    /**
+    * 处方内流水号
+    */
+    private Integer sequenceNo;
+
+    /**
+    * 是否附材'1'是
+    */
+    private String subtblFlag;
+
+    /**
+    * 样本类型
+    */
+    private String labCode;
+
+    /**
+    * 检验条码号
+    */
+    private String labBarcode;
+
+    /**
+    * 收费发送单打印标记
+    */
+    private String chargePrnflag;
+
+    /**
+    * 收费发送单打印时间
+    */
+    private Date chargePrndate;
+
+    /**
+    * 收费发送单打印人
+    */
+    private String chargePrnusercd;
+
+    /**
+    * 巡回卡打印标记(用作输血输液卡打印标志)
+    */
+    private String circultPrnflag;
+}

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

@@ -0,0 +1,499 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 医嘱资料档
+ */
+@Data
+public class MetIpmOrder {
+    /**
+     * 医嘱流水号
+     */
+    private String moOrder;
+
+    /**
+     * 住院流水号
+     */
+    private String inpatientNo;
+
+    /**
+     * 住院病历号
+     */
+    private String patientNo;
+
+    /**
+     * 住院科室代码
+     */
+    private String deptCode;
+
+    /**
+     * 住院护理站代码
+     */
+    private String nurseCellCode;
+
+    /**
+     * 开立科室代码
+     */
+    private String listDpcd;
+
+    /**
+     * 医嘱医师代号
+     */
+    private String docCode;
+
+    /**
+     * 医嘱医师姓名
+     */
+    private String docName;
+
+    /**
+     * 医嘱日期
+     */
+    private Date moDate;
+
+    /**
+     * 是否婴儿医嘱,1是/0否
+     */
+    private String babyFlag;
+
+    /**
+     * 婴儿序号
+     */
+    private Integer happenNo;
+
+    /**
+     * 项目属性,1院内项目/2院外项目
+     */
+    private String setItmattr;
+
+    /**
+     * 是否包含附材,1是/0否
+     */
+    private String setSubtbl;
+
+    /**
+     * 医嘱类别代码
+     */
+    private String typeCode;
+
+    /**
+     * 医嘱类别名称
+     */
+    private String typeName;
+
+    /**
+     * 医嘱是否分解:1长期/0临时
+     */
+    private String decmpsState;
+
+    /**
+     * 是否计费
+     */
+    private String chargeState;
+
+    /**
+     * 药房是否配药
+     */
+    private String needDrug;
+
+    /**
+     * 打印执行单
+     */
+    private String prnExelist;
+
+    /**
+     * 是否打印医嘱单
+     */
+    private String prmMorlist;
+
+    /**
+     * 是否需要确认
+     */
+    private String needConfirm;
+
+    /**
+     * 项目类别
+     */
+    private String itemType;
+
+    /**
+     * 项目编码
+     */
+    private String itemCode;
+
+    /**
+     * 项目名称
+     */
+    private String itemName;
+
+    /**
+     * 项目类别代码
+     */
+    private String classCode;
+
+    /**
+     * 项目类别名称
+     */
+    private String className;
+
+    /**
+     * 取药药房
+     */
+    private String pharmacyCode;
+
+    /**
+     * 执行科室代码
+     */
+    private String execDpcd;
+
+    /**
+     * 执行科室名称
+     */
+    private String execDpnm;
+
+    /**
+     * 药品基本剂量
+     */
+    private BigDecimal baseDose;
+
+    /**
+     * 剂量单位
+     */
+    private String doseUnit;
+
+    /**
+     * 最小单位
+     */
+    private String minUnit;
+
+    /**
+     * 计价单位
+     */
+    private String priceUnit;
+
+    /**
+     * 包装数量
+     */
+    private Short packQty;
+
+    /**
+     * 规格
+     */
+    private String specs;
+
+    /**
+     * 剂型代码
+     */
+    private String doseModelCode;
+
+    /**
+     * 药品类别
+     */
+    private String drugType;
+
+    /**
+     * 药品性质
+     */
+    private String drugQuality;
+
+    /**
+     * 价格
+     */
+    private BigDecimal itemPrice;
+
+    /**
+     * 组合序号
+     */
+    private String combNo;
+
+    /**
+     * 主药标记
+     */
+    private String mainDrug;
+
+    /**
+     * 医嘱状态,0开立，1审核，2执行，3作废，4重整
+     */
+    private String moStat;
+
+    /**
+     * 用法代码
+     */
+    private String usageCode;
+
+    /**
+     * 用法名称
+     */
+    private String useName;
+
+    /**
+     * 用法英文缩写
+     */
+    private String englishAb;
+
+    /**
+     * 频次代码
+     */
+    private String frequencyCode;
+
+    /**
+     * 频次名称
+     */
+    private String frequencyName;
+
+    /**
+     * 每次剂量
+     */
+    private BigDecimal doseOnce;
+
+    /**
+     * 1扣护士站常备药/2扣药房
+     */
+    private String stockMin;
+
+    /**
+     * 项目总量
+     */
+    private BigDecimal qtyTot;
+
+    /**
+     * 付数
+     */
+    private BigDecimal useDays;
+
+    /**
+     * 开始时间
+     */
+    private Date dateBgn;
+
+    /**
+     * 结束时间
+     */
+    private Date dateEnd;
+
+    /**
+     * 录入人员代码
+     */
+    private String recUsercd;
+
+    /**
+     * 录入人员姓名
+     */
+    private String recUsernm;
+
+    /**
+     * 确认标记,0未确认/1已
+     */
+    private String confirmFlag;
+
+    /**
+     * 确认时间
+     */
+    private Date confirmDate;
+
+    /**
+     * 确认人员代码
+     */
+    private String confirmUsercd;
+
+    /**
+     * Dc标记 0未dc/1已dc
+     */
+    private String dcFlag;
+
+    /**
+     * Dc时间
+     */
+    private Date dcDate;
+
+    /**
+     * DC原因代码
+     */
+    private String dcCode;
+
+    /**
+     * DC原因名称
+     */
+    private String dcName;
+
+    /**
+     * DC医师代码
+     */
+    private String dcDoccd;
+
+    /**
+     * DC医师姓名
+     */
+    private String dcDocnm;
+
+    /**
+     * Dc人员代码
+     */
+    private String dcUsercd;
+
+    /**
+     * Dc人员名称
+     */
+    private String dcUsernm;
+
+    /**
+     * 执行标记 0未执行/1已执行
+     */
+    private String executeFlag;
+
+    /**
+     * 执行时间
+     */
+    private Date executeDate;
+
+    /**
+     * 执行人员代码
+     */
+    private String executeUsercd;
+
+    /**
+     * 整档标记 0无/1有
+     */
+    private String decoFlag;
+
+    /**
+     * 本次分解时间
+     */
+    private Date dateCurmodc;
+
+    /**
+     * 下次分解时间
+     */
+    private Date dateNxtmodc;
+
+    /**
+     * 医嘱说明
+     */
+    private String moNote1;
+
+    /**
+     * 备注
+     */
+    private String moNote2;
+
+    /**
+     * 1不需要皮试/2需要皮试，未做/3皮试阳/4皮试阴
+     */
+    private String hypotest;
+
+    /**
+     * 检查部位检体
+     */
+    private String itemNote;
+
+    /**
+     * 申请单号
+     */
+    private String applyNo;
+
+    /**
+     * 加急标记: 0普通/1加急
+     */
+    private String emcFlag;
+
+    /**
+     * 医嘱提取标记: 0待提取/1已提取/2DC提取
+     */
+    private String getFlag;
+
+    /**
+     * 是否附材'1'是
+     */
+    private String subtblFlag;
+
+    /**
+     * 排列序号，按排列序号由大到小顺序显示医嘱
+     */
+    private Integer sortId;
+
+    /**
+     * DC审核时间
+     */
+    private Date dcConfirmDate;
+
+    /**
+     * DC审核人
+     */
+    private String dcConfirmOper;
+
+    /**
+     * DC审核标记，0未审核，1已审核
+     */
+    private String dcConfirmFlag;
+
+    /**
+     * 样本类型 名称
+     */
+    private String labCode;
+
+    /**
+     * 是否需要患者同意 0 不需要  1需要
+     */
+    private String permission;
+
+    /**
+     * 组套编码
+     */
+    private String packageCode;
+
+    /**
+     * 组套名称
+     */
+    private String packageName;
+
+    /**
+     * 扩展备注  [执行时间]
+     */
+    private String mark1;
+
+    /**
+     * 扩展备注1
+     */
+    private String mark2;
+
+    /**
+     * 扩展备注2
+     */
+    private String mark3;
+
+    /**
+     * 执行时间点[特殊频次]
+     */
+    private String execTimes;
+
+    /**
+     * 执行剂量[特殊频次]
+     */
+    private String execDose;
+
+    /**
+     * 双签字
+     */
+    private String mark4;
+
+    /**
+     * 扩展备注5
+     */
+    private String mark5;
+
+    /**
+     * 扩展备注6
+     */
+    private String mark6;
+
+    private FinComUndruginfo finComUndruginfo;
+
+    private List<FinComUndrugztinfo> finComUndrugztinfo;
+
+    private List<MetIpmExecundrug> metIpmExecundrugList;
+}

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

@@ -0,0 +1,223 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 病区退费申请表
+ */
+@Data
+public class MetNuiCancelitem {
+    /**
+     * 申请流水号
+     */
+    private String applyNo;
+
+    /**
+     * 申请单据号
+     */
+    private String billCode;
+
+    /**
+     * 住院流水号
+     */
+    private String inpatientNo;
+
+    /**
+     * 患者姓名
+     */
+    private String name;
+
+    /**
+     * 是否婴儿用药 0 不是 1 是
+     */
+    private String babyFlag;
+
+    /**
+     * 患者所在科室
+     */
+    private String deptCode;
+
+    /**
+     * 所在病区
+     */
+    private String nurseCellCode;
+
+    /**
+     * 药品标志,1药品/2非药
+     */
+    private String drugFlag;
+
+    /**
+     * 项目编码
+     */
+    private String itemCode;
+
+    /**
+     * 项目名称
+     */
+    private String itemName;
+
+    /**
+     * 规格
+     */
+    private String specs;
+
+    /**
+     * 零售价
+     */
+    private BigDecimal salePrice;
+
+    /**
+     * 申请退药数量（乘以付数后的总数量）
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 付数
+     */
+    private Short days;
+
+    /**
+     * 计价单位
+     */
+    private String priceUnit;
+
+    /**
+     * 执行科室
+     */
+    private String execDpcd;
+
+    /**
+     * 操作员编码
+     */
+    private String operCode;
+
+    /**
+     * 操作时间
+     */
+    private Date operDate;
+
+    /**
+     * 操作员所在科室
+     */
+    private String operDpcd;
+
+    /**
+     * 对应收费明细处方号
+     */
+    private String recipeNo;
+
+    /**
+     * 对应处方内流水号
+     */
+    private Integer sequenceNo;
+
+    /**
+     * 确认单号
+     */
+    private String billNo;
+
+    /**
+     * 退药确认标识 0未确认/1确认
+     */
+    private String confirmFlag;
+
+    /**
+     * 确认科室代码
+     */
+    private String confirmDpcd;
+
+    /**
+     * 确认人编码
+     */
+    private String confirmCode;
+
+    /**
+     * 确认时间
+     */
+    private Date confirmDate;
+
+    /**
+     * 退费标识 0未退费/1退费/2作废
+     */
+    private String chargeFlag;
+
+    /**
+     * 退费确认人
+     */
+    private String chargeCode;
+
+    /**
+     * 退费确认时间
+     */
+    private Date chargeDate;
+
+    /**
+     * 1 包装 单位 0, 最小单位
+     */
+    private String extFlag3;
+
+    /**
+     * 数量[22]
+     */
+    private BigDecimal qty;
+
+    /**
+     * 组套代码
+     */
+    private String packageCode;
+
+    /**
+     * 组套名称
+     */
+    private String packageName;
+
+    /**
+     * 退费原因
+     */
+    private String backreason;
+
+    /**
+     * 预留字段1 A护士长 B科主任  R-核算办 Y医技科室
+     */
+    private String extFlag1;
+
+    /**
+     * 预留字段2  R-核算办
+     */
+    private String extFlag2;
+
+    /**
+     * 退费审核-护士长
+     */
+    private String auditOper1;
+
+    /**
+     * 退费审核-护士长
+     */
+    private Date auditDate1;
+
+    /**
+     * 退费审核-科主任
+     */
+    private String auditOper2;
+
+    /**
+     * 退费审核-科主任
+     */
+    private Date auditDate2;
+
+    /**
+     * 退费审核-核算办
+     */
+    private String auditOper3;
+
+    /**
+     * 退费审核-核算办
+     */
+    private Date auditDate3;
+
+}

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

@@ -0,0 +1,209 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 护士站药品执行确认记录,PDA用
+ */
+@Data
+public class MetNuiExerecord {
+    /**
+     * 执行单流水号
+     */
+    private String execSqn;
+
+    /**
+     * 住院流水号
+     */
+    private String inpatientNo;
+
+    /**
+     * 条码号
+     */
+    private String barcode;
+
+    /**
+     * 执行状态0录入1开始执行2结束执行
+     */
+    private String exeState;
+
+    /**
+     * 执行单类别1药品2非药品
+     */
+    private String billType;
+
+    /**
+     * 配液时间
+     */
+    private Date inTime;
+
+    /**
+     * 配液
+     */
+    private String inOper;
+
+    /**
+     * 开始执行时间
+     */
+    private Date bgTime;
+
+    /**
+     * 开始执行操作员
+     */
+    private String bgOper;
+
+    /**
+     * 结束执行时间
+     */
+    private Date endTime;
+
+    /**
+     * 结束执行操作员
+     */
+    private String endOper;
+
+    /**
+     * 执行单类型
+     */
+    private String exeType;
+
+    /**
+     * 执行单使用时间
+     */
+    private Date useTime;
+
+    /**
+     * 执行单名称，药品名称
+     */
+    private String execName;
+
+    /**
+     * 用法名称
+     */
+    private String useName;
+
+    /**
+     * 总量
+     */
+    private BigDecimal qtyTot;
+
+    /**
+     * 频次
+     */
+    private String fqName;
+
+    /**
+     * 每次量
+     */
+    private BigDecimal doseOnce;
+
+    /**
+     * 单位
+     */
+    private String doseUnit;
+
+    /**
+     * 开始人姓名
+     */
+    private String bgName;
+
+    /**
+     * 结束人姓名
+     */
+    private String endName;
+
+    private String conFlag;
+
+    /**
+     * 多路标志
+     */
+    private String mulFlag;
+
+    private String workRemind;
+
+    private Short esttime;
+
+    /**
+     * 有效标志，3表示pda已经操作，
+     */
+    private String validFlag;
+
+    private Date modifyDate;
+
+    /**
+     * 单路标志
+     */
+    private String singleFlag;
+
+    /**
+     * 路数
+     */
+    private String mulCount;
+
+    private String hisExeTypeCode;
+
+    private String hisExeTypeName;
+
+    private String endFlag;
+
+    /**
+     * 目前存HIS执行单表中的Comb_No
+     */
+    private String hisOrderNo;
+
+    private String hisOrderSeq;
+
+    /**
+     * 中止时，新生成一条数据，同时将之前的记录的主键保存在此字段中
+     */
+    private String oldExecSqn;
+
+    /**
+     * 滴数
+     */
+    private String execBillSpeed;
+
+    /**
+     * 单位
+     */
+    private String execBillSpeedUnit;
+
+    /**
+     * 规格
+     */
+    private String specs;
+
+    /**
+     * 关联护理记录单标志0未关联，1已关联
+     */
+    private String nurserecordFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private String extendData1;
+
+    private String extendData2;
+
+    private String extendData3;
+
+    private String extendData4;
+
+    private Date recTime;
+    private String recOper1;
+    private String recOperName1;
+    private String recOper2;
+    private String recOperName2;
+    private Date exeTime;
+    private String exeOper1;
+    private String exeOperName1;
+    private String exeOper2;
+    private String exeOperName2;
+
+
+}

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

@@ -0,0 +1,968 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 手术申请表
+ */
+public class MetOpsApply {
+    /**
+     * 手术序列号
+     */
+    private String operationno;
+
+    /**
+     * 住院流水号/门诊号
+     */
+    private String clinicCode;
+
+    /**
+     * 病案号/病历号
+     */
+    private String patientNo;
+
+    /**
+     * 1门诊/2住院
+     */
+    private String pasource;
+
+    /**
+     * 患者姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sexCode;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 预交金
+     */
+    private BigDecimal prepayCost;
+
+    /**
+     * 住院科室
+     */
+    private String deptCode;
+
+    /**
+     * 病床号
+     */
+    private String bedNo;
+
+    /**
+     * 患者血型
+     */
+    private String bloodCode;
+
+    /**
+     * 手术诊断
+     */
+    private String diagnose;
+
+    /**
+     * 手术分类,1普通/2急诊/3感染
+     */
+    private String opsKind;
+
+    /**
+     * 手术医生编码
+     */
+    private String opsDocd;
+
+    /**
+     * 指导医生编码
+     */
+    private String guiDocd;
+
+    /**
+     * 病房号
+     */
+    private String sickRoom;
+
+    /**
+     * 预约时间
+     */
+    private Date preDate;
+
+    /**
+     * 预定用时
+     */
+    private BigDecimal duration;
+
+    /**
+     * 麻醉类型
+     */
+    private String anesType;
+
+    /**
+     * 助手数
+     */
+    private Short helperNum;
+
+    /**
+     * 洗手护士数
+     */
+    private Short washNurse;
+
+    /**
+     * 随台护士数
+     */
+    private Short accoNurse;
+
+    /**
+     * 巡回护士数
+     */
+    private Short prepNurse;
+
+    /**
+     * 执行科室
+     */
+    private String execDept;
+
+    /**
+     * 1普通 2加台 3点台 4 加急台
+     */
+    private String consoleType;
+
+    /**
+     * 申请医生编码
+     */
+    private String applyDocd;
+
+    /**
+     * 申请科室编码
+     */
+    private String applyDpcd;
+
+    /**
+     * 申请时间
+     */
+    private Date applyDate;
+
+    /**
+     * 申请备注
+     */
+    private String applyNote;
+
+    /**
+     * 审批医生编码
+     */
+    private String apprDocd;
+
+    /**
+     * 审批时间
+     */
+    private Date apprDate;
+
+    /**
+     * 审批备注
+     */
+    private String apprNote;
+
+    /**
+     * 麻醉医生编码
+     */
+    private String anesDocd;
+
+    /**
+     * 手术规模
+     */
+    private String degree;
+
+    /**
+     * 切口类型
+     */
+    private String inciType;
+
+    /**
+     * 1 有菌 0无菌
+     */
+    private String yngerm;
+
+    /**
+     * 1 幕上 2 幕下
+     */
+    private String screenup;
+
+    /**
+     * 手术台
+     */
+    private String consoleCode;
+
+    /**
+     * 接患者时间
+     */
+    private Date receptDate;
+
+    /**
+     * 是否允许医生查看安排结果  1 允许 2 不允许
+     */
+    private String bloodType;
+
+    /**
+     * 感染类型
+     */
+    private BigDecimal bloodNum;
+
+    /**
+     * 用血单位
+     */
+    private String bloodUnit;
+
+    /**
+     * 手术注意事项
+     */
+    private String opsNote;
+
+    /**
+     * 麻醉注意事项
+     */
+    private String aneNote;
+
+    /**
+     * 1手术申请 2 手术审批 3手术安排 4手术完成 5取消手术登记6科室确认
+     */
+    private String execstatus;
+
+    /**
+     * 0未做手术/1已做手术
+     */
+    private String ynfinished;
+
+    /**
+     * 0未麻醉/1已麻醉
+     */
+    private String ynanesth;
+
+    /**
+     * 签字家属
+     */
+    private String folk;
+
+    /**
+     * 家属关系
+     */
+    private String relaCode;
+
+    /**
+     * 家属意见
+     */
+    private String folkComment;
+
+    /**
+     * 加急手术,1是/0否
+     */
+    private String ynurgent;
+
+    /**
+     * 是否已经计费 , 1 未收费,0 已计费
+     */
+    private String ynchange;
+
+    /**
+     * 1重症/0否
+     */
+    private String ynheavy;
+
+    /**
+     * 1特殊手术/0否
+     */
+    private String ynspecial;
+
+    /**
+     * 操作员
+     */
+    private String operCode;
+
+    /**
+     * 操作时间
+     */
+    private Date operDate;
+
+    /**
+     * 1有效/0无效
+     */
+    private String ynvalid;
+
+    /**
+     * 1合并/0否
+     */
+    private String ynunite;
+
+    /**
+     * 合并后手术序列号
+     */
+    private String uniteNo;
+
+    /**
+     * 是否需要随台护士 0是/1否
+     */
+    private String isneedacco;
+
+    /**
+     * 是否需要巡回护士 0是/1否
+     */
+    private String isneedprep;
+
+    /**
+     * 房间号
+     */
+    private String roomId;
+
+    /**
+     * 手术医生科室编码（医生可能会发生转科，所以此处记录当时医生科室）
+     */
+    private String docDpcd;
+
+    /**
+     * 拟用仪器/耗材
+     */
+    private String needequipment;
+
+    /**
+     * 其他人员1
+     */
+    private String otherinfo;
+
+    /**
+     * 其他人员2
+     */
+    private String otherinfo1;
+
+    /**
+     * 其他人员3
+     */
+    private String otherinfo2;
+
+    private String memo;
+
+    /**
+     * 是否预住院
+     */
+    private String preFlag;
+
+    /**
+     * 是否是预约日间手术：1是
+     */
+    private String rjssPreFlag;
+
+    /**
+     * 日间序号
+     */
+    private String rjxh;
+
+    /**
+     * 手术级别
+     */
+    private String opsLevel;
+
+    /**
+     * HIS医嘱流水号
+     */
+    private String moOrder;
+
+    /**
+     * 数据产生时间
+     */
+    private Date insertdate;
+
+    public String getOperationno() {
+        return operationno;
+    }
+
+    public void setOperationno(String operationno) {
+        this.operationno = operationno;
+    }
+
+    public String getClinicCode() {
+        return clinicCode;
+    }
+
+    public void setClinicCode(String clinicCode) {
+        this.clinicCode = clinicCode;
+    }
+
+    public String getPatientNo() {
+        return patientNo;
+    }
+
+    public void setPatientNo(String patientNo) {
+        this.patientNo = patientNo;
+    }
+
+    public String getPasource() {
+        return pasource;
+    }
+
+    public void setPasource(String pasource) {
+        this.pasource = pasource;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSexCode() {
+        return sexCode;
+    }
+
+    public void setSexCode(String sexCode) {
+        this.sexCode = sexCode;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public BigDecimal getPrepayCost() {
+        return prepayCost;
+    }
+
+    public void setPrepayCost(BigDecimal prepayCost) {
+        this.prepayCost = prepayCost;
+    }
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+
+    public String getBloodCode() {
+        return bloodCode;
+    }
+
+    public void setBloodCode(String bloodCode) {
+        this.bloodCode = bloodCode;
+    }
+
+    public String getDiagnose() {
+        return diagnose;
+    }
+
+    public void setDiagnose(String diagnose) {
+        this.diagnose = diagnose;
+    }
+
+    public String getOpsKind() {
+        return opsKind;
+    }
+
+    public void setOpsKind(String opsKind) {
+        this.opsKind = opsKind;
+    }
+
+    public String getOpsDocd() {
+        return opsDocd;
+    }
+
+    public void setOpsDocd(String opsDocd) {
+        this.opsDocd = opsDocd;
+    }
+
+    public String getGuiDocd() {
+        return guiDocd;
+    }
+
+    public void setGuiDocd(String guiDocd) {
+        this.guiDocd = guiDocd;
+    }
+
+    public String getSickRoom() {
+        return sickRoom;
+    }
+
+    public void setSickRoom(String sickRoom) {
+        this.sickRoom = sickRoom;
+    }
+
+    public Date getPreDate() {
+        return preDate;
+    }
+
+    public void setPreDate(Date preDate) {
+        this.preDate = preDate;
+    }
+
+    public BigDecimal getDuration() {
+        return duration;
+    }
+
+    public void setDuration(BigDecimal duration) {
+        this.duration = duration;
+    }
+
+    public String getAnesType() {
+        return anesType;
+    }
+
+    public void setAnesType(String anesType) {
+        this.anesType = anesType;
+    }
+
+    public Short getHelperNum() {
+        return helperNum;
+    }
+
+    public void setHelperNum(Short helperNum) {
+        this.helperNum = helperNum;
+    }
+
+    public Short getWashNurse() {
+        return washNurse;
+    }
+
+    public void setWashNurse(Short washNurse) {
+        this.washNurse = washNurse;
+    }
+
+    public Short getAccoNurse() {
+        return accoNurse;
+    }
+
+    public void setAccoNurse(Short accoNurse) {
+        this.accoNurse = accoNurse;
+    }
+
+    public Short getPrepNurse() {
+        return prepNurse;
+    }
+
+    public void setPrepNurse(Short prepNurse) {
+        this.prepNurse = prepNurse;
+    }
+
+    public String getExecDept() {
+        return execDept;
+    }
+
+    public void setExecDept(String execDept) {
+        this.execDept = execDept;
+    }
+
+    public String getConsoleType() {
+        return consoleType;
+    }
+
+    public void setConsoleType(String consoleType) {
+        this.consoleType = consoleType;
+    }
+
+    public String getApplyDocd() {
+        return applyDocd;
+    }
+
+    public void setApplyDocd(String applyDocd) {
+        this.applyDocd = applyDocd;
+    }
+
+    public String getApplyDpcd() {
+        return applyDpcd;
+    }
+
+    public void setApplyDpcd(String applyDpcd) {
+        this.applyDpcd = applyDpcd;
+    }
+
+    public Date getApplyDate() {
+        return applyDate;
+    }
+
+    public void setApplyDate(Date applyDate) {
+        this.applyDate = applyDate;
+    }
+
+    public String getApplyNote() {
+        return applyNote;
+    }
+
+    public void setApplyNote(String applyNote) {
+        this.applyNote = applyNote;
+    }
+
+    public String getApprDocd() {
+        return apprDocd;
+    }
+
+    public void setApprDocd(String apprDocd) {
+        this.apprDocd = apprDocd;
+    }
+
+    public Date getApprDate() {
+        return apprDate;
+    }
+
+    public void setApprDate(Date apprDate) {
+        this.apprDate = apprDate;
+    }
+
+    public String getApprNote() {
+        return apprNote;
+    }
+
+    public void setApprNote(String apprNote) {
+        this.apprNote = apprNote;
+    }
+
+    public String getAnesDocd() {
+        return anesDocd;
+    }
+
+    public void setAnesDocd(String anesDocd) {
+        this.anesDocd = anesDocd;
+    }
+
+    public String getDegree() {
+        return degree;
+    }
+
+    public void setDegree(String degree) {
+        this.degree = degree;
+    }
+
+    public String getInciType() {
+        return inciType;
+    }
+
+    public void setInciType(String inciType) {
+        this.inciType = inciType;
+    }
+
+    public String getYngerm() {
+        return yngerm;
+    }
+
+    public void setYngerm(String yngerm) {
+        this.yngerm = yngerm;
+    }
+
+    public String getScreenup() {
+        return screenup;
+    }
+
+    public void setScreenup(String screenup) {
+        this.screenup = screenup;
+    }
+
+    public String getConsoleCode() {
+        return consoleCode;
+    }
+
+    public void setConsoleCode(String consoleCode) {
+        this.consoleCode = consoleCode;
+    }
+
+    public Date getReceptDate() {
+        return receptDate;
+    }
+
+    public void setReceptDate(Date receptDate) {
+        this.receptDate = receptDate;
+    }
+
+    public String getBloodType() {
+        return bloodType;
+    }
+
+    public void setBloodType(String bloodType) {
+        this.bloodType = bloodType;
+    }
+
+    public BigDecimal getBloodNum() {
+        return bloodNum;
+    }
+
+    public void setBloodNum(BigDecimal bloodNum) {
+        this.bloodNum = bloodNum;
+    }
+
+    public String getBloodUnit() {
+        return bloodUnit;
+    }
+
+    public void setBloodUnit(String bloodUnit) {
+        this.bloodUnit = bloodUnit;
+    }
+
+    public String getOpsNote() {
+        return opsNote;
+    }
+
+    public void setOpsNote(String opsNote) {
+        this.opsNote = opsNote;
+    }
+
+    public String getAneNote() {
+        return aneNote;
+    }
+
+    public void setAneNote(String aneNote) {
+        this.aneNote = aneNote;
+    }
+
+    public String getExecstatus() {
+        return execstatus;
+    }
+
+    public void setExecstatus(String execstatus) {
+        this.execstatus = execstatus;
+    }
+
+    public String getYnfinished() {
+        return ynfinished;
+    }
+
+    public void setYnfinished(String ynfinished) {
+        this.ynfinished = ynfinished;
+    }
+
+    public String getYnanesth() {
+        return ynanesth;
+    }
+
+    public void setYnanesth(String ynanesth) {
+        this.ynanesth = ynanesth;
+    }
+
+    public String getFolk() {
+        return folk;
+    }
+
+    public void setFolk(String folk) {
+        this.folk = folk;
+    }
+
+    public String getRelaCode() {
+        return relaCode;
+    }
+
+    public void setRelaCode(String relaCode) {
+        this.relaCode = relaCode;
+    }
+
+    public String getFolkComment() {
+        return folkComment;
+    }
+
+    public void setFolkComment(String folkComment) {
+        this.folkComment = folkComment;
+    }
+
+    public String getYnurgent() {
+        return ynurgent;
+    }
+
+    public void setYnurgent(String ynurgent) {
+        this.ynurgent = ynurgent;
+    }
+
+    public String getYnchange() {
+        return ynchange;
+    }
+
+    public void setYnchange(String ynchange) {
+        this.ynchange = ynchange;
+    }
+
+    public String getYnheavy() {
+        return ynheavy;
+    }
+
+    public void setYnheavy(String ynheavy) {
+        this.ynheavy = ynheavy;
+    }
+
+    public String getYnspecial() {
+        return ynspecial;
+    }
+
+    public void setYnspecial(String ynspecial) {
+        this.ynspecial = ynspecial;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getYnvalid() {
+        return ynvalid;
+    }
+
+    public void setYnvalid(String ynvalid) {
+        this.ynvalid = ynvalid;
+    }
+
+    public String getYnunite() {
+        return ynunite;
+    }
+
+    public void setYnunite(String ynunite) {
+        this.ynunite = ynunite;
+    }
+
+    public String getUniteNo() {
+        return uniteNo;
+    }
+
+    public void setUniteNo(String uniteNo) {
+        this.uniteNo = uniteNo;
+    }
+
+    public String getIsneedacco() {
+        return isneedacco;
+    }
+
+    public void setIsneedacco(String isneedacco) {
+        this.isneedacco = isneedacco;
+    }
+
+    public String getIsneedprep() {
+        return isneedprep;
+    }
+
+    public void setIsneedprep(String isneedprep) {
+        this.isneedprep = isneedprep;
+    }
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getDocDpcd() {
+        return docDpcd;
+    }
+
+    public void setDocDpcd(String docDpcd) {
+        this.docDpcd = docDpcd;
+    }
+
+    public String getNeedequipment() {
+        return needequipment;
+    }
+
+    public void setNeedequipment(String needequipment) {
+        this.needequipment = needequipment;
+    }
+
+    public String getOtherinfo() {
+        return otherinfo;
+    }
+
+    public void setOtherinfo(String otherinfo) {
+        this.otherinfo = otherinfo;
+    }
+
+    public String getOtherinfo1() {
+        return otherinfo1;
+    }
+
+    public void setOtherinfo1(String otherinfo1) {
+        this.otherinfo1 = otherinfo1;
+    }
+
+    public String getOtherinfo2() {
+        return otherinfo2;
+    }
+
+    public void setOtherinfo2(String otherinfo2) {
+        this.otherinfo2 = otherinfo2;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public String getPreFlag() {
+        return preFlag;
+    }
+
+    public void setPreFlag(String preFlag) {
+        this.preFlag = preFlag;
+    }
+
+    public String getRjssPreFlag() {
+        return rjssPreFlag;
+    }
+
+    public void setRjssPreFlag(String rjssPreFlag) {
+        this.rjssPreFlag = rjssPreFlag;
+    }
+
+    public String getRjxh() {
+        return rjxh;
+    }
+
+    public void setRjxh(String rjxh) {
+        this.rjxh = rjxh;
+    }
+
+    public String getOpsLevel() {
+        return opsLevel;
+    }
+
+    public void setOpsLevel(String opsLevel) {
+        this.opsLevel = opsLevel;
+    }
+
+    public String getMoOrder() {
+        return moOrder;
+    }
+
+    public void setMoOrder(String moOrder) {
+        this.moOrder = moOrder;
+    }
+
+    public Date getInsertdate() {
+        return insertdate;
+    }
+
+    public void setInsertdate(Date insertdate) {
+        this.insertdate = insertdate;
+    }
+}

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

@@ -0,0 +1,112 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+/**
+ * 手术人员安排
+ */
+public class MetOpsArrange {
+    /**
+     * 手术序号
+     */
+    private String operationno;
+
+    /**
+     * 角色编码
+     */
+    private String roleCode;
+
+    /**
+     * 员工代码
+     */
+    private String emplCode;
+
+    /**
+     * 员工姓名
+     */
+    private String emplName;
+
+    /**
+     * 0术前安排/1术后记录
+     */
+    private String foreFlag;
+
+    /**
+     * 操作员
+     */
+    private String operCode;
+
+    /**
+     * 操作时间
+     */
+    private Date operDate;
+
+    /**
+     * 状态：正常/加班/直落等
+     */
+    private String operKind;
+
+    public String getOperationno() {
+        return operationno;
+    }
+
+    public void setOperationno(String operationno) {
+        this.operationno = operationno;
+    }
+
+    public String getRoleCode() {
+        return roleCode;
+    }
+
+    public void setRoleCode(String roleCode) {
+        this.roleCode = roleCode;
+    }
+
+    public String getEmplCode() {
+        return emplCode;
+    }
+
+    public void setEmplCode(String emplCode) {
+        this.emplCode = emplCode;
+    }
+
+    public String getEmplName() {
+        return emplName;
+    }
+
+    public void setEmplName(String emplName) {
+        this.emplName = emplName;
+    }
+
+    public String getForeFlag() {
+        return foreFlag;
+    }
+
+    public void setForeFlag(String foreFlag) {
+        this.foreFlag = foreFlag;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getOperKind() {
+        return operKind;
+    }
+
+    public void setOperKind(String operKind) {
+        this.operKind = operKind;
+    }
+}

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

@@ -0,0 +1,321 @@
+package com.neuhis.his.domain.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 手术记录表
+ */
+public class MetOpsOperationitem {
+    /**
+    * 手术序号
+    */
+    private String operationno;
+
+    /**
+    * 项目编码
+    */
+    private String itemCode;
+
+    /**
+    * 门诊号/住院流水号
+    */
+    private String clinicCode;
+
+    /**
+    * 住院科室
+    */
+    private String deptCode;
+
+    /**
+    * 项目名称
+    */
+    private String itemName;
+
+    /**
+    * 单价
+    */
+    private BigDecimal unitPrice;
+
+    /**
+    * 收费比例
+    */
+    private BigDecimal feeRate;
+
+    /**
+    * 数量
+    */
+    private Short qty;
+
+    /**
+    * 单位
+    */
+    private String stockUnit;
+
+    /**
+    * 手术规模
+    */
+    private String degree;
+
+    /**
+    * 切口类型
+    */
+    private String icniType;
+
+    /**
+    * 幕上幕下
+    */
+    private String screenup;
+
+    /**
+    * 1有菌/0无菌
+    */
+    private String yngerm;
+
+    /**
+    * 手术部位
+    */
+    private String opePos;
+
+    /**
+    * 1加急/0否
+    */
+    private String ynurgent;
+
+    /**
+    * 1病危/0否
+    */
+    private String ynchange;
+
+    /**
+    * 1重症/0否
+    */
+    private String ynheavy;
+
+    /**
+    * 1特殊手术/0否
+    */
+    private String ynspecial;
+
+    /**
+    * 1主手术/0否
+    */
+    private String mainFlag;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 1有效/0无效
+    */
+    private String ynvalid;
+
+    /**
+    * 操作员
+    */
+    private String operCode;
+
+    /**
+    * 操作时间
+    */
+    private Date operDate;
+
+    /**
+    * 手术级别
+    */
+    private String opsLevel;
+
+    public String getOperationno() {
+        return operationno;
+    }
+
+    public void setOperationno(String operationno) {
+        this.operationno = operationno;
+    }
+
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+    }
+
+    public String getClinicCode() {
+        return clinicCode;
+    }
+
+    public void setClinicCode(String clinicCode) {
+        this.clinicCode = clinicCode;
+    }
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public BigDecimal getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(BigDecimal unitPrice) {
+        this.unitPrice = unitPrice;
+    }
+
+    public BigDecimal getFeeRate() {
+        return feeRate;
+    }
+
+    public void setFeeRate(BigDecimal feeRate) {
+        this.feeRate = feeRate;
+    }
+
+    public Short getQty() {
+        return qty;
+    }
+
+    public void setQty(Short qty) {
+        this.qty = qty;
+    }
+
+    public String getStockUnit() {
+        return stockUnit;
+    }
+
+    public void setStockUnit(String stockUnit) {
+        this.stockUnit = stockUnit;
+    }
+
+    public String getDegree() {
+        return degree;
+    }
+
+    public void setDegree(String degree) {
+        this.degree = degree;
+    }
+
+    public String getIcniType() {
+        return icniType;
+    }
+
+    public void setIcniType(String icniType) {
+        this.icniType = icniType;
+    }
+
+    public String getScreenup() {
+        return screenup;
+    }
+
+    public void setScreenup(String screenup) {
+        this.screenup = screenup;
+    }
+
+    public String getYngerm() {
+        return yngerm;
+    }
+
+    public void setYngerm(String yngerm) {
+        this.yngerm = yngerm;
+    }
+
+    public String getOpePos() {
+        return opePos;
+    }
+
+    public void setOpePos(String opePos) {
+        this.opePos = opePos;
+    }
+
+    public String getYnurgent() {
+        return ynurgent;
+    }
+
+    public void setYnurgent(String ynurgent) {
+        this.ynurgent = ynurgent;
+    }
+
+    public String getYnchange() {
+        return ynchange;
+    }
+
+    public void setYnchange(String ynchange) {
+        this.ynchange = ynchange;
+    }
+
+    public String getYnheavy() {
+        return ynheavy;
+    }
+
+    public void setYnheavy(String ynheavy) {
+        this.ynheavy = ynheavy;
+    }
+
+    public String getYnspecial() {
+        return ynspecial;
+    }
+
+    public void setYnspecial(String ynspecial) {
+        this.ynspecial = ynspecial;
+    }
+
+    public String getMainFlag() {
+        return mainFlag;
+    }
+
+    public void setMainFlag(String mainFlag) {
+        this.mainFlag = mainFlag;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getYnvalid() {
+        return ynvalid;
+    }
+
+    public void setYnvalid(String ynvalid) {
+        this.ynvalid = ynvalid;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getOpsLevel() {
+        return opsLevel;
+    }
+
+    public void setOpsLevel(String opsLevel) {
+        this.opsLevel = opsLevel;
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 申请单类型
+ */
+@Data
+public class MetOrdeApplyType {
+    /**
+    * 申请单类型ID，（EXAMSHEETTYPE）
+    */
+    private String applyTypeId;
+
+    private String applyTypeName;
+
+    /**
+    * 流程类别e
+    */
+    private String flowClass;
+
+    /**
+    * 打印标识
+    */
+    private String printFlag;
+
+    /**
+    * 类型大类E，1 放射 2 超声 3 病理 4 一般检查
+    */
+    private String sheetTypeClass;
+
+    /**
+    * 门诊模板类型
+    */
+    private String opModelType;
+
+    /**
+    * 住院模板类型
+    */
+    private String ipModelType;
+
+    /**
+    * 创建日期
+    */
+    private Date createDate;
+
+    /**
+    * 操作员编码
+    */
+    private String operCode;
+
+    /**
+    * 操作日期
+    */
+    private Date operDate;
+}

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

@@ -0,0 +1,125 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+/**
+ * 申请单检查大部位
+ */
+public class MetOrdeBigexampart {
+    /**
+     * 大部位编码
+     */
+    private String bigExamPartId;
+
+    /**
+     * 大部位名称
+     */
+    private String bigExamPartName;
+
+    /**
+     * 序号
+     */
+    private Integer sortNo;
+
+    /**
+     * 申请单类型
+     */
+    private String applyTypeId;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 操作人
+     */
+    private String operCode;
+
+    /**
+     * 操作时间
+     */
+    private Date operDate;
+
+    /**
+     * 有效状态
+     */
+    private String validState;
+
+    /**
+     * 英文名
+     */
+    private String englishName;
+
+    public String getBigExamPartId() {
+        return bigExamPartId;
+    }
+
+    public void setBigExamPartId(String bigExamPartId) {
+        this.bigExamPartId = bigExamPartId;
+    }
+
+    public String getBigExamPartName() {
+        return bigExamPartName;
+    }
+
+    public void setBigExamPartName(String bigExamPartName) {
+        this.bigExamPartName = bigExamPartName;
+    }
+
+    public Integer getSortNo() {
+        return sortNo;
+    }
+
+    public void setSortNo(Integer sortNo) {
+        this.sortNo = sortNo;
+    }
+
+    public String getApplyTypeId() {
+        return applyTypeId;
+    }
+
+    public void setApplyTypeId(String applyTypeId) {
+        this.applyTypeId = applyTypeId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getValidState() {
+        return validState;
+    }
+
+    public void setValidState(String validState) {
+        this.validState = validState;
+    }
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName;
+    }
+}

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

@@ -0,0 +1,164 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+/**
+ * 申请单检查部位
+ */
+public class MetOrdeExampart {
+    /**
+     * 检查部位
+     */
+    private String examPartId;
+
+    /**
+     * 检查部位名称
+     */
+    private String examPartName;
+
+    /**
+     * 检查部位序号
+     */
+    private Integer sortNo;
+
+    /**
+     * 申请单类型
+     */
+    private String applyTypeId;
+
+    /**
+     * 大部位编码
+     */
+    private String bigExamPartId;
+
+    /**
+     * 有效状态
+     */
+    private String validState;
+
+    /**
+     * 创建日期
+     */
+    private Date createDate;
+
+    /**
+     * 操作员编码
+     */
+    private String operCode;
+
+    /**
+     * 操作日期
+     */
+    private Date operDate;
+
+    /**
+     * 拼音码
+     */
+    private String spellCode;
+
+    /**
+     * 五笔码
+     */
+    private String wbCode;
+
+    /**
+     * 英文名
+     */
+    private String englishName;
+
+    public String getExamPartId() {
+        return examPartId;
+    }
+
+    public void setExamPartId(String examPartId) {
+        this.examPartId = examPartId;
+    }
+
+    public String getExamPartName() {
+        return examPartName;
+    }
+
+    public void setExamPartName(String examPartName) {
+        this.examPartName = examPartName;
+    }
+
+    public Integer getSortNo() {
+        return sortNo;
+    }
+
+    public void setSortNo(Integer sortNo) {
+        this.sortNo = sortNo;
+    }
+
+    public String getApplyTypeId() {
+        return applyTypeId;
+    }
+
+    public void setApplyTypeId(String applyTypeId) {
+        this.applyTypeId = applyTypeId;
+    }
+
+    public String getBigExamPartId() {
+        return bigExamPartId;
+    }
+
+    public void setBigExamPartId(String bigExamPartId) {
+        this.bigExamPartId = bigExamPartId;
+    }
+
+    public String getValidState() {
+        return validState;
+    }
+
+    public void setValidState(String validState) {
+        this.validState = validState;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperDate() {
+        return operDate;
+    }
+
+    public void setOperDate(Date operDate) {
+        this.operDate = operDate;
+    }
+
+    public String getSpellCode() {
+        return spellCode;
+    }
+
+    public void setSpellCode(String spellCode) {
+        this.spellCode = spellCode;
+    }
+
+    public String getWbCode() {
+        return wbCode;
+    }
+
+    public void setWbCode(String wbCode) {
+        this.wbCode = wbCode;
+    }
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName;
+    }
+}

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

@@ -0,0 +1,285 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 诊疗术语
+ */
+@Data
+public class MetOrdtUndrugterm {
+    /**
+    * 术语ID
+    */
+    private String termId;
+
+    /**
+    * 记录术语所属哪种术语类型：
+在医生开立医嘱时，医生确定术语类型，系统根据此字段筛选出该类型的术语
+    */
+    private String termClassId;
+
+    /**
+    * 术语类型名称
+    */
+    private String termClassName;
+
+    /**
+    * 名称
+    */
+    private String termName;
+
+    /**
+    * 规格
+    */
+    private String specs;
+
+    /**
+    * 应用范围e(0全院，1门诊，2住院)
+    */
+    private String visitType;
+
+    /**
+    * 有效性标记
+    */
+    private String validFlag;
+
+    /**
+    * 顺序号
+    */
+    private Integer sortNo;
+
+    /**
+    * 参考价格
+    */
+    private BigDecimal priceRef;
+
+    /**
+    * 是否需要收费
+    */
+    private String chargeFlag;
+
+    /**
+    * 用于标记该术语中的物价是否需要到相应科室划价
+    */
+    private String pricingFlag;
+
+    /**
+    * 医生开医嘱时，系统通过此字段判断是否提示医生要求患者填写知情同意书
+    */
+    private String consentFlag;
+
+    /**
+    * 造影剂
+    */
+    private String druginFlag;
+
+    /**
+    * 是否需要终端确认（0不需要确认，1需要确认）
+    */
+    private String confirmFlag;
+
+    /**
+    * 性别限制
+    */
+    private String sexLimit;
+
+    /**
+    * 备注
+    */
+    private String memo;
+
+    /**
+    * 医生开立医嘱用到此术语时，系统提示给医生的信息
+    */
+    private String docmoTip;
+
+    /**
+    * 可用执行科室范围，供医生开立医嘱和护士接收医嘱管理执行档时选择执行科室
+    */
+    private String execDepts;
+
+    /**
+    * 默认执行科室类型e(0登录科室、1患者所在科室)
+    */
+    private String defdeptType;
+
+    /**
+    * 申请单类型c
+    */
+    private String sheetType;
+
+    /**
+    * 病情标识e(0正常、1病重、2病危)
+    */
+    private String criticalState;
+
+    /**
+    * 护理级别标识e(LV1一级护理、LV2二级护理、LV3三级护理、LVS特级护理)
+    */
+    private String nurseGrade;
+
+    /**
+    * 检验测定时间
+    */
+    private String labTime;
+
+    /**
+    * 检验可用样本编码s
+    */
+    private String labSpecimens;
+
+    /**
+    * 检验可用试管s
+    */
+    private String labTubes;
+
+    /**
+    * 检验可用设备s
+    */
+    private String labMachines;
+
+    /**
+    * 检验类别c
+    */
+    private String labClass;
+
+    /**
+    * 物价是否审批
+    */
+    private String fincheckFlag;
+
+    /**
+    * 拼音码
+    */
+    private String spellCode;
+
+    /**
+    * 五笔码
+    */
+    private String wbCode;
+
+    /**
+    * 自定义码
+    */
+    private String customCode;
+
+    /**
+    * 对照码
+    */
+    private String mappingCode;
+
+    /**
+    * 简称
+    */
+    private String shortName;
+
+    /**
+    * 简称拼音码
+    */
+    private String shortSpell;
+
+    /**
+    * 简称五笔码
+    */
+    private String shortWb;
+
+    /**
+    * 别名
+    */
+    private String nickName;
+
+    /**
+    * 别名拼音码
+    */
+    private String nickSpell;
+
+    /**
+    * 别名五笔码
+    */
+    private String nickWb;
+
+    /**
+    * 扩展字段1
+    */
+    private String extData1;
+
+    /**
+    * 扩展字段2
+    */
+    private String extData2;
+
+    /**
+    * 扩展字段3
+    */
+    private String extData3;
+
+    /**
+    * 扩展字段4
+    */
+    private String extData4;
+
+    /**
+    * 扩展字段5
+    */
+    private String extData5;
+
+    /**
+    * 扩展字段6
+    */
+    private String extData6;
+
+    /**
+    * 扩展字段7
+    */
+    private String extData7;
+
+    /**
+    * 扩展字段8
+    */
+    private String extData8;
+
+    /**
+    * 扩展字段9
+    */
+    private String extData9;
+
+    /**
+    * 扩展字段10
+    */
+    private String extData10;
+
+    /**
+    * 创建日期
+    */
+    private Date createDate;
+
+    /**
+    * 操作员编码
+    */
+    private String operCode;
+
+    /**
+    * 操作日期
+    */
+    private Date operDate;
+
+    /**
+    * 医保类别
+    */
+    private String siGrade;
+
+    /**
+    * 英文名
+    */
+    private String englishName;
+
+    /**
+    * 单位
+    */
+    private String unit;
+
+
+}

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

@@ -0,0 +1,216 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+/**
+ * 病历一体化数据明细表
+ */
+public class NsrNisRecordDetail {
+    /**
+    * 主键
+    */
+    private Long id;
+
+    /**
+    * 外键
+    */
+    private Long recordId;
+
+    /**
+    * 患者住院流水号
+    */
+    private String inpatientNo;
+
+    /**
+    * 记录时间
+    */
+    private Date recordTime;
+
+    /**
+    * 元素编码
+    */
+    private String code;
+
+    /**
+    * 元素值
+    */
+    private String value;
+
+    /**
+    * 序号，用于包含多条同类数据的场合（如入量出量）区分顺序
+    */
+    private Short seqNo;
+
+    /**
+    * 数据源  1:护理评估   2:体温单   3:护理记录    4:移动护理    5:其他
+    */
+    private Short dataSource;
+
+    /**
+    * 操作人ID
+    */
+    private String operCode;
+
+    /**
+    * 操作时间
+    */
+    private Date operTime;
+
+    /**
+    * 操作人姓名
+    */
+    private String operName;
+
+    /**
+    * 操作类型：1.体温单界面录入 2.体温单单次录入 3.体温单批量录入 4.护理记录界面录入 5.护理记录批量录入 6.护理评估录入 7.移动护理录入 8.ICU录入 9.空 10.血糖单批量录入
+    */
+    private Short operType;
+
+    /**
+    * Code编码的中文重命名
+    */
+    private String rName;
+
+    /**
+    * 显示到体温单标记
+    */
+    private Short showTemperature;
+
+    /**
+    * 显示到护理记录标记
+    */
+    private Short showNurseRecord;
+
+    /**
+    * 同NSR_NIS_RECORD的guid，当体温单存储的数据时自行生成Guid
+    */
+    private String guid;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Long recordId) {
+        this.recordId = recordId;
+    }
+
+    public String getInpatientNo() {
+        return inpatientNo;
+    }
+
+    public void setInpatientNo(String inpatientNo) {
+        this.inpatientNo = inpatientNo;
+    }
+
+    public Date getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(Date recordTime) {
+        this.recordTime = recordTime;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Short getSeqNo() {
+        return seqNo;
+    }
+
+    public void setSeqNo(Short seqNo) {
+        this.seqNo = seqNo;
+    }
+
+    public Short getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(Short dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public String getOperCode() {
+        return operCode;
+    }
+
+    public void setOperCode(String operCode) {
+        this.operCode = operCode;
+    }
+
+    public Date getOperTime() {
+        return operTime;
+    }
+
+    public void setOperTime(Date operTime) {
+        this.operTime = operTime;
+    }
+
+    public String getOperName() {
+        return operName;
+    }
+
+    public void setOperName(String operName) {
+        this.operName = operName;
+    }
+
+    public Short getOperType() {
+        return operType;
+    }
+
+    public void setOperType(Short operType) {
+        this.operType = operType;
+    }
+
+    public String getrName() {
+        return rName;
+    }
+
+    public void setrName(String rName) {
+        this.rName = rName;
+    }
+
+    public Short getShowTemperature() {
+        return showTemperature;
+    }
+
+    public void setShowTemperature(Short showTemperature) {
+        this.showTemperature = showTemperature;
+    }
+
+    public Short getShowNurseRecord() {
+        return showNurseRecord;
+    }
+
+    public void setShowNurseRecord(Short showNurseRecord) {
+        this.showNurseRecord = showNurseRecord;
+    }
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+}

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

@@ -0,0 +1,175 @@
+package com.neuhis.his.domain.entity;
+
+/**
+ * Nis病历一体化编码
+ */
+public class NsrStandardCode {
+    /**
+    * 一体化编码Code
+    */
+    private String ncode;
+
+    /**
+    * 流水ID
+    */
+    private Long id;
+
+    /**
+    * 一体化编码Name
+    */
+    private String ncodeName;
+
+    /**
+    * 数据类型（0：文本；1：数字；2：时间）
+    */
+    private Short dataType;
+
+    /**
+    * 父级编码Id
+    */
+    private Long parentNcodeId;
+
+    /**
+    * 字段描述
+    */
+    private String ncodeDescription;
+
+    /**
+    * 最小值
+    */
+    private String minValue;
+
+    /**
+    * 最大值
+    */
+    private String maxValue;
+
+    /**
+    * 应用范围（0：全部；1：体温单；2：护理记录；3：评估；4：移动）
+    */
+    private Short ncodeScope;
+
+    /**
+    * 是否有效（0：无效，1：有效）
+    */
+    private Short isValid;
+
+    /**
+    * Nis评估项目Id对照
+    */
+    private String assessmentItemId;
+
+    /**
+    * 警告最小值
+    */
+    private String warningMinValue;
+
+    /**
+    * 警告最大值
+    */
+    private String warningMaxValue;
+
+    public String getNcode() {
+        return ncode;
+    }
+
+    public void setNcode(String ncode) {
+        this.ncode = ncode;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getNcodeName() {
+        return ncodeName;
+    }
+
+    public void setNcodeName(String ncodeName) {
+        this.ncodeName = ncodeName;
+    }
+
+    public Short getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Short dataType) {
+        this.dataType = dataType;
+    }
+
+    public Long getParentNcodeId() {
+        return parentNcodeId;
+    }
+
+    public void setParentNcodeId(Long parentNcodeId) {
+        this.parentNcodeId = parentNcodeId;
+    }
+
+    public String getNcodeDescription() {
+        return ncodeDescription;
+    }
+
+    public void setNcodeDescription(String ncodeDescription) {
+        this.ncodeDescription = ncodeDescription;
+    }
+
+    public String getMinValue() {
+        return minValue;
+    }
+
+    public void setMinValue(String minValue) {
+        this.minValue = minValue;
+    }
+
+    public String getMaxValue() {
+        return maxValue;
+    }
+
+    public void setMaxValue(String maxValue) {
+        this.maxValue = maxValue;
+    }
+
+    public Short getNcodeScope() {
+        return ncodeScope;
+    }
+
+    public void setNcodeScope(Short ncodeScope) {
+        this.ncodeScope = ncodeScope;
+    }
+
+    public Short getIsValid() {
+        return isValid;
+    }
+
+    public void setIsValid(Short isValid) {
+        this.isValid = isValid;
+    }
+
+    public String getAssessmentItemId() {
+        return assessmentItemId;
+    }
+
+    public void setAssessmentItemId(String assessmentItemId) {
+        this.assessmentItemId = assessmentItemId;
+    }
+
+    public String getWarningMinValue() {
+        return warningMinValue;
+    }
+
+    public void setWarningMinValue(String warningMinValue) {
+        this.warningMinValue = warningMinValue;
+    }
+
+    public String getWarningMaxValue() {
+        return warningMaxValue;
+    }
+
+    public void setWarningMaxValue(String warningMaxValue) {
+        this.warningMaxValue = warningMaxValue;
+    }
+}

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

@@ -0,0 +1,278 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+public class PdaBloodCircuit {
+    /**
+    * 主键
+    */
+    private String recordId;
+
+    /**
+    * 血袋条码号
+    */
+    private String barcode;
+
+    /**
+    * 巡视类型1输血前2输血开始3输血十五分钟4输血一小时5输血结束6输血结束四小时7暂停8继续9终止10巡视
+    */
+    private String circuitType;
+
+    /**
+    * 记录人工号
+    */
+    private String operpersonCode;
+
+    /**
+    * 记录人姓名
+    */
+    private String operpersonName;
+
+    /**
+    * 记录时间
+    */
+    private Date operTime;
+
+    /**
+    * 有无不良反应(1 有 2 无)
+    */
+    private String adverseReflection;
+
+    /**
+    * 体温
+    */
+    private String temperatur;
+
+    /**
+    * 脉搏
+    */
+    private String pulseRate;
+
+    /**
+    * 心率
+    */
+    private String heartRate;
+
+    /**
+    * 呼吸
+    */
+    private String breathingRate;
+
+    /**
+    * 收缩压(高压)
+    */
+    private String systolicPressure;
+
+    /**
+    * 舒张压(低压)
+    */
+    private String diastolicPressure;
+
+    /**
+    * 滴速
+    */
+    private String dropSpeed;
+
+    /**
+    * 静脉是否通路
+    */
+    private String tonglu;
+
+    /**
+    * 用药
+    */
+    private String drugs;
+
+    /**
+    * 是否有效，0有效1无效
+    */
+    private String validFlag;
+
+    /**
+    * 备注
+    */
+    private String mark;
+
+    /**
+    * PDA传给CA的值
+    */
+    private String pdaValue;
+
+    /**
+    * CA回传给PDA的值
+    */
+    private String pdaCaValue;
+
+    /**
+    * CA回传给PDA的值证书
+    */
+    private String pdaCaValuezs;
+
+    public String getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(String recordId) {
+        this.recordId = recordId;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    public String getCircuitType() {
+        return circuitType;
+    }
+
+    public void setCircuitType(String circuitType) {
+        this.circuitType = circuitType;
+    }
+
+    public String getOperpersonCode() {
+        return operpersonCode;
+    }
+
+    public void setOperpersonCode(String operpersonCode) {
+        this.operpersonCode = operpersonCode;
+    }
+
+    public String getOperpersonName() {
+        return operpersonName;
+    }
+
+    public void setOperpersonName(String operpersonName) {
+        this.operpersonName = operpersonName;
+    }
+
+    public Date getOperTime() {
+        return operTime;
+    }
+
+    public void setOperTime(Date operTime) {
+        this.operTime = operTime;
+    }
+
+    public String getAdverseReflection() {
+        return adverseReflection;
+    }
+
+    public void setAdverseReflection(String adverseReflection) {
+        this.adverseReflection = adverseReflection;
+    }
+
+    public String getTemperatur() {
+        return temperatur;
+    }
+
+    public void setTemperatur(String temperatur) {
+        this.temperatur = temperatur;
+    }
+
+    public String getPulseRate() {
+        return pulseRate;
+    }
+
+    public void setPulseRate(String pulseRate) {
+        this.pulseRate = pulseRate;
+    }
+
+    public String getHeartRate() {
+        return heartRate;
+    }
+
+    public void setHeartRate(String heartRate) {
+        this.heartRate = heartRate;
+    }
+
+    public String getBreathingRate() {
+        return breathingRate;
+    }
+
+    public void setBreathingRate(String breathingRate) {
+        this.breathingRate = breathingRate;
+    }
+
+    public String getSystolicPressure() {
+        return systolicPressure;
+    }
+
+    public void setSystolicPressure(String systolicPressure) {
+        this.systolicPressure = systolicPressure;
+    }
+
+    public String getDiastolicPressure() {
+        return diastolicPressure;
+    }
+
+    public void setDiastolicPressure(String diastolicPressure) {
+        this.diastolicPressure = diastolicPressure;
+    }
+
+    public String getDropSpeed() {
+        return dropSpeed;
+    }
+
+    public void setDropSpeed(String dropSpeed) {
+        this.dropSpeed = dropSpeed;
+    }
+
+    public String getTonglu() {
+        return tonglu;
+    }
+
+    public void setTonglu(String tonglu) {
+        this.tonglu = tonglu;
+    }
+
+    public String getDrugs() {
+        return drugs;
+    }
+
+    public void setDrugs(String drugs) {
+        this.drugs = drugs;
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+
+    public String getPdaValue() {
+        return pdaValue;
+    }
+
+    public void setPdaValue(String pdaValue) {
+        this.pdaValue = pdaValue;
+    }
+
+    public String getPdaCaValue() {
+        return pdaCaValue;
+    }
+
+    public void setPdaCaValue(String pdaCaValue) {
+        this.pdaCaValue = pdaCaValue;
+    }
+
+    public String getPdaCaValuezs() {
+        return pdaCaValuezs;
+    }
+
+    public void setPdaCaValuezs(String pdaCaValuezs) {
+        this.pdaCaValuezs = pdaCaValuezs;
+    }
+}

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

@@ -0,0 +1,365 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+public class PdaPsrRecord {
+    private String id;
+
+    private Date ocurDate;
+
+    private Date writeDate;
+
+    private String pressureResource;
+
+    private String ratingType;
+
+    private String inpatientNo;
+
+    private String patientName;
+
+    private String bedNo;
+
+    private String age;
+
+    private String sex;
+
+    private String deptCode;
+
+    private String deptName;
+
+    private String nurseCellCode;
+
+    private String nurseCellName;
+
+    private String height;
+
+    private String weight;
+
+    private String albumin;
+
+    private String hemoglobin;
+
+    private String tend;
+
+    private Date inDate;
+
+    private Date outDate;
+
+    private String lapseTo;
+
+    private String signNurse;
+
+    private String signHeadNurse;
+
+    private Date signDate;
+
+    private String auditOption;
+
+    private String auditPerson;
+
+    private Date auditDate;
+
+    private String isSubmit;
+
+    private String validFlag;
+
+    private String ratingRecordIdList;
+
+    private String diagnose;
+
+    private String diseaseHistory;
+
+    private String isDeptreport;
+
+    private String damagetype;
+
+    private String damagedegree;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Date getOcurDate() {
+        return ocurDate;
+    }
+
+    public void setOcurDate(Date ocurDate) {
+        this.ocurDate = ocurDate;
+    }
+
+    public Date getWriteDate() {
+        return writeDate;
+    }
+
+    public void setWriteDate(Date writeDate) {
+        this.writeDate = writeDate;
+    }
+
+    public String getPressureResource() {
+        return pressureResource;
+    }
+
+    public void setPressureResource(String pressureResource) {
+        this.pressureResource = pressureResource;
+    }
+
+    public String getRatingType() {
+        return ratingType;
+    }
+
+    public void setRatingType(String ratingType) {
+        this.ratingType = ratingType;
+    }
+
+    public String getInpatientNo() {
+        return inpatientNo;
+    }
+
+    public void setInpatientNo(String inpatientNo) {
+        this.inpatientNo = inpatientNo;
+    }
+
+    public String getPatientName() {
+        return patientName;
+    }
+
+    public void setPatientName(String patientName) {
+        this.patientName = patientName;
+    }
+
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getNurseCellCode() {
+        return nurseCellCode;
+    }
+
+    public void setNurseCellCode(String nurseCellCode) {
+        this.nurseCellCode = nurseCellCode;
+    }
+
+    public String getNurseCellName() {
+        return nurseCellName;
+    }
+
+    public void setNurseCellName(String nurseCellName) {
+        this.nurseCellName = nurseCellName;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
+    public String getAlbumin() {
+        return albumin;
+    }
+
+    public void setAlbumin(String albumin) {
+        this.albumin = albumin;
+    }
+
+    public String getHemoglobin() {
+        return hemoglobin;
+    }
+
+    public void setHemoglobin(String hemoglobin) {
+        this.hemoglobin = hemoglobin;
+    }
+
+    public String getTend() {
+        return tend;
+    }
+
+    public void setTend(String tend) {
+        this.tend = tend;
+    }
+
+    public Date getInDate() {
+        return inDate;
+    }
+
+    public void setInDate(Date inDate) {
+        this.inDate = inDate;
+    }
+
+    public Date getOutDate() {
+        return outDate;
+    }
+
+    public void setOutDate(Date outDate) {
+        this.outDate = outDate;
+    }
+
+    public String getLapseTo() {
+        return lapseTo;
+    }
+
+    public void setLapseTo(String lapseTo) {
+        this.lapseTo = lapseTo;
+    }
+
+    public String getSignNurse() {
+        return signNurse;
+    }
+
+    public void setSignNurse(String signNurse) {
+        this.signNurse = signNurse;
+    }
+
+    public String getSignHeadNurse() {
+        return signHeadNurse;
+    }
+
+    public void setSignHeadNurse(String signHeadNurse) {
+        this.signHeadNurse = signHeadNurse;
+    }
+
+    public Date getSignDate() {
+        return signDate;
+    }
+
+    public void setSignDate(Date signDate) {
+        this.signDate = signDate;
+    }
+
+    public String getAuditOption() {
+        return auditOption;
+    }
+
+    public void setAuditOption(String auditOption) {
+        this.auditOption = auditOption;
+    }
+
+    public String getAuditPerson() {
+        return auditPerson;
+    }
+
+    public void setAuditPerson(String auditPerson) {
+        this.auditPerson = auditPerson;
+    }
+
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+
+    public String getIsSubmit() {
+        return isSubmit;
+    }
+
+    public void setIsSubmit(String isSubmit) {
+        this.isSubmit = isSubmit;
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getRatingRecordIdList() {
+        return ratingRecordIdList;
+    }
+
+    public void setRatingRecordIdList(String ratingRecordIdList) {
+        this.ratingRecordIdList = ratingRecordIdList;
+    }
+
+    public String getDiagnose() {
+        return diagnose;
+    }
+
+    public void setDiagnose(String diagnose) {
+        this.diagnose = diagnose;
+    }
+
+    public String getDiseaseHistory() {
+        return diseaseHistory;
+    }
+
+    public void setDiseaseHistory(String diseaseHistory) {
+        this.diseaseHistory = diseaseHistory;
+    }
+
+    public String getIsDeptreport() {
+        return isDeptreport;
+    }
+
+    public void setIsDeptreport(String isDeptreport) {
+        this.isDeptreport = isDeptreport;
+    }
+
+    public String getDamagetype() {
+        return damagetype;
+    }
+
+    public void setDamagetype(String damagetype) {
+        this.damagetype = damagetype;
+    }
+
+    public String getDamagedegree() {
+        return damagedegree;
+    }
+
+    public void setDamagedegree(String damagedegree) {
+        this.damagedegree = damagedegree;
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class PushMessageRecorShf {
+    private String msgId;
+
+    private int msgType;
+
+    private int clinicType;
+
+    private String clinicNo;
+
+    private String pushMsg;
+
+    private byte[] pushMsg1;
+
+    private int pushStatus;
+
+    private int errorNum;
+
+    private String returnMsg;
+
+    private Date operDate;
+
+    private String ext1;
+
+    private String ext2;
+
+    private String ext3;
+
+    private String ext4;
+
+    private String ext5;
+
+    private byte[] pushMsg3;
+
+    private String moList;
+
+    /**
+     * 操作时间
+     */
+    private Date operDateStart;
+
+    /**
+     * 操作时间
+     */
+    private Date operDateEnd;
+}

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

@@ -0,0 +1,24 @@
+package com.neuhis.his.domain.entity;
+
+import java.util.Date;
+
+public class SearchEntity {
+    private Date startTime;
+    private Date endTime;
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+}

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

@@ -0,0 +1,172 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class VpComPatientinfo {
+    private String cardNo;
+
+    private String icCardno;
+
+    private String name;
+
+    private String spellCode;
+
+    private String wbCode;
+
+    private Date birthday;
+
+    private String sexCode;
+
+    private String idenno;
+
+    private String bloodCode;
+
+    private String profCode;
+
+    private String workHome;
+
+    private String workTel;
+
+    private String workZip;
+
+    private String home;
+
+    private String homeTel;
+
+    private String homeZip;
+
+    private String district;
+
+    private String nationCode;
+
+    private String linkmanName;
+
+    private String linkmanTel;
+
+    private String linkmanAdd;
+
+    private String relaCode;
+
+    private String mari;
+
+    private String counCode;
+
+    private String paykindCode;
+
+    private String paykindName;
+
+    private String pactCode;
+
+    private String pactName;
+
+    private String mcardNo;
+
+    private String areaCode;
+
+    private BigDecimal framt;
+
+    private String anaphyFlag;
+
+    private String hepatitisFlag;
+
+    private String actCode;
+
+    private BigDecimal actAmt;
+
+    private BigDecimal lactSum;
+
+    private BigDecimal lbankSum;
+
+    private Short arrearTimes;
+
+    private BigDecimal arrearSum;
+
+    private String inhosSource;
+
+    private Date lihosDate;
+
+    private Short inhosTimes;
+
+    private Date louthosDate;
+
+    private Date firSeeDate;
+
+    private Date lregDate;
+
+    private BigDecimal disobyCnt;
+
+    private Date endDate;
+
+    private String mark;
+
+    private String operCode;
+
+    private Date operDate;
+
+    private String isValid;
+
+    private String feeKind;
+
+    private String oldCardno;
+
+    private String isEncryptname;
+
+    private String normalname;
+
+    private String idcardtype;
+
+    private String vipFlag;
+
+    private String montherName;
+
+    private String isTreatment;
+
+    private String caseNo;
+
+    private String insuranceId;
+
+    private String insuranceName;
+
+    private String homeDoorNo;
+
+    private String linkmanDoorNo;
+
+    private String email;
+
+    private String heliao;
+
+    private String shouxing;
+
+    private String staff;
+
+    private String isbankcard;
+
+    private String nowhome;
+
+    private String nowhomeZip;
+
+    private String linkIdeno;
+
+    private String contycode;
+
+    private String mpi;
+
+    private String hisGuid;
+
+    private String tempcard;
+
+    private String admissioncode;
+
+    private String vpMsgId;
+
+    private BigDecimal vpPushStatus;
+
+    private String vpPushMsg;
+
+    private Date vpOperDate;
+
+}

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

@@ -0,0 +1,56 @@
+package com.neuhis.his.domain.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class VpMessageRecord {
+    /**
+     * 复合主键
+     */
+    private String msgId;
+
+    /**
+     * 表或视图名称
+     */
+    private String tableName;
+
+    /**
+     * 推送状态
+     */
+    private Integer pushStatus;
+
+    /**
+     * 推送返回状态
+     */
+    private String pushMsg;
+
+    /**
+     * 操作时间
+     */
+    private Date operDate;
+
+    /**
+     * 扩展字段1
+     */
+    private String ext1;
+
+    /**
+     * 扩展字段2
+     */
+    private String ext2;
+
+    /**
+     * 扩展字段3
+     */
+    private String ext3;
+
+    /**
+     * 错误次数
+     */
+    private Integer errorNum;
+
+    private boolean isInsert=true;
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/items/PVisit.java

@@ -0,0 +1,49 @@
+package com.neuhis.his.domain.entity.items;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.neuhis.his.domain.entity.FinIprInmaininfo;
+import com.neuhis.his.domain.entity.FinOprRegister;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Date;
+import java.util.Objects;
+
+@Data
+public class PVisit {
+
+    /**
+     * 最后一次入院日期
+     */
+    private Date inTime;
+
+    /**
+     * 最后一次出院日期
+     */
+    private Date outTime;
+
+    /**
+     * 住院天数
+     */
+    private int inDays=0;
+
+    private FinOprRegister finOprRegister;
+
+    private FinIprInmaininfo finIprInmaininfo;
+
+    public void init(){
+        if(!Objects.isNull(finIprInmaininfo)){
+            this.inTime = finIprInmaininfo.getInDate()!=null?finIprInmaininfo.getInDate():null;
+            this.outTime = finIprInmaininfo.getOutDate()!=null?finIprInmaininfo.getOutDate():null;
+        }
+    }
+
+    public int getInDays() {
+        if (!Objects.isNull(inTime) && !Objects.isNull(outTime)) {
+            return DateUtils.differentDaysByMillisecond(inTime, outTime);
+        }
+        return 0;
+    }
+
+
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/EmployeeVO.java

@@ -0,0 +1,14 @@
+package com.neuhis.his.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Data
+public class EmployeeVO {
+
+    @NotEmpty(message = "医生工号不能为空")
+    @ApiModelProperty(value = "医生工号",required=true)
+    private String emplCode;
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/FeeConfirmVO.java

@@ -0,0 +1,45 @@
+package com.neuhis.his.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.Hidden;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "FeeConfirmVO-住院确费入参类", description = "住院确费入参类")
+public class FeeConfirmVO {
+
+    @NotNull(message = "系统类型不能为空")
+    @ApiModelProperty(value = "系统类型，1：lis,2：pacs", example = "1")
+    private Integer sourcetype;
+
+    //费用操作类型 --1收费,2退费
+    @NotNull(message = "费用操作类型不能为空")
+    @ApiModelProperty(value = "费用操作类型，1：收费", example = "1")
+    private Integer feetype;
+
+    @NotBlank(message = "住院流水号不能为空")
+    @ApiModelProperty(value = "住院流水号", example = "ZY010001970076")
+    private String inpatientno;
+
+    @NotBlank(message = "医嘱流水号/申请单号不能为空")
+    @ApiModelProperty(value = "HIS医嘱流水号或pacs申请单号", example = "566434128")
+    private String prmMoorder;
+
+    @NotBlank(message = "操作员Id不能为空")
+    @ApiModelProperty(value = "操作员Id", example = "000626")
+    private String operId;
+
+    @ApiModelProperty(value = "收费日期", dataType = "java.sql.DateTime", hidden = true,example = "2024-01-01 12:18:48")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    private Date feeDate;
+
+    @ApiModelProperty(value = "操作日期", dataType = "java.sql.DateTime", hidden = true,example = "2024-01-01 12:18:48")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    private Date operDate;
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/JZComPatientInfoVO.java

@@ -0,0 +1,161 @@
+package com.neuhis.his.domain.vo;
+
+import com.neuhis.his.domain.entity.SearchEntity;
+import com.neuhis.his.domain.entity.items.PVisit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 急诊系统修改患者基本信息
+ */
+@Data
+@ApiModel(value="JZComPatientInfoVO-急诊患者信息修改患者基本信息入参类", description="急诊患者信息修改患者基本信息入参类")
+public class JZComPatientInfoVO {
+    /**
+     * 就诊卡号
+     */
+    @NotEmpty(message = "就诊卡号不能为空")
+    @ApiModelProperty(value = "就诊卡号",required=true)
+    private String cardNo;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty(value = "性别，M：男，F：女")
+    private String sexCode;
+
+    /**
+     * 证件类型
+     */
+    @ApiModelProperty(value = "证件类型，请参考代码表")
+    private String idcardtype;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号")
+    private String idenno;
+
+    /**
+     * 血型
+     */
+    @ApiModelProperty(value = "血型")
+    private String bloodCode;
+
+    /**
+     * 职业
+     */
+//    private String profCode;
+
+    /**
+     * 工作单位
+     */
+    @ApiModelProperty(value = "联系人姓名")
+    private String workHome;
+
+    /**
+     * 单位电话
+     */
+    @ApiModelProperty(value = "联系人姓名")
+    private String workTel;
+
+    /**
+     * 单位邮编
+     */
+//    private String workZip;
+
+    /**
+     * 户口或家庭所在
+     */
+    @ApiModelProperty(value = "户口或家庭所在")
+    private String home;
+
+    /**
+     * 家庭电话
+     */
+    @ApiModelProperty(value = "家庭电话")
+    private String homeTel;
+
+    /**
+     * 户口或家庭邮政编码
+     */
+//    private String homeZip;
+
+    /**
+     * 籍贯
+     */
+    //private String district;
+
+    /**
+     * 民族
+     */
+    //private String nationCode;
+
+    /**
+     * 联系人姓名
+     */
+    @ApiModelProperty(value = "联系人姓名")
+    private String linkmanName;
+
+    /**
+     * 联系人电话
+     */
+    @ApiModelProperty(value = "联系人电话")
+    private String linkmanTel;
+
+    /**
+     * 联系人住址
+     */
+    @ApiModelProperty(value = "联系人住址")
+    private String linkmanAdd;
+
+    /**
+     * 联系人关系
+     */
+    @ApiModelProperty(value = "联系人关系，请参考代码表")
+    private String relaCode;
+
+    /**
+     * 婚姻状况
+     */
+    //private String mari;
+
+    /**
+     * 国籍
+     */
+    //private String counCode;
+
+    /**
+     * 药物过敏
+     */
+    //private String anaphyFlag;
+
+    /**
+     * 重要疾病
+     */
+    //private String hepatitisFlag;
+
+    /**
+     * 现住址
+     */
+    @ApiModelProperty(value = "现住址")
+    private String nowhome;
+
+
+    /**
+     * 联系人身份证号码
+     */
+    @ApiModelProperty(value = "联系人身份证号码")
+    private String linkIdeno;
+}

ruoyi-admin/src/main/java/com/neuhis/his/domain/vo/PushinigStatus.java

@@ -0,0 +1,8 @@
+package com.neuhis.his.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class PushinigStatus {
+    private boolean pushing;
+}

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

@@ -0,0 +1,14 @@
+package com.neuhis.his.mapper;
+
+import com.neuhis.his.domain.dto.Accredit;
+
+import java.util.List;
+
+
+public interface AccreditMapper {
+    List<Accredit> selectAccreditList(Accredit accredit);
+    int insertAccredit(Accredit accredit);
+    int updateAccredit(Accredit accredit);
+    Accredit selectAccreditById(Long appid);
+    int deleteAccredit(String[] ids);
+}

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

@@ -0,0 +1,63 @@
+package com.neuhis.his.mapper;
+
+import java.util.List;
+import com.neuhis.his.domain.BizApiFieldMapping;
+
+/**
+ * 接口字段引射关系Mapper接口
+ * 
+ * @author zhangbin
+ * @date 2024-06-13
+ */
+public interface BizApiFieldMappingMapper 
+{
+    /**
+     * 查询接口字段引射关系
+     * 
+     * @param mappingId 接口字段引射关系主键
+     * @return 接口字段引射关系
+     */
+    public BizApiFieldMapping selectBizApiFieldMappingByMappingId(Long mappingId);
+
+    /**
+     * 查询接口字段引射关系列表
+     * 
+     * @param bizApiFieldMapping 接口字段引射关系
+     * @return 接口字段引射关系集合
+     */
+    public List<BizApiFieldMapping> selectBizApiFieldMappingList(BizApiFieldMapping bizApiFieldMapping);
+
+    public List<BizApiFieldMapping> selectBizApiFieldMappingListByApiCode(String apiCode);
+
+    /**
+     * 新增接口字段引射关系
+     * 
+     * @param bizApiFieldMapping 接口字段引射关系
+     * @return 结果
+     */
+    public int insertBizApiFieldMapping(BizApiFieldMapping bizApiFieldMapping);
+
+    /**
+     * 修改接口字段引射关系
+     * 
+     * @param bizApiFieldMapping 接口字段引射关系
+     * @return 结果
+     */
+    public int updateBizApiFieldMapping(BizApiFieldMapping bizApiFieldMapping);
+
+    /**
+     * 删除接口字段引射关系
+     * 
+     * @param mappingId 接口字段引射关系主键
+     * @return 结果
+     */
+    public int deleteBizApiFieldMappingByMappingId(Long mappingId);
+
+    /**
+     * 批量删除接口字段引射关系
+     * 
+     * @param mappingIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBizApiFieldMappingByMappingIds(String[] mappingIds);
+}