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

药品拆分问题处理

See merge request hurugang/thmz_system!13

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfDivideServiceImpl.java

@@ -150,6 +150,7 @@ public class YfDivideServiceImpl implements YfDivideService {
                 ypBaseYfNew.setSerial("01");
                 ypBaseYfNew.setGroupNo(ypBaseYfVo.getGroupNo());
                 ypBaseYfNew.setLocation(ypBaseYfVo.getLocation());
+                ypBaseYfNew.setPackRetprice(ypZdDict.getPackRetprice());
                 ypBaseYfMapper.insertYpBaseYf(ypBaseYfNew);
             }else{
                 double stockAmount = ypInDetlYf.getCurrentStock();