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

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

@@ -1983,6 +1983,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            jsonObject.put("waiting_count",0);
            jsonObject.put("patient_name","");
            jsonObject.put("time_cost",0);
            
            result.put((String)doctorlist.get(0).get("doctor"),jsonObject);
        }
        
@@ -2083,6 +2084,17 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        for (JSONObject jsonObject : result.values()) {
            finalresult.add(jsonObject);
        }
        Integer room_no = 1;
        for(JSONObject jsonObject :finalresult){
            String roomname = "";
            if(room_no < 10){
                roomname = "0"+room_no+"诊室";
            }else{
                roomname = room_no+"诊室";
            }
            jsonObject.put("room_name",roomname);
            room_no ++;
        }
        
        return finalresult;
    }