소스 검색

fix: 提示更明显

xdd 1 개월 전
부모
커밋
93c227f905

+ 5 - 0
fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderReportServiceImpl.java

@@ -8,6 +8,8 @@ import java.util.Map;
 
 import cn.jiguang.common.resp.APIConnectionException;
 import cn.jiguang.common.resp.APIRequestException;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
@@ -94,6 +96,9 @@ public class FsInquiryOrderReportServiceImpl implements IFsInquiryOrderReportSer
     {
         fsInquiryOrderReport.setCreateTime(DateUtils.getNowDate());
         FsDoctor drug =fsDoctorMapper.selectPackageFsDoctorType2Ids(2);
+        if(ObjectUtils.isNull(drug)) {
+            throw new IllegalArgumentException(String.format("没有可用药师,请联系管理员!请求参数: %s", JSON.toJSONString(fsInquiryOrderReport)));
+        }
         fsInquiryOrderReport.setDrugId(drug.getDoctorId());
         fsInquiryOrderReport.setDrugDoctorSignUrl(drug.getSignUrl());
         return fsInquiryOrderReportMapper.insertFsInquiryOrderReport(fsInquiryOrderReport);

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

@@ -24,12 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="drugType"    column="drug_type"    />
         <result property="isDrug"    column="is_drug"    />
-        <result property="failMsg"    column="fail_msg"    />
-        <result property="count"    column="count"    />
     </resultMap>
 
     <sql id="selectFsPrescribeDrugVo">
-        select drug_id, prescribe_id,is_drug, drug_name, drug_spec, usage_method, usage_frequency_unit, usage_per_use_count, usage_per_use_unit, usage_days, drug_num,drug_price, drug_unit, instructions,drug_img_url, product_id,product_attr_value_id,remark,drug_type,fail_msg,count from fs_prescribe_drug
+        select drug_id, prescribe_id,is_drug, drug_name, drug_spec, usage_method, usage_frequency_unit, usage_per_use_count, usage_per_use_unit, usage_days, drug_num,drug_price, drug_unit, instructions,drug_img_url, product_id,product_attr_value_id,remark,drug_type from fs_prescribe_drug
     </sql>
 
     <select id="selectFsPrescribeDrugList" parameterType="FsPrescribeDrug" resultMap="FsPrescribeDrugResult">