修改文件id获取逻辑

master
lzy 4 years ago
parent c3a0473303
commit d6c438beaf

@ -12,7 +12,7 @@
"errorCode":"0", "errorCode":"0",
//, //,
"directory":["DOCUMENT"], "directory":[],
// //
"indexFlag":"VISITING_SERIAL_NUMBER", "indexFlag":"VISITING_SERIAL_NUMBER",
// //
@ -22,17 +22,19 @@
//,& //,&
"downurl":"BASE64&ORIGINAL_URL", "downurl":"BASE64&ORIGINAL_URL",
//id //id
"assortid":"OW1PA2SR2Z5XX2JR10KR29SK2OW101", "assortid":"",
//id //id
"collectorid":"2", "collectorid":"2",
//id
"assortidParamKey":"DOCUMENT_TOPIC",
//( 1:2) //( 1:2)
"filesource":1, "filesource":1,
//(1:2ftp3) //(1:2ftp3)
"filestoragetype":1, "filestoragetype":1,
// //
"uploadConnector":"http://127.0.0.1:9291/api/downplatform/report", "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report",
//doubleBasic //doubleBasic
"basicDirectory":["DOCUMENT"], "basicDirectory":[""],
// //
"doubleBasic":["TestItemInfo","BioTestInfo"], "doubleBasic":["TestItemInfo","BioTestInfo"],
@ -47,10 +49,10 @@
//-------------------- //--------------------
//, //,
"repealDirectory":["DOCUMENT"], "repealDirectory":[""],
// //
"repealSerialnum":"UNIQUE_ID", "repealSerialnum":"UNIQUE_ID",
// //
"repoalConnector":"http://127.0.0.1:9291/api/down/cancel" "repoalConnector":"http://192.168.1.107:9291/api/down/cancel"
} }

@ -12,7 +12,7 @@
"errorCode":"0", "errorCode":"0",
//, //,
"directory":["DOCUMENT"], "directory":[""],
// //
"indexFlag":"VISITING_SERIAL_NUMBER", "indexFlag":"VISITING_SERIAL_NUMBER",
// //
@ -22,9 +22,11 @@
//,& //,&
"downurl":"BASE64&ORIGINAL_URL", "downurl":"BASE64&ORIGINAL_URL",
//id //id
"assortid":"OW1PA2SR2Z5XX2JR10KR29SK2OW101", "assortid":"",
//id //id
"collectorid":"2", "collectorid":"2",
//id
"assortidParamKey":"DOCUMENT_TOPIC",
//( 1:2) //( 1:2)
"filesource":1, "filesource":1,
//(1:2ftp3) //(1:2ftp3)
@ -32,7 +34,7 @@
// //
"uploadConnector":"http://127.0.0.1:9291/api/downplatform/report", "uploadConnector":"http://127.0.0.1:9291/api/downplatform/report",
//doubleBasic //doubleBasic
"basicDirectory":["DOCUMENT"], "basicDirectory":[""],
// //
"doubleBasic":["TestItemInfo","BioTestInfo"], "doubleBasic":["TestItemInfo","BioTestInfo"],

@ -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;
}

@ -13,6 +13,8 @@ public enum Codes {
//上传接口地址 //上传接口地址
UPLOAD("0","uploadConnector"), UPLOAD("0","uploadConnector"),
REPOAL("0","repoalConnector"), REPOAL("0","repoalConnector"),
assortid("assortid","assortidKey"),
collectorid("collectorid","collectoridKey"),
//患者主索引号 //患者主索引号
EMP_ID("0","indexFlag") EMP_ID("0","indexFlag")
; ;

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.docus.bgts.entity.AfCollectTask; import com.docus.bgts.entity.AfCollectTask;
import com.docus.bgts.entity.CanlcelDto; import com.docus.bgts.entity.CanlcelDto;
import com.docus.bgts.entity.ReportDownDto; import com.docus.bgts.entity.ReportDownDto;
import com.docus.bgts.entity.ZdAssort;
/** /**
* <p> * <p>
@ -29,4 +30,19 @@ public interface IAfCollectTaskService extends IService<AfCollectTask> {
* @param canlcelDto * @param canlcelDto
*/ */
void invokeRepoalFile(CanlcelDto canlcelDto) throws Exception; 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);
} }

@ -2,10 +2,7 @@ package com.docus.bgts.handler;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.docus.bgts.entity.CanlcelDto; import com.docus.bgts.entity.*;
import com.docus.bgts.entity.ReportDownDto;
import com.docus.bgts.entity.ReportDownPatientDto;
import com.docus.bgts.entity.ReportDownScanFileDto;
import com.docus.bgts.enums.Codes; import com.docus.bgts.enums.Codes;
import com.docus.bgts.facade.IAfCollectTaskService; import com.docus.bgts.facade.IAfCollectTaskService;
import com.docus.bgts.facade.IMrReportErrorService; import com.docus.bgts.facade.IMrReportErrorService;
@ -26,10 +23,7 @@ import javax.jws.WebService;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.StringReader; import java.io.StringReader;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@WebService @WebService
public class TBasicWebService implements ITBasicWebService { public class TBasicWebService implements ITBasicWebService {
@ -325,12 +319,15 @@ public class TBasicWebService implements ITBasicWebService {
return resText; return resText;
} }
/** /**
* id * id
* *
* @return * @return
*/ */
private String getAssortid(Element element) { private String getAssortid(Element element) {
String assortId = String.valueOf(FileUtils.getJsonByName("assortid")); String assortId = String.valueOf(FileUtils.getJsonByName("assortid"));
if (StringUtils.isBlank(assortId)) { if (StringUtils.isBlank(assortId)) {
String assortIdKey = String.valueOf(FileUtils.getJsonByName("assortidParamKey")); String assortIdKey = String.valueOf(FileUtils.getJsonByName("assortidParamKey"));
@ -339,6 +336,23 @@ public class TBasicWebService implements ITBasicWebService {
} else { } else {
assortId = element.element(assortIdKey).getText(); 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; return assortId;
} }

@ -3,6 +3,7 @@ package com.docus.bgts.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.docus.bgts.entity.AfCollectTask; import com.docus.bgts.entity.AfCollectTask;
import com.docus.bgts.entity.ZdAssort;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
@ -20,4 +21,24 @@ public interface AfCollectTaskMapper extends BaseMapper<AfCollectTask> {
* @return * @return
*/ */
String getpatientIdByEmpId(@Param("jzh") String empId); 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);
} }

@ -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);
}
} }

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

@ -8,4 +8,16 @@
from docus_medicalrecord.t_basic from docus_medicalrecord.t_basic
where jzh=#{jzh} where jzh=#{jzh}
</select> </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> </mapper>
Loading…
Cancel
Save