feat(module-datafill): 增加恩菲药品转换并更新报表数据

- 在 NFDataSyncJob 类中添加恩菲药品转换方法 nfDrugConvert()
- 更新 FCustomReportDatasetMapper.xml 中的 SQL 查询，增加新的药品字段
-移除 EquipmentStatisticsServiceImpl 中未使用的导入和注解

@@ -10,12 +10,9 @@ import com.skua.modules.common.service.IPgCommonService;
 import com.skua.modules.statistics.mapper.EquipmentStatisticsMapper;
 import com.skua.modules.statistics.service.IEquipmentStatisticsService;
 import com.skua.modules.statistics.vo.EquipmentFailurelVO;
-import com.skua.modules.statistics.vo.EquipmentOperationRecordVO;
 import com.skua.modules.statistics.vo.EquipmentRepairMaintainTaskCostDetailVO;
 import com.skua.modules.statistics.vo.EquipmentRepairMaintainTaskCostVO;
 import com.skua.tool.util.JSUtils;
-import lombok.SneakyThrows;
-import netscape.javascript.JSUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;

@@ -582,6 +582,28 @@
 			ROUND(SUM(v3.NACLO),2) AS NACLO,
 			ROUND(SUM(v3.PACGT),2) AS PACGT,
 			ROUND(SUM(v3.PACYT),2) AS PACYT,
+			ROUND(SUM(v3.SSALFE),2) AS SSALFE,
+			ROUND(SUM(v3.PAFS),2) AS PAFS,
+			ROUND(SUM(v3.YLFW),2) AS YLFW,
+			ROUND(SUM(v3.FHTY),2) AS FHTY,
+			ROUND(SUM(v3.LS),2) AS LS,
+			ROUND(SUM(v3.C6H8O7),2) AS C6H8O7,
+			ROUND(SUM(v3.NAOH),2) AS NAOH,
+			ROUND(SUM(v3.FECL2),2) AS FECL2,
+			ROUND(SUM(v3.NACLO3),2) AS NACLO3,
+			ROUND(SUM(v3.HXT),2) AS HXT,
+			ROUND(SUM(v3.HCL),2) AS HCL,
+			ROUND(SUM(v3.LCL2),2) AS LCL2,
+			ROUND(SUM(v3.YJ),2) AS YJ,
+			ROUND(SUM(v3.HCOOH),2) AS HCOOH,
+			ROUND(SUM(v3.XHJ),2) AS XHJ,
+			ROUND(SUM(v3.CF),2) AS CF,
+			ROUND(SUM(v3.DK),2) AS DK,
+			ROUND(SUM(v3.PAFC),2) AS PAFC,
+			ROUND(SUM(v3.PACZ),2) AS PACZ,
+			ROUND(SUM(v3.JJ),2) AS JJ,
+			ROUND(SUM(v3.C6H12O6),2) AS C6H12O6,
+			ROUND(SUM(v3.CFJ),2) AS CFJ,
 			v3.BZ AS BZ,
 			v3.depart_id AS depart_id,
 			LEFT(v3.time,7) AS time
@@ -664,6 +686,28 @@
 			ROUND(SUM(v3.NACLO),2) AS NACLO,
 			ROUND(SUM(v3.PACGT),2) AS PACGT,
 			ROUND(SUM(v3.PACYT),2) AS PACYT,
+			ROUND(SUM(v3.SSALFE),2) AS SSALFE,
+			ROUND(SUM(v3.PAFS),2) AS PAFS,
+			ROUND(SUM(v3.YLFW),2) AS YLFW,
+			ROUND(SUM(v3.FHTY),2) AS FHTY,
+			ROUND(SUM(v3.LS),2) AS LS,
+			ROUND(SUM(v3.C6H8O7),2) AS C6H8O7,
+			ROUND(SUM(v3.NAOH),2) AS NAOH,
+			ROUND(SUM(v3.FECL2),2) AS FECL2,
+			ROUND(SUM(v3.NACLO3),2) AS NACLO3,
+			ROUND(SUM(v3.HXT),2) AS HXT,
+			ROUND(SUM(v3.HCL),2) AS HCL,
+			ROUND(SUM(v3.LCL2),2) AS LCL2,
+			ROUND(SUM(v3.YJ),2) AS YJ,
+			ROUND(SUM(v3.HCOOH),2) AS HCOOH,
+			ROUND(SUM(v3.XHJ),2) AS XHJ,
+			ROUND(SUM(v3.CF),2) AS CF,
+			ROUND(SUM(v3.DK),2) AS DK,
+			ROUND(SUM(v3.PAFC),2) AS PAFC,
+			ROUND(SUM(v3.PACZ),2) AS PACZ,
+			ROUND(SUM(v3.JJ),2) AS JJ,
+			ROUND(SUM(v3.C6H12O6),2) AS C6H12O6,
+			ROUND(SUM(v3.CFJ),2) AS CFJ,
 			v3.BZ AS BZ,
 			v3.depart_id AS depart_id,
 			v3.time

@@ -2,6 +2,7 @@ package com.skua.modules.job;
 
 import com.skua.common.constant.ReportConstant;
 import com.skua.core.context.SpringContextUtils;
+import com.skua.core.util.ConvertUtils;
 import com.skua.core.util.DateUtils;
 import com.skua.modules.report.service.IReportDataService;
 import lombok.extern.slf4j.Slf4j;
@@ -47,9 +48,10 @@ public class NFDataSyncJob implements Job {
 		if(StringUtils.isNotEmpty(this.parameter)){
 			yesterday = this.parameter;
 		}
+		Map<String,String> nfData = nfDrugConvert();
 		log.info("开始同步【"+yesterday+"】恩菲的数据入报表");
 		JdbcTemplate nfDb = (JdbcTemplate) SpringContextUtils.getBean("nf-db");
-		String sql = "select * from day_report_data where update_time like '"+yesterday+"%'";
+		String sql = "select * from day_report_data where update_time like '"+yesterday+"%' and item_type = 'nhrb'";
 		List<Map<String, Object>> dataList = nfDb.queryForList(sql);
 		if(dataList.size() > 0){
 			for (Map<String, Object> map : dataList) {
@@ -78,6 +80,9 @@ public class NFDataSyncJob implements Job {
 						data.put(itemCode, itemValue);
 					}
 				}else if("nhrb".equals(itemType)){
+					if(ConvertUtils.isNotEmpty(nfData.get(itemCode))){
+						itemCode = nfData.get(itemCode);
+					}
 					data.put(itemCode, itemValue);
 					data.put("reportId", ReportConstant.view3a24);
 					reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view3a24);
@@ -89,4 +94,18 @@ public class NFDataSyncJob implements Job {
 		log.info("恩菲的数据入报表完成");
 	}
 
+	/**
+	 * 恩菲的药品转换
+	 * @return
+	 */
+	private Map<String, String> nfDrugConvert() {
+		Map<String,String> map = new HashMap<>();
+		map.put("PAC", "PACGT");
+		map.put("CPAM", "PAMZ");
+		map.put("APAM", "PAMF");
+		map.put("CPAME", "PAMRJ");
+		map.put("CAOH2", "SH");
+		return map;
+	}
+
 }