|
@@ -16,6 +16,8 @@ import cn.hnthyy.thmz.mapper.his.yp.*;
|
|
import cn.hnthyy.thmz.service.his.yp.YpZdDictService;
|
|
import cn.hnthyy.thmz.service.his.yp.YpZdDictService;
|
|
import cn.hnthyy.thmz.vo.YpZdDictVo;
|
|
import cn.hnthyy.thmz.vo.YpZdDictVo;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
+import cn.hutool.core.convert.Convert;
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -149,7 +151,7 @@ public class YpZdDictServiceImpl implements YpZdDictService {
|
|
YpTypeNumberEnum ypTypeNumber = YpTypeNumberEnum.getYpTypeNumberByCode(Integer.parseInt(ypType));
|
|
YpTypeNumberEnum ypTypeNumber = YpTypeNumberEnum.getYpTypeNumberByCode(Integer.parseInt(ypType));
|
|
assert ypTypeNumber != null;
|
|
assert ypTypeNumber != null;
|
|
String maxCode = ypZdDictMapper.selectMaxCode(ypTypeNumber.minNum, ypTypeNumber.maxNum);
|
|
String maxCode = ypZdDictMapper.selectMaxCode(ypTypeNumber.minNum, ypTypeNumber.maxNum);
|
|
- int code = Integer.parseInt(maxCode)+1;
|
|
|
|
|
|
+ int code = Convert.toInt(maxCode,0) +1;
|
|
maxCode = callYpCodeFormat(code);
|
|
maxCode = callYpCodeFormat(code);
|
|
// 药品编码与医嘱编码冲突重置编码
|
|
// 药品编码与医嘱编码冲突重置编码
|
|
int cs = ypZdDictMapper.selectYzOrderItemByCode(maxCode);
|
|
int cs = ypZdDictMapper.selectYzOrderItemByCode(maxCode);
|