Przeglądaj źródła

医技项目录入失败回显原数据

hurugang 2 lat temu
rodzic
commit
47c3c6e9ce

+ 17 - 0
src/main/java/cn/hnthyy/thmz/controller/zd/JcJyController.java

@@ -27,6 +27,7 @@ import cn.hnthyy.thmz.vo.ThmzmxsrParamsVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -852,6 +853,14 @@ public class JcJyController {
             resultMap.put("message", "保存检查项目成功");
             return resultMap;
         } catch (Exception e) {
+            if (e instanceof DataIntegrityViolationException) {
+                if (e.getMessage().contains("将截断字符串或二进制数据")) {
+                    resultMap.put("code", -1);
+                    resultMap.put("message", "项目名称超长,请缩短名称");
+                    log.error("系统异常,错误信息{项目名称超长}");
+                    return resultMap;
+                }
+            }
             e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "保存检查项目失败,错误信息:【" + e.getMessage() + "】");
@@ -1230,6 +1239,14 @@ public class JcJyController {
             resultMap.put("message", "保存检验项目成功");
             return resultMap;
         } catch (Exception e) {
+            if (e instanceof DataIntegrityViolationException) {
+                if (e.getMessage().contains("将截断字符串或二进制数据")) {
+                    resultMap.put("code", -1);
+                    resultMap.put("message", "项目名称超长,请缩短名称");
+                    log.error("系统异常,错误信息{项目名称超长}");
+                    return resultMap;
+                }
+            }
             e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "保存检验项目失败,错误信息:【" + e.getMessage() + "】");

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

@@ -488,7 +488,7 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
         List<MzDepositFile> mzDepositFileList=mzDepositFileMapper.selectMzDepositFileByTimes(mzReceiptSerial.getPatientId(),mzReceiptSerial.getTimes(),mzReceiptSerial.getReceiptNo(),"mz_deposit_file");
         if(mzDepositFileList!=null && mzDepositFileList.size()>0){
             BigDecimal totalAmount = mzChargeDetailMapper.selectSumAmount(mzReceiptSerial.getPatientId(), mzReceiptSerial.getTimes(), mzReceiptSerial.getReceiptNo());
-            String payInfo="总额:"+totalAmount;
+            String payInfo="总额:"+totalAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
             for(MzDepositFile mzDepositFile:mzDepositFileList){
                 if(Constants.YBJZ.equals(mzDepositFile.getChequeType())){
                     payInfo=payInfo+" 统筹:"+mzDepositFile.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP);

+ 2 - 0
src/main/resources/static/js/mz/jc_jy_zd_class.js

@@ -145,6 +145,7 @@ function saveJcZdClass() {
                 $('#tb_table').bootstrapTable('refresh');
                 successMesage(res);
             } else {
+                $("#editJcModal").modal();
                 errorMesage(res);
             }
         }
@@ -189,6 +190,7 @@ function saveJyZdClass() {
                 $('#tb_table').bootstrapTable('refresh');
                 successMesage(res);
             } else {
+                $("#editJyModal").modal();
                 errorMesage(res);
             }
         }

+ 2 - 0
src/main/resources/static/js/mz/jc_jy_zd_item.js

@@ -184,6 +184,7 @@ function saveJcZdItem() {
                 $('#tb_table').bootstrapTable('refresh');
                 successMesage(res);
             } else {
+                $("#editJcModal").modal();
                 errorMesage(res);
             }
         }
@@ -310,6 +311,7 @@ function saveJyZdItem() {
                 $('#tb_table').bootstrapTable('refresh');
                 successMesage(res);
             } else {
+                $("#editJyModal").modal();
                 errorMesage(res);
             }
         }