Browse Source

修复休息时间自动审核出院申请

lighter 6 months ago
parent
commit
8f53f3efa9

+ 7 - 3
src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiSettleApplyDao.java

@@ -37,9 +37,13 @@ public interface SiSettleApplyDao {
                                     @Param("ledger") int ledger,
                                     @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,acct_used_flag,death_flag,sort_no) values (#{patNo},#{times},#{ledgerSn},#{inputStaff}," +
-            "#{inputComment},getdate(),0,#{type},#{settleDatetime},0,#{acctUsedFlag},#{deathFlag},#{sortNo})")
+    @Insert("insert into t_si_settle_apply " +
+            "(pat_no,times,ledger_sn,input_staff,input_comment,input_datetime,status,type," +
+            "settle_datetime,settled,acct_used_flag,death_flag,sort_no,handle_staff," +
+            "handle_comment,handle_datetime) values " +
+            "(#{patNo},#{times},#{ledgerSn},#{inputStaff},#{inputComment},getdate()," +
+            "#{status},#{type},#{settleDatetime},0,#{acctUsedFlag},#{deathFlag},#{sortNo}," +
+            "#{handleStaff},#{handleComment},#{handleDatetime})")
     void insertSettleApply(SiSettleApply apply);
 
     @Select("select a.*,c.sex as gender,rtrim(c.name) as name,b.med_type, " +

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

@@ -131,8 +131,8 @@ public class SiSettleApplyService {
         LocalTime amEnd = LocalTime.of(12, 0);
         LocalTime pmStart = LocalTime.of(14, 0);
         LocalTime pmEnd = LocalTime.of(17, 30);
-        return (!currentTime.isBefore(amStart) && !currentTime.isAfter(amEnd)) ||
-                        (!currentTime.isBefore(pmStart) && !currentTime.isAfter(pmEnd));
+        return (currentTime.isAfter(amStart) && currentTime.isBefore(amEnd)) ||
+                        (currentTime.isAfter(pmStart) && currentTime.isBefore(pmEnd));
     }
 
     public ResultVo<List<SiSettleApply>> selectUnhandledApplies() {