clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

This commit is contained in:
LiJianZhao 2025-05-23 14:16:37 +08:00
parent 7c70e4cdbe
commit bf9770f552
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java
View File

@ -333,7 +333,7 @@ public class SocialInventoryUploadService extends BaseService {
public boolean upload3503() {
QueryWrapper<InventoryPurchaseLog> logQuery = new QueryWrapper<>();
logQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
logQuery.orderByAsc("id");
logQuery.orderByAsc("social_type");
logQuery.last("limit 1");
InventoryPurchaseLog curInventoryPurchaseLog = inventoryPurchaseLogMapper.selectOne(logQuery);
if (curInventoryPurchaseLog == null) {
@ -471,7 +471,7 @@ public class SocialInventoryUploadService extends BaseService {
if (chargeOrder.getPayType().equals(RetailOrderPayTypeEnum.MEDICARE.getCode())) {
//医保支付
ChargeSocialPayLog payLog = chargeSocialPayLogMapper.selectOne(new QueryWrapper<ChargeSocialPayLog>().
eq("retail_order_code", orderInventory.getChargeOrderCode()).last("limit 1"));
eq("charge_order_code", orderInventory.getChargeOrderCode()).last("limit 1"));
im3505.setSetlId(payLog.getSetlId());
im3505.setMdtrtSn(payLog.getMdtrtId());
im3505.setPsnNo(payLog.getPsnNo());
@ -495,7 +495,8 @@ public class SocialInventoryUploadService extends BaseService {
List<Map<String, String>> drugtracinfo = new ArrayList<>();
List<String> TracCodgList = orderInventory.getTraceabilityCode() == null ? new ArrayList<>()
List<String> TracCodgList = orderInventory.getTraceabilityCode() == null||
orderInventory.getTraceabilityCode().isEmpty() ? new ArrayList<>()
: Arrays.asList(orderInventory.getTraceabilityCode().split(","));
for (String tracCodg : TracCodgList) {
Map<String, String> map =new HashMap<>();