diff --git a/dataConfig/homeQualitySet.json b/dataConfig/homeQualitySet.json index ca33c05..c336471 100644 --- a/dataConfig/homeQualitySet.json +++ b/dataConfig/homeQualitySet.json @@ -10,19 +10,19 @@ //唯一键目录结构数组,最高层为前面,最后一层为数据采集层,根节点不填 "directory":["Msg"], //患者主索引号 - "indexFlag":"INHOSP_NO", + "indexFlag":"PatInfo,INHOSP_NO", //采集流水号 - "serialnum":"IDNO", + "serialnum":"ReportInfo,SAMPLE_NO", //文件标题 - "filetitle":"FILENAME", + "filetitle":"ReportInfo,TEST_CATEG_NAME", //下载地址,&代表多个选其一 - "downurl":"PDF_PATH", + "downurl":"ReportInfo,REPORT_PDF_URL", //分类id - "assortid":"", + "assortid":"Opww12AWQ221ZWAS112RRK12200W1", //系统id - "collectorid":"1", + "collectorid":"6", //获取分类id参数 - "assortidParamKey":"TABLE_TYPE", + "assortidParamKey":"", //采集类型(文件来源 1:采集器;2:扫描生产软件) "filesource":1, //下载类型(1:服务器本地;2:ftp服务器;3:共享文件夹) @@ -32,7 +32,7 @@ //基本数据存放处,根节点不填,最后一层为基本信息存放标签与doubleBasic配合 "basicDirectory":["Msg"], //可能存在存储基本数据不同情况的标签 - "doubleBasic":["TestItemInfo","BioTestInfo"], + "doubleBasic":[], //--------------采集操作判断撤销/新增--------------- //是否开启采集操作判断撤销/新增 0:不开启,1:开启 默认不开启 @@ -45,9 +45,9 @@ //--------撤销配置部分------------ //采集流水号所在位置,根目录不填 - "repealDirectory":["Msg"], + "repealDirectory":["Msg","PatInfo"], //采集流水号名 - "repealSerialnum":"IDNO", + "repealSerialnum":"SAMPLE_NO", //撤销接口 "repoalConnector":"http://192.168.1.107:9291/api/down/cancel" diff --git a/dataConfig/广东省中医院住院检验-homeQualitySet.json b/dataConfig/广东省中医院住院检验-homeQualitySet.json new file mode 100644 index 0000000..c336471 --- /dev/null +++ b/dataConfig/广东省中医院住院检验-homeQualitySet.json @@ -0,0 +1,54 @@ +{ + //----------响应标签------------- + //外部结构,多层,隔开 + "ResHead":"Response,RetInfo", + //响应代码 + "ResCode":"RetCode", + //响应消息 + "ResMsg":"RetCon", + + //唯一键目录结构数组,最高层为前面,最后一层为数据采集层,根节点不填 + "directory":["Msg"], + //患者主索引号 + "indexFlag":"PatInfo,INHOSP_NO", + //采集流水号 + "serialnum":"ReportInfo,SAMPLE_NO", + //文件标题 + "filetitle":"ReportInfo,TEST_CATEG_NAME", + //下载地址,&代表多个选其一 + "downurl":"ReportInfo,REPORT_PDF_URL", + //分类id + "assortid":"Opww12AWQ221ZWAS112RRK12200W1", + //系统id + "collectorid":"6", + //获取分类id参数 + "assortidParamKey":"", + //采集类型(文件来源 1:采集器;2:扫描生产软件) + "filesource":1, + //下载类型(1:服务器本地;2:ftp服务器;3:共享文件夹) + "filestoragetype":1, + //上传接口 + "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report", + //基本数据存放处,根节点不填,最后一层为基本信息存放标签与doubleBasic配合 + "basicDirectory":["Msg"], + //可能存在存储基本数据不同情况的标签 + "doubleBasic":[], + + //--------------采集操作判断撤销/新增--------------- + //是否开启采集操作判断撤销/新增 0:不开启,1:开启 默认不开启 + "isJudge":"0", + //判断标签存在目录,首个标签不填 + "judgeDirectory":[""], + //判定标签,值0-新增;1-撤回;2-修改 + "judgeIndex":"", + + + //--------撤销配置部分------------ + //采集流水号所在位置,根目录不填 + "repealDirectory":["Msg","PatInfo"], + //采集流水号名 + "repealSerialnum":"SAMPLE_NO", + //撤销接口 + "repoalConnector":"http://192.168.1.107:9291/api/down/cancel" + +} \ No newline at end of file diff --git a/dataConfig/梅州电子病理-homeQualitySet.json b/dataConfig/梅州人民医院电子病历-homeQualitySet.json similarity index 100% rename from dataConfig/梅州电子病理-homeQualitySet.json rename to dataConfig/梅州人民医院电子病历-homeQualitySet.json diff --git a/src/main/java/com/docus/bgts/handler/TBasicWebService.java b/src/main/java/com/docus/bgts/handler/TBasicWebService.java index e84d6a7..f497b7e 100644 --- a/src/main/java/com/docus/bgts/handler/TBasicWebService.java +++ b/src/main/java/com/docus/bgts/handler/TBasicWebService.java @@ -327,6 +327,9 @@ public class TBasicWebService implements ITBasicWebService { break; } } + if (StringUtils.isBlank(resText)) { + throw new RuntimeException(args[args.length - 1] + "的值不能为空"); + } return resText; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f6502e9..0ebbec1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9404 + port: 9402 # http mybatis-plus: @@ -15,8 +15,8 @@ beat: url: http://localhost:9399/beat system: - code: "Nursing_documents" - prop: 9204 + code: "201_P_WS_JYBGTS" + prop: 9202 # web service diff --git a/src/main/resources/config/application-广东省中医院住院检验.yml b/src/main/resources/config/application-广东省中医院住院检验.yml new file mode 100644 index 0000000..0ebbec1 --- /dev/null +++ b/src/main/resources/config/application-广东省中医院住院检验.yml @@ -0,0 +1,28 @@ +server: + port: 9402 +# http + +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + global-config: + db-config: + field-strategy: NOT_EMPTY + db-type: MYSQL +beat: + url: http://localhost:9399/beat + +system: + code: "201_P_WS_JYBGTS" + prop: 9202 +# web service + + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + username: docus + password: docus702 + url: jdbc:mysql://db.docus.cn:3306/docus_archivefile?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true \ No newline at end of file diff --git a/src/main/resources/config/application-梅州电子病历.yml b/src/main/resources/config/application-梅州入民医院电子病历.yml similarity index 100% rename from src/main/resources/config/application-梅州电子病历.yml rename to src/main/resources/config/application-梅州入民医院电子病历.yml