Browse Source

父类码查询变更

hurugang 5 years ago
parent
commit
f016be819d

+ 1 - 1
src/main/java/cn/hnthyy/thmz/controller/MzChargeDetailController.java

@@ -945,7 +945,7 @@ public class MzChargeDetailController {
     private boolean fomartThmzBussinessReport(Map<String, Object> resultMap, List<Map<String, Object>> depetBusinessReports, List<Map<String, Object>> depetBusinessReportsHis) {
         if (depetBusinessReports != null && depetBusinessReports.size() > 0) {
             String defaultDept ="defaultDept";
-            List<MzBillItem> mzBillItems = mzBillItemService.queryMzBillItem();
+            List<MzBillItem> mzBillItems = mzBillItemService.queryZyBillItem();
             Map<String, String> mzBillItemMap = null;
             if (mzBillItems != null) {
                 mzBillItemMap = mzBillItems.stream().collect(Collectors.toMap(MzBillItem::getCode, MzBillItem::getName));

+ 11 - 0
src/main/java/cn/hnthyy/thmz/mapper/his/MzBillItemMapper.java

@@ -6,6 +6,17 @@ import org.apache.ibatis.annotations.Select;
 import java.util.List;
 
 public interface MzBillItemMapper {
+    /**
+     * 门诊收费父类码
+     * @return
+     */
     @Select("select * from mz_bill_item")
     List<MzBillItem> selectMzBillItem();
+
+    /**
+     * 住院收费父类码
+     * @return
+     */
+    @Select("SELECT code,name FROM zy_zd_audit_report ")
+    List<MzBillItem> selectZyBillItem();
 }

+ 6 - 0
src/main/java/cn/hnthyy/thmz/service/his/MzBillItemService.java

@@ -6,4 +6,10 @@ import java.util.List;
 
 public interface MzBillItemService {
     List<MzBillItem> queryMzBillItem();
+
+    /**
+     * 住院收费父类码
+     * @return
+     */
+    List<MzBillItem> queryZyBillItem();
 }

+ 5 - 0
src/main/java/cn/hnthyy/thmz/service/impl/his/MzBillItemServiceImpl.java

@@ -16,4 +16,9 @@ public class MzBillItemServiceImpl implements MzBillItemService {
     public List<MzBillItem> queryMzBillItem() {
         return mzBillItemMapper.selectMzBillItem();
     }
+
+    @Override
+    public List<MzBillItem> queryZyBillItem() {
+        return mzBillItemMapper.selectZyBillItem();
+    }
 }

+ 1 - 0
src/main/resources/static/js/jBox/baseISSOnline.js

@@ -1,3 +1,4 @@
+//@ sourceURL=baseISSOnline.js
 var Device = function()
 {
 	message : ""