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

Compare commits

base: clinic-v2:0bed77b5d7b3a8bae04a5aa039d92e8cf0016d77
Branches Tags
clinic-v2:master
clinic-v2:fea_tongmingxuan_xinjiangbushu
..
compare: clinic-v2:91f337cdb59e9dfd92efc8e375e66a48d74a7c5d
Branches Tags
clinic-v2:fea_tongmingxuan_xinjiangbushu
clinic-v2:master

No commits in common. "0bed77b5d7b3a8bae04a5aa039d92e8cf0016d77" and "91f337cdb59e9dfd92efc8e375e66a48d74a7c5d" have entirely different histories.
0bed77b5d7 ... 91f337cdb5

2 changed files with 3 additions and 4 deletions
Show Stats Expand all files Collapse all files

3
src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
View File

@ -224,11 +224,10 @@ public class ChargeService extends BaseService {
} }
//组套逻辑 //组套逻辑
if (dbService.getIsGroup()) { if (dbService.getIsGroup()) {
List<ItemGroupList> itemGroupList = itemGroupListMapper.selectList(new QueryWrapper<ItemGroupList>().eq("item_id", dbService.getId()).eq("del_flag",false)); List<ItemGroupList> itemGroupList = itemGroupListMapper.selectList(new QueryWrapper<ItemGroupList>().eq("item_id", dbService.getId()));
if (itemGroupList.isEmpty()) { if (itemGroupList.isEmpty()) {
throw new MessageException("组套:" + service.getItemName() + "没有绑定商品数据"); throw new MessageException("组套:" + service.getItemName() + "没有绑定商品数据");
} }
for (ItemGroupList itemGroup : itemGroupList) { for (ItemGroupList itemGroup : itemGroupList) {
String fsn = StringUtil.getCode("FSN"); String fsn = StringUtil.getCode("FSN");
ChargeItemList itemList = new ChargeItemList(); ChargeItemList itemList = new ChargeItemList();

4
src/main/resources/doc_title/1314.json
View File

@ -38,14 +38,14 @@
"11": { "11": {
"en": "json.data_creation_time", "en": "json.data_creation_time",
"zh": "数据创建时间", "zh": "数据创建时间",
"column_width": 150 "column_width": 100
} }
}, },
{ {
"12": { "12": {
"en": "json.data_update_time", "en": "json.data_update_time",
"zh": "数据更新时间", "zh": "数据更新时间",
"column_width": 150 "column_width": 100
} }
}, },
{ {