Browse Source

优化匹配和目录下载

lighter 1 year ago
parent
commit
737d0eb5d4

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/dictionary/NationalMatchDao.java

@@ -162,7 +162,7 @@ public interface NationalMatchDao {
             "bke608 as approvalNumber,ake002 as nationalName,aka074 as specifications, " +
             "ake003 as catalogueType,bke215 as fundType,aae030 as start_time, aae031 as end_time, " +
             "matchedCount=(select count(1) from yp_zd_dict t where t.aaz231=a.aaz231) " +
-            "from t_industrial_injury_catalogue a where a.ake003 in ('23','24','21') and a.ake002 like #{name} ")
+            "from t_industrial_injury_catalogue a where a.ake003 in ('21','22','23','24') and a.ake002 like #{name} ")
     List<SiCentralSuppliesMini> selectInjurySupplies(String name);
 
     @Update("update yp_zd_dict set national_status=1,national_code=#{nationalCode}," +

+ 14 - 4
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiDownloadService.java

@@ -294,12 +294,22 @@ public class SiDownloadService {
                     versionName = list.get(0).getVersionName();
                 }
                 if (list.size() == 20) {
-                    dnlddao.insertChnsHblBatch(list);
-                    list.clear();
+                    try {
+                        dnlddao.insertChnsHblBatch(list);
+                        list.clear();
+                    } catch (Exception e) {
+                        log.info("{}", JSONArray.toJSON(list));
+                        throw e;
+                    }
                 }
             }
-            if (list.size() > 0) {
-                dnlddao.insertChnsHblBatch(list);
+            if (!list.isEmpty()) {
+                try {
+                    dnlddao.insertChnsHblBatch(list);
+                } catch (Exception e) {
+                    log.info("{}", JSONArray.toJSON(list));
+                    throw e;
+                }
             }
             if (StringUtil.notBlank(versionName)) {
                 return ResultVoUtil.success(versionName);