Explorar o código

[task-6326] 试剂更换验证对接 第二次提交

huangws hai 2 meses
pai
achega
7990dd7fcc

+ 1 - 1
GetDataByView/src/main/java/com/jyxt/getdatabyview/GetDataByViewApplication.java

@@ -48,7 +48,7 @@ public class GetDataByViewApplication implements CommandLineRunner{
         if(Objects.equals(updateReagentCode, "1")){
             handleData.updateReagentCode();
         } else if(Objects.equals(updateReagentCode, "0")){
-            handleData.Test();
+//            handleData.Test();
 //            handleData.upadteReagentInfo();
             handleData.HandleData();
         } else if(Objects.equals(updateReagentCode, "2")){

+ 1 - 1
GetDataByView/src/main/java/com/jyxt/getdatabyview/HandleData.java

@@ -55,7 +55,7 @@ public class HandleData {
             Map<String, String> oldReagentMap = ibpsRepository.getOldReagent(reagentCode);
             String oldBatchNumber = String.valueOf(oldReagentMap.get("oldBatchNumber") == null ? "" : oldReagentMap.get("oldBatchNumber"));
             String oldExpiredDate = String.valueOf(oldReagentMap.get("oldExpiredDate") == null ? "" : oldReagentMap.get("oldExpiredDate"));
-            String reagentType = ibpsRepository.getReagentByField(reagentCode,"bian_ma_","shi_shi_lei_bie_");
+            String reagentType = ibpsRepository.getReagentByField(reagentCode,"bian_ma_","shi_ji_lei_bie_");
             String deviceID = ibpsRepository.getReagentByField(reagentCode,"bian_ma_","yi_qi_she_bei_");
             String deviceCode = ibpsRepository.getReagentByField(reagentCode,"bian_ma_","she_bei_bian_hao_");
 //            String reagentType = "定性";

+ 12 - 11
GetDataByView/src/main/java/com/jyxt/getdatabyview/view/repository/LISViewRepository.java

@@ -48,17 +48,18 @@ public class LISViewRepository {
 
     public List<Map<String, Object>> getReagentLotVerification() {
         List<Map<String, Object>> retList = new ArrayList<Map<String, Object>>();
-        /*
-        Map<String, Object> retMap = new HashMap<>();
-        retMap.put("ReagentName", "(国J)α-羟丁酸脱氢酶(HBDH)测定试剂盒(速率法)");
-        retMap.put("ReagentNumber", "04010110420");
-        retMap.put("NewBatchNumber", "555");
-        retMap.put("ExpiredDate", "2029-12-30");
-        retMap.put("GroupCode", "lj");
-        retMap.put("GroupName", "临检");
-        retList.add(retMap);
-        return retList;
-        */
+        if(1==2){
+            Map<String, Object> retMap = new HashMap<>();
+            retMap.put("ReagentName", "(国J)α-羟丁酸脱氢酶(HBDH)测定试剂盒(速率法)");
+            retMap.put("ReagentNumber", "04010110420");
+            retMap.put("NewBatchNumber", "555");
+            retMap.put("ExpiredDate", "2029-12-30");
+            retMap.put("GroupCode", "lj");
+            retMap.put("GroupName", "临检");
+            retList.add(retMap);
+            return retList;
+        }
+
         Map<String, Object> retMap = new HashMap<>();
         String sqlQry = "SELECT * FROM v_mate_whr_Reagent \n" +
                 "WHERE confDate >= to_char(CURRENT_DATE - 1, 'YYYY-MM-DD') \n" +