结算申请添加个人账户使用标志。

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>1</version>
+    <version>2</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

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

@@ -21,8 +21,8 @@ public interface SiSettleApplyDao {
             "and status_flag > '1' and isnull(group_no, '00')='00' and order_code in ('06026','06053','05973')")
     Date selectActOrderDisDate(@Param("table") String table, @Param("patNo") String patNo, @Param("times") Integer times);
 
-    @Select("select status,handle_comment,type,settle_datetime from t_si_settle_apply with(nolock) where pat_no=#{patNo} " +
-            "and times=#{times} and ledger_sn=#{ledger} and type=#{type}")
+    @Select("select status,handle_comment,type,settle_datetime,acct_used_flag from t_si_settle_apply with(nolock) " +
+            "where pat_no=#{patNo} and times=#{times} and ledger_sn=#{ledger} and type=#{type}")
     SiSettleApply selectSettleApply(@Param("patNo") String patNo,
                                     @Param("times") int times,
                                     @Param("ledger") int ledger,
@@ -35,8 +35,8 @@ public interface SiSettleApplyDao {
                            @Param("type") int type);
 
     @Insert("insert into t_si_settle_apply (pat_no,times,ledger_sn,input_staff,input_comment,input_datetime,status,type," +
-            "settle_datetime,settled) values (#{patNo},#{times},#{ledgerSn},#{inputStaff},#{inputComment},getdate()," +
-            "0,#{type},#{settleDatetime},0)")
+            "settle_datetime,settled,acct_used_flag) values (#{patNo},#{times},#{ledgerSn},#{inputStaff},#{inputComment},getdate()," +
+            "0,#{type},#{settleDatetime},0,#{acctUsedFlag})")
     void insertSettleApply(SiSettleApply apply);
 
     @Select("select a.pat_no,a.times,a.ledger_sn,a.status,a.type,c.sex as gender,rtrim(c.name) as name,b.med_type, " +

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

@@ -137,12 +137,12 @@ public interface SiZyDao {
             "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}) " +
+            "and trans_flag_yb!=2 and charge_date<=#{endtime}) " +
             "from t_si_pat_info a where pat_no=#{patNo} and times=#{times} and ledger_sn=#{ledgerSn}")
     PreSetlmt selectPreSetlmt(@Param("patNo") String patNo,
                               @Param("times") int times,
                               @Param("ledgerSn") int ledgerSn,
-                              @Param("today") String today);
+                              @Param("endtime") String endtime);
 
     @Select("select psn_no,certno as mdtrtCertNo,certno,mdtrtCertType='02', " +
             "psn_cert_type,psn_type,mdtrt_id,insutype,insuplc_admdvs, " +

src/main/java/thyyxxk/webserver/dao/his/yibao/DismissDao.java

@@ -134,7 +134,7 @@ public interface DismissDao {
 
     @Select("select isnull(sum(charge_fee),0) from zy_detail_charge where inpatient_no=#{patNo} and " +
             "admiss_times=#{times} and ledger_sn=#{ledgerSn} and isnull(charge_status, '1') <> '1' and " +
-            "charge_date ${compare} #{timeLimit}")
+            "isnull(trans_flag_yb,0)!=2 and charge_date ${compare} #{timeLimit}")
     BigDecimal selectOverTimeLimitFee(@Param("patNo") String patNo,
                                       @Param("times") Integer times,
                                       @Param("ledgerSn") int ledgerSn,

src/main/java/thyyxxk/webserver/entity/medicalinsurance/inpatient/SiSettleApply.java

@@ -70,6 +70,11 @@ public class SiSettleApply implements Serializable {
 	 */
 	private Date handleDatetime;
 
+	/**
+	 * 个人账户使用标志
+	 * */
+	private String acctUsedFlag;
+
 	private String mdtrtId;
 
 	private String wardName;

src/main/java/thyyxxk/webserver/entity/medicalinsurance/inpatient/ZyPatientInfo.java

@@ -37,6 +37,7 @@ public class ZyPatientInfo {
     private Date zjdzDatetime;
     private String staffId;
     private String admdvs;
+    private String acctUsedFlag;
 
     private String psnNo;
     private String insuplcAdmdvs;

src/main/java/thyyxxk/webserver/entity/yibao/patient/Patient.java

@@ -26,6 +26,7 @@ public class Patient {
     private String admissPhysicianName;
     private String referPhysician;
     private String referPhysicianName;
+    private String acctUsedFlag;
 
     private String dutyNurse;
     private String dutyNurseName;

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

@@ -419,7 +419,7 @@ public class SiZyService {
             }
         }
         preSetlmt.setPsnSetlway(p.getDbg() ? PsnSetlWay.SETTLE_BY_QUOTA.getCode() : PsnSetlWay.SETTLE_BY_ITEMS.getCode());
-        preSetlmt.setAcctUsedFlag(YesOrNo.NO.getCodeStr());
+        preSetlmt.setAcctUsedFlag(p.getAcctUsedFlag());
         preSetlmt.setMidSetlFlag(YesOrNo.NO.getCodeStr());
         preSetlmt.setInvono(SnowFlakeId.instance().nextId());
         JSONObject input = exec.makeTradeHeaderWithInsureArea(SiFunction.HOSPITALIZATION_SETTLEMENT, preSetlmt.getInsuplcAdmdvs());