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

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationTemplateDetailDO.java

@@ -34,6 +34,7 @@ public class RehabilitationTemplateDetailDO extends UuidIdentityEntityWithOperat
    private String name;//服务项名称
    private Integer expense;//费用
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
@@ -141,4 +142,12 @@ public class RehabilitationTemplateDetailDO extends UuidIdentityEntityWithOperat
    public void setName(String name) {
        this.name = name;
    }
    public Integer getExpense() {
        return expense;
    }
    public void setExpense(String name) {
        this.expense = expense;
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/rehabilitation/RehabilitationPlanController.java

@@ -376,6 +376,12 @@ public class RehabilitationPlanController extends EnvelopRestEndpoint {
            JSONArray array = new JSONArray();
            for(Object planDetail : json.getJSONArray("detail")) {
                JSONObject j = (JSONObject)planDetail;
                String expense = j.getString("expense");
                if(expense.contains(".")){
                    int pointIndex = expense.indexOf(".");
                    expense = expense.substring(0,pointIndex);
                }
                j.put("expense",expense);
                if(j.has("executeTime")) {
                    String executeTime = j.get("executeTime").toString();
                    String[] result = null;