num

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -167,12 +167,14 @@ public class MzChargeDetailController {
             List<MzChargeDetail> mzChargeDetails = new ArrayList<>();
             if (PayMarkEnum.NO_CHARGE.code.equals(mzChargeDetail.getPayMark())) {
                 if (StringUtils.isNotBlank(mzChargeDetail.getPatientId())) {
+                    // 查询病人信息
                     MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(mzChargeDetail.getPatientId());
                     if (mzPatientMi == null) {
                         resultMap.put("code", -1);
                         resultMap.put("message", "病人不存在！");
                         return resultMap;
                     }
+                    // 将未缴费的处方转成完整的收费明细
                     mzChargeDetails.addAll(mzChargeDetailService.unPaidToFullChargeDetail(mzChargeDetail.getPatientId(), mzPatientMi.getName()));
                 }
                 if (StringUtils.isNotBlank(mzChargeDetail.getName())) {

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzSerialNoServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Service
@@ -43,7 +44,7 @@ public class MzSerialNoServiceImpl implements MzSerialNoService {
         if (mzSerialNo == null) {
             throw new MzException("序列号生成器不存在，请先设置！");
         }
-        Integer newOutpatientNo=Integer.valueOf(mzSerialNo.getOutpatientNo()) + 1;
+        BigDecimal newOutpatientNo = new BigDecimal(mzSerialNo.getOutpatientNo()).add(new BigDecimal(1));
         mzSerialNo.setNewOutpatientNo(newOutpatientNo.toString());
         int num = mzSerialNoMapper.updateOutpatientNo(mzSerialNo.getOutpatientNo(),mzSerialNo.getNewOutpatientNo());
         if (num == 0) {