结算单上传列表增加一些字段,支付方式做了修改

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

@@ -351,7 +351,7 @@ public interface UpIdCollectionDao extends BaseMapper<SetlinfoUpld> {
             "select " +
             "row_number() over (order by setl_time) as rowNumber," +
             "rtrim(a.pat_no) pat_no,a.age,a.times,ledger_sn,psn_name,gend,brdy,insutype,psn_type,mdtrt_id,setl_id,setl_time, " +
-            "       a.med_type,medfee_sumamt,fund_pay_sumamt, " +
+            "       a.med_type,medfee_sumamt,fund_pay_sumamt, b.dis_date," +
             "       acct_pay,psn_cash_pay,clr_optins,clr_optins_name = (select name from t_region where code=clr_optins), " +
             "       outDeptName=(select rtrim(name) from zd_unit_code where code=isnull(zk_ward,small_dept))," +
             "       rtrim(isnull(zk_ward,small_dept)) as out_dept," +

src/main/java/thyyxxk/webserver/entity/querydata/SiSetlinfoTemp.java

@@ -309,6 +309,10 @@ public class SiSetlinfoTemp implements Serializable {
     private String disDiagComment;
     private String referPhysicianName;
     private String referPhysician;
+    /**
+     * 出院时间
+     */
+    private Date disDate;
 
     /**
      * 参保地
@@ -431,7 +435,7 @@ public class SiSetlinfoTemp implements Serializable {
                     return "未知";
             }
         }
-        return "";
+        return "未申请审核";
     }
 
 

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

@@ -417,7 +417,7 @@ public class SetlListUpldService {
         if (isFertilitySign) {
             setlinfoUpld.setHiPaymtd("1");
         }
-        setlinfoUpld.setHiPaymtd(getDrgHaiPay(setlinfoUpld.getInsuplc(),setlinfoUpld.getHiPaymtd()));
+        setlinfoUpld.setHiPaymtd(getDrgHaiPay(setlinfoUpld.getInsuplc(),setlinfoUpld.getHiPaymtd(),setlinfoUpld.getSetlEndDate()));
         //  如果是 职工基本医疗保险的话 没有单位名称和地址 那么就 写死成 普通职工 和 现住址
         if ("310".equals(setlinfoUpld.getHiType())) {
             if (StringUtil.isBlank(setlinfoUpld.getEmpAddr())) {
@@ -487,7 +487,10 @@ public class SetlListUpldService {
 
 
 
-    private String getDrgHaiPay(String insuplcAdmdvs,String defaultValue){
+    private String getDrgHaiPay(String insuplcAdmdvs,String defaultValue,Date setlTime){
+        if(setlTime.getTime() < DateUtil.parse("2023-01-01","yyyy-MM-dd").getTime()){
+            return "3";
+        }
         if(StringUtil.isBlank(insuplcAdmdvs)){
             return defaultValue;
         }
@@ -996,8 +999,13 @@ public class SetlListUpldService {
             qw.isNotNull("a.setl_list_id");
         }
         if (param.getAuditFlag() != All) {
-            qw.eq("c.audit_flag", param.getAuditFlag());
+            if(param.getAuditFlag() == 5){
+                qw.isNull("c.audit_flag");
+            }else {
+                qw.eq("c.audit_flag", param.getAuditFlag());
+            }
         }
+
         if (param.getHiPaymtd() != null && param.getHiPaymtd() != 0) {
             qw.eq("a.hi_paymtd", param.getHiPaymtd());
         }
@@ -1927,7 +1935,7 @@ public class SetlListUpldService {
         if (isFertilitySign) {
             setlinfoUpld.setHiPaymtd("1");
         }
-        setlinfoUpld.setHiPaymtd(getDrgHaiPay(setlinfoUpld.getInsuplc(),setlinfoUpld.getHiPaymtd()));
+        setlinfoUpld.setHiPaymtd(getDrgHaiPay(setlinfoUpld.getInsuplc(),setlinfoUpld.getHiPaymtd(),setlinfoUpld.getSetlEndDate()));
         //  如果是 职工基本医疗保险的话 没有单位名称和地址 那么就 写死成 普通职工 和 现住址
         if ("310".equals(setlinfoUpld.getHiType())) {
             if (StringUtil.isBlank(setlinfoUpld.getEmpAddr())) {