1.室内质控月分析增加设备名称

2.按照客户提供的视图调整为保存样本和弃置样本从两张视图中去获取,解决保存和弃置数量对不上的问题

GetDataByRESTful/src/main/java/com/jyxt/getdatabyrestful/service/impl/LISServiceImpl.java

@@ -112,28 +112,40 @@ public class LISServiceImpl implements LISService {
                 continue;
             }
 
+//            StringBuilder sql = new StringBuilder(
+//                    "select STATE,SAVE_DATE,DESTROY_DATE,INSPECTION_ID,PATIENT_NAME,TEST_ORDER_NAME from V_JT_SAVEANDDESTROY where ");
+//
+//            // 处理STATE参数（可能为单个值或多个值）
+//            String stateValue = inputMap.get("STATE").toString();
+//            if (stateValue.contains(",")) {
+//                String[] states = stateValue.split(",");
+//                sql.append("STATE IN (");
+//                for (int i = 0; i < states.length; i++) {
+//                    sql.append("'").append(states[i].trim()).append("'");
+//                    if (i < states.length - 1) {
+//                        sql.append(",");
+//                    }
+//                }
+//                sql.append(")");
+//            } else {
+//                sql.append("STATE = '").append(stateValue).append("'");
+//            }
+
             StringBuilder sql = new StringBuilder(
-                    "select STATE,SAVE_DATE,DESTROY_DATE,INSPECTION_ID,PATIENT_NAME,TEST_ORDER_NAME from V_JT_SAVEANDDESTROY where ");
-
-            // 处理STATE参数（可能为单个值或多个值）
-            String stateValue = inputMap.get("STATE").toString();
-            if (stateValue.contains(",")) {
-                String[] states = stateValue.split(",");
-                sql.append("STATE IN (");
-                for (int i = 0; i < states.length; i++) {
-                    sql.append("'").append(states[i].trim()).append("'");
-                    if (i < states.length - 1) {
-                        sql.append(",");
-                    }
-                }
-                sql.append(")");
+                    "select ");
+            if (inputMap.get("STATE").equals("2")) {
+                sql.append(
+                        "STATE,SAVE_DATE,DESTROY_DATE,INSPECTION_ID,PATIENT_NAME,TEST_ORDER_NAME from v_jt_inspection_destroy where ");
             } else {
-                sql.append("STATE = '").append(stateValue).append("'");
+                sql.append(
+                        "STATE,SAVE_DATE,INSPECTION_ID,PATIENT_NAME,TEST_ORDER_NAME from v_jt_inspection_save where ");
             }
 
+
+
             // 处理其他查询条件
             if (inputMap.containsKey("SAVE_DATE") && inputMap.get("SAVE_DATE") != null) {
-                sql.append(" AND SAVE_DATE = '").append(inputMap.get("SAVE_DATE")).append("'");
+                sql.append("SAVE_DATE = '").append(inputMap.get("SAVE_DATE")).append("'");
             }
 //            if (inputMap.containsKey("DESTROY_DATE") && inputMap.get("DESTROY_DATE") != null) {
 //                sql.append(" AND DESTROY_DATE = '").append(inputMap.get("DESTROY_DATE")).append("'");

GetDataByView/src/main/java/com/jyxt/getdatabyview/HandleData.java

@@ -258,6 +258,7 @@ public class HandleData {
                 putIfNotNull(insertMap, "zhi_kong_chang_ji", entityMap, "QCMFG");
                 putIfNotNull(insertMap, "shi_kong_gui_ze_", entityMap, "QCRule");
                 putIfNotNull(insertMap, "shi_fou_he_ge_", entityMap, "PASS");
+                putIfNotNull(insertMap, "she_bei_ming_cheng_", entityMap, "DEVICENAME");
                 insertList.add(insertMap);
             }