From 239b092e76b20dc2020d8f507c034e1f84a2c8bc Mon Sep 17 00:00:00 2001
From: mengkuiliang <1464081137@qq.com>
Date: Thu, 9 Nov 2023 17:37:18 +0800
Subject: [PATCH] =?UTF-8?q?'APP=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2''=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=81=A5=E5=BA=B7=E8=A1=8C=E4=B8=BA=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E6=80=BB=E7=A7=AF=E5=88=86=20=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0score=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../familydoctor/EvaluateSurveyController.java |  2 ++
 .../impl/NurseAppLoginServiceImpl.java         | 18 ++++++++++++++++++
 .../vo/nurseapplogin/PatientAndDiseaseVO.java  |  6 ++++++
 3 files changed, 26 insertions(+)

diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/familydoctor/EvaluateSurveyController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/familydoctor/EvaluateSurveyController.java
index 5c8fa2e..02165eb 100644
--- a/xinelu-admin/src/main/java/com/xinelu/web/controller/familydoctor/EvaluateSurveyController.java
+++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/familydoctor/EvaluateSurveyController.java
@@ -1,5 +1,6 @@
 package com.xinelu.web.controller.familydoctor;
 
+import com.xinelu.common.annotation.MobileRequestAuthorization;
 import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.core.page.TableDataInfo;
@@ -31,6 +32,7 @@ public class EvaluateSurveyController extends BaseController {
 
     @ApiOperation("问卷列表")
     @GetMapping("survey/list")
+    @MobileRequestAuthorization
     public TableDataInfo surveyList(EvaluateSurvey entity) {
         startPage();
         List<EvaluateSurvey> list = evaluateSurveyService.findList(entity);
diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
index cb70fb4..dd9d02a 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
@@ -13,6 +13,7 @@ import com.xinelu.applet.vo.nurseapplogin.PatientAndDiseaseVO;
 import com.xinelu.applet.vo.nursepersonapplogin.OrderAndItemVO;
 import com.xinelu.applet.vo.specialdisease.WeekDaysVO;
 import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.domain.R;
 import com.xinelu.common.enums.AppointmentTimeIntervalEnum;
 import com.xinelu.common.enums.ConfirmRefundStatusEnum;
 import com.xinelu.common.enums.GooodsOrderStatusEnum;
@@ -20,6 +21,7 @@ import com.xinelu.common.enums.OrderStatusEnum;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.AgeUtil;
 import com.xinelu.common.utils.http.HttpService;
+import com.xinelu.common.utils.http.HttpUtils;
 import com.xinelu.common.utils.spring.SpringUtils;
 import com.xinelu.manage.domain.appointmentorder.AppointmentOrder;
 import com.xinelu.manage.domain.goodsOrder.GoodsOrder;
@@ -220,6 +222,7 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
         patientDisease.setWaitPayCount(waitPayCount);
         patientDisease.setWaitReceivedGoodsCount(waitReceivedGoodsCount);
         patientDisease.setReceivedGoodsCount(receivedGoodsCount);
+
         return AjaxResult.success(patientDisease);
     }
 
@@ -235,6 +238,10 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
                         JSONObject signInfo = jsonObject.getJSONObject("data");
                         if (signInfo.containsKey("signNo")) {
                             signNo = signInfo.getString("signNo");
+
+                            // 查询居民健康积分
+                            getResidentScore(patientDisease);
+
                         }
                     } else {
                         signNo = null;
@@ -251,6 +258,17 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
         }
     }
 
+    // 查询居民健康积分
+    private void getResidentScore(PatientAndDiseaseVO patientDisease) {
+        String result = HttpUtils.sendGet(SpringUtils.getFdUrl(patientDisease.getCityCode()) + "/patient/score/record/total/" + patientDisease.getCardNo());
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (!jsonObject.get("code").toString().equals("1")) {
+            log.error("查询居民健康积分出错：{}", jsonObject.get("msg").toString());
+        } else {
+            patientDisease.setScore(jsonObject.getString("data"));
+        }
+    }
+
     /**
      * App查询预约服务订单
      *
diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java
index 0c6b461..aa51bbb 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java
@@ -172,4 +172,10 @@ public class PatientAndDiseaseVO implements Serializable {
      * 基础疾病信息
      */
     private Integer[] diseaseList;
+
+    /**
+     *  居民健康行为积分-总分
+     */
+    private String score;
+
 }