hisid去除

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/afterwaring/XCFYDataTransferService.java

@@ -24,15 +24,7 @@ public class XCFYDataTransferService {
     public Integer transferDataList(String querySql, String insertSql, Map<String, Object> paramMap, TransferDataCallFunction transferDataCallFunction) {
         NamedParameterJdbcTemplate namedParameterJdbcTemplate = DynamicDBUtil.getNamedParameterJdbcTemplate(Constant.FY_ORACLE);
         NamedParameterJdbcTemplate localNamedParameterJdbcTemplate = DynamicDBUtil.getNamedParameterJdbcTemplate(Constant.LOCAL_MYSQL);
-//        String whereSql = "";
-//        Date visitTime = null;
-//        Map<String,Object> paramMap = new HashMap<>();
-//        if(null != visitTime){
-//            whereSql = "where VISIT_TIME>:VISIT_TIME";
-//            paramMap.put("VISIT_TIME", visitTime);
-//        }
-//        String sql = "select * from v_master_admission_bill %s order by VISIT_TIME asc limit 1000";
-//        sql = String.format(sql, whereSql);
+
         List<Map<String, Object>> dataList = namedParameterJdbcTemplate.queryForList(querySql, paramMap);
         if (CollectionUtil.isEmpty(dataList)) {
             log.error("querySql：{} paramMap:{} 未查询到数据，返回", querySql, paramMap);
@@ -50,7 +42,6 @@ public class XCFYDataTransferService {
             MapSqlParameterSource parameters = new MapSqlParameterSource(dataMap);
             batchArgs.add(parameters);
         }
-//        String insertSql = "insert into master_admission_bill() values()";
         localNamedParameterJdbcTemplate.batchUpdate(insertSql, batchArgs.toArray(new MapSqlParameterSource[batchArgs.size()]));
         return dataList.size();
     }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDataV_PRESCRIPTION_ORDERJob.java

@@ -25,13 +25,13 @@ public class XCFYDataV_PRESCRIPTION_ORDERJob implements Job {
     @Autowired
     JdbcTemplate jdbcTemplate;
 
-    String insertSql = "INSERT INTO prescription_order (hisid, patient_id, inp_outpatient_number, order_number, " +
+    String insertSql = "INSERT INTO prescription_order (patient_id, inp_outpatient_number, order_number, " +
             "order_time, stop_order_time, order_status, order_type, order_catalog, item_id, item_name, drug_spec, " +
             "each_dose, dose_unit, exe_frequency, days_timelines, medication_method, drug_use_total, inspection_site, " +
             "mark, start_exc_time, intended_stop_time, input_operator, input_time, order_doctor, order_department, " +
             "proof_nurse, proof_time, stop_order_operater, stop_order_exc_time, stop_order_doctor, exc_operater, " +
             "exc_department, approver, approval_time, medical_insurance_mark, create_time, create_by, " +
-            "medical_insurance_ratio) VALUES (:HISID,:PATIENT_ID,:INP_OUTPATIENT_NUMBER,:ORDER_NUMBER," +
+            "medical_insurance_ratio) VALUES (:PATIENT_ID,:INP_OUTPATIENT_NUMBER,:ORDER_NUMBER," +
             ":ORDER_TIME,:STOP_ORDER_TIME,:ORDER_STATUS,:ORDER_TYPE,:ORDER_CATALOG,:ITEM_ID,:ITEM_NAME," +
             ":DRUG_SPEC,:EACH_DOSE,:DOSE_UNIT,:EXE_FREQUENCY,:DAYS_TIMELINES,:MEDICATION_METHOD,:DRUG_USE_TOTAL," +
             ":INSPECTION_SITE,:MARK,:START_EXC_TIME,:INTENDED_STOP_TIME,:INPUT_OPERATOR,:INPUT_TIME,:ORDER_DOCTOR," +