diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java index 90260c9..0a8d635 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java @@ -224,10 +224,11 @@ public class ChargeService extends BaseService { } //组套逻辑 if (dbService.getIsGroup()) { - List itemGroupList = itemGroupListMapper.selectList(new QueryWrapper().eq("item_id", dbService.getId())); + List itemGroupList = itemGroupListMapper.selectList(new QueryWrapper().eq("item_id", dbService.getId()).eq("del_flag",false)); if (itemGroupList.isEmpty()) { throw new MessageException("组套:" + service.getItemName() + "没有绑定商品数据"); } + for (ItemGroupList itemGroup : itemGroupList) { String fsn = StringUtil.getCode("FSN"); ChargeItemList itemList = new ChargeItemList(); diff --git a/src/main/resources/doc_title/1314.json b/src/main/resources/doc_title/1314.json index 8c49876..a77705f 100644 --- a/src/main/resources/doc_title/1314.json +++ b/src/main/resources/doc_title/1314.json @@ -38,14 +38,14 @@ "11": { "en": "json.data_creation_time", "zh": "数据创建时间", - "column_width": 100 + "column_width": 150 } }, { "12": { "en": "json.data_update_time", "zh": "数据更新时间", - "column_width": 100 + "column_width": 150 } }, {