与上传对照

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiQueryDao.java

@@ -275,7 +275,8 @@ public interface SiQueryDao {
                           @Param("mdtrtId") String mdtrtId,
                           @Param("insutype") String insutype);
 
-    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay, " +
+    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay,setl_list_id,psn_name, " +
+            "psn_cash_pay,setl_time, " +
             "fundPaySumamt=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +
             "and b.times=a.times and b.ledger_sn=a.ledger_sn),a.insutype, " +
             "hospPay=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +
@@ -286,7 +287,8 @@ public interface SiQueryDao {
                                                                      @Param("endtime") String endtime,
                                                                      @Param("insutype") String insutype);
 
-    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay, " +
+    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay,setl_list_id,psn_name, " +
+            "psn_cash_pay,setl_time, " +
             "fundPaySumamt=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +
             "and b.times=a.times and b.ledger_sn=a.ledger_sn),a.insutype, " +
             "hospPay=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +
@@ -297,7 +299,8 @@ public interface SiQueryDao {
                                                                     @Param("endtime") String endtime,
                                                                     @Param("insutype") String insutype);
 
-    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay, " +
+    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay,setl_list_id,psn_name, " +
+            "psn_cash_pay,setl_time, " +
             "fundPaySumamt=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +
             "and b.times=a.times and b.ledger_sn=a.ledger_sn),a.insutype, " +
             "hospPay=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +
@@ -308,7 +311,8 @@ public interface SiQueryDao {
                                                                            @Param("endtime") String endtime,
                                                                            @Param("insutype") String insutype);
 
-    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay, " +
+    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay,setl_list_id,psn_name, " +
+            "psn_cash_pay,setl_time, " +
             "fundPaySumamt=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +
             "and b.times=a.times and b.ledger_sn=a.ledger_sn),a.insutype, " +
             "hospPay=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +
@@ -319,7 +323,8 @@ public interface SiQueryDao {
                                                                  @Param("endtime") String endtime,
                                                                  @Param("insutype") String insutype);
 
-    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay, " +
+    @Select("select pat_no,times,ledger_sn,insuplc_admdvs,medfee_sumamt,insutype,hifmi_pay,hifp_pay,cvlserv_pay,setl_list_id,psn_name, " +
+            "psn_cash_pay,setl_time, " +
             "fundPaySumamt=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +
             "and b.times=a.times and b.ledger_sn=a.ledger_sn),a.insutype, " +
             "hospPay=(select sum(b.fund_payamt) from t_si_setldetail b where b.pat_no=a.pat_no " +

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiQueryService.java

@@ -1413,6 +1413,8 @@ public class SiQueryService {
         Map<String, String> regionMap = new HashMap<>();
         Map<String, List<BaseSetlStatistics>> admdvsSetldataMap = new HashMap<>();
 
+        List<BaseSetlStatistics> shangChuanJieSuanDan = new ArrayList<>();
+
         baseStatistics.forEach(itm -> {
             itm.setInsutypeName(Insutype.getName(itm.getInsutype()));
             if (null != itm.getHospPay()) {
@@ -1435,6 +1437,7 @@ public class SiQueryService {
                 tempList.add(itm);
                 admdvsSetldataMap.put(admdvsName, tempList);
             }
+            shangChuanJieSuanDan.add(itm);
         });
 
         List<SetlStatisticResult> resultList = new ArrayList<>();
@@ -1490,7 +1493,7 @@ public class SiQueryService {
                 resultItem.setChildren(children);
             }
         }
-
+        resultList.get(0).setShangChuanJieSuanDan(shangChuanJieSuanDan);
         return ResultVoUtil.success(resultList);
     }