Merge branch 'dev-1.1.4' into 'dev-1.1.4'

药品字典维护优化

See merge request lihong/thmz_system!40

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpBaseMapper.java

@@ -82,8 +82,7 @@ public interface YpBaseMapper {
             "  b.d_code  like '%${searchText}%'  or c.d_code  like '%${searchText}%' or" +
             "  b.charge_code = #{searchText} or c.charge_code = #{searchText} or" +
             "  b.print_name like '%${searchText}%' or c.drugname like '%${searchText}%') and" +
-            "  c.group_no=#{ypBase.groupNo} and" +
-            "  c.drug_id is not null" +
+            "  c.group_no=#{ypBase.groupNo} " +
             "  <when test='ypBase.delFlag!=null'>" +
             "   and isnull(c.del_flag,0)=#{ypBase.delFlag}" +
             "  </when>" +

src/main/java/cn/hnthyy/thmz/service/impl/his/yp/YpZdDictServiceImpl.java

@@ -130,6 +130,7 @@ public class YpZdDictServiceImpl implements YpZdDictService {
     public int saveYpZdDict(YpZdDict ypZdDict) throws MzException {
         ypZdDict.setPyCode(PyWbUtil.toBigFirstChar(ypZdDict.getName()));
         ypZdDict.setWbCode(PyWbUtil.getWBCode(ypZdDict.getName()));
+        ypZdDict.setDrugId(ypZdDict.getCode());
         if(StringUtils.isNotBlank(ypZdDict.getCode())){
             YpZdDict oldZd = ypZdDictMapper.selectYpZdDictByCodeAndSerial(ypZdDict.getCode(), ypZdDict.getSerial());
             String changedFieldsOfSql = ColumnSqlUtil.getChangedNotFieldsOfSql(oldZd, ypZdDict,0);

src/main/resources/templates/yk/drug_info.html

@@ -160,7 +160,7 @@
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
                             <input id="name" name="name" class="form-control col-md-7 col-xs-12"
-                                   data-validate-length-range="1,15"
+                                   data-validate-length-range="1,30"
                                    placeholder="请输入" required="required" type="text">
                         </div>
                     </div>