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

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

@@ -375,11 +375,17 @@ public class RehabilitationPlanController extends EnvelopRestEndpoint {
            rehabilitationPlanService.deleteDetailByPlanIdAndHospitalServiceItemId(planId, hospitalServiceItemId, DateUtil.getDateShort(new Date()));
            JSONArray array = new JSONArray();
            for(Object planDetail : json.getJSONArray("detail")) {
                String expense="";
                JSONObject j = (JSONObject)planDetail;
                String expense = j.getString("expense");
                if(expense.contains(".")){
                    int pointIndex = expense.indexOf(".");
                    expense = expense.substring(0,pointIndex);
                if (j.get("expense") instanceof Integer){
                    expense= String.valueOf(j.getInt("expense"));
                }
                else{
                    expense = j.getString("expense");
                    if(expense.contains(".")){
                        int pointIndex = expense.indexOf(".");
                        expense = expense.substring(0,pointIndex);
                    }
                }
                j.put("expense",expense);
                if(j.has("executeTime")) {