From 6ee2e8abf727491e8e8b791bc85a0adc558ac30a Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Thu, 8 Jul 2021 14:57:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3ID=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/custom/WechatAppletController.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
index a94f16d44..178c563c3 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
@@ -83,6 +83,8 @@ public class WechatAppletController extends BaseController {
                                   @RequestParam(value="randomFlag",required = false,defaultValue = "false") boolean randomFlag) {
         if(randomFlag){
             List<CustomerCaseResponse> reponseList = sysCustomerCaseService.getWxCustomerCaseByRandom(pageSize);
+            //处理ID加密
+            dealIdEnc(reponseList);
             TableDataInfo rspData = new TableDataInfo();
             rspData.setCode(HttpStatus.SUCCESS);
             rspData.setMsg("查询成功");
@@ -305,8 +307,10 @@ public class WechatAppletController extends BaseController {
      * @return
      */
     private void dealIdEnc(List<CustomerCaseResponse> list) {
-        for (CustomerCaseResponse cus : list) {
-            cus.setId(AesUtils.encrypt(cus.getId() + "", null));
+        if(list != null){
+            for (CustomerCaseResponse cus : list) {
+                cus.setId(AesUtils.encrypt(cus.getId() + "", null));
+            }
         }
     }
 

From fb8a266b94d104d4863a7d8b400ddb4d49bd7fae Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Thu, 8 Jul 2021 17:47:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=88=E5=8C=96=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=97=AE=E5=8D=B7=E7=A7=BB=E9=99=A4=E5=87=8F?=
 =?UTF-8?q?=E8=84=82=E7=BB=8F=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/utils/healthyData.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js
index c286b1df6..e8ac89b1b 100644
--- a/stdiet-ui/src/utils/healthyData.js
+++ b/stdiet-ui/src/utils/healthyData.js
@@ -823,12 +823,12 @@ export function dealHealthy(customerHealthy) {
   return customerHealthy;
 }
 
-export const extendHealthyTitle = {"0":"减脂","5":"降血压","6":"降血糖","3": "备孕营养", "1": "月经不调", "2": "多囊调理", "11":"心脑血管调理","13":"胃肠肿瘤调理","4":"产后调理","7":"高血脂"};
-export const projectName = {"0":"减脂","5":"高血压","6":"高血糖","3": "备孕营养", "1":"月经不调", "2":"多囊卵巢综合症", "13":"胃肠肿瘤","4":"产后调理","7":"高血脂"};
+export const extendHealthyTitle = {"0":"减脂","5":"降血压","6":"降血糖","3": "备孕营养", "1": "月经不调", "2": "多囊调理", "11":"心脑血管调理","13":"胃肠肿瘤调理","4":"产后调理","7":"高血脂","10":"消化系统管理"};
+export const projectName = {"0":"减脂","5":"高血压","6":"高血糖","3": "备孕营养", "1":"月经不调", "2":"多囊卵巢综合症", "13":"胃肠肿瘤","4":"产后调理","7":"高血脂","10":"消化系统管理"};
 //需要填写慢病调查问卷的项目
 export const extendHealthyIndex = [5, 6, 1, 2, 13,4,7];
 //跳过减脂经历问卷的项目
-export const notExperienceIndex = [3,1,2,13,4,7];
+export const notExperienceIndex = [3,1,2,13,4,7,10];
 
 export function getTitleKey(projectId){
     return extendHealthyTitle[projectId+""] != null ? extendHealthyTitle[projectId+""] : extendHealthyTitle["0"];