新增供应商企业信用代码维护以及日志提示优化

src/main/java/thyyxxk/webserver/dao/his/medicine/YpZdSupplyDao.java

@@ -65,6 +65,9 @@ public interface YpZdSupplyDao extends BaseMapper<YpZdSupply> {
             "<if test=\"useFlag != null and useFlag != '' \">" +
             "use_flag = #{useFlag}, " +
             "</if>" +
+            "<if test=\"supplyCode != null and supplyCode != '' \">" +
+            "supply_code = #{supplyCode}, " +
+            "</if>" +
             "</trim>" +
             "where code = #{code} " +
             "</script>")

src/main/java/thyyxxk/webserver/entity/medicine/YpZdSupply.java

@@ -60,5 +60,9 @@ public class YpZdSupply implements Serializable {
      * 1：已使用
      */
     private String useFlag;
+    /**
+     * 企业（供应商）信用代码
+     */
+    private String supplyCode;
 
 }

src/main/java/thyyxxk/webserver/service/medicine/YpDictService.java

@@ -522,8 +522,8 @@ public class YpDictService {
         YpZdSupply ypSupply = ypSupplyDao.selectYpSupplyByCode(code);
 
         // 根据名称生成新的拼音码和五笔码
-        ypZdSupply.setPyCode(PingYinUtils.pyShouZiMuDaXie(ypZdSupply.getName()));
-        ypZdSupply.setDCode(PingYinUtils.getWBCode(ypZdSupply.getName()));
+        ypZdSupply.setPyCode(PingYinUtils.pyShouZiMuDaXie(ypZdSupply.getName()).substring(0,9));
+        ypZdSupply.setDCode(PingYinUtils.getWBCode(ypZdSupply.getName()).substring(0,9));
         int num;
         try{
             if(null != ypSupply){
@@ -537,7 +537,7 @@ public class YpDictService {
             resultMap.put("cg", "保存药品供应商字典成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存药品供应商字典失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存药品供应商字典失败: " + e.getMessage());
         }
     }
 
@@ -562,7 +562,7 @@ public class YpDictService {
             resultMap.put("cg", "删除药品供应商字典成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除药品供应商字典失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除药品供应商字典失败: " + e.getMessage());
         }
     }
 
@@ -610,7 +610,7 @@ public class YpDictService {
             resultMap.put("cg", "保存药品生产厂家字典成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存药品生产厂家字典失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存药品生产厂家字典失败: " + e.getMessage());
         }
     }
 
@@ -635,7 +635,7 @@ public class YpDictService {
             resultMap.put("cg", "删除药品生产厂家字典成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除药品生产厂家字典失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除药品生产厂家字典失败: " + e.getMessage());
         }
     }
 
@@ -698,7 +698,7 @@ public class YpDictService {
             resultMap.put("cg", "更新药品账页字典停用或启用成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新药品账页字典停用或启用失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新药品账页字典停用或启用失败: " + e.getMessage());
         }
 
     }
@@ -941,7 +941,7 @@ public class YpDictService {
             resultMap.put("cg", "保存药品别名信息成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存药品别名信息失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存药品别名信息失败: " + e.getMessage());
         }
     }
 
@@ -967,7 +967,7 @@ public class YpDictService {
             resultMap.put("cg", "删除药品别名信息成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除药品别名信息失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除药品别名信息失败: " + e.getMessage());
         }
     }
 
@@ -1037,7 +1037,7 @@ public class YpDictService {
             resultMap.put("cg", "更新药品临购标志成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新药品临购标志失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新药品临购标志失败: " + e.getMessage());
         }
 
     }
@@ -1074,7 +1074,7 @@ public class YpDictService {
             resultMap.put("cg", "更新药库药品停用或启用成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新药库药品停用或启用失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新药库药品停用或启用失败: " + e.getMessage());
         }
 
     }
@@ -1105,7 +1105,7 @@ public class YpDictService {
             resultMap.put("cg", "更新药品国家基本药物标志成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新药品国家基本药物标志失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新药品国家基本药物标志失败: " + e.getMessage());
         }
 
     }
@@ -1174,7 +1174,7 @@ public class YpDictService {
             resultMap.put("cg", "更新高警示药品标志成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新高警示药品标志失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新高警示药品标志失败: " + e.getMessage());
         }
 
     }
@@ -1205,7 +1205,7 @@ public class YpDictService {
             resultMap.put("cg", "更新国家组织药品集中采购中标药品标志成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新国家组织药品集中采购中标药品标志失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新国家组织药品集中采购中标药品标志失败: " + e.getMessage());
         }
 
     }
@@ -1236,7 +1236,7 @@ public class YpDictService {
             resultMap.put("cg", "更新重点监控药品标志成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新重点监控药品标志失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新重点监控药品标志失败: " + e.getMessage());
         }
 
     }
@@ -1267,7 +1267,7 @@ public class YpDictService {
             resultMap.put("cg", "更新口服药品是否允许退药标志成功！");
             return ResultVoUtil.success(resultMap);
         } catch(Exception e){
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新口服药品是否允许退药标志失败！");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "更新口服药品是否允许退药标志失败: " + e.getMessage());
         }
 
     }