12/19 药品对照优化1.0

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -736,7 +736,8 @@ public class IoOrderDetailBizController extends BaseController {
             AliYljgBillDetailDrug aliYljgBillDetailDrug = aliYljgBillDetailDrugList.get(i);
 
 
-            String code = aliYljgBillDetailDrug.getAliYljgBillDetailDrugCodeList().get(0).getCode();
+            AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode1 = aliYljgBillDetailDrug.getAliYljgBillDetailDrugCodeList().get(0);
+            String code = aliYljgBillDetailDrugCode1.getCode();
             if (StrUtil.isEmpty(code)) {
                 return ResultVOUtils.error("单据码为空！");
             }
@@ -755,7 +756,7 @@ public class IoOrderDetailBizController extends BaseController {
             filterUdiRelRequest.setNameCode(nameCode);
             List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest);
             if (CollUtil.isEmpty(udiRelevanceResponses)) {
-                return ResultVOUtils.error("未通过药品标识获取详情信息！");
+                return ResultVOUtils.error("未通过药品标识【"+aliYljgBillDetailDrug.getProdName()+nameCode+"】获取详情信息！");
             }
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
             List<AliYljgBillDetailDrugCode> aliYljgBillDetailDrugCodeList1 = aliYljgBillDetailDrug.getAliYljgBillDetailDrugCodeList();

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -592,16 +592,28 @@
             <if test="diType != '' and diType != null">
                 AND diType = #{diType}
             </if>
-            <if test="filterType != null and filterType == 1">
+            <if test="filterType != null and filterType == 1 and productsType == 1">
                 AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
-                     thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
-                <if test="productsType == 1">
-                    and basic_products.originUuid <![CDATA[<>]]> ''
-                </if>
+                thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
+                and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
-            <if test="filterType != null and filterType == 2">
+            <if test="filterType != null and filterType == 1 and productsType == 2">
+                AND (thirdId is not null or thirdId1 is not null)
+            </if>
+            <if test="filterType != null and filterType == 1 and productsType == 2">
+                AND  basic_products.nameCode is not null
+            </if>
+            <if test="filterType != null and filterType == 2  and productsType == 1">
                 AND basic_products.originUuid is NULL
             </if>
+            <if test="filterType != null and filterType == 2 and productsType == 2">
+                AND  ((thirdId = '' or thirdId is null)  or  (thirdId1 = '' or thirdId1 is null)
+                )
+            </if>
+            <if test="filterType != null and filterType == 2 and productsType == 2">
+                AND  ( (mainId = '' or mainId is null)  or  (basic_products.nameCode = '' or basic_products.nameCode is null)
+                )
+            </if>
             <if test="filterType != null and filterType == 3">
                 AND (mainId is NULL or mainId = '')
                 <if test="productsType == 1">

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -210,15 +210,28 @@
             <if test="diType != '' and diType != null">
                 AND diType = #{diType}
             </if>
-            <if test="filterType != null and filterType == 1">
-                AND (basic_udirel.thirdId <![CDATA[<>]]> '' or basic_udirel.thirdId1 <![CDATA[<>]]> '' or
-                     basic_udirel.thirdId2 <![CDATA[<>]]> '' or
-                     basic_udirel.thirdId3 <![CDATA[<>]]> '' or basic_udirel.thirdId4 <![CDATA[<>]]> '')
+            <if test="filterType != null and filterType == 1 and productType == 1">
+                AND (basic_udirel.thirdId <![CDATA[<>]]> '' or basic_udirel.thirdId1 <![CDATA[<>]]> '' or basic_udirel.thirdId2 <![CDATA[<>]]> '' or
+                tbasic_udirel.hirdId3 <![CDATA[<>]]> '' or basic_udirel.thirdId4 <![CDATA[<>]]> '')
                 and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
-            <if test="filterType != null and filterType == 2">
+            <if test="filterType != null and filterType == 1 and productType == 2">
+                AND (basic_udirel.thirdId is not null or basic_udirel.thirdId1 is not null)
+            </if>
+            <if test="filterType != null and filterType == 1 and productType == 2">
+                AND  basic_products.nameCode is not null
+            </if>
+            <if test="filterType != null and filterType == 2  and productType == 1">
                 AND basic_products.originUuid is NULL
             </if>
+            <if test="filterType != null and filterType == 2 and productType == 2">
+                AND  ((basic_udirel.thirdId = '' or basic_udirel.thirdId is null)  or  (basic_udirel.thirdId1 = '' or basic_udirel.thirdId1 is null)
+                )
+            </if>
+            <if test="filterType != null and filterType == 2 and productType == 2">
+                AND  ( (basic_udirel.mainId = '' or basic_udirel.mainId is null)  or  (basic_products.nameCode = '' or basic_products.nameCode is null)
+                )
+            </if>
             <if test="filterType != null and filterType == 3">
                 AND (basic_udirel.thirdId IS NULL or basic_udirel.thirdId = '')
                 and basic_products.originUuid <![CDATA[<>]]> ''