diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2203A.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2203A.java index 079537a..444faad 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2203A.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2203A.java @@ -31,7 +31,7 @@ public class IM2203A extends BaseInputModel{ @IMField(key = "med_type", name = "医疗类别", required = true) private String med_type; @IMField(key = "begntime", name = "开始时间", required = true) - private LocalDateTime begntime; + private String begntime; @IMField(key = "main_cond_dscr", name = "主要病情描述") private String main_cond_dscr; @IMField(key = "dise_codg", name = "病种编码") @@ -47,7 +47,7 @@ public class IM2203A extends BaseInputModel{ @IMField(key = "geso_val", name = "孕周数") private BigDecimal geso_val; @IMField(key = "exp_content", name = "字段扩展") - private ExpContent exp_content; + private String exp_content; } @Data public static class Diseinfo{ diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java index 15216a3..b6dd692 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java +++ b/src/main/java/com/syjiaer/clinic/server/common/util/HttpUtil.java @@ -90,7 +90,7 @@ public class HttpUtil { } public List download(String version_name, int type) { Map input = new HashMap<>(); - + input.put("ver", version_name); String infno = String.valueOf(type); diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java index 41a947c..3caa89e 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java @@ -311,11 +311,12 @@ public class DiagnosisService extends BaseService { mdtrtinfo.setMdtrt_id(patientRegistration.getMdtrtId()); mdtrtinfo.setPsn_no(patientRegistration.getPsnNo()); mdtrtinfo.setMed_type(config.get("social", "medType")); - mdtrtinfo.setBegntime(curTime); - IM2203A.ExpContent expContent = new IM2203A.ExpContent(); - expContent.setTrum_flag("0"); - expContent.setRel_ttp_flag("0"); - mdtrtinfo.setExp_content(expContent); + mdtrtinfo.setBegntime(curTime.format(FORMATTER)); + + JSONObject jsonObj = new JSONObject(); + jsonObj.put("days","1"); + //把jsonObj转化成json字符串 + mdtrtinfo.setExp_content(jsonObj.toJSONString()); im2203A.setMdtrtinfo(mdtrtinfo); JSONArray jsonArray = JSONArray.parseArray(diagnosisMedicalRecord.getDiagnosisDetail()); int i = 0; diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 1a42f92..f4902f2 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -1,18 +1,20 @@ - - %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n - UTF-8 + + INFO + DENY + ACCEPT + - ${REQUEST_FILE} + ${user.dir}/logs/request/app.log ${user.dir}/logs/request/app.%d{yyyy-MM-dd}.log @@ -25,13 +27,11 @@ true - - - - ${LOG_FILE} + + ${user.dir}/logs/info/app.log - ${user.dir}/logs/base/app.%d{yyyy-MM-dd}.log + ${user.dir}/logs/info/app.%d{yyyy-MM-dd}.log 30 @@ -40,16 +40,57 @@ %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n UTF-8 + + INFO + ACCEPT + DENY + + + + + ${user.dir}/logs/warn/app.log + + + ${user.dir}/logs/warn/app.%d{yyyy-MM-dd}.log + + 30 + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + UTF-8 + + + WARN + ACCEPT + DENY + + + + ${user.dir}/logs/error/app.log + + + ${user.dir}/logs/error/app.%d{yyyy-MM-dd}.log + + 30 + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + UTF-8 + + + ERROR + ACCEPT + DENY + - - - - + - + + + \ No newline at end of file