总后台、店铺增加2类、3类医疗器械照经营范围填写

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreScrmController.java

@@ -32,8 +32,8 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/store/his/store")
-public class FsStoreScrmController extends BaseController
-{
+public class FsStoreScrmController extends BaseController {
+
     @Autowired
     private IFsStoreScrmService fsStoreService;
 
@@ -43,6 +43,47 @@ public class FsStoreScrmController extends BaseController
     @Autowired
     private IFsDoctorService fsDoctorService;
 
+    /**
+     * 获取店铺管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:query')")
+    @GetMapping(value = "/{storeId}")
+    public AjaxResult getInfo(@PathVariable("storeId") Long storeId) {
+        FsStoreScrm fsStore = fsStoreService.selectFsStoreByStoreId(storeId);
+        //获取店铺下绑定的药师职业证书
+        FsDoctorParam param=new FsDoctorParam();
+        param.setStoreId(fsStore.getStoreId());
+        param.setDoctorType(2);
+        fsStore.setDoctorList(fsDoctorService.getDoctorInfoByStoreId(param));
+//        fsStore.setPhone(ParseUtils.parsePhone(fsStore.getPhone()));
+        return AjaxResult.success(fsStore);
+    }
+
+    /**
+     * 新增店铺管理
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:add')")
+    @Log(title = "店铺管理", businessType = BusinessType.INSERT,logParam = {"店铺","新增店铺信息"},isStoreLog = true)
+    @PostMapping
+    public AjaxResult add(@RequestBody FsStoreScrm fsStore) {
+        storeAuditLogUtil.addOperLog(fsStoreService.insertFsStore(fsStore));
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改店铺管理
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:edit')")
+    @Log(title = "店铺管理", businessType = BusinessType.UPDATE,logParam = {"店铺","修改店铺信息"},isStoreLog = true)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FsStoreScrm fsStore) {
+        if (fsStore.getPhone()!=null&&fsStore.getPhone().contains("*")) {
+            fsStore.setPhone(null);
+        }
+        return toAjax(fsStoreService.updateFsStore(fsStore));
+    }
+
+
     /**
      * 查询店铺管理列表
      */
@@ -92,23 +133,6 @@ public class FsStoreScrmController extends BaseController
         return util.exportExcel(excelVOList, "商家申请登记表");
     }
 
-    /**
-     * 获取店铺管理详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('his:store:query')")
-    @GetMapping(value = "/{storeId}")
-    public AjaxResult getInfo(@PathVariable("storeId") Long storeId)
-    {
-        FsStoreScrm fsStore = fsStoreService.selectFsStoreByStoreId(storeId);
-        //获取店铺下绑定的药师职业证书
-        FsDoctorParam param=new FsDoctorParam();
-        param.setStoreId(fsStore.getStoreId());
-        param.setDoctorType(2);
-        fsStore.setDoctorList(fsDoctorService.getDoctorInfoByStoreId(param));
-//        fsStore.setPhone(ParseUtils.parsePhone(fsStore.getPhone()));
-        return AjaxResult.success(fsStore);
-    }
-
     /**
      * 新增或修改时候校验上传的营业执照是否包含药品零售
      */
@@ -117,33 +141,6 @@ public class FsStoreScrmController extends BaseController
         return R.ok().put("data", TxOcrClient.isContains(imageUrl, null));
     }
 
-    /**
-     * 新增店铺管理
-     */
-    @PreAuthorize("@ss.hasPermi('his:store:add')")
-    @Log(title = "店铺管理", businessType = BusinessType.INSERT,logParam = {"店铺","新增店铺信息"},isStoreLog = true)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreScrm fsStore)
-    {
-        storeAuditLogUtil.addOperLog(fsStoreService.insertFsStore(fsStore));
-        return AjaxResult.success();
-    }
-
-    /**
-     * 修改店铺管理
-     */
-    @PreAuthorize("@ss.hasPermi('his:store:edit')")
-    @Log(title = "店铺管理", businessType = BusinessType.UPDATE,logParam = {"店铺","修改店铺信息"},isStoreLog = true)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreScrm fsStore)
-    {
-
-        if (fsStore.getPhone()!=null&&fsStore.getPhone().contains("*")){
-            fsStore.setPhone(null);
-        }
-        return toAjax(fsStoreService.updateFsStore(fsStore));
-    }
-
     /**
      * 删除店铺管理
      */

fs-common/src/main/java/com/fs/common/utils/txocr/TxOcrClient.java

