Merge branch 'master' of https://172.16.32.165/lighter/web-server

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

@@ -20,8 +20,8 @@ public interface SiSetlinfoDao extends BaseMapper<SiSetlinfo> {
     /**
      * 更新患者的医保基本信息（结算id）
      *
-     * @param patNo  住院号/门诊号
-     * @param times  住院次数/门诊次数
+     * @param patNo        住院号/门诊号
+     * @param times        住院次数/门诊次数
      * @param ledgerSn     账页号
      * @param setlId       结算id
      * @param medinsSetlId 医药机构结算ID，存放发送方报文ID
@@ -51,16 +51,17 @@ public interface SiSetlinfoDao extends BaseMapper<SiSetlinfo> {
             "and revoked=0 and a.insutype=#{insutype} and setl_time>=#{begndate} " +
             "and setl_time<=#{enddate} and a.setl_id=b.setl_id")
     List<SiSetlinfo> selectSetlinfosWithInsutype(@Param("setlType") String setlType,
-                                     @Param("insutype") String insutype,
-                                     @Param("begndate") String begndate,
-                                     @Param("enddate") String enddate);
+                                                 @Param("insutype") String insutype,
+                                                 @Param("begndate") String begndate,
+                                                 @Param("enddate") String enddate);
 
     @Select("select a.*, " +
             "hospPay=(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 and (b.fund_pay_type='999996' or b.setl_proc_info='999996')) " +
-            "from t_si_setlinfo a where a.setl_type=21 and a.revoked=0 and a.insutype like #{insutype} " +
+            "from t_si_setlinfo a where a.setl_type=#{setltype} and a.revoked=0 and a.insutype like #{insutype} " +
             "and a.insuplc_admdvs like #{insuplcAdmdvs} and a.setl_time>=#{begntime} and a.setl_time<=#{endtime}")
-    List<SiSetlinfo> selectMyList(@Param("insutype") String insutype,
+    List<SiSetlinfo> selectMyList(@Param("setltype") String setltype,
+                                  @Param("insutype") String insutype,
                                   @Param("insuplcAdmdvs") String insuplcAdmdvs,
                                   @Param("begntime") String begntime,
                                   @Param("endtime") String endtime);

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

@@ -1759,7 +1759,7 @@ public class SiQueryService {
         if (StringUtil.isBlank(insutype)) {
             insutype = "%%";
         }
-        List<SiSetlinfo> list = setlinfoDao.selectMyList(insutype, insuplcAdmdvs, begntime, endtime);
+        List<SiSetlinfo> list = setlinfoDao.selectMyList(condition.getSetlType(), insutype, insuplcAdmdvs, begntime, endtime);
         list.forEach(item -> {
             if (null != item.getHospPay()) {
                 log.info("hosp: {}", item.getHospPay());