修改文件id获取逻辑

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"
 
 }

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"],
 

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;
+
+/**
+ * <p>
+ * 病案分类
+ * </p>
+ *
+ * @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;
+}

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")
     ;

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;
 
 /**
  * <p>
@@ -29,4 +30,19 @@ public interface IAfCollectTaskService extends IService<AfCollectTask> {
      * @param canlcelDto
      */
     void invokeRepoalFile(CanlcelDto canlcelDto) throws Exception;
+
+    /**
+     * 获取assortId 通过assortId
+     * @param assortId
+     * @return
+     */
+    String getAssortIdByAssortId(String assortId);
+    /**
+     * 获取assortId 通过assortName
+     * @param assortId
+     * @return
+     */
+    String getAssortIdByAssortName(String assortId);
+
+    void insertZdAssort(ZdAssort zdAssort);
 }

src/main/java/com/docus/bgts/handler/TBasicWebService.java

@@ -2,10 +2,7 @@ package com.docus.bgts.handler;
 
 
 import com.alibaba.fastjson.JSON;
-import com.docus.bgts.entity.CanlcelDto;
-import com.docus.bgts.entity.ReportDownDto;
-import com.docus.bgts.entity.ReportDownPatientDto;
-import com.docus.bgts.entity.ReportDownScanFileDto;
+import com.docus.bgts.entity.*;
 import com.docus.bgts.enums.Codes;
 import com.docus.bgts.facade.IAfCollectTaskService;
 import com.docus.bgts.facade.IMrReportErrorService;
@@ -26,10 +23,7 @@ import javax.jws.WebService;
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @WebService
 public class TBasicWebService implements ITBasicWebService {
@@ -302,8 +296,8 @@ public class TBasicWebService implements ITBasicWebService {
 
                     if (byElement1 != null && StringUtils.isNotBlank(byElement1.getText())) {
                         break;
-                    }else {
-                        byElement1=null;
+                    } else {
+                        byElement1 = null;
                     }
                 }
             } else {
@@ -325,12 +319,15 @@ public class TBasicWebService implements ITBasicWebService {
         return resText;
     }
 
+
+
     /**
      * 获取分类id
      *
      * @return
      */
     private String getAssortid(Element element) {
+
         String assortId = String.valueOf(FileUtils.getJsonByName("assortid"));
         if (StringUtils.isBlank(assortId)) {
             String assortIdKey = String.valueOf(FileUtils.getJsonByName("assortidParamKey"));
@@ -339,6 +336,23 @@ public class TBasicWebService implements ITBasicWebService {
             } else {
                 assortId = element.element(assortIdKey).getText();
             }
+            String myAssortId = afCollectTaskService.getAssortIdByAssortId(assortId);
+            if (StringUtils.isBlank(myAssortId)) {
+                myAssortId = afCollectTaskService.getAssortIdByAssortName(assortId);
+                if (StringUtils.isBlank(myAssortId)) {
+                    String uuid = UUID.randomUUID().toString().replaceAll("-","");
+                    ZdAssort zdAssort = new ZdAssort();
+                    zdAssort.setAssortName(assortId);
+                    zdAssort.setAssortId(uuid);
+                    zdAssort.setEffective(1);
+                    afCollectTaskService.insertZdAssort(zdAssort);
+                    assortId = uuid;
+                } else {
+                    assortId = myAssortId;
+                }
+            } else {
+                assortId = myAssortId;
+            }
         }
         return assortId;
     }

src/main/java/com/docus/bgts/mapper/AfCollectTaskMapper.java

@@ -3,6 +3,7 @@ package com.docus.bgts.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.docus.bgts.entity.AfCollectTask;
+import com.docus.bgts.entity.ZdAssort;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -20,4 +21,24 @@ public interface AfCollectTaskMapper extends BaseMapper<AfCollectTask> {
      * @return
      */
     String getpatientIdByEmpId(@Param("jzh") String empId);
+
+    /**
+     *  获取assortId 通过assortId
+     * @param assortId
+     * @return
+     */
+    String getAssortIdByAssortId(@Param("assortId") String assortId);
+
+    /**
+     * 获取assortId 通过assortName
+     * @param assortName
+     * @return
+     */
+    String getAssortIdByAssortName(@Param("assortName") String assortName);
+
+    /**
+     * 插入表zdAssort数据
+     * @param zdAssort
+     */
+    void insertZdAssort(@Param("zdAssort") ZdAssort zdAssort);
 }

src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java

@@ -136,4 +136,19 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
         }
     }
 
+    @Override
+    public String getAssortIdByAssortId(String assortId) {
+        return afCollectTaskMapper.getAssortIdByAssortId(assortId);
+    }
+
+    @Override
+    public String getAssortIdByAssortName(String assortId) {
+        return afCollectTaskMapper.getAssortIdByAssortName(assortId);
+    }
+
+    @Override
+    public void insertZdAssort(ZdAssort zdAssort) {
+        afCollectTaskMapper.insertZdAssort(zdAssort);
+    }
+
 }

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9403
+  port: 9701
 #  http
 
 mybatis-plus:
@@ -15,8 +15,8 @@ beat:
   url: http://localhost:9399/beat
 
 system:
-  code: "204_P_WS_BLBGTS"
-  prop: 9203
+  code: "EmrDocAr"
+  prop: 9801
 #  web service
 
 

src/main/resources/mapper/AfCollectTaskMapper.xml

@@ -8,4 +8,16 @@
         from docus_medicalrecord.t_basic
         where jzh=#{jzh}
     </select>
+
+    <select id="getAssortIdByAssortId" resultType="string">
+        select assort_id from zd_assort where assort_id=#{assortId}
+    </select>
+
+    <select id="getAssortIdByAssortName" resultType="string">
+          select assort_id from zd_assort where assort_name=#{assortName}
+    </select>
+
+    <insert id="insertZdAssort">
+        insert into zd_assort(assort_id,assort_name,effective) values(#{zdAssort.assortId},#{zdAssort.assortName},#{zdAssort.effective})
+    </insert>
 </mapper>