Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionLogController.java

@@ -112,11 +112,11 @@ public class PrescriptionLogController extends BaseController {
            if (prescriptionLogs != null) {
                JSONArray ja = new JSONArray();
                prescriptionLogs.stream().forEach(one -> {
                    JSONObject jo = new JSONObject();
                    jo.put("createTime", DateUtil.dateToStrLong(one.getCreateTime()));
                    jo.put("statusName", one.getStatusName());
                    ja.put(jo);
                    prescriptionLogs.stream().forEach(one -> {
                        JSONObject jo = new JSONObject();
                        jo.put("createTime", DateUtil.dateToStrLong(one.getCreateTime()));
                        jo.put("statusName", one.getStatusName());
                        ja.put(jo);
                });
                return write(200, "获取处方流程成功", "data", ja);
            } else {