保证退费的yb_self_flag和收费一致

src/main/java/thyyxxk/sizyfeeoprnsystm/dao/SiZyDao.java

@@ -119,7 +119,8 @@ public interface SiZyDao {
             "pric=charge_fee/charge_amount, " +
             "tcmdrugUsedWay=(case when charge_code='BILL02' then '1' else '' end), " +
             "ward_code as bilgDeptCodg, " +
-            "hospApprFlag=case when yb_self_flag='1' then '2' else '1' end," +
+            "hospApprFlag=case when (select yb_self_flag from zy_detail_charge t where t.inpatient_no=a.inpatient_no and " +
+            "t.admiss_times=a.admiss_times and t.ledger_sn=a.ledger_sn and t.detail_sn=a.ori_detail_sn)='1' then '2' else '1' end," +
             "mdtrtId=(select mdtrt_id from t_si_pat_info b where b.pat_no=inpatient_no and b.times=admiss_times and b.ledger_sn=a.ledger_sn), " +
             "psnNo=(select psn_no from t_si_pat_info b where b.pat_no=inpatient_no and b.times=admiss_times and b.ledger_sn=a.ledger_sn), " +
             "medType=(select med_type from t_si_pat_info b where b.pat_no=inpatient_no and b.times=admiss_times and b.ledger_sn=a.ledger_sn), " +
@@ -302,7 +303,8 @@ public interface SiZyDao {
             "charge_amount as cnt, " +
             "pric=charge_fee/charge_amount, " +
             "ward_code as bilgDeptCodg, " +
-            "hospApprFlag=case when yb_self_flag='1' then '2' else '1' end," +
+            "hospApprFlag=case when (select yb_self_flag from zy_detail_charge t where t.inpatient_no=a.inpatient_no and " +
+            "t.admiss_times=a.admiss_times and t.ledger_sn=a.ledger_sn and t.detail_sn=a.ori_detail_sn)='1' then '2' else '1' end," +
             "mdtrtId=(select mdtrt_id from t_si_pat_info b where b.pat_no=inpatient_no and b.times=admiss_times and b.ledger_sn=a.ledger_sn), " +
             "psnNo=(select psn_no from t_si_pat_info b where b.pat_no=inpatient_no and b.times=admiss_times and b.ledger_sn=a.ledger_sn), " +
             "medType=(select med_type from t_si_pat_info b where b.pat_no=inpatient_no and b.times=admiss_times and b.ledger_sn=a.ledger_sn), " +

src/main/java/thyyxxk/sizyfeeoprnsystm/service/SelfpayService.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 import thyyxxk.sizyfeeoprnsystm.dao.SelfpayDao;
 import thyyxxk.sizyfeeoprnsystm.dicts.SiFunction;
 import thyyxxk.sizyfeeoprnsystm.pojo.FeeCounteract;
-import thyyxxk.sizyfeeoprnsystm.pojo.Overview;
 import thyyxxk.sizyfeeoprnsystm.pojo.selfpay.FmiOwnpayPatnDise;
 import thyyxxk.sizyfeeoprnsystm.pojo.selfpay.FmiOwnpayPatnFee;
 import thyyxxk.sizyfeeoprnsystm.pojo.selfpay.FmiOwnpayPatnMdtrt;

src/main/resources/application-prod.yml

@@ -27,7 +27,8 @@ mybatis:
   configuration:
     map-underscore-to-camel-case: true
 
-si-api-url: http://mbs.hun.hsip.gov.cn:20001/isp-api/powercsb/1101
+#si-api-url: http://mbs.hun.hsip.gov.cn:20001/isp-api/powercsb/1101
+si-api-url: http://10.93.28.228/isp-api/powercsb/1101
 si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
 si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
 upld-notify-url: http://172.16.32.160:8706/socketMessage