From a95ae8ffee78b4d8d5cc87b9714cb55f5df9e2a9 Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Mon, 12 Apr 2021 01:02:32 +0800
Subject: [PATCH] 修改医生预约时间显示不对的问题

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java
index 4892aba..ad73027 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AdvisoryDoctorInfoServiceImpl.java
@@ -195,13 +195,31 @@
                 JSONArray array = new JSONArray();
                 JSONObject obj = null;
                 for (AppointmentTime app : byAdvisoryId) {
-                    obj = new JSONObject();
-                    obj.put("name", app.getName());
-                    obj.put("afternoon", app.getAfternoon());
-                    obj.put("evening", app.getEvening());
-                    obj.put("morning", app.getMorning());
+                    boolean flag = true;
+                    for (int i = 0; i < array.size(); i++) {
+                        JSONObject jsonObject = array.getJSONObject(i);
+                        if (jsonObject.getString("name").equals(app.getName())) {
+                            if (app.getAfternoon() == 1) {
+                                jsonObject.put("afternoon", 1);
+                            } else if (app.getEvening() == 1) {
+                                jsonObject.put("evening", 1);
+                            } else if (app.getMorning() == 1) {
+                                jsonObject.put("morning", 1);
+                            }
+                            flag = false;
+                            array.add(jsonObject);
+                            break;
+                        }
+                    }
 
-                    array.add(obj);
+                    if (flag) {
+                        obj = new JSONObject();
+                        obj.put("name", app.getName());
+                        obj.put("afternoon", app.getAfternoon());
+                        obj.put("evening", app.getEvening());
+                        obj.put("morning", app.getMorning());
+                        array.add(obj);
+                    }
                 }
                 json.put("appointments", array);
             }

--
Gitblit v1.8.0