diff --git a/dataConfig/homeQualitySet.json b/dataConfig/homeQualitySet.json index 881c745..ae4520c 100644 --- a/dataConfig/homeQualitySet.json +++ b/dataConfig/homeQualitySet.json @@ -12,7 +12,7 @@ "errorCode":"0", //唯一键目录结构数组,最高层为前面,最后一层为数据采集层,根节点不填 - "directory":["DOCUMENT"], + "directory":[], //患者主索引号 "indexFlag":"VISITING_SERIAL_NUMBER", //采集流水号 @@ -22,17 +22,19 @@ //下载地址,&代表多个选其一 "downurl":"BASE64&ORIGINAL_URL", //分类id - "assortid":"OW1PA2SR2Z5XX2JR10KR29SK2OW101", + "assortid":"", //系统id "collectorid":"2", + //获取分类id参数 + "assortidParamKey":"DOCUMENT_TOPIC", //采集类型(文件来源 1:采集器;2:扫描生产软件) "filesource":1, //下载类型(1:服务器本地;2:ftp服务器;3:共享文件夹) "filestoragetype":1, //上传接口 - "uploadConnector":"http://127.0.0.1:9291/api/downplatform/report", + "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report", //基本数据存放处,根节点不填,最后一层为基本信息存放标签与doubleBasic配合 - "basicDirectory":["DOCUMENT"], + "basicDirectory":[""], //可能存在存储基本数据不同情况的标签 "doubleBasic":["TestItemInfo","BioTestInfo"], @@ -47,10 +49,10 @@ //--------撤销配置部分------------ //采集流水号所在位置,根目录不填 - "repealDirectory":["DOCUMENT"], + "repealDirectory":[""], //采集流水号名 "repealSerialnum":"UNIQUE_ID", //撤销接口 - "repoalConnector":"http://127.0.0.1:9291/api/down/cancel" + "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 index 881c745..f50ee5e 100644 --- a/dataConfig/梅州人民医院电子病历-homeQualitySet.json +++ b/dataConfig/梅州人民医院电子病历-homeQualitySet.json @@ -12,7 +12,7 @@ "errorCode":"0", //唯一键目录结构数组,最高层为前面,最后一层为数据采集层,根节点不填 - "directory":["DOCUMENT"], + "directory":[""], //患者主索引号 "indexFlag":"VISITING_SERIAL_NUMBER", //采集流水号 @@ -22,9 +22,11 @@ //下载地址,&代表多个选其一 "downurl":"BASE64&ORIGINAL_URL", //分类id - "assortid":"OW1PA2SR2Z5XX2JR10KR29SK2OW101", + "assortid":"", //系统id "collectorid":"2", + //获取分类id参数 + "assortidParamKey":"DOCUMENT_TOPIC", //采集类型(文件来源 1:采集器;2:扫描生产软件) "filesource":1, //下载类型(1:服务器本地;2:ftp服务器;3:共享文件夹) @@ -32,7 +34,7 @@ //上传接口 "uploadConnector":"http://127.0.0.1:9291/api/downplatform/report", //基本数据存放处,根节点不填,最后一层为基本信息存放标签与doubleBasic配合 - "basicDirectory":["DOCUMENT"], + "basicDirectory":[""], //可能存在存储基本数据不同情况的标签 "doubleBasic":["TestItemInfo","BioTestInfo"], diff --git a/src/main/java/com/docus/bgts/entity/ZdAssort.java b/src/main/java/com/docus/bgts/entity/ZdAssort.java new file mode 100644 index 0000000..23794fb --- /dev/null +++ b/src/main/java/com/docus/bgts/entity/ZdAssort.java @@ -0,0 +1,45 @@ +package com.docus.bgts.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + *
+ * 病案分类 + *
+ * + * @author 曾文和 + * @since 2021-04-20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ZdAssort对象", description="病案分类") +public class ZdAssort implements Serializable { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "分类id") + private String assortId; + + @ApiModelProperty(value = "分类名称") + private String assortName; + + @ApiModelProperty(value = "分类排序") + private Integer assortSort; + + @ApiModelProperty(value = "是否启用 1是,0否") + private Integer effective; + + @ApiModelProperty(value = "是否校验 1是,0否") + private Integer isCheck; + + @ApiModelProperty(value = "代码分类") + private String assortCode; + + @ApiModelProperty(value = "等级") + private Integer level; +} diff --git a/src/main/java/com/docus/bgts/enums/Codes.java b/src/main/java/com/docus/bgts/enums/Codes.java index aa948b1..2f25910 100644 --- a/src/main/java/com/docus/bgts/enums/Codes.java +++ b/src/main/java/com/docus/bgts/enums/Codes.java @@ -13,6 +13,8 @@ public enum Codes { //上传接口地址 UPLOAD("0","uploadConnector"), REPOAL("0","repoalConnector"), + assortid("assortid","assortidKey"), + collectorid("collectorid","collectoridKey"), //患者主索引号 EMP_ID("0","indexFlag") ; diff --git a/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java b/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java index 4a0545b..4e708f3 100644 --- a/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java +++ b/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.docus.bgts.entity.AfCollectTask; import com.docus.bgts.entity.CanlcelDto; import com.docus.bgts.entity.ReportDownDto; +import com.docus.bgts.entity.ZdAssort; /** *
@@ -29,4 +30,19 @@ public interface IAfCollectTaskService extends IService