UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处方单分流，单据读取关联关系

Browse Source
dev_unify
yewj 8 months ago
parent 122f698004
commit f469754e17
6 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/com/glxp/api/constant/BusTypeConstant.java
Unescape Escape View File

@ -1,16 +1,16 @@
package com.glxp.api.constant;
public enum BusTypeConstant {
YPCF002("药品处方单","YPCF002"),
QXCF001("器械处方单","QXCF001"),
CGJH001("采购计划","CGJH001"),
LYRK("领药入库","LYRK"),
GMRK("购买入库","GMRK"),
LYCK("领药出库","LYCK"),
QXCF001("器械处方单", "QXCF001"),
CGJH001("采购计划", "CGJH001"),
LYRK("领药入库", "LYRK"),
GMRK("购买入库", "GMRK"),
LYCK("领药出库", "LYCK"),
;
private String name;
private String busType;
BusTypeConstant(String name, String busType) {
this.name = name;
this.busType = busType;

8
src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
Unescape Escape View File

@ -73,7 +73,7 @@ public class IoCollectOriginController extends BaseController {
String busType = collectOrderRequest.getBusType();
if (StrUtil.isBlank(busType)) return ResultVOUtils.error("请选择业务名称");
if (busType.equals(BusTypeConstant.YPCF002.getBusType())) {
if (busType.startsWith("YPCF")) {
GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
getSickPrescribeRequest.setLimit(collectOrderRequest.getLimit());
getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo());
@ -90,7 +90,7 @@ public class IoCollectOriginController extends BaseController {
BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);
return baseResponse;
}else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) {
} else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) {
GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
getSickPrescribeRequest.setLimit(collectOrderRequest.getLimit());
getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo());
@ -107,7 +107,7 @@ public class IoCollectOriginController extends BaseController {
BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeQx(getSickPrescribeRequest);
return baseResponse;
}else if (busType.contains("SC")) {
} else if (busType.contains("SC")) {
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setStatus(10);
filterOrderRequest.setAction(busType);
@ -122,7 +122,7 @@ public class IoCollectOriginController extends BaseController {
filterOrderRequest.setKeyWords(collectOrderRequest.getKeyWords());
BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = ioCollectOrderService.selectImportUdi(filterOrderRequest);
return baseResponse;
}else {
} else {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
filterThrOrderRequest.setLimit(collectOrderRequest.getLimit());
filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo());

6
src/main/java/com/glxp/api/http/ErpBasicClient.java
Unescape Escape View File

@ -218,6 +218,7 @@ public class ErpBasicClient {
return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
}
}
public BaseResponse<PageSimpleResponse<IoCollectOrder>> getPrescribeQx(GetSickPrescribeRequest getSickPrescribeRequest) {
ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(getSickPrescribeRequest.getThirdSys());
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getPrescribesQx";
@ -445,7 +446,7 @@ public class ErpBasicClient {
public BaseResponse<PageSimpleResponse<YbDrug>> getYbDrugDetail(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) {
// String url = "https://www.udims.com/UDI_DL_Server_test" + "/udchs/ybDrug/list";
ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId");
String url = basicThirdSysEntity.getThridUrl() + "/udchs/ybDrug/list";
String url = basicThirdSysEntity.getThridUrl() + "/udchs/ybDrug/list";
try {
String response = httpOkClient.uCloudPost(url, ybHcflDetailFilterRequest);
BaseResponse<PageSimpleResponse<YbDrug>> listBaseResponse =
@ -478,12 +479,13 @@ public class ErpBasicClient {
}
}
//TODO 阿超改==校验码是和下级所有码否传过了逻辑还没写
/**
* 校验码是和下级所有码否上传医保过了(返回的list就是码已经重复上传到医保的了)
*/
public BaseResponse<List> collectOrderCheckCodeUploading(List<String> codeList) {
ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId");
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/relCode/checkCode";
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/relCode/checkCode";
try {
String response = httpOkClient.uCloudPost(url, codeList);
BaseResponse<List> listBaseResponse =

6
src/main/java/com/glxp/api/service/collect/DownloadFactory.java
Unescape Escape View File

@ -36,11 +36,11 @@ public class DownloadFactory {
if (busType == null) {
return ResultVOUtils.error("下载失败，未配置业务类型");
}
if (busType.equals(BusTypeConstant.YPCF002.getBusType())) {
if (busType.startsWith("YPCF")) {
return ypcf002Download.downloadOrder(collectOrderRequest);
}else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) {
} else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) {
return qxcf001Download.downloadOrder(collectOrderRequest);
}else if (busType.contains("SC")) {
} else if (busType.contains("SC")) {
return ioCollectOrderService.importUdi(collectOrderRequest);
} else {
return thrOrderDownload.downloadOrder(collectOrderRequest);

2
src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
Unescape Escape View File

@ -655,7 +655,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
// collectOrder.setWorkPlaceCode(defaultWorkplace[0]);
// }
collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode());
// collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode());
collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType());
BeanUtils.copyProperties(collectOrder, ioCollectOrderOrigin);
boolean save = collectOrderOriginService.save(ioCollectOrderOrigin);

11
src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java
Unescape Escape View File

@ -50,10 +50,7 @@ public class IoCodeLostServiceImpl extends ServiceImpl<IoCodeLostMapper, IoCodeL
public IoCodeLostEntity findByCode(String code) {
List<IoCodeLostEntity> codeLostEntities = codeLostEntityMapper.selectList(new QueryWrapper<IoCodeLostEntity>().like("code", code).last("limit 1"));
if (CollUtil.isNotEmpty(codeLostEntities)) {
return codeLostEntities.get(0);
}
RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code);
if (codeRelEntity != null) {
IoCodeLostEntity udiEntity = new IoCodeLostEntity();
@ -63,6 +60,12 @@ public class IoCodeLostServiceImpl extends ServiceImpl<IoCodeLostMapper, IoCodeL
udiEntity.setExpireDate(MsDateUtil.formatDate(codeRelEntity.getValidateDate(), "yyMMdd"));
return udiEntity;
}
List<IoCodeLostEntity> codeLostEntities = codeLostEntityMapper.selectList(new QueryWrapper<IoCodeLostEntity>().like("code", code).last("limit 1"));
if (CollUtil.isNotEmpty(codeLostEntities)) {
return codeLostEntities.get(0);
}
return null;
}

Write Preview
Loading…
Cancel
Save