优化益寿缘添加常用处方接口

fs-doctor-app/src/main/java/com/fs/app/controller/PrescribeController.java

@@ -157,13 +157,13 @@ public class PrescribeController extends  AppBaseController {
         BeanUtils.copyProperties(param,doctorPrescribe);
         doctorPrescribe.setDoctorId(Long.parseLong(getDoctorId()));
         doctorPrescribeService.insertFsDoctorPrescribe(doctorPrescribe);
-        HashSet<Long> set = new HashSet<>();
+//        HashSet<Long> set = new HashSet<>();
         List<FsDoctorPrescribeDrug> drugs = param.getDrugs();
-        for (FsDoctorPrescribeDrug drug : drugs) {
-            if (!set.add(drug.getProductId())) {
-                return R.error("存在重复药品");
-            }
-        }
+//        for (FsDoctorPrescribeDrug drug : drugs) {
+//            if (!set.add(drug.getProductId())) {
+//                return R.error("存在重复药品");
+//            }
+//        }
 
         for(FsDoctorPrescribeDrug drug:drugs){
             drug.setPrescribeId(doctorPrescribe.getPrescribeId());
@@ -178,12 +178,12 @@ public class PrescribeController extends  AppBaseController {
     public R editPrescribe(@Validated @RequestBody FsDoctorPrescribeAddEditParam param, HttpServletRequest request){
         FsDoctorPrescribe prescribe=doctorPrescribeService.selectFsDoctorPrescribeByPrescribeId(param.getPrescribeId());
         List<FsDoctorPrescribeDrug> drugs = param.getDrugs();
-        HashSet<Long> set = new HashSet<>();
-        for (FsDoctorPrescribeDrug drug : drugs) {
-            if (!set.add(drug.getProductId())) {
-                return R.error("存在重复药品");
-            }
-        }
+//        HashSet<Long> set = new HashSet<>();
+//        for (FsDoctorPrescribeDrug drug : drugs) {
+//            if (!set.add(drug.getProductId())) {
+//                return R.error("存在重复药品");
+//            }
+//        }
         BeanUtils.copyProperties(param,prescribe);
         prescribe.setDoctorId(Long.parseLong(getDoctorId()));
         doctorPrescribeService.updateFsDoctorPrescribe(prescribe);

fs-service/src/main/java/com/fs/his/param/FsDoctorPrescribeAddEditParam.java

@@ -30,4 +30,7 @@ public class FsDoctorPrescribeAddEditParam   implements Serializable {
 
     List<FsDoctorPrescribeDrug> drugs;
 
+    //备注
+    private String remark;
+
 }

fs-service/src/main/java/com/fs/his/vo/FsDoctorPrescribeListDVO.java

@@ -25,6 +25,8 @@ public class FsDoctorPrescribeListDVO implements Serializable {
 
     List<FsDoctorPrescribeDrug> drugs;
 
+    private String remark;
+
 
 
 }