长泰：单据号变成流水号，下载处方单据查询问题

云霄妇幼：单据号变成流水号

src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java

@@ -34,6 +34,7 @@ import com.glxp.mipsdl.util.ResultVOUtils;
 import com.glxp.mipsdl.util.SubmitOrderUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -48,7 +49,8 @@ import java.util.Map;
 @Slf4j
 @Service
 public abstract class CommonHttpClient implements BaseHttpClient {
-
+    @Value("${DSF_XML_SQL_TYPE:Mysql}")
+    private String defXmlSqlType;
     @Autowired
     private HttpClient httpClient;
     @Autowired
@@ -327,27 +329,8 @@ public abstract class CommonHttpClient implements BaseHttpClient {
     private DataSource dataSource;
 
     public String getDataSourceType() {
-        Connection conn = null;
-        DatabaseMetaData metaData = null;
-        String databaseProductName = "";
-        try {
-            conn = dataSource.getConnection();
-            metaData = conn.getMetaData();
-            databaseProductName = metaData.getDatabaseProductName();//MySQL //Oracle
-        } catch (SQLException throwables) {
-            throwables.printStackTrace();
-        } finally {
-            // 释放连接资源
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        log.info("数据库类型为：" + databaseProductName);
-        return databaseProductName;
+
+        return defXmlSqlType;
 
     }
 

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.enums.SqlLike;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -1405,21 +1406,22 @@ public class CtqyyClient extends CommonHttpClient {
     public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
         udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType());
         if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) {
+            log.info("udiwmsBasicSkPrescribeRequest11111"+udiwmsBasicSkPrescribeRequest);
             LambdaQueryWrapper<VInsurNationGoodsPhysic> wrapper = new LambdaQueryWrapper<>();
 
             String startTime = udiwmsBasicSkPrescribeRequest.getStartTime();
             String endTime = udiwmsBasicSkPrescribeRequest.getEndTime();
-            wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, startTime);
-            wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, endTime);
+            wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME,  DateUtil.parseDate(startTime));
+            wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME,  DateUtil.parseDate(endTime));
 
             String code = udiwmsBasicSkPrescribeRequest.getCode();
             String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName();
             String key = udiwmsBasicSkPrescribeRequest.getKey();
             wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code));
-            wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsPhysic::getSTOOUT_NO, key)
-                    .or().like(VInsurNationGoodsPhysic::getRXNO, key)
-                    .or().like(VInsurNationGoodsPhysic::getPSN_NAME, key)
-                    .or().like(VInsurNationGoodsPhysic::getPSN_NO, key)
+            wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsPhysic::getSTOOUT_NO, "%"+key+"%")
+                    .or().like(VInsurNationGoodsPhysic::getRXNO, "%"+key+"%")
+                    .or().like(VInsurNationGoodsPhysic::getPSN_NAME, "%"+key+"%")
+                    .or().like(VInsurNationGoodsPhysic::getPSN_NO, "%"+key+"%")
             );
             wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsPhysic::getPSN_NAME, fromCorpName));
             if (udiwmsBasicSkPrescribeRequest.getBusType().equals("YPCF003")) {
@@ -1764,7 +1766,7 @@ public class CtqyyClient extends CommonHttpClient {
                     ioCollectOrder.setBusType("YPCF002");
 
                 }
-                ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER());
+                ioCollectOrder.setBillNo(presInfoEntity.getSTOOUT_NO());
                 ioCollectOrder.setFromType("HIS系统");
                 ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID());
                 ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());

src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java

@@ -1656,7 +1656,7 @@ public class YxfyyyClient extends CommonHttpClient {
                 VYpzsPresInfo presInfoEntity = value.get(0);
                 StringBuilder errorMsg = new StringBuilder();
                 IoCollectOrder ioCollectOrder = new IoCollectOrder();
-                ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER());
+                ioCollectOrder.setBillNo(presInfoEntity.getSTOOUT_NO());
                 ioCollectOrder.setFromType("HIS系统");
                 ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID());
                 ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());