优化

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

@@ -188,16 +188,29 @@ public interface SiZyDao {
             "</script>")
     void insertSiChargeTempFeeBatch(List<SiChargeTemp> list);
 
-    @Select("select psn_no,certno as mdtrtCertNo,certno, " +
-            "psn_cert_type,psn_type,mdtrt_id,insutype,insuplc_admdvs, " +
+//    @Select("select psn_no,certno as mdtrtCertNo,certno, " +
+//            "psn_cert_type,psn_type,mdtrt_id,insutype,insuplc_admdvs, " +
+//            "medfeeSumamt=(select sum(charge_fee) from zy_detail_charge b where b.inpatient_no=a.pat_no " +
+//            "and b.admiss_times=a.times and b.ledger_sn=a.ledger_sn and isnull(b.infant_flag,0)=0 " +
+//            "and trans_flag_yb!=2 and charge_date<=#{today}) " +
+//            "from t_si_pat_info a where pat_no=#{patNo} and times=#{times} and ledger_sn=#{ledgerSn}")
+//    ZyPreSetlmt selectPreSetlmt(@Param("patNo") String patNo,
+//                                @Param("times") int times,
+//                                @Param("ledgerSn") int ledgerSn,
+//                                @Param("today") String today);
+
+    @Select("select psn_no,certno as mdtrtCertNo,certno,mdtrtCertType='02', " +
+            "psn_cert_type,psn_type,psn_name,mdtrt_id,insutype,insuplc_admdvs, " +
             "medfeeSumamt=(select sum(charge_fee) from zy_detail_charge b where b.inpatient_no=a.pat_no " +
             "and b.admiss_times=a.times and b.ledger_sn=a.ledger_sn and isnull(b.infant_flag,0)=0 " +
-            "and trans_flag_yb!=2 and charge_date<=#{today}) " +
+            "and trans_flag_yb!=2 and charge_date<=#{today})," +
+            "expContent=(select d.exp_content from zy_actpatient d where d.inpatient_no=#{patNo}) " +
             "from t_si_pat_info a where pat_no=#{patNo} and times=#{times} and ledger_sn=#{ledgerSn}")
     ZyPreSetlmt selectPreSetlmt(@Param("patNo") String patNo,
-                                @Param("times") int times,
-                                @Param("ledgerSn") int ledgerSn,
-                                @Param("today") String today);
+                              @Param("times") int times,
+                              @Param("ledgerSn") int ledgerSn,
+                              @Param("today") String today);
+
 
     @Select("select psn_no,certno as mdtrtCertNo,certno, " +
             "psn_cert_type,psn_type,mdtrt_id,insutype,insuplc_admdvs, " +

src/main/java/thyyxxk/sizyfeeoprnsystm/pojo/ZyPreSetlmt.java

@@ -96,4 +96,10 @@ public class ZyPreSetlmt {
      * */
     @JSONField(name = "insuplc_admdvs")
     private String insuplcAdmdvs;
+
+    /**
+     * 额外内容
+     * */
+    @JSONField(name = "exp_content")
+    private String expContent;
 }