主管医生修改

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

@@ -360,11 +360,12 @@ public interface UpIdCollectionDao extends BaseMapper<SetlinfoUpld> {
             "       insuplc_admdvs,bmy_bz, " +
             "       setl_list_id,datediff(day ,b.admiss_date ,b.dis_date) as act_ipt_days,b.operation,b.dec_type," +
             "       id,req_op_id,rtrim(req_op_name) req_op_name,req_op_date,req_remark," +
-            "audit_staff,audit_name,audit_date,audit_remark,audit_flag," +
-            "refer_physician_name = (select top 1 rtrim(name) from a_employee_mi where code = b.refer_physician),b.refer_physician,a.ipt_med_type " +
-            "from t_si_setlinfo a left join  zy_inactpatient b on (a.pat_no = b.inpatient_no and a.times = b.admiss_times) " +
-            "left join t_yb_setl_modify_req c on (a.pat_no = c.pat_no and a.times = c.times) " +
-            "where revoked = 0 and " +
+            " audit_staff,audit_name,audit_date,audit_remark,audit_flag," +
+            " refer_physician_name = (select top 1 rtrim(name) from a_employee_mi where code = isnull(b.refer_physician,bb.zyys)),isnull(b.refer_physician,bb.zyys) refer_physician,a.ipt_med_type " +
+            " from t_si_setlinfo a left join  zy_inactpatient b on (a.pat_no = b.inpatient_no and a.times = b.admiss_times) " +
+            " left join t_yb_setl_modify_req c on (a.pat_no = c.pat_no and a.times = c.times)  " +
+            " left join batj_ba2 bb on a.pat_no = bb.bah and a.times = bb.zycs"+
+            " where revoked = 0 and " +
             " ${ew.sqlSegment} " +
             ") temp where rowNumber > ${pageSize} * (${currentPage} - 1)")
     List<SiSetlinfoTemp> huoQuJieSuanRenYuan(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper,
@@ -374,6 +375,7 @@ public interface UpIdCollectionDao extends BaseMapper<SetlinfoUpld> {
     @Select("  select count(*)      from t_si_setlinfo a " +
             "                  left join zy_inactpatient b on (a.pat_no = b.inpatient_no and a.times = b.admiss_times) " +
             "                  left join t_yb_setl_modify_req c on (a.pat_no = c.pat_no and a.times = c.times) " +
+            "                  left join batj_ba2 bb on a.pat_no = bb.bah and a.times = bb.zycs"+
             "        where revoked = 0 and " +
             " ${ew.sqlSegment} ")
     long huoQuJieSuanRenYuanTotal(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);

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

@@ -1152,7 +1152,7 @@ public class SetlListUpldService {
             qw.eq("a.hi_paymtd", param.getHiPaymtd());
         }
         if (StringUtil.notBlank(param.getReferPhysician())) {
-            qw.eq("b.refer_physician", param.getReferPhysician());
+            qw.eq("isnull(b.refer_physician,bb.zyys)", param.getReferPhysician());
         }
         if (ListUtil.notBlank(param.getUploadJieZhiDay())) {
             Integer value = Integer.parseInt(day);