Ver código fonte

中间断账第二个账页的入院时间加1秒

lighter 3 anos atrás
pai
commit
d9ae49fb75

+ 5 - 2
src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -265,12 +265,15 @@ public class DismissService {
                 indata.getLedgerSn()) < 1) {
             return -1;
         }
-        final Date admissDate = getBegntime(indata.getInpatientNo(), indata.getAdmissTimes(), indata.getTable());
-        final Date dismissDate = getEndtime(indata.getMidSetl(), indata.getInpatientNo(), indata.getAdmissTimes(),
+        Date admissDate = getBegntime(indata.getInpatientNo(), indata.getAdmissTimes(), indata.getTable());
+        Date dismissDate = getEndtime(indata.getMidSetl(), indata.getInpatientNo(), indata.getAdmissTimes(),
                 indata.getZjdzDatetime());
         Date tempendtime = indata.getMidSetl() ? dismissDate : DateUtil.parse("2999-12-31 23:59:59");
         ReceiptEntity receiptEntity = dismissFeeAnalyse(indata.getInpatientNo(), indata.getAdmissTimes(),
                 indata.getLedgerSn(), admissDate, tempendtime);
+        if (indata.getLedgerSn() > 1) {
+            admissDate = DateUtil.addOneSecond(admissDate);
+        }
         if (dao.writeReceiptTable(indata.getInpatientNo(), indata.getAdmissTimes(), indata.getLedgerSn(), 1,
                 admissDate, dismissDate, indata.getWardCode(), indata.getDeptCode(), dismissDate, "01",
                 indata.getStaffId(), receiptEntity.getAdult()) < 1) {

+ 7 - 0
src/main/java/thyyxxk/webserver/utils/DateUtil.java

@@ -98,6 +98,13 @@ public class DateUtil {
         return Integer.parseInt(String.valueOf(between_days));
     }
 
+    public static Date addOneSecond(Date begntime) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(begntime);
+        cal.add(Calendar.SECOND, 1);
+        return cal.getTime();
+    }
+
     public static Integer calculateAge(Date birthDate) {
         if (null == birthDate) {
             return null;