Browse Source

完善省内异地对账。

lighter 3 years ago
parent
commit
d4bf985265

+ 4 - 0
src/main/java/thyyxxk/webserver/constants/sidicts/ClrType.java

@@ -11,11 +11,15 @@ public enum ClrType {
 
     OUTPATIENT("11", "门诊"),
 
+    REMOTE_OUTPATIENT("9901", "异地门诊"),
+
     OUTPATIENT_SLOW_SPECIAL_DSS("14", "门诊慢特病"),
 
     BIRTH_OUTPATIENT("53", "生育门诊"),
     INPATIENT("21", "住院"),
 
+    REMOTE_INPATIENT("9902", "异地住院"),
+
     MATERNITY_INPATIENT("99940", "生育住院"),
 
     ACCIDENT_INJURY_INPATIENT("22", "意外伤害住院"),

+ 2 - 2
src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiManageDao.java

@@ -44,7 +44,7 @@ public interface SiManageDao {
             "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 insutype=#{insutype} and clr_type=#{clrType} and revoked=0 " +
             "and clr_optins=#{clrOptins} and setl_time>=#{start} and setl_time<=#{end} and fund_pay_sumamt!=0 " +
-            "and (insuplc_admdvs='439900' or insuplc_admdvs like '4301%')")
+            "and insuplc_admdvs like '43%' ")
     List<InstSetlLdgChkBrf> selectSetlChkBrfsWithInsutype(@Param("clrType") String clrType,
                                                           @Param("insutype") String insutype,
                                                           @Param("clrOptins") String clrOptins,
@@ -55,7 +55,7 @@ public interface SiManageDao {
             "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 clr_type=#{clrType} and revoked=0 and clr_optins=#{clrOptins} and fund_pay_sumamt!=0 " +
-            "and setl_time>=#{start} and setl_time<=#{end} and (insuplc_admdvs='439900' or insuplc_admdvs like '4301%')")
+            "and setl_time>=#{start} and setl_time<=#{end} and insuplc_admdvs like '43%' ")
     List<InstSetlLdgChkBrf> selectSetlChkBrfs(@Param("clrType") String clrType,
                                               @Param("clrOptins") String clrOptins,
                                               @Param("start") String start,

+ 1 - 1
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiManageService.java

@@ -321,7 +321,7 @@ public class SiManageService {
         wrapper.apply("fund_pay_sumamt!=0");
         wrapper.apply("setl_time>='" + begndate + "'");
         wrapper.apply("setl_time<='" + enddate + "'");
-        wrapper.apply("(insuplc_admdvs='439900' or insuplc_admdvs like '4301%') ");
+        wrapper.apply("insuplc_admdvs like '43%' ");
         List<SiSetlinfo> list = setlinfoDao.selectList(wrapper);
         if (null == list || list.isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有查询到符合条件的数据。");

+ 1 - 2
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiZyService.java

@@ -473,8 +473,7 @@ public class SiZyService {
             }
 
             // 跨省异地数据不参与对账,对总账时无需统计进去。
-            // TODO: 2022/9/3 clr_type 9902 到底是什么,文档里找不到
-            if (setlEntity.getInsuplcAdmdvs().startsWith("43") && !setlEntity.getClrType().equals("9902")) {
+            if (setlEntity.getInsuplcAdmdvs().startsWith("43")) {
                 InstStlLdgChk ldgChk = new InstStlLdgChk();
                 ldgChk.setInsutype(setlEntity.getInsutype());
                 ldgChk.setClrType(setlEntity.getClrType());