Jelajahi Sumber

一个身份证只能入驻到一家店且只能在平台注册一次。

Guos 15 jam lalu
induk
melakukan
fd19c80a98

+ 1 - 1
fs-service/src/main/java/com/fs/his/mapper/FsDoctorMapper.java

@@ -228,7 +228,7 @@ public interface FsDoctorMapper
      * **/
     List<FsDoctorVO> getDoctorInfoByStoreId(@Param("param") FsDoctorParam param);
 
-    Boolean idCardExists(String idCard, Long userId);
+    Boolean idCardExists(String idCard);
 
     /**
      * 身份证是否在这家店已经存在

+ 1 - 2
fs-service/src/main/java/com/fs/his/service/IFsDoctorService.java

@@ -131,10 +131,9 @@ public interface IFsDoctorService
     /**
      * 验证该身份证是否已经注册
      * @param idCard
-     * @param userId
      * @return
      */
-    Boolean idCardExistsByUserId(String idCard, Long userId);
+    Boolean idCardExists(String idCard);
 
     /**
      * 身份证是否在这家店已经存在

+ 2 - 2
fs-service/src/main/java/com/fs/his/service/impl/FsDoctorServiceImpl.java

@@ -563,8 +563,8 @@ public class FsDoctorServiceImpl implements IFsDoctorService
 
 
     @Override
-    public Boolean idCardExistsByUserId(String idCard, Long userId) {
-        return fsDoctorMapper.idCardExists(idCard, userId);
+    public Boolean idCardExists(String idCard) {
+        return fsDoctorMapper.idCardExists(idCard);
     }
 
     /**

+ 22 - 22
fs-service/src/main/java/com/fs/hisStore/util/DrugComponentAnalyzer.java

@@ -25,7 +25,7 @@ public class DrugComponentAnalyzer {
 
     // 禁售成分库(可从数据库/配置文件加载)
     private static final Set<String> FORBIDDEN_COMPONENTS = new HashSet<>(Arrays.asList(
-            "罂粟壳", "吗啡", "海洛因", "可卡因", "芬太尼","罂粟","洋地黄毒苷"
+            "罂粟壳", "吗啡", "复方福尔可定糖浆", "可卡因", "芬太尼","罂粟","洋地黄毒苷"
     ));
 
     // 停用词集合
@@ -123,26 +123,26 @@ public class DrugComponentAnalyzer {
         public boolean isForbidden() { return isForbidden; }
     }
 
-//    public static void main(String[] args) {
-//        // 测试文本1:含禁售成分
-//        String text1 = "洋地黄毒苷,左啡诺";
-//        CheckResult result1 = checkForbiddenComponents(FORBIDDEN_COMPONENTS, text1);
-//        System.out.println("文本1拆分成分:" + result1.getAllComponents());
-//        System.out.println("文本1禁售成分:" + result1.getForbiddenComponents());
-//        System.out.println("文本1是否禁售:" + result1.isForbidden());
-//        // 输出:
-//        // 文本1拆分成分:[对乙酰氨基酚, 罂粟壳, 淀粉]
-//        // 文本1禁售成分:[罂粟壳]
-//        // 文本1是否禁售:true
-//
-//        // 测试文本2:无禁售成分
-//        String text2 = "阿莫西林克拉维酸钾分散片,辅料为硬脂酸镁";
-//        CheckResult result2 = checkForbiddenComponents(FORBIDDEN_COMPONENTS, text2);
-//        System.out.println("\n文本2拆分成分:" + result2.getAllComponents());
-//        System.out.println("文本2是否禁售:" + result2.isForbidden());
-//        // 输出:
-//        // 文本2拆分成分:[阿莫西林克拉维酸钾, 硬脂酸镁]
-//        // 文本2是否禁售:false
-//    }
+    public static void main(String[] args) {
+        // 测试文本1:含禁售成分
+        String text1 = "复方福尔可定糖浆,左啡诺";
+        CheckResult result1 = checkForbiddenComponents(FORBIDDEN_COMPONENTS, text1);
+        System.out.println("文本1拆分成分:" + result1.getAllComponents());
+        System.out.println("文本1禁售成分:" + result1.getForbiddenComponents());
+        System.out.println("文本1是否禁售:" + result1.isForbidden());
+        // 输出:
+        // 文本1拆分成分:[对乙酰氨基酚, 罂粟壳, 淀粉]
+        // 文本1禁售成分:[罂粟壳]
+        // 文本1是否禁售:true
+
+        // 测试文本2:无禁售成分
+        String text2 = "阿莫西林克拉维酸钾分散片,辅料为硬脂酸镁";
+        CheckResult result2 = checkForbiddenComponents(FORBIDDEN_COMPONENTS, text2);
+        System.out.println("\n文本2拆分成分:" + result2.getAllComponents());
+        System.out.println("文本2是否禁售:" + result2.isForbidden());
+        // 输出:
+        // 文本2拆分成分:[阿莫西林克拉维酸钾, 硬脂酸镁]
+        // 文本2是否禁售:false
+    }
 
 }

+ 1 - 1
fs-service/src/main/resources/mapper/his/FsDoctorMapper.xml

@@ -393,7 +393,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="idCardExists" resultType="java.lang.Boolean">
-        select 1 from fs_doctor where id_card = #{idCard}
+        select count(doctor_id) from fs_doctor where id_card = #{idCard}
     </select>
 
     <select id="isIdNumberInShop" resultType="java.lang.Boolean">

+ 3 - 3
fs-user-app/src/main/java/com/fs/app/controller/UserController.java

@@ -265,9 +265,9 @@ public class UserController extends  AppBaseController {
             }else if(!fsStoreScrm.getStatus().equals(1)){
                 return R.error("药剂师,绑定店铺状态未启用!");
             }else{
-                Boolean idNumberInShop = doctorService.isIdNumberInShop(param.getIdCard(), param.getStoreId());
-                if(idNumberInShop){
-                    return R.error("该药剂师已在当前店铺存在");
+                Boolean idCardExists = doctorService.idCardExists(param.getIdCard());
+                if(idCardExists){
+                    return R.error("该药剂师已在其他店铺存在");
                 }
             }
             param.setStoreName(fsStoreScrm.getStoreName());