This commit is contained in:
parent
b65a445a15
commit
5ce3e291dc
|
|
@ -31,7 +31,7 @@ public class IM2203A extends BaseInputModel{
|
||||||
@IMField(key = "med_type", name = "医疗类别", required = true)
|
@IMField(key = "med_type", name = "医疗类别", required = true)
|
||||||
private String med_type;
|
private String med_type;
|
||||||
@IMField(key = "begntime", name = "开始时间", required = true)
|
@IMField(key = "begntime", name = "开始时间", required = true)
|
||||||
private LocalDateTime begntime;
|
private String begntime;
|
||||||
@IMField(key = "main_cond_dscr", name = "主要病情描述")
|
@IMField(key = "main_cond_dscr", name = "主要病情描述")
|
||||||
private String main_cond_dscr;
|
private String main_cond_dscr;
|
||||||
@IMField(key = "dise_codg", name = "病种编码")
|
@IMField(key = "dise_codg", name = "病种编码")
|
||||||
|
|
@ -47,7 +47,7 @@ public class IM2203A extends BaseInputModel{
|
||||||
@IMField(key = "geso_val", name = "孕周数")
|
@IMField(key = "geso_val", name = "孕周数")
|
||||||
private BigDecimal geso_val;
|
private BigDecimal geso_val;
|
||||||
@IMField(key = "exp_content", name = "字段扩展")
|
@IMField(key = "exp_content", name = "字段扩展")
|
||||||
private ExpContent exp_content;
|
private String exp_content;
|
||||||
}
|
}
|
||||||
@Data
|
@Data
|
||||||
public static class Diseinfo{
|
public static class Diseinfo{
|
||||||
|
|
|
||||||
|
|
@ -311,11 +311,12 @@ public class DiagnosisService extends BaseService {
|
||||||
mdtrtinfo.setMdtrt_id(patientRegistration.getMdtrtId());
|
mdtrtinfo.setMdtrt_id(patientRegistration.getMdtrtId());
|
||||||
mdtrtinfo.setPsn_no(patientRegistration.getPsnNo());
|
mdtrtinfo.setPsn_no(patientRegistration.getPsnNo());
|
||||||
mdtrtinfo.setMed_type(config.get("social", "medType"));
|
mdtrtinfo.setMed_type(config.get("social", "medType"));
|
||||||
mdtrtinfo.setBegntime(curTime);
|
mdtrtinfo.setBegntime(curTime.format(FORMATTER));
|
||||||
IM2203A.ExpContent expContent = new IM2203A.ExpContent();
|
|
||||||
expContent.setTrum_flag("0");
|
JSONObject jsonObj = new JSONObject();
|
||||||
expContent.setRel_ttp_flag("0");
|
jsonObj.put("days","1");
|
||||||
mdtrtinfo.setExp_content(expContent);
|
//把jsonObj转化成json字符串
|
||||||
|
mdtrtinfo.setExp_content(jsonObj.toJSONString());
|
||||||
im2203A.setMdtrtinfo(mdtrtinfo);
|
im2203A.setMdtrtinfo(mdtrtinfo);
|
||||||
JSONArray jsonArray = JSONArray.parseArray(diagnosisMedicalRecord.getDiagnosisDetail());
|
JSONArray jsonArray = JSONArray.parseArray(diagnosisMedicalRecord.getDiagnosisDetail());
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,20 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- 定义日志文件的路径和名称 -->
|
<!-- 定义日志文件的路径和名称 -->
|
||||||
<property name="LOG_FILE" value="${user.dir}/logs/base/app.log"/>
|
|
||||||
<property name="REQUEST_FILE" value="${user.dir}/logs/request/app.log"/>
|
|
||||||
|
|
||||||
<!-- 控制台输出 -->
|
<!-- 控制台输出 -->
|
||||||
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
|
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
|
||||||
<encoder>
|
<encoder>
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||||
<charset>UTF-8</charset>
|
|
||||||
</encoder>
|
</encoder>
|
||||||
|
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||||
|
<level>INFO</level>
|
||||||
|
<onMatch>DENY</onMatch>
|
||||||
|
<onMismatch>ACCEPT</onMismatch>
|
||||||
|
</filter>
|
||||||
</appender>
|
</appender>
|
||||||
<appender name="REQUEST" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
<appender name="REQUEST" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<file>${REQUEST_FILE}</file>
|
<file>${user.dir}/logs/request/app.log</file>
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<!-- 日志文件按天滚动 -->
|
<!-- 日志文件按天滚动 -->
|
||||||
<fileNamePattern>${user.dir}/logs/request/app.%d{yyyy-MM-dd}.log</fileNamePattern>
|
<fileNamePattern>${user.dir}/logs/request/app.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||||
|
|
@ -25,13 +27,11 @@
|
||||||
</encoder>
|
</encoder>
|
||||||
<immediateFlush>true</immediateFlush>
|
<immediateFlush>true</immediateFlush>
|
||||||
</appender>
|
</appender>
|
||||||
|
<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
<!-- 文件输出 -->
|
<file>${user.dir}/logs/info/app.log</file>
|
||||||
<appender name="DEFAULT" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${LOG_FILE}</file>
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<!-- 日志文件按天滚动 -->
|
<!-- 日志文件按天滚动 -->
|
||||||
<fileNamePattern>${user.dir}/logs/base/app.%d{yyyy-MM-dd}.log</fileNamePattern>
|
<fileNamePattern>${user.dir}/logs/info/app.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||||
<!-- 保留 30 天的历史日志 -->
|
<!-- 保留 30 天的历史日志 -->
|
||||||
<maxHistory>30</maxHistory>
|
<maxHistory>30</maxHistory>
|
||||||
|
|
||||||
|
|
@ -40,16 +40,57 @@
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||||
<charset>UTF-8</charset>
|
<charset>UTF-8</charset>
|
||||||
</encoder>
|
</encoder>
|
||||||
|
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||||
|
<level>INFO</level>
|
||||||
|
<onMatch>ACCEPT</onMatch>
|
||||||
|
<onMismatch>DENY</onMismatch>
|
||||||
|
</filter>
|
||||||
|
</appender>
|
||||||
|
<!-- 文件输出 -->
|
||||||
|
<appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
|
<file>${user.dir}/logs/warn/app.log</file>
|
||||||
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
|
<!-- 日志文件按天滚动 -->
|
||||||
|
<fileNamePattern>${user.dir}/logs/warn/app.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||||
|
<!-- 保留 30 天的历史日志 -->
|
||||||
|
<maxHistory>30</maxHistory>
|
||||||
|
</rollingPolicy>
|
||||||
|
<encoder>
|
||||||
|
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||||
|
<charset>UTF-8</charset>
|
||||||
|
</encoder>
|
||||||
|
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||||
|
<level>WARN</level>
|
||||||
|
<onMatch>ACCEPT</onMatch>
|
||||||
|
<onMismatch>DENY</onMismatch>
|
||||||
|
</filter>
|
||||||
|
</appender>
|
||||||
|
<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
|
<file>${user.dir}/logs/error/app.log</file>
|
||||||
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
|
<!-- 日志文件按天滚动 -->
|
||||||
|
<fileNamePattern>${user.dir}/logs/error/app.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||||
|
<!-- 保留 30 天的历史日志 -->
|
||||||
|
<maxHistory>30</maxHistory>
|
||||||
|
</rollingPolicy>
|
||||||
|
<encoder>
|
||||||
|
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||||
|
<charset>UTF-8</charset>
|
||||||
|
</encoder>
|
||||||
|
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||||
|
<level>ERROR</level>
|
||||||
|
<onMatch>ACCEPT</onMatch>
|
||||||
|
<onMismatch>DENY</onMismatch>
|
||||||
|
</filter>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<logger name="com.syjiaer.clinic.server.common.util.HttpUtil" level="info" additivity="false">
|
<logger name="com.syjiaer.clinic.server.common.util.HttpUtil" level="info" additivity="false">
|
||||||
<!-- <appender-ref ref="CONSOLE"/>-->
|
|
||||||
<appender-ref ref="REQUEST"/>
|
<appender-ref ref="REQUEST"/>
|
||||||
</logger>
|
</logger>
|
||||||
|
<root level="INFO">
|
||||||
<!-- 根日志记录器 -->
|
|
||||||
<root level="WARN">
|
|
||||||
<appender-ref ref="CONSOLE"/>
|
<appender-ref ref="CONSOLE"/>
|
||||||
<appender-ref ref="DEFAULT"/>
|
<appender-ref ref="INFO"/>
|
||||||
|
<appender-ref ref="WARN"/>
|
||||||
|
<appender-ref ref="ERROR"/>
|
||||||
</root>
|
</root>
|
||||||
</configuration>
|
</configuration>
|
||||||
Loading…
Reference in New Issue