Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server

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

@@ -493,10 +493,12 @@ public class ChargeService extends BaseService {
 
     public void uploadCostDetails(String changeOrderCode) {
         ChargeOrder order = chargeOrderMapper.selectByCode(changeOrderCode);
-
-
         List<ChargeGoodsList> goodsLists = chargeGoodsListMapper.selectByCode(changeOrderCode);
         List<ChargeItemList> itemLists = chargeItemListMapper.selectByCode(changeOrderCode);
+
+        if (order.getMdtrtId() == null){
+            throw new MessageException("非医保挂号，不能上传费用明细信息");
+        }
         //撤销之前上传的费用明细信息
         try {
             IM2205 im2205 = new IM2205();