Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-doctor-app/src/main/java/com/fs/app/controller/DoctorController.java

@@ -280,7 +280,7 @@ public class DoctorController extends  AppBaseController {
     @Login
     @ApiOperation("修改信息")
     @PostMapping("/editDoctor")
-    public R editDoctor(@Validated @RequestBody DoctorEditParam param, HttpServletRequest request){
+    public R editDoctor(@RequestBody DoctorEditParam param, HttpServletRequest request){
         FsDoctor doctor=new FsDoctor();
         doctor.setDoctorId(Long.parseLong(getDoctorId()));
         doctor.setWorkStatus(param.getWorkStatus());

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -927,6 +927,15 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         if (qwUser==null){
             return R.error("客服不存在");
         }
+
+        //医健宝
+        if ("医健宝".equals(signProjectName)) {
+            //查询销售
+            CompanyUser user = companyUserMapper.selectCompanyUserById(qwUser.getCompanyId());
+            contactWay = user.getQrCodeWeixin() != null?user.getQrCodeWeixin():"";
+            return R.error(400, msg).put("qrcode", contactWay);
+        }
+
         if (StringUtils.isNotEmpty(qwUser.getContactWay())){
             contactWay = qwUser.getContactWay();
         }

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

@@ -500,5 +500,10 @@ public class FsStoreScrm extends BaseEntity {
      **/
     private String drugLicenseBusinessScope;
 
+    /**
+     * 食品经营许可证/备案凭证经营范围
+     **/
+    private String foodLicenseBusinessScope;
+
 
 }

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

@@ -281,6 +281,11 @@ public class FsStoreScrmInfoParam extends BaseEntity
      **/
     private String drugLicenseBusinessScope;
 
+    /**
+     * 食品经营许可证/备案凭证经营范围
+     **/
+    private String foodLicenseBusinessScope;
+
 
 
 }

fs-service/src/main/java/com/fs/hisStore/service/categoryVal/WellnessFoodCheck.java

@@ -3,6 +3,7 @@ package com.fs.hisStore.service.categoryVal;
 import com.fs.common.utils.txocr.ContainsResult;
 import com.fs.hisStore.domain.FsStoreScrm;
 import com.fs.hisStore.service.impl.FsStoreScrmServiceImpl;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -35,11 +36,25 @@ public class WellnessFoodCheck extends AbstractHandler{
     public ContainsResult check(String cateName, Long storeId, String medicalDeviceCode, String productType){
         FsStoreScrm fsStoreScrm = fsStoreScrmService.selectFsStoreByStoreId(storeId);
         ContainsResult result = new ContainsResult();
-        boolean flag = StringUtils.isNotEmpty(fsStoreScrm.getFoodLicense());
-        result.setFlag(flag);
-        result.setMessage(flag ? "已上传健康食品经营许可证" : "未上传健康食品经营许可证");
-        //目前没有办法通过文档抽取保健食品中前面的打勾,只能判断是否上传，当然可以重写TxOcrClient.ExtractDocBasic方法。
-        return result;
+        if(ObjectUtils.isEmpty(fsStoreScrm.getFoodLicenseBusinessScope())){
+            result.setFlag(false);
+            result.setMessage("未填写传健康食品经营许可证");
+            return result;
+        }else{
+            String foodLicenseBusinessScope = fsStoreScrm.getFoodLicenseBusinessScope();
+
+            boolean ybz_flag = foodLicenseBusinessScope.contains("预包装食品");
+            boolean bj_flag = foodLicenseBusinessScope.contains("保健食品");
+            if(ybz_flag || bj_flag){
+                result.setFlag(true);
+                result.setMessage("通过");
+            }else {
+                result.setFlag(false);
+                result.setMessage("不符合！");
+            }
+            return result;
+        }
+
     }
 
 }

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

@@ -299,4 +299,10 @@ public class FsStoreDetailsScrmVo extends BaseEntity
      **/
     private String drugLicenseBusinessScope;
 
+
+    /**
+     * 食品经营许可证/备案凭证经营范围
+     **/
+    private String foodLicenseBusinessScope;
+
 }

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

@@ -89,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="medicalDevice2BusinessScope" column="medical_device2_business_scope" />
         <result property="medicalDevice3BusinessScope" column="medical_device3_business_scope" />
         <result property="drugLicenseBusinessScope" column="drug_license_business_scope" />
+        <result property="foodLicenseBusinessScope" column="food_license_business_scope" />
     </resultMap>
 
     <sql id="selectFsStoreVo">
@@ -108,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                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,medical_device2_business_scope,medical_device3_business_scope,drug_license_business_scope
+            ,food_license_business_scope
         from fs_store_scrm
     </sql>
 
@@ -230,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="medicalDevice2BusinessScope !=null ">medical_device2_business_scope,</if>
             <if test="medicalDevice3BusinessScope !=null ">medical_device3_business_scope,</if>
             <if test="drugLicenseBusinessScope !=null ">drug_license_business_scope, </if>
+            <if test="foodLicenseBusinessScope !=null ">food_license_business_scope, </if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="cityIds != null">#{cityIds},</if>
@@ -327,6 +330,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="medicalDevice2BusinessScope !=null ">#{medicalDevice2BusinessScope},</if>
             <if test="medicalDevice3BusinessScope !=null ">#{medicalDevice3BusinessScope},</if>
             <if test="drugLicenseBusinessScope !=null ">#{drugLicenseBusinessScope}, </if>
+            <if test="foodLicenseBusinessScope !=null ">#{foodLicenseBusinessScope}, </if>
         </trim>
     </insert>
 
@@ -426,6 +430,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="medicalDevice2BusinessScope !=null ">medical_device2_business_scope = #{medicalDevice2BusinessScope} , </if>
             <if test="medicalDevice3BusinessScope !=null ">medical_device3_business_scope = #{medicalDevice3BusinessScope} , </if>
             <if test="drugLicenseBusinessScope !=null ">drug_license_business_scope = #{drugLicenseBusinessScope} , </if>
+            <if test="foodLicenseBusinessScope !=null ">food_license_business_scope = #{foodLicenseBusinessScope} , </if>
         </trim>
         where store_id = #{storeId}
     </update>

fs-service/src/main/resources/mapper/hospital580/Hospital580PrescriptionScrmMapper.xml

@@ -128,9 +128,9 @@
         <if test="query.doctorDrugId != null">
             AND hps.doctor_drug_id = #{query.doctorDrugId}
         </if>
-        <if test="query.type != null">
-            AND hps.type = #{query.type}
-        </if>
+<!--        <if test="query.type != null">-->
+<!--            AND hps.type = #{query.type}-->
+<!--        </if>-->
         <if test="query.patientName != null and query.patientName != ''">
             AND hps.patient_name LIKE CONCAT('%', #{query.patientName}, '%')
         </if>