From 9849a99706d2c3c540d29778a1b5ff24a29264a8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 07 十二月 2021 10:46:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
index feeea55..15eb630 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -153,7 +153,7 @@
                 statisticsList.forEach(e -> {
                     String reserveSubContent = e.getReserveSubContent();
                     String dateString = dateFormat.format(e.getCreateAt());
-                    if (reserveSubContent.contains("上午体温")) {
+                    if (reserveSubContent.contains("今日上午体温(℃)")) {
                         int index = conditions.indexOf(dateString + " " + "上午体温");
                         if (index == -1) {
                             conditions.append(dateString + " " + "上午体温:" + e.getAnswerContent() + "℃" + "\n");
@@ -161,7 +161,7 @@
                             conditions.replace(index, conditions.indexOf("℃", index),
                                     dateString + " " + "上午体温:" + e.getAnswerContent());
                         }
-                    } else if (reserveSubContent.contains("下午体温")) {
+                    } else if (reserveSubContent.contains("今日下午体温(℃)")) {
                         int index = conditions.indexOf(dateString + " " + "下午体温");
                         if (index == -1) {
                             conditions.append(dateString + " " + "下午体温:" + e.getAnswerContent() + "℃" + "\n");
@@ -242,7 +242,7 @@
                 statisticsList.forEach(e -> {
                     String reserveSubContent = e.getReserveSubContent();
                     String dateString = dateFormat.format(e.getCreateAt());
-                    if (reserveSubContent.contains("上午体温")) {
+                    if (reserveSubContent.contains("今日上午体温(℃)")) {
                         int index = conditions.indexOf(dateString + " " + "上午体温");
                         if (index == -1) {
                             conditions.append(dateString + " " + "上午体温:" + e.getAnswerContent() + "℃" + "\n");
@@ -250,7 +250,7 @@
                             conditions.replace(index, conditions.indexOf("℃", index),
                                     dateString + " " + "上午体温:" + e.getAnswerContent());
                         }
-                    } else if (reserveSubContent.contains("下午体温")) {
+                    } else if (reserveSubContent.contains("今日下午体温(℃)")) {
                         int index = conditions.indexOf(dateString + " " + "下午体温");
                         if (index == -1) {
                             conditions.append(dateString + " " + "下午体温:" + e.getAnswerContent() + "℃" + "\n");

--
Gitblit v1.7.1