fix: 平武初始化

scpwxyy
chenhc 8 months ago
parent d329ed0921
commit c464b33fec

@ -70,6 +70,7 @@ import com.glxp.mipsdl.service.yb.YbClient;
import com.glxp.mipsdl.thirddao.ctqyy.*; import com.glxp.mipsdl.thirddao.ctqyy.*;
import com.glxp.mipsdl.thirddao.scpwxyy.A003Mapper; import com.glxp.mipsdl.thirddao.scpwxyy.A003Mapper;
import com.glxp.mipsdl.thirddao.scpwxyy.A010detailMapper; import com.glxp.mipsdl.thirddao.scpwxyy.A010detailMapper;
import com.glxp.mipsdl.thirddao.scpwxyy.A011detailMapper;
import com.glxp.mipsdl.util.*; import com.glxp.mipsdl.util.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dom4j.Document; import org.dom4j.Document;
@ -158,12 +159,20 @@ public class ScpwxyyClient extends CommonHttpClient {
@Resource @Resource
private A008Service a008Service; private A008Service a008Service;
@Resource @Resource
private A013Service a013Service;
@Resource
private A014Service a014Service;
@Resource
private A005Service a005Service; private A005Service a005Service;
@Resource @Resource
private A010headService a010headService; private A010headService a010headService;
@Resource @Resource
private A011headService a011headService;
@Resource
private A010detailMapper a010detailMapper; private A010detailMapper a010detailMapper;
@Resource @Resource
private A011detailMapper a011detailMapper;
@Resource
private A003Mapper a003Mapper; private A003Mapper a003Mapper;
/** /**
@ -420,35 +429,33 @@ public class ScpwxyyClient extends CommonHttpClient {
* @return * @return
*/ */
public BaseResponse getSickPescribe(GetSickPrescribeRequest getSickPrescribeRequest) { public BaseResponse getSickPescribe(GetSickPrescribeRequest getSickPrescribeRequest) {
CtqyyRequest ctqyyRequest = new CtqyyRequest(); if (IntUtil.value(getSickPrescribeRequest.getInOutType()) == 1) {
ctqyyRequest.setMsgHeader(getMsgHeader("getResiPresInfo")); List<A014> list = a014Service.list(new LambdaQueryWrapper<A014>()
getSickPrescribeRequest.setResiNo(getSickPrescribeRequest.getAdNum()); .like(StrUtil.isNotBlank(getSickPrescribeRequest.getCode()), A014::getApplyNo, getSickPrescribeRequest.getCode())
getSickPrescribeRequest.setAdNum(null); .like(StrUtil.isNotBlank(getSickPrescribeRequest.getSickCode()), A014::getSickId, getSickPrescribeRequest.getSickCode())
ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(getSickPrescribeRequest)); .like(StrUtil.isNotBlank(getSickPrescribeRequest.getSickName()), A014::getPsnName, getSickPrescribeRequest.getSickName())
String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URI_GET_SICKER_PRESCIRBE), ctqyyRequest); .like(StrUtil.isNotBlank(getSickPrescribeRequest.getIdNum()), A014::getCertno, getSickPrescribeRequest.getIdNum())
response = parserResult(response); );
try { log.info("解析四川武平县医院返回患者处方退费信息,返回结果:{}", list);
BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); PageInfo<A014> pageInfo = new PageInfo<>(list);
Map map = (Map) baseResponse.getData(); PageSimpleResponse<A014> pageSimpleResponse = new PageSimpleResponse<>();
List<BasicSkPrescribeResponse> basicSkPrescribeResponses = JSON.parseArray(map.get("list") + "", BasicSkPrescribeResponse.class); pageSimpleResponse.setTotal(pageInfo.getTotal());
for (BasicSkPrescribeResponse basicSkPrescribeResponse : basicSkPrescribeResponses) { pageSimpleResponse.setList(list);
List<BasicSkPrescribeItemEntity> itemEntities = basicSkPrescribeResponse.getItemList(); return ResultVOUtils.success(pageSimpleResponse);
if (CollUtil.isNotEmpty(itemEntities)) { }else {
for (BasicSkPrescribeItemEntity itemEntity : itemEntities) { List<A013> list = a013Service.list(new LambdaQueryWrapper<A013>()
itemEntity.setCount("0"); .like(StrUtil.isNotBlank(getSickPrescribeRequest.getCode()), A013::getApplyNo, getSickPrescribeRequest.getCode())
} .like(StrUtil.isNotBlank(getSickPrescribeRequest.getSickCode()), A013::getSickId, getSickPrescribeRequest.getSickCode())
} .like(StrUtil.isNotBlank(getSickPrescribeRequest.getSickName()), A013::getPsnName, getSickPrescribeRequest.getSickName())
} .like(StrUtil.isNotBlank(getSickPrescribeRequest.getIdNum()), A013::getCertno, getSickPrescribeRequest.getIdNum())
map.put("list", JSON.toJSON(basicSkPrescribeResponses)); );
baseResponse.setData(""); log.info("解析四川武平县医院返回患者处方信息,返回结果:{}", list);
baseResponse.setData(map); PageInfo<A013> pageInfo = new PageInfo<>(list);
return baseResponse; PageSimpleResponse<A013> pageSimpleResponse = new PageSimpleResponse<>();
} catch (Exception e) { pageSimpleResponse.setTotal(pageInfo.getTotal());
log.error("解析四川平武县医院智业返回处方信息数据异常,返回结果:{}", response); pageSimpleResponse.setList(list);
log.error("异常信息:{}", e); return ResultVOUtils.success(pageSimpleResponse);
return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果(" + response + ")");
} }
} }
@ -1417,27 +1424,35 @@ public class ScpwxyyClient extends CommonHttpClient {
return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, pageInfo); return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, pageInfo);
} else { } else {
LambdaQueryWrapper<VInsurNationGoodsReturn> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<A011head> wrapper = new LambdaQueryWrapper<>();
String startTime = udiwmsBasicSkPrescribeRequest.getStartTime(); String startTime = udiwmsBasicSkPrescribeRequest.getStartTime();
String endTime = udiwmsBasicSkPrescribeRequest.getEndTime(); String endTime = udiwmsBasicSkPrescribeRequest.getEndTime();
wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsReturn::getSEL_RETN_TIME, startTime); wrapper.ge(StrUtil.isNotEmpty(startTime), A011head::getPrescribedate, startTime);
wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsReturn::getSEL_RETN_TIME, endTime); wrapper.le(StrUtil.isNotEmpty(endTime), A011head::getPrescribedate, endTime);
String code = udiwmsBasicSkPrescribeRequest.getCode(); String code = udiwmsBasicSkPrescribeRequest.getCode();
String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName(); String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName();
String key = udiwmsBasicSkPrescribeRequest.getKey(); String key = udiwmsBasicSkPrescribeRequest.getKey();
wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsReturn::getAPPLY_NO, key) wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(A011head::getCode, key)
.or().like(VInsurNationGoodsReturn::getPSN_NAME, key) .or().like(A011head::getSickcode, key)
.or().like(VInsurNationGoodsReturn::getPSN_NO, key) // .or().like(A011head::getSettleno, key)
); );
wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsReturn::getAPPLY_NO, code)); wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(A011head::getCode, code));
wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsReturn::getPSN_NAME, fromCorpName)); wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(A011head::getDeptname, fromCorpName));
//拉取处方退货时改成拉取v_ypzs_pres_info_return
IPage<VYpzsPresInfoReturn> page = vYpzsPresInfoReturnMapper.selectGroupedWithPagination(new Page<VYpzsPresInfoReturn>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), if (null != udiwmsBasicSkPrescribeRequest.getPage() && null != udiwmsBasicSkPrescribeRequest.getLimit()) {
udiwmsBasicSkPrescribeRequest); PageHelper.offsetPage((udiwmsBasicSkPrescribeRequest.getPage() - 1) * udiwmsBasicSkPrescribeRequest.getLimit(), udiwmsBasicSkPrescribeRequest.getLimit());
return this.covertReturnOrder(udiwmsBasicSkPrescribeRequest, page); }
List<A011head> list = a011headService.list(wrapper);
PageInfo<A011head> pageInfo = new PageInfo<>(list);
PageSimpleResponse<A011head> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(list);
return this.covertReturnOrder(udiwmsBasicSkPrescribeRequest, pageInfo);
} }
} }
@ -1671,152 +1686,161 @@ public class ScpwxyyClient extends CommonHttpClient {
* @return * @return
*/ */
private BaseResponse covertSellOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, PageInfo<A010head> pageInfo) { private BaseResponse covertSellOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, PageInfo<A010head> pageInfo) {
List<A010head> presInfoEntities = pageInfo.getList(); List<A010head> headList = pageInfo.getList();
List<VYpzsPresInfo> vInsurNationGoodsPhysics = new ArrayList<>();
if (CollUtil.isNotEmpty(presInfoEntities)) {
List<String> collect = presInfoEntities.stream().map(A010head::getCodefk).collect(Collectors.toList());
LambdaQueryWrapper<VYpzsPresInfo> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.in(VYpzsPresInfo::getPRESCRIBE_NUMBER, collect);
= vYpzsPresInfoMapper.selectList(wrapper1); if (CollUtil.isNotEmpty(headList)) {
List<String> codefks = headList.stream().map(A010head::getCodefk).collect(Collectors.toList());
LambdaQueryWrapper<A010detail> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.in(A010detail::getCodefk, codefks);
List<A010detail> a010details = a010detailMapper.selectList(wrapper1);
Map<String, List<A010detail>> detailsMap = new HashMap<>();
if (CollUtil.isNotEmpty(a010details)) {
detailsMap = a010details.stream()
.collect(Collectors.groupingBy(A010detail::getCodefk));
} }
// TODO: 2024/9/19 这边在转换的时候就不能用VInsurNationGoodsPhysic
if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) {
Map<String, List<VYpzsPresInfo>> groupedByPrescribeNumber = vInsurNationGoodsPhysics.stream()
.collect(Collectors.groupingBy(VYpzsPresInfo::getPHYSIC_CODE));
List<IoCollectOrder> ioCollectOrders = new ArrayList<>(); List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
groupedByPrescribeNumber.forEach((key, value) -> { Map<String, List<A010detail>> finalDetailsMap = detailsMap;
VYpzsPresInfo presInfoEntity = value.get(0); headList.forEach(headItem -> {
StringBuilder errorMsg = new StringBuilder(); StringBuilder errorMsg = new StringBuilder();
IoCollectOrder ioCollectOrder = new IoCollectOrder(); IoCollectOrder ioCollectOrder = new IoCollectOrder();
ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER()); ioCollectOrder.setBillNo(headItem.getCode());
ioCollectOrder.setFromType("HIS系统"); ioCollectOrder.setFromType("HIS系统");
ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID()); ioCollectOrder.setFromCorp(headItem.getDeptcode());
ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());
ioCollectOrder.setFromCorpName(presInfoEntity.getSICK_NAME()); ioCollectOrder.setFromCorpName(headItem.getDeptname());
Date date = DateUtil.parseDate(presInfoEntity.getLAY_TIME()); Date date = DateUtil.parseDate(headItem.getPrescribedate());
ioCollectOrder.setBillTime(date); ioCollectOrder.setBillTime(date);
ioCollectOrder.setCreateTime(new Date()); ioCollectOrder.setCreateTime(new Date());
ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser()); ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getSTOOUT_NO()); ioCollectOrder.setBackupOrderRemark1(headItem.getRemark());
ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID()); // ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID());
// ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME()); // ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME());
// ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO()); // ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO());
ioCollectOrder.setUpdateTime(new Date()); ioCollectOrder.setUpdateTime(new Date());
ioCollectOrder.setSplitStatus(0); ioCollectOrder.setSplitStatus(0);
ioCollectOrder.setTagStatus(0); ioCollectOrder.setTagStatus(0);
List<A010detail> itemDetails = finalDetailsMap.get(headItem.getCodefk());
List<IoCollectOrderBiz> bizList = new ArrayList<>(); List<IoCollectOrderBiz> bizList = new ArrayList<>();
value.forEach(entity -> { if (CollUtil.isNotEmpty(itemDetails)) {
itemDetails.forEach(entity -> {
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE())); List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getThrid()));
if (CollUtil.isNotEmpty(basicUdirelEntities)) { if (CollUtil.isNotEmpty(basicUdirelEntities)) {
BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0); BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0);
collectOrderBiz.setRelId(basicUdirelEntity.getId()); collectOrderBiz.setRelId(basicUdirelEntity.getId());
} else { } else {
errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";"); errorMsg.append(entity.getItemname()).append("字典未对照").append(";");
} }
// List<VYpzsPresInfo> vYpzsPresInfos = vYpzsPresInfoMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfo>().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getPRESCRIBE_NUMBER()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getPHYSIC_CODE())); collectOrderBiz.setGgxh(entity.getBzgg());
collectOrderBiz.setMeasureUnit(entity.getMeasureunit());
// if (CollUtil.isNotEmpty(vYpzsPresInfos)) { collectOrderBiz.setCount(IntUtil.value(entity.getCount()));
// VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfos.get(0); collectOrderBiz.setThrCode(entity.getThrid());
// collectOrderBiz.setCpmctymc(entity.getItemname());
// }
collectOrderBiz.setGgxh(entity.getPACK_SPEC());
collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT());
collectOrderBiz.setCount(IntUtil.value(entity.getLAY_PHYSIC_QUANTITY()));
collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
collectOrderBiz.setYbbm(entity.getCOUNTRY_CODE());
// collectOrderBiz.setRemark1(entity.get() + "");
collectOrderBiz.setRemark1(entity.getRemark());
collectOrderBiz.setNameCode(entity.getItemcode());
collectOrderBiz.setTagStatus(1); collectOrderBiz.setTagStatus(1);
collectOrderBiz.setUnTagCount(0); collectOrderBiz.setUnTagCount(0);
bizList.add(collectOrderBiz); bizList.add(collectOrderBiz);
}); });
}
if (StrUtil.isNotBlank(errorMsg)) { if (StrUtil.isNotBlank(errorMsg)) {
ioCollectOrder.setErrorMsg(errorMsg.toString()); ioCollectOrder.setErrorMsg(errorMsg.toString());
ioCollectOrder.setTagStatus(4); ioCollectOrder.setTagStatus(4);
} }
ioCollectOrder.setBizList(bizList); ioCollectOrder.setBizList(bizList);
ioCollectOrders.add(ioCollectOrder); ioCollectOrders.add(ioCollectOrder);
}); });
PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(ioCollectOrders); pageSimpleResponse.setList(ioCollectOrders);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} else { } else {
return ResultVOUtils.error(500, "下载失败!"); return ResultVOUtils.error(500, "下载失败!");
} }
} }
private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage<VYpzsPresInfoReturn> page) { private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, PageInfo<A011head> pageInfo) {
List<VYpzsPresInfoReturn> presInfoEntities = page.getRecords(); List<A011head> headList = pageInfo.getList();
List<VYpzsPresInfoReturn> vInsurNationGoodsReturns = new ArrayList<>();
if (CollUtil.isNotEmpty(presInfoEntities)) {
List<String> collect = presInfoEntities.stream().map(VYpzsPresInfoReturn::getAPPLY_NO).collect(Collectors.toList()); if (CollUtil.isNotEmpty(headList)) {
LambdaQueryWrapper<VYpzsPresInfoReturn> wrapper1 = new LambdaQueryWrapper<>(); List<String> codefks = headList.stream().map(A011head::getCodefk).collect(Collectors.toList());
wrapper1.in(VYpzsPresInfoReturn::getAPPLY_NO, collect); LambdaQueryWrapper<A011detail> wrapper1 = new LambdaQueryWrapper<>();
vInsurNationGoodsReturns = vYpzsPresInfoReturnMapper.selectList(wrapper1); wrapper1.in(A011detail::getCodefk, codefks);
List<A011detail> a011details = a011detailMapper.selectList(wrapper1);
Map<String, List<A011detail>> detailsMap = new HashMap<>();
if (CollUtil.isNotEmpty(a011details)) {
detailsMap = a011details.stream()
.collect(Collectors.groupingBy(A011detail::getCodefk));
} }
// TODO: 2024/9/19 这边在转换的时候就不能用vInsurNationGoodsReturns
if (CollUtil.isNotEmpty(vInsurNationGoodsReturns)) {
Map<String, List<VYpzsPresInfoReturn>> groupedByPrescribeNumber = vInsurNationGoodsReturns.stream()
.collect(Collectors.groupingBy(VYpzsPresInfoReturn::getAPPLY_NO));
List<IoCollectOrder> ioCollectOrders = new ArrayList<>(); List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
groupedByPrescribeNumber.forEach((key, value) -> { Map<String, List<A011detail>> finalDetailsMap = detailsMap;
VYpzsPresInfoReturn presInfoEntity = value.get(0); headList.forEach(headItem -> {
StringBuilder errorMsg = new StringBuilder(); StringBuilder errorMsg = new StringBuilder();
IoCollectOrder ioCollectOrder = new IoCollectOrder(); IoCollectOrder ioCollectOrder = new IoCollectOrder();
ioCollectOrder.setBillNo(presInfoEntity.getAPPLY_NO()); ioCollectOrder.setBillNo(headItem.getCode());
ioCollectOrder.setFromType("HIS系统"); ioCollectOrder.setFromType("HIS系统");
ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID()); ioCollectOrder.setFromCorp(headItem.getDeptcode());
ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());
ioCollectOrder.setFromCorpName(presInfoEntity.getSICK_NAME()); ioCollectOrder.setFromCorpName(headItem.getDeptname());
// Date date = DateUtil.parseDate(presInfoEntity.get()); Date date = DateUtil.parseDate(headItem.getPrescribedate());
ioCollectOrder.setBillTime(presInfoEntity.getKEEP_BOOK_TIME()); ioCollectOrder.setBillTime(date);
ioCollectOrder.setCreateTime(new Date()); ioCollectOrder.setCreateTime(new Date());
ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser()); ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
ioCollectOrder.setUpdateTime(new Date()); ioCollectOrder.setUpdateTime(new Date());
ioCollectOrder.setSplitStatus(0); ioCollectOrder.setSplitStatus(0);
ioCollectOrder.setTagStatus(0); ioCollectOrder.setTagStatus(0);
List<IoCollectOrderBiz> bizList = new ArrayList<>(); List<IoCollectOrderBiz> bizList = new ArrayList<>();
value.forEach(entity -> { List<A011detail> itemDetails = finalDetailsMap.get(headItem.getCodefk());
if (CollUtil.isNotEmpty(itemDetails)) {
itemDetails.forEach(entity -> {
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE())); List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getThrid()));
if (basicUdirelEntity != null) { if (CollUtil.isNotEmpty(basicUdirelEntities)) {
BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0);
collectOrderBiz.setRelId(basicUdirelEntity.getId()); collectOrderBiz.setRelId(basicUdirelEntity.getId());
} else { } else {
errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";"); errorMsg.append(entity.getItemname()).append("字典未对照").append(";");
} }
List<VYpzsPresInfoReturn> vYpzsPresInfoReturns = vYpzsPresInfoReturnMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfoReturn>().eq(VYpzsPresInfoReturn::getAPPLY_NO, entity.getAPPLY_NO()).eq(VYpzsPresInfoReturn::getPHYSIC_CODE, entity.getPHYSIC_CODE()));
if (CollUtil.isNotEmpty(vYpzsPresInfoReturns)) { collectOrderBiz.setGgxh(entity.getBzgg());
VYpzsPresInfoReturn vYpzsPresInfo = vYpzsPresInfoReturns.get(0); collectOrderBiz.setMeasureUnit(entity.getMeasureunit());
collectOrderBiz.setGgxh(vYpzsPresInfo.getPHYSIC_SPEC()); collectOrderBiz.setCount(IntUtil.value(entity.getCount()));
collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT()); collectOrderBiz.setThrCode(entity.getThrid());
} collectOrderBiz.setCpmctymc(entity.getItemname());
collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
// collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER());
collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
collectOrderBiz.setYbbm(entity.getFEE_SEQUENCE_NO());
collectOrderBiz.setCount(entity.getQUANTITY()); collectOrderBiz.setRemark1(entity.getRemark());
collectOrderBiz.setNameCode(entity.getItemcode());
collectOrderBiz.setTagStatus(1); collectOrderBiz.setTagStatus(1);
collectOrderBiz.setUnTagCount(0); collectOrderBiz.setUnTagCount(0);
bizList.add(collectOrderBiz); bizList.add(collectOrderBiz);
}); });
}
if (StrUtil.isNotBlank(errorMsg)) { if (StrUtil.isNotBlank(errorMsg)) {
ioCollectOrder.setErrorMsg(errorMsg.toString()); ioCollectOrder.setErrorMsg(errorMsg.toString());
ioCollectOrder.setTagStatus(4); ioCollectOrder.setTagStatus(4);
} }
ioCollectOrder.setBizList(bizList); ioCollectOrder.setBizList(bizList);
ioCollectOrders.add(ioCollectOrder); ioCollectOrders.add(ioCollectOrder);
}); });
PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(ioCollectOrders); pageSimpleResponse.setList(ioCollectOrders);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} else { } else {

@ -2,6 +2,8 @@ package com.glxp.mipsdl.entity.scpwxyy;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -12,93 +14,139 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class A013 { public class A013 {
@TableField("MED_LIST_CODG")
private String medListCodg; private String medListCodg;
@TableField("FIXMEDINS_HILIST_ID")
private String fixmedinsHilistId; private String fixmedinsHilistId;
@TableField("FIXMEDINS_HILIST_NAME")
private String fixmedinsHilistName; private String fixmedinsHilistName;
@TableField("FIXMEDINS_BCHNO")
private String fixmedinsBchno; private String fixmedinsBchno;
@TableField("PRSC_DR_CERT_TYPE")
private String prscDrCertType; private String prscDrCertType;
@TableField("PRSC_DR_CERTNO")
private String prscDrCertno; private String prscDrCertno;
@TableField("PRSC_DR_NAME")
private String prscDrName; private String prscDrName;
@TableField("PHAR_CERT_TYPE")
private String pharCertType; private String pharCertType;
@TableField("PHAR_CERTNO")
private String pharCertno; private String pharCertno;
@TableField("PHAR_NAME")
private String pharName; private String pharName;
@TableField("PHAR_PRAC_CERT_NO")
private String pharPracCertNo; private String pharPracCertNo;
@TableField("HI_FEESETL_TYPE")
private String hiFeesetlType; private String hiFeesetlType;
@TableField("SETL_ID")
private String setlId; private String setlId;
@TableField("MDTRT_SN")
private String mdtrtSn; private String mdtrtSn;
@TableField("PSN_NO")
private String psnNo; private String psnNo;
@TableField("PSN_CERT_TYPE")
private String psnCertType; private String psnCertType;
@TableField("CERTNO")
private String certno; private String certno;
@TableField("PSN_NAME")
private String psnName; private String psnName;
@TableField("MANU_LOTNUM")
private String manuLotnum; private String manuLotnum;
@TableField("MANU_DATE")
private Date manuDate; private Date manuDate;
@TableField("EXPY_END")
private Date expyEnd; private Date expyEnd;
@TableField("RX_FLAG")
private String rxFlag; private String rxFlag;
@TableField("TRDN_FLAG")
private String trdnFlag; private String trdnFlag;
@TableField("FINL_TRNS_PRIC")
private BigDecimal finlTrnsPric; private BigDecimal finlTrnsPric;
@TableField("RXNO")
private String rxno; private String rxno;
@TableField("RX_CIRC_FLAG")
private String rxCircFlag; private String rxCircFlag;
@TableField("RTAL_DOCNO")
private String rtalDocno; private String rtalDocno;
@TableField("STOOUT_NO")
private String stooutNo; private String stooutNo;
@TableField("BCHNO")
private String bchno; private String bchno;
@TableField("RUG_PROD_BARC")
private String rugProdBarc; private String rugProdBarc;
@TableField("SHELF_POSI")
private String shelfPosi; private String shelfPosi;
@TableField("SEL_RETN_CNT")
private Byte selRetnCnt; private Byte selRetnCnt;
@TableField("SEL_RETN_TIME")
private Date selRetnTime; private Date selRetnTime;
@TableField("SEL_RETN_OPTER_NAME")
private String selRetnOpterName; private String selRetnOpterName;
@TableField("MEMO")
private String memo; private String memo;
@TableField("MDTRT_SETL_TYPE")
private String mdtrtSetlType; private String mdtrtSetlType;
@TableField("DRUGTRACINFO")
private String drugtracinfo; private String drugtracinfo;
@TableField("APPLY_NO")
private String applyNo; private String applyNo;
@TableField("SETTLE_NO")
private String settleNo; private String settleNo;
@TableField("SICK_ID")
private String sickId; private String sickId;
@TableField("MATERIAL_SPEC")
private String materialSpec; private String materialSpec;
@TableField("MATERIAL_CERTIFICATE_NO")
private String materialCertificateNo; private String materialCertificateNo;
@TableField("MODEL_NUMBER")
private String modelNumber; private String modelNumber;
@TableField("FACTORY_NAME")
private String factoryName; private String factoryName;
@TableField("UNIT")
private String unit; private String unit;
} }

@ -2,6 +2,8 @@ package com.glxp.mipsdl.entity.scpwxyy;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -12,83 +14,124 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class A014 { public class A014 {
@TableField("MED_LIST_CODG")
private String medListCodg; private String medListCodg;
@TableField("FIXMEDINS_HILIST_ID")
private String fixmedinsHilistId; private String fixmedinsHilistId;
@TableField("FIXMEDINS_HILIST_NAME")
private String fixmedinsHilistName; private String fixmedinsHilistName;
@TableField("FIXMEDINS_BCHNO")
private String fixmedinsBchno; private String fixmedinsBchno;
@TableField("PRSC_DR_CERT_TYPE")
private String prscDrCertType; private String prscDrCertType;
@TableField("PRSC_DR_CERTNO")
private String prscDrCertno; private String prscDrCertno;
@TableField("PRSC_DR_NAME")
private String prscDrName; private String prscDrName;
@TableField("PHAR_CERT_TYPE")
private String pharCertType; private String pharCertType;
@TableField("PHAR_CERTNO")
private String pharCertno; private String pharCertno;
@TableField("PHAR_NAME")
private String pharName; private String pharName;
@TableField("PHAR_PRAC_CERT_NO")
private String pharPracCertNo; private String pharPracCertNo;
@TableField("HI_FEESETL_TYPE")
private String hiFeesetlType; private String hiFeesetlType;
@TableField("SETL_ID")
private String setlId; private String setlId;
@TableField("MDTRT_SN")
private String mdtrtSn; private String mdtrtSn;
@TableField("PSN_NO")
private String psnNo; private String psnNo;
@TableField("PSN_CERT_TYPE")
private String psnCertType; private String psnCertType;
@TableField("CERTNO")
private String certno; private String certno;
@TableField("PSN_NAME")
private String psnName; private String psnName;
@TableField("MANU_LOTNUM")
private String manuLotnum; private String manuLotnum;
@TableField("MANU_DATE")
private Date manuDate; private Date manuDate;
@TableField("EXPY_END")
private Date expyEnd; private Date expyEnd;
@TableField("RX_FLAG")
private String rxFlag; private String rxFlag;
@TableField("TRDN_FLAG")
private String trdnFlag; private String trdnFlag;
@TableField("FINL_TRNS_PRIC")
private BigDecimal finlTrnsPric; private BigDecimal finlTrnsPric;
@TableField("RXNO")
private String rxno; private String rxno;
@TableField("RX_CIRC_FLAG")
private String rxCircFlag; private String rxCircFlag;
@TableField("RTAL_DOCNO")
private String rtalDocno; private String rtalDocno;
@TableField("STOOUT_NO")
private String stooutNo; private String stooutNo;
@TableField("BCHNO")
private String bchno; private String bchno;
@TableField("RUG_PROD_BARC")
private String rugProdBarc; private String rugProdBarc;
@TableField("SHELF_POSI")
private String shelfPosi; private String shelfPosi;
@TableField("SEL_RETN_CNT")
private Integer selRetnCnt; private Integer selRetnCnt;
@TableField("SEL_RETN_TIME")
private Date selRetnTime; private Date selRetnTime;
@TableField("SEL_RETN_OPTER_NAME")
private String selRetnOpterName; private String selRetnOpterName;
@TableField("MEMO")
private String memo; private String memo;
@TableField("MDTRT_SETL_TYPE")
private String mdtrtSetlType; private String mdtrtSetlType;
@TableField("DRUGTRACINFO")
private String drugtracinfo; private String drugtracinfo;
@TableField("APPLY_NO")
private String applyNo; private String applyNo;
@TableField("SETTLE_NO")
private String settleNo; private String settleNo;
@TableField("SICK_ID")
private String sickId; private String sickId;
} }

@ -6,6 +6,7 @@ import lombok.Data;
@Data @Data
public class GetSickPrescribeRequest extends ListPageRequest { public class GetSickPrescribeRequest extends ListPageRequest {
private Integer inOutType = 0;// 默认是0药品处方查询 1药品处方退费
private String code; private String code;
private String sickName; private String sickName;
private String sickCode; private String sickCode;

Loading…
Cancel
Save