'APP个人中心查询''接口添加 居民健康行为积分总积分 响应参数score。

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);

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查询预约服务订单
      *

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;
+
 }