口腔科生成出院医嘱以String形式返回医嘱号给前端。

src/main/java/thyyxxk/webserver/controller/yibao/PatientController.java

@@ -91,7 +91,7 @@ public class PatientController {
     }
 
     @PostMapping("/genDismissActOrder")
-    public ResultVo<Float> genDismissActOrder(@RequestBody Patient param) {
+    public ResultVo<String> genDismissActOrder(@RequestBody Patient param) {
         return service.genDismissActOrder(param);
     }
 

src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -93,7 +93,8 @@ public class DismissService {
     }
 
     public ResultVo<List<NegativeFee>> calculateForDismiss(Patient param) {
-        log.info("出院结算费用计算：{}", param);
+        String logtype = param.getDismissFlag() == 1 ? "出院结算" : "中间断账";
+        log.info("{}费用计算：{}", logtype, param);
         final String patNo = param.getInpatientNo();
         final Integer times = param.getAdmissTimes();
         if (param.getDismissFlag() == 1) {
@@ -182,8 +183,8 @@ public class DismissService {
             throw new BizException(exception);
         }
         final Integer transFlag = param.getDismissFlag() == 1 ? 0 : 2;
-        List<ReceiptFee> receiptFees = dao.calculateCost(patNo, times, ledgerSn, param.getStaffId(), param.getAdmissDate(),
-                actOrderDisDate, param.getAdmissWard(), param.getAdmissDept(), transFlag);
+        List<ReceiptFee> receiptFees = dao.calculateCost(patNo, times, ledgerSn, param.getStaffId(),
+                param.getAdmissDate(), actOrderDisDate, param.getAdmissWard(), param.getAdmissDept(), transFlag);
         if (null == receiptFees || receiptFees.isEmpty()) {
             ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
             exception.setMessage("费用计算失败。执行zy_cngl_fyjs过程出错。");
@@ -194,6 +195,7 @@ public class DismissService {
         if (null == adultFee) {
             adultFee = "0";
         }
+        log.info("总费用：{}，发票计算费用：{}", adultFee, receipts[0]);
         if (DecimalUtil.compare(receipts[0], adultFee) != 0) {
             ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
             exception.setMessage("此患者明细费用与发票费用不一致。");