科室收入统计优化

src/main/java/thyyxxk/webserver/dao/his/reports/KeShiShouRuDao.java

@@ -1,10 +1,13 @@
 package thyyxxk.webserver.dao.his.reports;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.querydata.KeShiFeiiYongTongJi;
+import thyyxxk.webserver.entity.xc.XcPageHelp;
 
 import java.util.List;
 import java.util.Set;
@@ -35,9 +38,25 @@ public interface KeShiShouRuDao {
      */
     @Select({"<script>" +
             "select top ${pageSize} * from (select ROW_NUMBER() over (ORDER BY charge_date ) as RowNumber," +
-            "rtrim(inpatient_no) patient,admiss_times times,rtrim(charge_code_mx) charge_code_mx,charge_date," +
-            "rtrim(op_id_code)op_id_code,rtrim(exec_unit)exec_unit," +
-            "rtrim(ward_code)ward_code,convert(decimal(18,2),charge_fee) charge_fee,convert(decimal(18,2),charge_amount) charge_amount,source = '住院' " +
+            "rtrim(inpatient_no)    patient, " +
+            "          patientName    = (select rtrim(name) from a_patient_mi where a.inpatient_no = a_patient_mi.inpatient_no), " +
+            "                           admiss_times           times, " +
+            "                           rtrim(charge_code_mx)  charge_code_mx, " +
+            "          chargeCodeName = (dbo.get_charge_name(charge_code_mx, serial)), " +
+            "                           charge_date, " +
+            "                           rtrim(op_id_code)      op_id_code, " +
+            "          opName         = (select rtrim(name) from a_employee_mi where code = op_id_code), " +
+            "                           rtrim(exec_unit)       exec_unit, " +
+            "          exec_unit_name = (select rtrim(name) from zd_unit_code where code = exec_unit), " +
+            "                           rtrim(ward_code)       ward_code, " +
+            "          ward_code_name = (select rtrim(name) from zd_unit_code where code = ward_code), " +
+            "                           convert(decimal(18, " +
+            "                               2), " +
+            "                                   charge_fee)    charge_fee, " +
+            "                           convert(decimal(18, " +
+            "                               2), " +
+            "                                   charge_amount) charge_amount, " +
+            "          source         = '住院'" +
             "from zy_detail_charge a " +
             "where " +
             " charge_date &gt;= #{startTime,jdbcType=TIMESTAMP} and charge_date &lt;= #{endTime,jdbcType=TIMESTAMP} and trans_flag_yb &lt;&gt; 2 " +
@@ -166,6 +185,38 @@ public interface KeShiShouRuDao {
                                                              @Param("fenLei") String fenLei);
 
 
+    @Select("SELECT       rtrim(inpatient_no)    patient, " +
+            "             admiss_times           times, " +
+            "             rtrim(charge_code_mx)  charge_code_mx, " +
+            "             charge_date, " +
+            "             rtrim(op_id_code)      op_id_code, " +
+            "             rtrim(exec_unit)       exec_unit, " +
+            "             rtrim(ward_code)       ward_code, " +
+            "             convert(decimal(18, " +
+            "                 2), " +
+            "                     charge_fee)    charge_fee, " +
+            "             convert(decimal(18, " +
+            "                 2), " +
+            "                     charge_amount) charge_amount, " +
+            "    source = '住院' " +
+            "FROM zy_detail_charge a " +
+            "WHERE  trans_flag_yb <> 2 " +
+            " and ${ew.sqlSegment} " +
+            "  AND a.exec_unit IN (#{unit})")
+    List<KeShiFeiiYongTongJi> test(XcPageHelp<KeShiFeiiYongTongJi> pageHelp,
+                                   @Param(Constants.WRAPPER) QueryWrapper<?> qw,
+                                   @Param("unit") String unit);
+
+    @Select("select ${fenLei} " +
+            "sum(charge_fee) charge_fee," +
+            "sum(charge_amount) charge_amount," +
+            "count(1) total,source = '住院'" +
+            " from zy_detail_charge a " +
+            " ${ew.customSqlSegment} ")
+    List<KeShiFeiiYongTongJi> getZhuYuanFeiYongXiangMuFenLeiV2(IPage<KeShiFeiiYongTongJi> page,
+                                                               @Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper,
+                                                               @Param("fenLei") String fenLei);
+
     /**
      * 这个是获取门诊费用的
      *
@@ -182,11 +233,11 @@ public interface KeShiShouRuDao {
      */
     @Select("<script>" +
             "select top ${pageSize} * from (select ROW_NUMBER() over (ORDER BY confirm_time ) as RowNumber, rtrim(patient_id) patient," +
-            "times,rtrim(name) patient_name,\n" +
-            "rtrim(charge_item_code) charge_code_mx,confirm_time as charge_date,confirm_id op_id_code,rtrim(exec_dept) exec_unit,rtrim(warn_dept) ward_code,\n" +
-            "cast ((quantity*drug_win) as decimal(14,2)) charge_amount,\n" +
-            "cast ((quantity*drug_win*unit_price) as decimal(14,2)) charge_fee,source = '门诊'\n" +
-            "from mz_charge_detail where  bill_item_code NOT IN ('TC','020') and\n" +
+            "times,rtrim(name) patient_name, " +
+            "rtrim(charge_item_code) charge_code_mx,confirm_time as charge_date,confirm_id op_id_code,rtrim(exec_dept) exec_unit,rtrim(warn_dept) ward_code, " +
+            "cast ((quantity*drug_win) as decimal(14,2)) charge_amount, " +
+            "cast ((quantity*drug_win*unit_price) as decimal(14,2)) charge_fee,source = '门诊' " +
+            "from mz_charge_detail where  bill_item_code NOT IN ('TC','020') and " +
             "confirm_time &gt;= #{startTime,jdbcType = TIMESTAMP} and confirm_time &lt;= #{endTime,jdbcType = TIMESTAMP}" +
             "<if test=\"list != null and list.size > 0 \">" +
             " and exec_dept in " +
@@ -203,7 +254,7 @@ public interface KeShiShouRuDao {
             "<if test=\"reqDept != null and reqDept != '' \">" +
             " and warn_dept = #{reqDept,jdbcType = CHAR}" +
             "</if>" +
-            ") temp where\n" +
+            ") temp where " +
             "RowNumber > ${pageSize} * (${currentPage} - 1) order by RowNumber " +
             "</script>")
     List<KeShiFeiiYongTongJi> getMenZhenFeiYong(@Param("currentPage") long currentPage,
@@ -230,7 +281,7 @@ public interface KeShiShouRuDao {
      */
     @Select("<script>" +
             "select count(*) total, sum (cast ((quantity*drug_win*unit_price) as decimal(14,2))) charge_fee  " +
-            "from mz_charge_detail where  bill_item_code NOT IN ('TC','020') and\n" +
+            "from mz_charge_detail where  bill_item_code NOT IN ('TC','020') and " +
             "confirm_time &gt;= #{startTime,jdbcType = TIMESTAMP} and confirm_time &lt;= #{endTime,jdbcType = TIMESTAMP}" +
             "<if test=\"execUnitList != null and execUnitList.size > 0 \">" +
             " and exec_dept in " +
@@ -277,15 +328,18 @@ public interface KeShiShouRuDao {
             "charge_item_code charge_code_mx," +
             "</when>" +
             "<when test=\"fenLei == 'confirm_id' \">" +
-            "confirm_id op_id_code," +
+            "confirm_id op_id_code, opName = (select rtrim(name) from a_employee_mi where code = confirm_id)," +
+            "</when>" +
+            "<when test=\"fenLei == 'warn_dept' \">" +
+            "warn_dept , wardCodeName = (select rtrim(name) from zd_unit_code where code = warn_dept), " +
             "</when>" +
             "<otherwise>" +
             "CONVERT(varchar(100), charge_date, 23) charge_date_string ," +
             "</otherwise>" +
             "</choose>" +
-            "sum(cast ((quantity*drug_win*unit_price) as decimal(14,2))) charge_fee,\n" +
+            "sum(cast ((quantity*drug_win*unit_price) as decimal(14,2))) charge_fee, " +
             "sum(cast ((quantity*drug_win) as decimal(14,2))) charge_amount,source= '门诊' " +
-            "from mz_charge_detail where  bill_item_code NOT IN ('TC','020') and\n" +
+            "from mz_charge_detail where  bill_item_code NOT IN ('TC','020') and " +
             "confirm_time &gt;= #{startTime,jdbcType = TIMESTAMP} and confirm_time &lt;= #{endTime,jdbcType = TIMESTAMP}" +
             "<if test=\"execUnitList != null and execUnitList.size > 0 \">" +
             " and exec_dept in " +
@@ -315,6 +369,19 @@ public interface KeShiShouRuDao {
                                                              @Param("fenLei") String fenLei);
 
 
+    @Select("<script>" +
+            "select " +
+            " ${fenLei} "+
+            "sum(cast ((quantity*drug_win*unit_price) as decimal(14,2))) charge_fee, " +
+            "sum(cast ((quantity*drug_win) as decimal(14,2))) charge_amount,count(1) total,source= '门诊' " +
+            "from mz_charge_detail where  bill_item_code NOT IN ('TC','020') and " +
+            "${ew.sqlSegment}" +
+            "</script>")
+    List<KeShiFeiiYongTongJi> getMenZhenFeiYongXiangMuFenLeiV2(IPage<KeShiFeiiYongTongJi> page,
+                                                               @Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper,
+                                                               @Param("fenLei") String fenLei);
+
+
     /**
      * 获取住院或门诊的患者 信息
      *

src/main/java/thyyxxk/webserver/service/reports/KeShiShouRuServer.java

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.service.reports;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -9,11 +10,9 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.querydata.KeShiFeiiYongTongJi;
 import thyyxxk.webserver.entity.querydata.QueryDrugsAndProjects;
+import thyyxxk.webserver.entity.xc.XcPageHelp;
 import thyyxxk.webserver.service.PublicServer;
-import thyyxxk.webserver.utils.DateUtil;
-import thyyxxk.webserver.utils.ExcelUtil;
-import thyyxxk.webserver.utils.ResultVoUtil;
-import thyyxxk.webserver.utils.StringUtil;
+import thyyxxk.webserver.utils.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
@@ -40,6 +39,20 @@ public class KeShiShouRuServer {
         this.publicServer = publicServer;
     }
 
+    static class PersonComparator implements Comparator<KeShiFeiiYongTongJi> {
+
+        @Override
+        public int compare(KeShiFeiiYongTongJi p1, KeShiFeiiYongTongJi p2) {
+            if (p1.getChargeDateString() != null && p2.getChargeDateString() != null) {
+                Date o1 = DateUtil.parse(p1.getChargeDateString(), DateUtil.DATE);
+                Date o2 = DateUtil.parse(p2.getChargeDateString(), DateUtil.DATE);
+                assert o1 != null;
+                return o1.compareTo(o2);
+            }
+            return -1;
+        }
+    }
+
 
     public ResultVo<KeShiFeiiYongTongJi> getKeShouFei(QueryDrugsAndProjects param) {
         if (StringUtil.isBlank(param.getStartTime()) || StringUtil.isBlank(param.getEndTime())) {
@@ -47,9 +60,7 @@ public class KeShiShouRuServer {
         }
 
         KeShiFeiiYongTongJi qp = new KeShiFeiiYongTongJi();
-        log.info("查询科室收费统计 ==> 执行科室：{},开始{},结束：{}。项目编码：{}，录入人：{}，申请科室：{},总数：{}，当前页：{}，页大小：{}",
-                param.getExecUnitList(), param.getStartTime(), param.getEndTime(),
-                param.getChargeCodeMx(), param.getOpId(), param.getReqDeptCode(), param.getTotal(), param.getCurrentPage(), param.getPageSize());
+        log.info("查询科室收费统计 ==> 执行科室：{},开始{},结束：{}。项目编码：{}，录入人：{}，申请科室：{},总数：{}，当前页：{}，页大小：{}", param.getExecUnitList(), param.getStartTime(), param.getEndTime(), param.getChargeCodeMx(), param.getOpId(), param.getReqDeptCode(), param.getTotal(), param.getCurrentPage(), param.getPageSize());
         List<String> keShiLieBiao = publicServer.getKeShiLieBiaoList(param.getExecUnitList());
         GetDropdownBox renHuanCodeHeCodeRs = new GetDropdownBox();
         if (StringUtil.notBlank(param.getOpId())) {
@@ -62,67 +73,145 @@ public class KeShiShouRuServer {
         } else {
             page = new Page<>(param.getCurrentPage(), param.getPageSize());
         }
+
+        QueryWrapper<?> qw = new QueryWrapper<>();
+
         if (param.getLaiYuan() == 0) {
+            qw.ge("charge_date", param.getStartTime());
+            qw.le("charge_date", param.getEndTime());
+            if (ListUtil.notBlank(keShiLieBiao)) {
+                qw.in("a.exec_unit", keShiLieBiao);
+            }
+            if (StringUtil.notBlank(param.getChargeCodeMx())) {
+                qw.eq("a.charge_code_mx", param.getChargeCodeMx());
+            }
+            if (StringUtil.notBlank(renHuanCodeHeCodeRs.getCode())) {
+                qw.eq("a.op_id_code", renHuanCodeHeCodeRs.getCode());
+            }
+            if (StringUtil.notBlank(param.getReqDeptCode())) {
+                qw.eq("a.ward_code", param.getReqDeptCode());
+            }
+
             switch (param.getFenLei()) {
                 case 0:
-                    qp.setData(dao.getZhuYuanFeiYongXiangMuFenLei(page, keShiLieBiao, param.getStartTime(),
-                            param.getEndTime(), param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(),
-                            param.getReqDeptCode(), "CONVERT(varchar(100), charge_date, 23) charge_date_string"));
+                    qw.groupBy("CONVERT(varchar(100), charge_date, 23)");
+                    qp.setData(dao.getZhuYuanFeiYongXiangMuFenLeiV2(page,
+                            qw,
+                            "CONVERT(varchar(100), charge_date, 23) charge_date_string,"));
                     qp.setTotal(page.getTotal());
                     break;
                 case 1:
-                    qp.setData(dao.getZhuYuanFeiYongXiangMuFenLei(page, keShiLieBiao, param.getStartTime(),
-                            param.getEndTime(), param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(),
-                            param.getReqDeptCode(), "op_id_code"));
+                    qw.groupBy("op_id_code");
+                    qp.setData(dao.getZhuYuanFeiYongXiangMuFenLeiV2(page,
+                            qw,
+                            "op_id_code,opName = (select rtrim(name) from a_employee_mi where code = op_id_code ),"));
                     qp.setTotal(page.getTotal());
                     break;
                 case 2:
-                    qp.setData(dao.getZhuYuanFeiYongXiangMuFenLei(page, keShiLieBiao, param.getStartTime(),
-                            param.getEndTime(), param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(),
-                            param.getReqDeptCode(), "charge_code_mx"));
+                    qw.groupBy("charge_code_mx,serial");
+                    qp.setData(dao.getZhuYuanFeiYongXiangMuFenLeiV2(page,
+                            qw,
+                            "charge_code_mx,charge_code_name =(select dbo.get_charge_name(charge_code_mx, serial)),"));
                     qp.setTotal(page.getTotal());
                     break;
-                default:
+                case 3:
+                    // todo 肖蟾自定义分页插件
+//                    XcPageHelp<KeShiFeiiYongTongJi> pageHelp = new XcPageHelp<>(1, 40);
+//                    QueryWrapper<?> qw2 = new QueryWrapper<>();
+//                    qw2.ge("charge_date", "2023-02-01 00:00:00")
+//                            .le("charge_date", "2023-02-28 23:59:59");
+//
+//                    dao.test(pageHelp, qw2, "3100000");
+//                    if (true) {
+//                        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "测试");
+//                    }
                     if (param.getTotal() == 0) {
-                        qp = dao.getKeShiFeiYongZhuYuanTotal(keShiLieBiao, param.getStartTime(), param.getEndTime(),
-                                param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode());
+                        qp = dao.getKeShiFeiYongZhuYuanTotal(keShiLieBiao, param.getStartTime(), param.getEndTime(), param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode());
                     }
-                    qp.setData(dao.getKeShiFeiYongZhuYuan(param.getCurrentPage(), param.getPageSize(), keShiLieBiao, param.getStartTime(), param.getEndTime(),
-                            param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode()));
+                    qp.setData(dao.getKeShiFeiYongZhuYuan(param.getCurrentPage(), param.getPageSize(), keShiLieBiao, param.getStartTime(), param.getEndTime(), param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode()));
+
+                    break;
+                case 4:
+                    qw.groupBy("a.ward_code");
+                    qp.setData(dao.getZhuYuanFeiYongXiangMuFenLeiV2(page,
+                            qw,
+                            "a.ward_code,wardCodeName = (select rtrim(name) from zd_unit_code where code = a.ward_code),"));
+                    qp.setTotal(page.getTotal());
+                    break;
+                default:
+
                     break;
             }
         } else {
-            huanZheBiao = "mz_patient_mi";
+            if (StringUtil.notBlank(param.getStartTime())) {
+                qw.ge("confirm_time", param.getStartTime());
+                qw.le("confirm_time", param.getEndTime());
+            }
+            if (ListUtil.notBlank(param.getExecUnitList())) {
+                qw.in("exec_dept", param.getExecUnitList());
+            }
+            if (StringUtil.notBlank(param.getChargeCodeMx())) {
+                qw.eq("charge_item_code", param.getChargeCodeMx());
+            }
+            if (StringUtil.notBlank(param.getCode())) {
+                qw.eq("confirm_id", param.getCode());
+            }
+            if (StringUtil.notBlank(param.getReqDeptCode())) {
+                qw.eq("warn_dept", param.getReqDeptCode());
+            }
+
             switch (param.getFenLei()) {
                 case 0:
-                    qp.setData(dao.getMenZhenFeiYongXiangMuFenLei(page, keShiLieBiao, param.getStartTime(), param.getEndTime(),
-                            param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode(), "CONVERT(varchar(100),charge_date, 23)"));
+                    qw.groupBy("CONVERT(varchar(100),confirm_time, 23)");
+                    qp.setData(dao.getMenZhenFeiYongXiangMuFenLeiV2(
+                            page,
+                            qw,
+                            "CONVERT(varchar(100),confirm_time, 23) as charge_date_string,"
+                    ));
                     qp.setTotal(page.getTotal());
                     break;
                 case 1:
-                    qp.setData(dao.getMenZhenFeiYongXiangMuFenLei(page, keShiLieBiao, param.getStartTime(), param.getEndTime(),
-                            param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode(), "confirm_id"));
+                    qw.groupBy("confirm_id");
+                    qp.setData(
+                            dao.getMenZhenFeiYongXiangMuFenLeiV2(page,
+                                    qw,
+                                    "confirm_id,opName = (select rtrim(name) from a_employee_mi where code = confirm_id),")
+                    );
                     qp.setTotal(page.getTotal());
                     break;
                 case 2:
-                    qp.setData(dao.getMenZhenFeiYongXiangMuFenLei(page, keShiLieBiao, param.getStartTime(), param.getEndTime(),
-                            param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode(), "charge_item_code"));
+                    qw.groupBy("charge_item_code,group_no");
+                    qp.setData(
+                            dao.getMenZhenFeiYongXiangMuFenLeiV2(page,
+                                    qw,
+                                    "charge_item_code as charge_code_mx,charge_code_name =(select dbo.get_charge_name(charge_item_code, group_no)),")
+                    );
                     qp.setTotal(page.getTotal());
                     break;
-                default:
+                case 3:
                     if (param.getTotal() == 0) {
-                        qp = dao.getMenZhenFeiYongTotal(keShiLieBiao, param.getStartTime(), param.getEndTime(),
-                                param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode());
+                        qp = dao.getMenZhenFeiYongTotal(keShiLieBiao, param.getStartTime(), param.getEndTime(), param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode());
                     }
-                    qp.setData(dao.getMenZhenFeiYong(param.getCurrentPage(), param.getPageSize(), keShiLieBiao, param.getStartTime(), param.getEndTime(),
-                            param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode()));
+                    qp.setData(dao.getMenZhenFeiYong(param.getCurrentPage(), param.getPageSize(), keShiLieBiao, param.getStartTime(), param.getEndTime(), param.getChargeCodeMx(), renHuanCodeHeCodeRs.getCode(), renHuanCodeHeCodeRs.getCodeRs(), param.getReqDeptCode()));
+                    break;
+                case 4:
+                    qw.groupBy("warn_dept");
+                    qp.setData(dao.getMenZhenFeiYongXiangMuFenLeiV2(
+                            page,
+                            qw,
+                            "warn_dept as wardCode,wardCodeName = (select rtrim(name) from zd_unit_code where code = warn_dept),"));
+                    qp.setTotal(page.getTotal());
+                    break;
+                default:
+
                     break;
             }
         }
-        pingJieZiDuanMingChen(qp, huanZheBiao);
+//        pingJieZiDuanMingChen(qp, huanZheBiao);
         return ResultVoUtil.success(qp);
     }
 
+
     private void pingJieZiDuanMingChen(KeShiFeiiYongTongJi qp, String huanZheBiao) {
         if (qp.getData() != null && !qp.getData().isEmpty()) {
             Set<String> huanZheHaoSet = new HashSet<>();
@@ -139,28 +228,18 @@ public class KeShiShouRuServer {
             });
 
 
-            Map<String, String> huanZheXingMingMap = dao.huanZheXingMing(huanZheHaoSet, huanZheBiao)
-                    .stream()
-                    .collect(Collectors.toMap(GetDropdownBox::getCode, GetDropdownBox::getName, (key1, key2) -> key1));
-            Map<String, String> xiangMuMingChenMap = dao.xiangMuMingChen(xiangMuSet)
-                    .stream()
-                    .collect(Collectors.toMap(GetDropdownBox::getCode, GetDropdownBox::getName, (key1, key2) -> key1));
+            Map<String, String> huanZheXingMingMap = dao.huanZheXingMing(huanZheHaoSet, huanZheBiao).stream().collect(Collectors.toMap(GetDropdownBox::getCode, GetDropdownBox::getName, (key1, key2) -> key1));
+            Map<String, String> xiangMuMingChenMap = dao.xiangMuMingChen(xiangMuSet).stream().collect(Collectors.toMap(GetDropdownBox::getCode, GetDropdownBox::getName, (key1, key2) -> key1));
 
-            Map<String, String> huoQuKeShiMap = dao.huoQuKeShiHuoRenYuan(keShiSet, "zd_unit_code")
-                    .stream()
-                    .collect(Collectors.toMap(GetDropdownBox::getCode, GetDropdownBox::getName, (key1, key2) -> key1));
+            Map<String, String> huoQuKeShiMap = dao.huoQuKeShiHuoRenYuan(keShiSet, "zd_unit_code").stream().collect(Collectors.toMap(GetDropdownBox::getCode, GetDropdownBox::getName, (key1, key2) -> key1));
 
             // 获取人员信息
             List<GetDropdownBox> RenYuan = dao.huoQuKeShiHuoRenYuan(luRuRenSet, "a_employee_mi");
             // 第一次用 code 匹配
-            Map<String, String> luRuRenXingMingMap = RenYuan
-                    .stream()
-                    .collect(Collectors.toMap(GetDropdownBox::getCode, GetDropdownBox::getName, (key1, key2) -> key1));
+            Map<String, String> luRuRenXingMingMap = RenYuan.stream().collect(Collectors.toMap(GetDropdownBox::getCode, GetDropdownBox::getName, (key1, key2) -> key1));
 
             // 第二次用 code_rs 匹配
-            Map<String, String> luRuRenXingMingRenShiMap = RenYuan
-                    .stream()
-                    .collect(Collectors.toMap(GetDropdownBox::getCodeRs, GetDropdownBox::getName, (key1, key2) -> key1));
+            Map<String, String> luRuRenXingMingRenShiMap = RenYuan.stream().collect(Collectors.toMap(GetDropdownBox::getCodeRs, GetDropdownBox::getName, (key1, key2) -> key1));
 
             qp.getData().forEach(item -> {
                 if (huanZheXingMingMap.containsKey(item.getPatient())) {