@@ -27,6 +27,15 @@ public class TxOcrClient  {
 
     private static final String YPLS = "药品零售";
 
+    /**
+     * 医疗器械url识别
+     * @return
+     */
+    public ContainsResult medicalDeviceUrlOcr(String imageUrl){
+        String ocr = ExtractDocBasic(imageUrl);
+        return null;
+    }
+
 
     /**
      * 营业执照识别
@@ -54,7 +63,7 @@ public class TxOcrClient  {
 
 
     /**
-     * 文档抽取
+     * 文档抽取(基础版)
      * @param imageUrl
      * @return
      */

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreScrm.java

@@ -484,4 +484,16 @@ public class FsStoreScrm extends BaseEntity {
      * **/
     @TableField(exist = false)
     private Integer remainDays;
+
+    /**
+     * 2类医疗器械经营许可证营业范围
+     **/
+    private String medicalDevice2BusinessScope;
+
+    /**
+     * 3类医疗器械经营许可证营业范围
+     **/
+    private String medicalDevice3BusinessScope;
+
+
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStoreScrmInfoParam.java

@@ -266,4 +266,16 @@ public class FsStoreScrmInfoParam extends BaseEntity
      **/
     private Byte isMedicalDevice1ExpiryPermanent;
 
+    /**
+     * 2类医疗器械经营许可证营业范围
+     **/
+    private String medicalDevice2BusinessScope;
+
+    /**
+     * 3类医疗器械经营许可证营业范围
+     **/
+    private String medicalDevice3BusinessScope;
+
+
+
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreDetailsScrmVo.java

@@ -284,4 +284,15 @@ public class FsStoreDetailsScrmVo extends BaseEntity
      **/
     private Date qualificationUpdateTime;
 
+    /**
+     * 2类医疗器械经营许可证营业范围
+     **/
+    private String medicalDevice2BusinessScope;
+
+    /**
+     * 3类医疗器械经营许可证营业范围
+     **/
+    private String medicalDevice3BusinessScope;
+
+
 }

fs-service/src/main/resources/mapper/hisStore/FsStoreScrmMapper.xml

@@ -86,7 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="settlementAgreementFileName" column="settlement_agreement_file_name" />
         <result property="qualityAssuranceAgreementFileName" column="quality_assurance_agreement_fileName" />
         <result property="otherSpecialQualificationFileName" column="other_special_qualification_fileName" />
-
+        <result property="medicalDevice2BusinessScope" column="medical_device2_business_scope" />
+        <result property="medicalDevice3BusinessScope" column="medical_device3_business_scope" />
     </resultMap>
 
     <sql id="selectFsStoreVo">
@@ -105,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                quality_assurance_agreement_code,settlement_agreement_code,is_medical_device1_expiry_permanent,
                is_drug_license_permanent,is_medical_device2_expiry_permanent,is_medical_device3_expiry_permanent,is_food_license_expiry_permanent,is_medical_license_expiry_permanent,
                title_Name_one,title_Name_two,title_Name_three,settlement_agreement_file_name,quality_assurance_agreement_fileName,other_special_qualification_fileName,
-               is_effective_permanent1,is_effective_permanent2,is_effective_permanent3
+               is_effective_permanent1,is_effective_permanent2,is_effective_permanent3,medical_device2_business_scope,medical_device3_business_scope
         from fs_store_scrm
     </sql>
 
@@ -225,6 +226,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settlementAgreementFileName !=null ">settlement_agreement_file_name , </if>
             <if test="qualityAssuranceAgreementFileName !=null ">quality_assurance_agreement_fileName , </if>
             <if test="otherSpecialQualificationFileName !=null ">other_special_qualification_fileName , </if>
+            <if test="medicalDevice2BusinessScope !=null ">medical_device2_business_scope,</if>
+            <if test="medicalDevice3BusinessScope !=null ">medical_device3_business_scope,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="cityIds != null">#{cityIds},</if>
@@ -319,6 +322,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settlementAgreementFileName !=null ">#{settlementAgreementFileName} , </if>
             <if test="qualityAssuranceAgreementFileName !=null ">#{qualityAssuranceAgreementFileName} , </if>
             <if test="otherSpecialQualificationFileName !=null ">#{otherSpecialQualificationFileName} , </if>
+            <if test="medicalDevice2BusinessScope !=null ">#{medicalDevice2BusinessScope},</if>
+            <if test="medicalDevice3BusinessScope !=null ">#{medicalDevice3BusinessScope},</if>
         </trim>
     </insert>
 
@@ -415,6 +420,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settlementAgreementFileName !=null ">settlement_agreement_file_name = #{settlementAgreementFileName} , </if>
             <if test="qualityAssuranceAgreementFileName !=null ">quality_assurance_agreement_fileName = #{qualityAssuranceAgreementFileName} , </if>
             <if test="otherSpecialQualificationFileName !=null ">other_special_qualification_fileName = #{otherSpecialQualificationFileName} , </if>
+            <if test="medicalDevice2BusinessScope !=null ">medical_device2_business_scope = #{medicalDevice2BusinessScope} , </if>
+            <if test="medicalDevice3BusinessScope !=null ">medical_device3_business_scope = #{medicalDevice3BusinessScope} , </if>
         </trim>
         where store_id = #{storeId}
     </update>