结算单

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

@@ -171,11 +171,13 @@ public interface UpIdCollectionDao {
     SetlinfoUpld setlinfo3(@Param("patNo") String patNo);
 
 
-    @Select("select clinic_diag as wmDiseCode, clinic_diag_str otpWmDise " +
-            "from zy_inactpatient " +
-            "where inpatient_no = #{patNo} " +
-            "  and admiss_times = #{times}")
-    SetlinfoUpld setlinfo4(@Param("patNo") String patNo, @Param("times") Integer times);
+    @Select("select clinic_diag_code as wmDiseCode, clinic_diag_str otpWmDise " +
+            "from t_case_frontsheet_main " +
+            "where bah = #{patNo} " +
+            "  and admiss_times = #{times}" +
+            "  and nullif(clinic_diag_code, '') is not null ")
+    SetlinfoUpld setlinfo4(@Param("patNo") String patNo,
+                           @Param("times") Integer times);
 
     @Select("select (select si_code from zd_country_code where code = country)                    as ntly, " +
             "       dis_date                               as setl_end_date, " +
@@ -199,17 +201,17 @@ public interface UpIdCollectionDao {
             "from a_employee_mi where code = #{code}")
     GetDropdownBox userInfo(String code);
 
-    @Select("select isnull(sum(charge_amount),0) from zy_detail_charge where inpatient_no = #{patNo} and admiss_times = #{times} and ledger_sn = #{ledgerSn} and infant_flag = #{infantFlag}" + " and charge_code_mx in ('F01464','017051')")
-    int teJiHuLi(@Param("patNo") String patNo, @Param("times") Integer times, @Param("ledgerSn") Integer ledgerSn, @Param("infantFlag") Integer infantFlag);
+    @Select("select sum(charge_amount) from zy_detail_charge where inpatient_no = #{patNo} and admiss_times = #{times} and ledger_sn = #{ledgerSn} and infant_flag = #{infantFlag}" + " and charge_code_mx in ('F01464','017051')")
+    Integer teJiHuLi(@Param("patNo") String patNo, @Param("times") Integer times, @Param("ledgerSn") Integer ledgerSn, @Param("infantFlag") Integer infantFlag);
 
-    @Select("select isnull(sum(charge_amount),0) from zy_detail_charge where inpatient_no = #{patNo} and admiss_times = #{times} and ledger_sn = #{ledgerSn} and infant_flag = #{infantFlag}" + " and charge_code_mx in ('F01465','017052')")
-    int yiJiHuLi(@Param("patNo") String patNo, @Param("times") Integer times, @Param("ledgerSn") Integer ledgerSn, @Param("infantFlag") Integer infantFlag);
+    @Select("select sum(charge_amount) from zy_detail_charge where inpatient_no = #{patNo} and admiss_times = #{times} and ledger_sn = #{ledgerSn} and infant_flag = #{infantFlag}" + " and charge_code_mx in ('F01465','017052')")
+    Integer yiJiHuLi(@Param("patNo") String patNo, @Param("times") Integer times, @Param("ledgerSn") Integer ledgerSn, @Param("infantFlag") Integer infantFlag);
 
-    @Select("select isnull(sum(charge_amount),0) from zy_detail_charge where inpatient_no = #{patNo} and admiss_times = #{times} and ledger_sn = #{ledgerSn} and infant_flag = #{infantFlag}" + " and charge_code_mx in ('F01466','017053')")
-    int erJiHuLi(@Param("patNo") String patNo, @Param("times") Integer times, @Param("ledgerSn") Integer ledgerSn, @Param("infantFlag") Integer infantFlag);
+    @Select("select sum(charge_amount) from zy_detail_charge where inpatient_no = #{patNo} and admiss_times = #{times} and ledger_sn = #{ledgerSn} and infant_flag = #{infantFlag}" + " and charge_code_mx in ('F01466','017053')")
+    Integer erJiHuLi(@Param("patNo") String patNo, @Param("times") Integer times, @Param("ledgerSn") Integer ledgerSn, @Param("infantFlag") Integer infantFlag);
 
     @Select("select isnull(sum(charge_amount),0) from zy_detail_charge where inpatient_no = #{patNo} and admiss_times = #{times} and ledger_sn = #{ledgerSn} and infant_flag = #{infantFlag}" + " and charge_code_mx in ('F01467','017054')")
-    int sanJiHuLi(@Param("patNo") String patNo, @Param("times") Integer times, @Param("ledgerSn") Integer ledgerSn, @Param("infantFlag") Integer infantFlag);
+    Integer sanJiHuLi(@Param("patNo") String patNo, @Param("times") Integer times, @Param("ledgerSn") Integer ledgerSn, @Param("infantFlag") Integer infantFlag);
 
     /**
      * 这里是 住院诊断消息
@@ -539,12 +541,13 @@ public interface UpIdCollectionDao {
     String getYbDeptName(String code);
 
     @Select("select dise_code as diag_code," +
-            " dise_name as diag_name, " +
-            " oprn_oprt_name = '00000'," +
-            " oprn_oprt_code = '无手术'  " +
+            " dise_name as diag_name " +
+//            " ,oprn_oprt_name = '00000'," +
+//            " oprn_oprt_code = '无手术'  " +
             " from t_si_pat_info " +
             "where pat_no = #{patNo} and times = #{times} " +
-            "and ledger_sn = #{ledgerSn}")
+            "and ledger_sn = #{ledgerSn} " +
+            "and nullif(dise_code, '') is not null")
     List<OpspdiseinfoUpld> diagnosisOfMenterSDisease(@Param("patNo") String patNo,
                                                      @Param("times") Integer times,
                                                      @Param("ledgerSn") Integer ledgerSn);
@@ -556,10 +559,10 @@ public interface UpIdCollectionDao {
     OpspdiseinfoUpld outpatientDiagnosis1(@Param("patNo") String patNo,
                                           @Param("times") Integer times);
 
-    @Select("select yb_code  as diag_code,\n" +
-            "       yb_name  as diag_name,\n" +
-            "       '00000'  as oprn_oprt_name,\n" +
-            "       '无手术' as oprn_oprt_code\n" +
+    @Select("select top 1 yb_code  as diag_code,\n" +
+            "       yb_name  as diag_name\n" +
+//            "       ,'00000'  as oprn_oprt_name,\n" +
+//            "       '无手术' as oprn_oprt_code\n" +
             "from zd_icd_code_new\n" +
             "where yb_code = #{ybCode} ")
     OpspdiseinfoUpld outpatientSlowDiagnosis(String ybCode);
@@ -599,13 +602,11 @@ public interface UpIdCollectionDao {
             "       isnull(work_tel,employer_tel)                        as emp_tel, " +
             "       employer_zipcode                                     as poscode, " +
             "       relation_name                                        as coner_name, " +
-            "       (select rtrim(yb_code) from zy_zd_relative_code where code = relation_code) " +
-            "                                                            as patn_rlts, " +
             "       relation_district                                    as coner_addr, " +
             "       relation_tel                                         as coner_tel, " +
             "       c.insuplc_admdvs                                     as insuplc," +
             " (select wjw_code from zd_nation_code where code =  b.nation_code)   as naty/*民族*/,\n" +
-            "       '01'                                                 as patnRlts," +
+            "       '1'                                                 as patnRlts," +
             "       a.adress                                             as conerAddr," +
             "       '1'                                                  as hiPaymtd, " +
             "       cast(fund_pay_sumamt as decimal(16,2)) as  fund_pay_sumamt," +