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

@@ -96,6 +96,7 @@ public class PrescriptionLogController extends BaseController {
            for (int i = 0; i < expressageLogs.size(); i++) {
                PrescriptionExpressageLog prescriptionExpressageLog = expressageLogs.get(i);
                PrescriptionLog prescriptionLog = new PrescriptionLog();
                prescriptionLog.setStatus(PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue());
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
@@ -117,20 +118,24 @@ public class PrescriptionLogController extends BaseController {
                    return 0;
                }
            });
            if (prescriptionLogs != null) {
            if (prescriptionLogs != null && prescriptionLogs.size() > 0) {
                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);
                });
                for (int i = 0; i < prescriptionLogs.size(); i++) {
                    PrescriptionLog one = prescriptionLogs.get(i);
                    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 {
                return error(-1, "获取失败");
            }
        } catch (Exception e) {
        } catch (
                Exception e
                )
        {
            e.printStackTrace();
            return error(-1, "获取失败");
        }

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

@@ -61,11 +61,13 @@ public class PatientPrescriptionLogController extends BaseController {
            for (int i = 0; i < expressageLogs.size(); i++) {
                PrescriptionExpressageLog prescriptionExpressageLog = expressageLogs.get(i);
                PrescriptionLog prescriptionLog = new PrescriptionLog();
                prescriptionLog.setStatus(PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue());
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getAcceptUser());
                prescriptionLog.setUserName(prescriptionExpressageLog.getAcceptUserName());
                prescriptionLogs.add(prescriptionLog);
            }
            //排序
@@ -81,15 +83,15 @@ public class PatientPrescriptionLogController extends BaseController {
                    return 0;
                }
            });
            if (prescriptionLogs != null) {
            if (prescriptionLogs != null && prescriptionLogs.size() > 0) {
                JSONArray ja = new JSONArray();
                prescriptionLogs.stream().forEach(one -> {
                for (int i = 0; i < prescriptionLogs.size(); i++) {
                    PrescriptionLog one = prescriptionLogs.get(i);
                    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 {
                return error(-1, "获取失败");