Merge branch 'master' into 'master'

药品字典保存修复

See merge request lighter/web-server!132

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

@@ -235,11 +235,11 @@ public interface YpDictDao extends BaseMapper<YpZdDict> {
             "   retprice, pack_size, drug_flag, infusion, class_code, dosage, concentration, vol_unit, mini_unit, pack_unit, " +
             "   self_flag, separate_flag, suprice_flag, country_flag, drug_kind, drug_id, drug_id_link, weight, " +
             "   weigh_unit, volum, serial_new, mz_bill_item, zy_bill_item )" +
-            " select code, serial, #{groupNo}, name, py_code, d_code, left(specification, 10) as specification, " +
+            " select code, serial, #{groupNo} as group_no, name, py_code, d_code, left(specification, 10) as specification, " +
             "       left(specification2, 10) as specification2, pack_retprice, retprice, pack_size," +
             "       drug_flag, infusion_flag, class_code, dosage, concentration, vol_unit, mini_unit, pack_unit, self_flag, " +
-            "       separate_flag, suprice_flag, country_flag, right(drug_kind, 2), drug_id, " +
-            "       rtrim(ltrim(drug_id)) + rtrim(ltrim(dosage)), weight, weigh_unit, volum, serial, bill_item_mz, bill_item_zy " +
+            "       separate_flag, suprice_flag, country_flag, right(drug_kind, 2) as drug_kind, drug_id, " +
+            "       rtrim(ltrim(drug_id)) as drug_id_link, weight, weigh_unit, volum, serial as serial_new, bill_item_mz, bill_item_zy " +
             " from yp_zd_dict where code = #{code} and serial = #{serial}")
     int insertYpBaseSync(@Param("code") String code, @Param("serial") String serial, @Param("groupNo") String groupNo);
 

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

@@ -812,7 +812,7 @@ public class YpDictService {
             ypZdDictVo.setOperDate(new Date());
             ypZdDictVo.setOperId("");
             YpZdDict copyVo = new YpZdDict();
-            BeanUtils.copyProperties(copyVo, ypZdDictVo, YpZdDict.class);
+            BeanUtils.copyProperties(ypZdDictVo, copyVo, YpZdDict.class);
             copyVo.setDrugId(copyVo.getCode());
             num = dao.insert(copyVo);
             if(num == 0){
@@ -821,7 +821,7 @@ public class YpDictService {
 
             if(copyVo.getSerial().equals("99")){
                 YpZdDict minYp = new YpZdDict();
-                BeanUtils.copyProperties(minYp, copyVo, YpZdDict.class);
+                BeanUtils.copyProperties(copyVo, minYp, YpZdDict.class);
                 minYp.setSerial("01");
                 BigDecimal minPackPrice = DecimalUtil.divide(ypZdDictVo.getPackRetprice(), ypZdDictVo.getPackSize(), 3);
                 minYp.setPackRetprice(minPackPrice.doubleValue());