修复个微采集表提交信息逻辑

fs-service/src/main/resources/mapper/his/FsPrescribeMapper.xml

@@ -333,7 +333,7 @@
         LEFT JOIN fs_user_information_collection infoc ON infoc.third_party_user_id = so.third_party_user_id
         LEFT JOIN fs_user_information_collection main_infoc ON main_infoc.id = so.collection_id
         <where>
-            so.doctor_confirm != -1                <!--  被医生拒访的处方不展示-->
+            so.doctor_confirm != -1                <!--  被医生拒方的处方不展示 不包括药师审核不通过的-->
             AND (fso.order_id IS NULL OR (fso.status != -3 AND fso.status != -2))   <!--  已取消与已退款的订单处方不展示-->
             AND (main_infoc.id IS NULL OR main_infoc.qw_tag = 0)  <!--  如果用户在信息采集表中，则添加企微筛选条件-->
             <if test="companyId != null ">and fso.company_id = #{companyId}</if>

fs-user-app/src/main/java/com/fs/app/controller/UserInfoCollectionController.java

@@ -140,11 +140,16 @@ public class UserInfoCollectionController extends AppBaseController {
     @PostMapping("/submitCollectionAnswerParam")
     public R submitCollectionAnswerParam(@RequestBody SubmitCollectionAnswerParam param)
     {
-        String userIdStr = getUserId();
-        if (StringUtils.isEmpty(userIdStr)) {
-            throw new CustomException("请登录");
+        long userId;
+        try {
+            String userIdStr = getUserId();
+            if (StringUtils.isEmpty(userIdStr)) {
+                throw new CustomException("请登录");
+            }
+            userId = Long.parseLong(userIdStr);
+        } catch (Exception e) {
+            return R.error(401, "未登录");
         }
-        long userId = Long.parseLong(getUserId());
         param.setUserId(userId);
         int result = userInformationCollectionService.submitCollectionAnswerParam(param);
         if (result > 0) {