标签

hjzx-api/src/main/java/api/controller/patient/PatientLabelController.java

@@ -118,8 +118,8 @@ public class PatientLabelController extends BaseController {
     //@PathVariable String[] patientids, @PathVariable  String  labelname)  {
     {
         List<String> patientids = new ArrayList<>();
-
-        if (input.getPatientids() != null && input.getPatientids().size()>0) {
+        if (input.getPatientids() != null && input.getPatientids().stream().count()>0) {
+      //  if (input.getPatientids() != null && input.getPatientids().size()>0) {
             patientids = input.getPatientids();
         }
         LambdaQueryWrapper<PatientLabel> lp = new LambdaQueryWrapper<>();
@@ -151,13 +151,27 @@ public class PatientLabelController extends BaseController {
 
     public AjaxResult batchadd(@RequestBody LabelInput inputlabel) {
         Label labelmodel=new Label();
-        if(inputlabel.getLabelId()!=null && inputlabel.getLabelId()>0){}
+
+        Long labelid;
+        //判断标签是否存在
+        LambdaQueryWrapper<Label> lqw=new LambdaQueryWrapper<>();
+        lqw.eq(Label::getLabelName,inputlabel.getLabelName());
+        List<Label> labelList=labelService.getList(lqw);
+        if(labelList.size()>0){
+            labelmodel=labelList.get(0);
+            labelid=labelmodel.getLabelId();
+
+            labelmodel.setPatientCount(inputlabel.getPatientids().stream().count()+labelmodel.getPatientCount());
+            labelService.update(labelmodel);
+
+        }
         else{
             //先添加标签
             labelmodel.setLabelName(inputlabel.getLabelName());
             labelmodel.setPatientCount(inputlabel.getPatientids().stream().count());
             labelmodel.setCreateUser(CurrentUser().getUserName());
              labelService.insert(labelmodel);
+            labelid=labelmodel.getLabelId();
         }
 
         Date currentDate = new Date(System.currentTimeMillis());
@@ -166,7 +180,7 @@ public class PatientLabelController extends BaseController {
         lp.in(Patient::getPatientId,inputlabel.getPatientids());
        List<Patient> patientList= patientService.getList(lp);
 
-       Long labelid=inputlabel.getLabelId()==null?labelmodel.getLabelId():inputlabel.getLabelId();
+      // Long labelid=inputlabel.getLabelId()==null?labelmodel.getLabelId():inputlabel.getLabelId();
 
         StringBuilder error = new StringBuilder();
         for (int i = 0; i < patientids.stream().count(); i++) {