Merge branch 'feat-oe' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeMedicineController.java

@@ -97,7 +97,8 @@ public class OeMedicineController {
             vo.setMedicalInsurance(i%2==0 ? Boolean.TRUE : Boolean.FALSE);
             vo.setDosageForm(i%2==0 ?"片剂" : "注射液");
             vo.setSpecification("0.1g");
-            vo.setDrugType(i%2==0 ? "仿制" : "原研");
+            vo.setDrugType(i%2==0 ? "ANDA" : "RLD");
+            vo.setDrugTypeName(i%2==0 ? "仿制" : "原研");
             list.add(vo);
         }
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeMedicineVO.java

@@ -62,10 +62,15 @@ public class OeMedicineVO implements Serializable {
     private String specification;
 
     /**
-     * 原研/仿制药
+     * 原研/仿制药类型
      */
     private String drugType;
 
+    /**
+     * 原研/仿制药类型名称
+     */
+    private String drugTypeName;
+
     /**
      * 备注
      */