Bläddra i källkod

优化挂号记录时间功能

hurugang 2 år sedan
förälder
incheckning
f93d5cb34c

+ 1 - 1
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzReceiptSerialServiceImpl.java

@@ -460,7 +460,7 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
 //            mzReceiptSerial.setTotalCharge(totalPay);
 //        }
         if (mzReceiptSerial.getTotalCharge() != null) {
-            mzReceiptSerial.setTotalCharge(mzReceiptSerial.getTotalCharge().setScale(1, BigDecimal.ROUND_FLOOR));
+            mzReceiptSerial.setTotalCharge(mzReceiptSerial.getTotalCharge().setScale(2, BigDecimal.ROUND_FLOOR));
             mzReceiptSerialVo.setTotalChargeStr(NumberToCN.number2CNMontrayUnit(mzReceiptSerial.getTotalCharge()));
         }
         mzReceiptSerialVo.setFeeList(feeList);

+ 7 - 5
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzyReqrecServiceImpl.java

@@ -163,12 +163,14 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
         }
         pediatricAgeLimit(mzPatientMi, mzyRequest);
         //covidManage(mzyReqrec, mzPatientMi, mzyRequest);
-        if ((Constants.AM.equals(mzyRequest.getAmpm()) || Constants.PM.equals(mzyRequest.getAmpm())) && StringUtils.isBlank(mzyReqrec.getApTime())) {
-            //上下午的号且没有传时间切片字段,默认选择第一个
-            String apTime = mzyRequestService.getApTime(mzyRequest);
-            mzyReqrec.setApTime(apTime);
+        if ((Constants.AM.equals(mzyRequest.getAmpm()) || Constants.PM.equals(mzyRequest.getAmpm()))) {
+            if(StringUtils.isBlank(mzyReqrec.getApTime())){
+                //上下午的号且没有传时间切片字段,默认选择第一个
+                String apTime = mzyRequestService.getApTime(mzyRequest);
+                mzyReqrec.setApTime(apTime);
+            }
+            mzyReqrec.setRequestDay(mzyReqrec.getFullApTime(mzyRequest.getRequestDay(), mzyReqrec.getApTime()));
         }
-        mzyReqrec.setRequestDay(mzyReqrec.getFullApTime(mzyRequest.getRequestDay(), mzyReqrec.getApTime()));
         int times = getTimes(mzPatientMi);
         int serialNo = mzSerialNoService.getMzSerialNo();
         Date now = new Date();