Преглед на файлове

修复新增信息采集表性别与电话号码映射错误的问题

cgp преди 1 седмица
родител
ревизия
aa98887036

+ 9 - 0
fs-company/src/main/java/com/fs/hisStore/controller/FsUserInformationCollectionController.java

@@ -174,4 +174,13 @@ public class FsUserInformationCollectionController extends BaseController
         List<FsUserInformationCollectionOverviewVo> list =fsUserInformationCollectionService.getUnBindCollectionList(queryDto);
         return getDataTable(list);
     }
+
+    /**
+     * 查询销售是否具有代填权限
+     * */
+    @GetMapping("/getSalesHasCollectionPermission")
+    public AjaxResult getSalesHasCollectionPermission(){
+        boolean salesProxyFillConfig = fsUserInformationCollectionService.getSalesProxyFillConfig();
+        return AjaxResult.success(salesProxyFillConfig);
+    }
 }

+ 6 - 0
fs-service/src/main/java/com/fs/hisStore/service/IFsUserInformationCollectionService.java

@@ -156,4 +156,10 @@ public interface IFsUserInformationCollectionService extends IService<FsUserInfo
      * 获取未绑定的用户信息采集列表
      * */
     List<FsUserInformationCollectionOverviewVo> getUnBindCollectionList(FsUserInformationCollectionOverviewDTO queryDto);
+
+    /**
+     * 获取销售代填配置
+     * @return true: 允许销售代填, false: 不允许销售代填
+     */
+    boolean getSalesProxyFillConfig();
 }

+ 18 - 16
fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -1358,6 +1358,24 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         return resultList;
     }
 
+    /**
+     * 获取销售代填配置
+     * @return true: 允许销售代填, false: 不允许销售代填
+     */
+    @Override
+    public boolean getSalesProxyFillConfig() {
+        String json = configService.selectConfigByKey("his.salesProxyFill");
+        if (StringUtils.isNotEmpty(json)) {
+            try {
+                JSONObject jsonObject = JSON.parseObject(json);
+                return jsonObject.getBooleanValue("isSalesProxyFill");
+            } catch (Exception e) {
+                log.error("解析销售代填配置失败, json={}", json, e);
+            }
+        }
+        return false; // 默认返回 false
+    }
+
     private List<AnswerVO> getAnswerVOs(List<AnswerVO> target,List<AnswerVO> source) {
         target.addAll(source);
         return target.stream()
@@ -1454,22 +1472,6 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         return shedule;
     }
 
-    /**
-     * 获取销售代填配置
-     * @return true: 允许销售代填, false: 不允许销售代填
-     */
-    private boolean getSalesProxyFillConfig() {
-        String json = configService.selectConfigByKey("his.salesProxyFill");
-        if (StringUtils.isNotEmpty(json)) {
-            try {
-                JSONObject jsonObject = JSON.parseObject(json);
-                return jsonObject.getBooleanValue("isSalesProxyFill");
-            } catch (Exception e) {
-                log.error("解析销售代填配置失败, json={}", json, e);
-            }
-        }
-        return false; // 默认返回 false
-    }
     public static void main(String[] args) {
 //        String str1 = "[{\"options\":[{\"flag\":false,\"name\":\"通天\",\"value\":0},{\"flag\":false,\"name\":\"哈哈\",\"value\":1}],\"title\":\"测试标题1\",\"value\":1},{\"options\":[{\"flag\":false,\"name\":\"呼呼\",\"value\":0},{\"flag\":false,\"name\":\"嘻嘻\",\"value\":1}],\"title\":\"测试标题2\",\"value\":1},{\"options\":[{\"flag\":false,\"name\":\"胸痛\",\"value\":0},{\"flag\":false,\"name\":\"胸闷\",\"value\":1},{\"flag\":false,\"name\":\"头晕\",\"value\":2},{\"flag\":false,\"name\":\"肢体麻木\",\"value\":3},{\"flag\":false,\"name\":\"无\",\"value\":4}],\"title\":\"您目前是否有心脑血管相关症状,如胸痛、胸闷、头晕、肢体麻木等?\",\"value\":1}]";
 //        String str2 = "[{\"options\":[{\"flag\":true,\"name\":\"胸痛\",\"value\":0},{\"flag\":true,\"name\":\"胸闷\",\"value\":1},{\"flag\":true,\"name\":\"头晕\",\"value\":2},{\"flag\":true,\"name\":\"肢体麻木\",\"value\":3},{\"flag\":true,\"name\":\"无\",\"value\":4}],\"title\":\"您目前是否有心脑血管相关症状,如胸痛、胸闷、头晕、肢体麻木等?\",\"value\":1},{\"options\":[{\"flag\":false,\"name\":\"胃疼\",\"value\":0},{\"flag\":false,\"name\":\"反酸\",\"value\":1},{\"flag\":false,\"name\":\"恶心\",\"value\":2},{\"flag\":false,\"name\":\"呕吐\",\"value\":3},{\"flag\":false,\"name\":\"黑便\",\"value\":4},{\"flag\":false,\"name\":\"无\",\"value\":5}],\"title\":\"您近期是否出现胃部不适症状,如胃痛、反酸、恶心、呕吐或黑便?\",\"value\":1}]";