Merge branch 'master' into 'master'

科室相关字典等优化

See merge request lighter/web-server!136

src/main/java/thyyxxk/webserver/dao/his/dictionary/BedDeptDictDao.java

@@ -15,7 +15,7 @@ public interface BedDeptDictDao {
 
     @Select("  select a.ward_code as wardCode,   " +
             "         a.dept_code as deptCode,   " +
-            "         a.openbed_num as openBedNum,   " +
+            "         a.openbed_num as openbedNum,   " +
             "         a.borrowbed_num as borrowBedNum,   " +
             "         a.lentbed_num as lentbedNum,   " +
             "         rtrim(a.ward_name) as wardName,   " +
@@ -102,7 +102,7 @@ public interface BedDeptDictDao {
 
     @Update("<script>" +
             "<foreach item='item' collection='list' >" +
-            " update zy_adtward set openbed_num = #{item.openBedNum} " +
+            " update zy_adtward set openbed_num = #{item.openbedNum} " +
             " where ward_code = #{item.deptCode} and dept_code = #{item.deptCode} " +
             "</foreach>" +
             "</script>")

src/main/java/thyyxxk/webserver/service/dictionary/wxservice/ServiceNumberService.java

@@ -73,7 +73,9 @@ public class ServiceNumberService {
             } else {
                 String maxCode = healthEducationDao.selectMaxCodeOfHealthEducation();
                 String newCode;
-                if(maxCode.startsWith("0")){
+                if(StringUtil.isEmpty(maxCode)){
+                    newCode = "01";
+                } else if(maxCode.startsWith("0")){
                     int number = Integer.parseInt(maxCode.replace("0", ""));
                     if(number == 9){
                         newCode = (number + 1) + "";

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

@@ -225,7 +225,7 @@ public class YpDictService {
 
         Map<String, Object> resultMap = new HashMap<>();
         try{
-            int num = ypClassDao.deleteYpClassByCode(code);
+            int num = drugKindDao.deleteDrugKindByCode(code);
             if(num == 0){
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除药品分类字典失败！");
             }