把门诊科室编号和科室名称给明细

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

@@ -118,7 +118,9 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                     dataMap.put("ADMISSION_DISEASE_NAME", "");
                 }
                 String hisId = dataMap.get("HISID").toString();
-                Integer count = getDetailByHisId(hisId);
+                String admission_dept_name = dataMap.get("ADMISSION_DEPT_NAME").toString();
+                String admission_dept_id = dataMap.get("ADMISSION_DEPT_ID").toString();
+                Integer count = getDetailByHisId(hisId, admission_dept_id, admission_dept_name);
                 if (null == count || count <= 0) {
                     log.error("hisid:{} 未查询到门诊结算清单", hisId);
                     return false;
@@ -174,7 +176,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
 
     }
 
-    public Integer getDetailByHisId(String hisId) {
+    public Integer getDetailByHisId(String hisId,String admission_dept_id,String admission_dept_name) {
         String sql = "select * from V_YBKF_OUTPATIENT_SETTLE_DEL where hisid=:HISID and item_id is not null";
         Map<String, String> cateGoriesMap = CommonUtil.getCategoriesItemsMap();
         Map<String, Object> paramMap = new HashMap<>();
@@ -184,6 +186,8 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
                 dataMap.put("CREATE_BY", "auto");
                 dataMap.put("CREATE_TIME", new Date());
+                dataMap.put("ADMISSION_DEPT_ID", admission_dept_id);
+                dataMap.put("ADMISSION_DEPT_NAME", admission_dept_name);
                 String itemIDHosp = dataMap.getOrDefault("ITEM_ID_HOSP", "").toString();
                 String itemId = dataMap.getOrDefault("ITEM_ID", "").toString();
                 if (StringUtils.isNotBlank(itemIDHosp) && StringUtils.isBlank(itemId)) {