Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -4849,8 +4849,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            params.put("consultStatus", consultStatus);
        }
        if("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
            if (flag){
                sql += " and d.del='1' order by dw.workTotal desc ,d.consult_status DESC ,a.total " + consutlSort;
            }else{
                sql += " and d.del='1' order by dw.workTotal desc nulls last,d.consult_status desc nulls last ,a.total " + consutlSort;
            }
        }else {
            sql += " and d.del='1' order by dw.workTotal desc ,d.consult_status DESC ,a.total " + consutlSort;
        sql += " and d.del='1' order by dw.workTotal desc nulls last,d.consult_status DESC nulls last,a.total " + consutlSort;
        }
        String sqlCount = "select count(1) as \"total\" from ( "+sql+" ) t";
        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql, params, page, pagesize);
        /*list.stream().forEach(e->{

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")) {