Merge branch 'medicare' of liubing/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOrderDrugsEndpoint.java

@@ -49,7 +49,7 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
            return success("操作成功", medOrderService.getSettlementInfoList(cardNo,orgCode));
        } catch (Exception e) {
            e.getMessage();
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
@@ -63,7 +63,7 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
            return success("操作成功", medOrderService.getSettlementInfoFirst(recipe_no));
        } catch (Exception e) {
            e.getMessage();
           e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
@@ -80,7 +80,7 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
        try {
            return success("操作成功", medOrderService.getSettlementInfoSecond(recipe_no,readcardResult,registerResult));
        } catch (Exception e) {
            e.getMessage();
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
@@ -96,7 +96,7 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
            return success("操作成功", medOrderService.getSettlementInfo(chargeArr,recipe_no));
        } catch (Exception e) {
            e.getMessage();
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
@@ -111,7 +111,7 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
            return success("操作成功", medOrderService.executeSickSettleMultiNew(recipe_no));
        } catch (Exception e) {
            e.getMessage();
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }