diff --git a/docus-webservice/dataConfig/homeQualitySet.json b/docus-webservice/dataConfig/homeQualitySet.json index 4d20022..36b6a68 100644 --- a/docus-webservice/dataConfig/homeQualitySet.json +++ b/docus-webservice/dataConfig/homeQualitySet.json @@ -2,156 +2,164 @@ "selectColumns":[ { "serialNumber": "1", - "tableName": "t_basic_sub", - "columnName": "healthy_card", - "qualityColumn": "VUID", + "tableName": "t_basic", + "columnName": "ward_palce", + "qualityColumn": "SUBOR_HOSPITAL_DISTRICT", "byNull":0 }, { "serialNumber": "2", "tableName": "t_basic", - "columnName": "admiss_id", - "qualityColumn": "INHOSP_INDEX_NO", + "columnName": "emp_id", + "qualityColumn": "ACCOUNT_NUM", "byNull":0 }, { "serialNumber": "3", "tableName": "t_basic", - "columnName": "inpatient_no", - "qualityColumn": "INHOSP_NO", + "columnName": "admiss_id", + "qualityColumn": "INHOSP_INDEX_NO", "byNull":0 }, { "serialNumber": "4", "tableName": "t_basic", - "columnName": "jzh", - "qualityColumn": "EMPI_ID", - "byNull":1 + "columnName": "name", + "qualityColumn": "PAT_NAME", + "byNull":0 }, { "serialNumber": "5", "tableName": "t_basic", - "columnName": "dis_date", - "qualityColumn": "DISCHARGE_DATETIME", + "columnName": "admiss_times", + "qualityColumn": "VISIT_NO", "byNull":0 }, { "serialNumber": "6", "tableName": "t_basic", - "columnName": "name", - "qualityColumn": "PAT_NAME", + "columnName": "dis_dept", + "qualityColumn": "DEPT_CODE", "byNull":0 }, { "serialNumber": "7", "tableName": "t_basic", - "columnName": "admiss_times", - "qualityColumn": "VISIT_NO", + "columnName": "dis_dept_name", + "qualityColumn": "DEPT_NAME", "byNull":0 }, { "serialNumber": "8", "tableName": "t_basic", - "columnName": "visit_type_code", - "qualityColumn": "VISIT_TYPE_CODE", + "columnName": "attending", + "qualityColumn": "CHAR_DOC_CODE", "byNull":0 }, { "serialNumber": "9", "tableName": "t_basic", - "columnName": "visit_type_name", - "qualityColumn": "VISIT_TYPE_NAME", + "columnName": "dis_date", + "qualityColumn": "DISCHARGE_DATETIME", "byNull":0 }, { "serialNumber": "10", "tableName": "t_basic", - "columnName": "admiss_days", - "qualityColumn": "INHOSP_DAYS", + "columnName": "is_dead", + "qualityColumn": "DEATH_FLAG", "byNull":0 }, { "serialNumber": "11", "tableName": "t_basic", - "columnName": "id_card", - "qualityColumn": "ID_NUMBER", + "columnName": "inpatient_no", + "qualityColumn": "INHOSP_NO", "byNull":0 }, { "serialNumber": "12", "tableName": "t_basic", - "columnName": "main_diag_code", - "qualityColumn": "WM_DIAG_CODE", + "columnName": "jzh", + "qualityColumn": "EMPI_ID", "byNull":0 }, { "serialNumber": "13", "tableName": "t_basic", - "columnName": "main_diag_name", - "qualityColumn": "WM_DIAG_NAME", + "columnName": "visit_type_code", + "qualityColumn": "VISIT_TYPE_CODE", "byNull":0 }, { "serialNumber": "14", "tableName": "t_basic", - "columnName": "attending", - "qualityColumn": "WM_DIAG_DR_CODE", + "columnName": "visit_type_name", + "qualityColumn": "VISIT_TYPE_NAME", "byNull":0 }, { "serialNumber": "15", "tableName": "t_basic", - "columnName": "attending_name", - "qualityColumn": "WM_DIAG_DR_NAME", + "columnName": "admiss_days", + "qualityColumn": "INHOSP_DAYS", "byNull":0 }, { "serialNumber": "16", "tableName": "t_basic", - "columnName": "tcm_diag_code", - "qualityColumn": "TCM_DIAG_CODE", + "columnName": "id_card", + "qualityColumn": "ID_NUMBER", "byNull":0 }, { "serialNumber": "17", "tableName": "t_basic", - "columnName": "tcm_diag_name", - "qualityColumn": "TCM_DIAG_NAME", + "columnName": "main_diag_code", + "qualityColumn": "WM_DIAG_CODE", "byNull":0 }, { "serialNumber": "18", "tableName": "t_basic", - "columnName": "dis_dept", - "qualityColumn": "DEPT_CODE", - "byNull":1 + "columnName": "main_diag_name", + "qualityColumn": "WM_DIAG_NAME", + "byNull":0 }, { "serialNumber": "19", "tableName": "t_basic", - "columnName": "dis_dept_name", - "qualityColumn": "DEPT_NAME", - "byNull":1 + "columnName": "tcm_diag_code", + "qualityColumn": "TCM_DIAG_CODE", + "byNull":0 }, { "serialNumber": "20", "tableName": "t_basic", - "columnName": "emp_id", - "qualityColumn": "ACCOUNT_NUM", - "byNull":1 + "columnName": "tcm_diag_name", + "qualityColumn": "TCM_DIAG_NAME", + "byNull":0 }, { "serialNumber": "21", "tableName": "t_basic", - "columnName": "ward_palce", - "qualityColumn": "SUBOR_HOSPITAL_DISTRICT", + "columnName": "admiss_dept", + "qualityColumn": "ADMIT_DEPT_CODE", "byNull":1 }, { "serialNumber": "22", "tableName": "t_basic", - "columnName": "admiss_dept", - "qualityColumn": "ADMIT_DEPT_COD", + "columnName": "admiss_dept_name", + "qualityColumn": "ADMIT_DEPT_NAME", + "byNull":1 + } + , + { + "serialNumber": "23", + "tableName": "t_basic", + "columnName": "admiss_date", + "qualityColumn": "ADMIT_DATE", "byNull":1 } ] diff --git a/docus-webservice/src/main/java/com/docus/webservice/handler/TBasicWebService.java b/docus-webservice/src/main/java/com/docus/webservice/handler/TBasicWebService.java index bc493d3..f5ea958 100644 --- a/docus-webservice/src/main/java/com/docus/webservice/handler/TBasicWebService.java +++ b/docus-webservice/src/main/java/com/docus/webservice/handler/TBasicWebService.java @@ -15,6 +15,8 @@ import com.docus.webservice.service.IMrReportErrorService; import com.docus.webservice.service.ITBasicService; import com.docus.webservice.utils.*; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import javax.jws.WebService; @@ -37,6 +39,7 @@ public class TBasicWebService implements ITBasicWebService { @Autowired private AfInterfaceCollectMapper afInterfaceCollectMapper; + private Logger log= LogManager.getLogger(TBasicWebService.class); /** * 获取jar包所在位置 * @@ -66,6 +69,7 @@ public class TBasicWebService implements ITBasicWebService { @Override public String OUT_HOS_REG(String tbasic) { + log.info("打印底层xml"+tbasic); try { //解析xml HashMap tBasicMap = new HashMap<>(); @@ -81,16 +85,20 @@ public class TBasicWebService implements ITBasicWebService { this.saveAndCall(tBasic); } catch (RuntimeException e) { insertLog(tbasic); + log.error("OUT_HOS_REG方法中错误信息:"+e.getMessage()); return ResultUtils.fail(e.getMessage()); } } else { insertLog(tbasic); + log.info("请提供完整的xml"); return ResultUtils.fail("请提供完整的xml"); } } catch (Exception e) { e.printStackTrace(); + log.error("OUT_HOS_REG方法中错误信息:"+e.getMessage()); return ResultUtils.fail(); } + log.info("返回结果:"+ResultUtils.success().asXML()); return ResultUtils.success().asXML(); } @@ -102,7 +110,7 @@ public class TBasicWebService implements ITBasicWebService { */ private void parseXml(String tbasic, HashMap tBasicMap, HashMap tBasicSubMap) { XmlUtils xmlUtils = null; - + log.info("开始解析xml"); try { xmlUtils = new XmlUtils(new ByteArrayInputStream(tbasic.getBytes("UTF-8"))); } catch (UnsupportedEncodingException e) { @@ -119,11 +127,13 @@ public class TBasicWebService implements ITBasicWebService { value = xmlUtils.getElementText(selectColumn.getQualityColumn()) == null ? null : String.valueOf(xmlUtils.getElementText(selectColumn.getQualityColumn())); } catch (RuntimeException e) { String message = e.getMessage(); + log.error("解析xml出现:"+message); throw new RuntimeException(message); } if (StringUtils.isBlank(value)) { if (selectColumn.getByNull() == 0) { insertLog(tbasic); + log.error(selectColumn.getQualityColumn() + " 字段不能为空值"); throw new RuntimeException(selectColumn.getQualityColumn() + " 字段不能为空值"); } else { continue; @@ -138,9 +148,9 @@ public class TBasicWebService implements ITBasicWebService { } } } - @Override public String OUT_HOS_CAN(String tbasic) { + log.info("打印底层xml"+tbasic); try { HashMap tBasicMap = new HashMap<>(); HashMap tBasicSubMap = new HashMap<>(); @@ -151,6 +161,7 @@ public class TBasicWebService implements ITBasicWebService { tBasic = JSON.parseObject(JSON.toJSONString(tBasicMap), TBasic.class); if (StringUtils.isBlank(tBasic.getEmpId())) { insertLog(tbasic); + log.info("emp_id字段不能为空值"); return ResultUtils.fail("emp_id字段不能为空值"); } tBasic.setUpdateTime(new Date()); @@ -160,6 +171,7 @@ public class TBasicWebService implements ITBasicWebService { } catch (RuntimeException e) { insertLog(tbasic); e.printStackTrace(); + log.error("OUT_HOS_CAN方法中错误信息:"+e.getMessage()); return ResultUtils.fail(e.getMessage()); } } else { @@ -168,12 +180,14 @@ public class TBasicWebService implements ITBasicWebService { } } catch (Exception e) { e.printStackTrace(); + log.error("OUT_HOS_CAN方法中错误信息:"+e.getMessage()); return ResultUtils.fail(); } + log.info("OUT_HOS_CAN方法运行结果:"+ResultUtils.success().asXML()); return ResultUtils.success().asXML(); } - public void saveAndCall(TBasic tBasic) throws URISyntaxException { + log.info("病案对象"+tBasic.toString()); //解析json映射文件 String json = JsonUtils.readJsonFile(CurrentPath() + Codes.JSON_COLLECTLIST.getMessage()); if (StringUtils.isNotBlank(json)) { @@ -191,8 +205,10 @@ public class TBasicWebService implements ITBasicWebService { afc.setJzh(tBasic.getJzh()); afc.setTaskCount(task_count); afc.setCreateTime(new Date()); - afInterfaceCollectMapper.addAfInterfaceCollect(afc); - + int i = afInterfaceCollectMapper.addAfInterfaceCollect(afc); + if (i<0) { + log.info("省中医病案采集表添加信息失败!"); + } //添加省中医病案采集-子任务 List list=new ArrayList<>(); for (CollectList collectList : collectLists) { @@ -205,8 +221,10 @@ public class TBasicWebService implements ITBasicWebService { collectList.setId(afcsId); list.add(afInterfaceCollectSub); } - afInterfaceCollectMapper.addAfInterfaceCollectSub(list); - + int i1 = afInterfaceCollectMapper.addAfInterfaceCollectSub(list); + if (i1<0) { + log.info("省中医病案采集-子任务失败!"); + } for (CollectList collectList : collectLists) { //调用http发送请求 this.sendHttp(collectList,tBasic.getJzh()); diff --git a/docus-webservice/src/main/resources/logback-spring.xml b/docus-webservice/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..130fce9 --- /dev/null +++ b/docus-webservice/src/main/resources/logback-spring.xml @@ -0,0 +1,50 @@ + + + + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + + configLog/log.log + + + + + + log/demo.%d.%i.log + + 15 + + + 10MB + + + + + + %d %p (%file:%line\)- %m%n + + + UTF-8 + + + + + + + + + + + + + \ No newline at end of file