Merge branch 'master' of http://192.168.1.222:3000/liyuanyuan/ylsf

ylsf-api/src/main/java/api/controller/patient/LabelController.java

@@ -0,0 +1,99 @@
+package api.controller.patient;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import api.controller.BaseController;
+import api.entity.database.patient.Label;
+import api.entity.input.PageInput;
+import api.model.AjaxResult;
+import api.service.patient.ILabelService;
+import api.util.annotation.Log;
+import api.util.enums.BusinessType;
+import api.util.helper.StringHelper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.Arrays;
+
+@Api(value = "p_label",tags = "p_label")
+@RestController
+@RequestMapping("/patient/label")
+public class LabelController extends BaseController {
+    @Autowired
+    private ILabelService labelService;
+
+    @ApiOperation("列表")
+    @Log(title = "查询p_label列表",businessType = BusinessType.QUERY)
+    @GetMapping
+    public AjaxResult getList(Label input, PageInput pageInput) {
+        LambdaQueryWrapper<Label> qw = new LambdaQueryWrapper();
+
+        qw.like(!StringHelper.isEmpty(input.getLabelName()), Label::getLabelName, input.getLabelName());
+
+
+        qw.eq(  Label::getIsDelete, 0L);
+        Page<Label> page = GetPage(pageInput);
+        if (page != null) {
+            IPage<Label> iPage = labelService.getListPage(page, qw);
+            return Success("成功", iPage.getRecords(), iPage.getTotal());
+        } else {
+            return Success("成功", labelService.getList(qw));
+        }
+    }
+
+    @ApiOperation("详情")
+    @Log(title = "查询p_label详情",businessType = BusinessType.QUERY)
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable long id) {
+        return Success("成功", labelService.getEntity(id));
+    }
+
+    @ApiOperation("新增")
+    @Log(title = "新增p_label",businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Label input) {
+        LambdaQueryWrapper<Label> exist=new LambdaQueryWrapper<>();
+        exist.eq(Label::getLabelName,input.getLabelName());
+        exist.eq(Label::getIsDelete,0L);
+
+        if(  labelService.exists(exist)){
+            return  Success("标签名已存在");
+        }
+
+
+         input.setCreateUser(CurrentUser().getUserName());
+        boolean result = labelService.insert(input);
+        if (result) {
+            return Success("成功");
+        } else {
+            return Error("新增失败");
+        }
+    }
+
+    @ApiOperation("编辑")
+    @Log(title = "编辑p_label",businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Label input)  {
+        boolean result = labelService.update(input);
+        if (result) {
+            return Success("成功");
+        } else {
+            return Error("修改失败");
+        }
+    }
+
+    @ApiOperation("删除")
+    @Log(title = "删除p_label",businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult delete(@PathVariable Long[] ids)  {
+        boolean result = labelService.delete(Arrays.asList(ids));
+        if (result) {
+            return Success("成功");
+        } else {
+            return Error("删除失败");
+        }
+    }
+
+}

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

@@ -1,8 +1,10 @@
 package api.controller.patient;
 
+import api.entity.database.patient.Label;
 import api.entity.database.patient.Patient;
 import api.entity.database.patient.PatientLog;
 import api.entity.input.patient.LabelInput;
+import api.service.patient.ILabelService;
 import api.service.patient.IPatientLogService;
 import api.service.patient.IPatientService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -38,13 +40,16 @@ public class PatientLabelController extends BaseController {
     @Autowired
     private IPatientService patientService;
 
+    @Autowired
+    private ILabelService labelService;
+
     @ApiOperation("列表")
     @Log(title = "查询p_patientlabel列表",businessType = BusinessType.QUERY)
     @GetMapping
     public AjaxResult getList(PatientLabel input, PageInput pageInput) {
         LambdaQueryWrapper<PatientLabel> qw = new LambdaQueryWrapper();
-        qw.eq(input.getLabelId() != null && input.getLabelId() > 0, PatientLabel::getLabelId, input.getLabelId());
-        qw.like(!StringHelper.isEmpty(input.getPatientId()), PatientLabel::getPatientId, input.getPatientId());
+        qw.eq(input.getLabelId() != null , PatientLabel::getLabelId, input.getLabelId());
+        qw.eq(!StringHelper.isEmpty(input.getPatientId()), PatientLabel::getPatientId, input.getPatientId());
         qw.like(!StringHelper.isEmpty(input.getPatientName()), PatientLabel::getPatientName, input.getPatientName());
         qw.like(!StringHelper.isEmpty(input.getPhoneNumber()), PatientLabel::getPhoneNumber, input.getPhoneNumber());
         qw.like(!StringHelper.isEmpty(input.getLabelName()), PatientLabel::getLabelName, input.getLabelName());
@@ -71,6 +76,8 @@ public class PatientLabelController extends BaseController {
     @Log(title = "新增p_patientlabel",businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PatientLabel input) {
+
+
         Date currentDate = new Date(System.currentTimeMillis());
         input.setCreateTime(currentDate);
         input.setCreateUserName(CurrentUser().getNickName());
@@ -118,7 +125,8 @@ public class PatientLabelController extends BaseController {
 
         LambdaQueryWrapper<PatientLabel> lp = new LambdaQueryWrapper<>();
         lp.in(PatientLabel::getPatientId, patientids);
-        lp.eq(PatientLabel::getLabelName, input.getLabelName());
+
+        lp.eq(PatientLabel::getLabelId, input.getLabelId());
         boolean result = patientlabelService.delete(lp);
         if (result) {
             //删除标签 存log记录
@@ -142,14 +150,26 @@ public class PatientLabelController extends BaseController {
     @ApiOperation("批量打标签")
     @Log(title = "新增p_patientlabel",businessType = BusinessType.INSERT)
     @PostMapping("/batchadd")
-   // public AjaxResult batchadd(@PathVariable List<String> patientids, @PathVariable  String  labelname) {
+
     public AjaxResult batchadd(@RequestBody LabelInput inputlabel) {
+        Label labelmodel=new Label();
+        if(inputlabel.getLabelId()!=null && inputlabel.getLabelId()>0){}
+        else{
+            //先添加标签
+            labelmodel.setLabelName(inputlabel.getLabelName());
+            labelmodel.setPatientCount(inputlabel.getPatientids().stream().count());
+            labelmodel.setCreateUser(CurrentUser().getUserName());
+             labelService.insert(labelmodel);
+        }
+
         Date currentDate = new Date(System.currentTimeMillis());
         List<String> patientids= inputlabel.getPatientids();
         LambdaQueryWrapper<Patient> lp=new LambdaQueryWrapper<>();
         lp.in(Patient::getPatientId,inputlabel.getPatientids());
        List<Patient> patientList= patientService.getList(lp);
 
+       Long labelid=inputlabel.getLabelId()==null?labelmodel.getLabelId():inputlabel.getLabelId();
+
         StringBuilder error = new StringBuilder();
         for (int i = 0; i < patientids.stream().count(); i++) {
             PatientLabel input=new PatientLabel();
@@ -158,15 +178,14 @@ public class PatientLabelController extends BaseController {
             input.setCreateUserName(CurrentUser().getNickName());
             input.setCreateUser(CurrentUser().getUserName());
             input.setIsDelete(0L);
+            input.setLabelId(labelid);
             input.setPatientId(String_id);
             var patient=  patientList.stream().filter(x->x.getPatientId().equals(String_id)).collect(Collectors.toList()).stream().findFirst();
             input.setLabelName(inputlabel.getLabelName());
             input.setPatientName(patient.get().getName() );
             input.setPhoneNumber(patient.get().getPhoneNumber());
             boolean result = patientlabelService.insert(input);
-            if (!result) {
-              //  error.append(patientids.get(i)).append("删除失败;");
-            } else {
+            if (result)  {
                 //添加标签 存log记录
             var ppp=  patientList.stream().filter(x->x.getPatientId().equals(String_id)).findFirst().get();
                ppp.setUpdateTime(currentDate);

ylsf-entity/src/main/java/api/entity/database/patient/Label.java

@@ -0,0 +1,35 @@
+package api.entity.database.patient;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/** p_label */
+@ApiModel(value = "Label", description = "p_label实体")
+@Data
+@TableName("p_label")
+public class Label {
+    /** label_id */
+    @ApiModelProperty("label_id")
+    @TableId(type = IdType.AUTO)
+    private Long labelId;
+    /** 标签名 */
+    @ApiModelProperty("标签名")
+    private String labelName;
+    /** 患者数量 */
+    @ApiModelProperty("患者数量")
+    private Long patientCount;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    /** 创建人 */
+    @ApiModelProperty("创建人")
+    private String createUser;
+    /** 删除标志0否1是 */
+    @ApiModelProperty("删除标志0否1是")
+    private Long isDelete;
+}

ylsf-entity/src/main/java/api/entity/database/patient/Patient.java

@@ -78,12 +78,7 @@ public class Patient {
     /** 最近就诊时间 */
     @ApiModelProperty("最近就诊时间")
     private Date jzsj;
-    /** 最近入院时间 */
-    @ApiModelProperty("最近入院时间")
-    private Date rysj;
-    /** 最近出院时间 */
-    @ApiModelProperty("最近出院时间")
-    private Date cysj;
+
     /** 最近就诊科室 */
     @ApiModelProperty("最近就诊科室")
     private Long jzks;
@@ -92,15 +87,70 @@ public class Patient {
     @ApiModelProperty("最近就诊科室展示用")
     private String jzksName;
 
-    /** 病区 */
-    @ApiModelProperty("病区")
-    private String ssbq;
-    /** 诊断疾病 */
-    @ApiModelProperty("诊断疾病")
-    private String zdjb;
+
+    /** 最近就诊科室展示用 */
+    @ApiModelProperty("最近就诊诊断")
+    private String zjjzzd;
+
+    @ApiModelProperty("最近就诊疾病")
+    private String zjjzjb;
+
+    @ApiModelProperty("最近就诊医生")
+    private  String zjjzys;
+
+
+
+    /** 最近入院时间 */
+    @ApiModelProperty("最近入院时间")
+    private Date rysj;
+
+    @ApiModelProperty("最近入院诊断")
+    private  String zjryzd;
+
+
+    @ApiModelProperty("最近入院疾病")
+    private  String zjryjb;
+
+
+    @ApiModelProperty("最近住院科室展示用")
+    private  String zjzyksName;
+
+    @ApiModelProperty("最近住院科室id")
+    private  Long zjzyks;
+
     /** 主治医生 */
     @ApiModelProperty("主治医生")
     private String zzys;
+    /** 主治医生name */
+    @ApiModelProperty("主治医生name")
+    private String zzysName;
+    /** 最近出院时间 */
+    @ApiModelProperty("最近出院时间（如果有新的住院记录，还未出院该字段为空）")
+    private Date cysj;
+
+    /** 最近出院诊断疾病 */
+    @ApiModelProperty("最近出院诊断")
+    private String zjcyzd;
+
+    /** 最近出院诊断疾病 */
+    @ApiModelProperty("最近出院疾病")
+    private String zjcyjb;
+
+
+
+    @ApiModelProperty("最近出院科室id")
+    private  Long zjcyks;
+
+
+    @ApiModelProperty("最近出院科室展示用")
+    private  String zjcyksName;
+
+
+    /** 病区 */
+    @ApiModelProperty("所属病区")
+    private String ssbq;
+
+
     /** 创建人 */
     @ApiModelProperty("创建人")
     private String createUser;
@@ -124,9 +174,7 @@ public class Patient {
     private Date updateTime;
 
 
-    /** 主治医生name */
-    @ApiModelProperty("主治医生name")
-    private String zzysName;
+
 
     /** 责任护士name */
     @ApiModelProperty("责任护士name")

ylsf-entity/src/main/java/api/entity/database/patient/PatientLabel.java

@@ -16,7 +16,7 @@ public class PatientLabel {
     /** 主键 标签id */
     @ApiModelProperty("主键 标签id")
     @TableId(type = IdType.AUTO)
-    private Long labelId;
+    private Long patientlabelId;
     /** 患者id */
     @ApiModelProperty("患者id")
     private String patientId;
@@ -43,4 +43,8 @@ public class PatientLabel {
     @ApiModelProperty("创建人姓名")
     private String createUserName;
 
+    /** label表的id */
+    @ApiModelProperty("label表的id")
+    private Long labelId;
+
 }

ylsf-entity/src/main/java/api/entity/input/patient/LabelInput.java

@@ -9,6 +9,7 @@ import java.util.List;
 public class LabelInput {
 
     private  String    LabelName;
+private  Long LabelId;
 
    private List<String> patientids;
 }

ylsf-mapper/src/main/java/api/mapper/patient/LabelMapper.java

@@ -0,0 +1,9 @@
+package api.mapper.patient;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import api.entity.database.patient.Label;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface LabelMapper extends BaseMapper<Label> {
+}

ylsf-service/src/main/java/api/service/patient/ILabelService.java

@@ -0,0 +1,7 @@
+package api.service.patient;
+
+import api.entity.database.patient.Label;
+import api.service.IBaseService;
+
+public interface ILabelService extends IBaseService<Label> {
+}

ylsf-service/src/main/java/api/service/patient/IPatientService.java

@@ -1,7 +1,13 @@
 package api.service.patient;
 
 import api.entity.database.patient.Patient;
+import api.entity.input.sf.BatchPhoneInput;
 import api.service.IBaseService;
 
+import java.util.List;
+
 public interface IPatientService extends IBaseService<Patient> {
+
+
+    boolean updatephonestatus(String phone,String status);
 }

ylsf-service/src/main/java/api/service/patient/impl/LabelServiceImpl.java

@@ -0,0 +1,14 @@
+package api.service.patient.impl;
+
+import api.entity.database.patient.Label;
+import api.mapper.patient.LabelMapper;
+import api.service.patient.ILabelService;
+import api.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+@Service
+public class LabelServiceImpl extends BaseServiceImpl<LabelMapper, Label> implements ILabelService{
+    public LabelServiceImpl(){ super(false); }
+}

ylsf-service/src/main/java/api/service/patient/impl/PatientServiceImpl.java

@@ -4,6 +4,7 @@ import api.entity.database.patient.Patient;
 import api.mapper.patient.PatientMapper;
 import api.service.patient.IPatientService;
 import api.service.BaseServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -11,4 +12,12 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class PatientServiceImpl extends BaseServiceImpl<PatientMapper, Patient> implements IPatientService{
     public PatientServiceImpl(){ super(false); }
+@Override
+   public  boolean updatephonestatus(String patientid,String status) {
+       LambdaUpdateWrapper<Patient> patient=new LambdaUpdateWrapper<>();
+       patient.eq(Patient::getPatientId,patientid);
+       patient.set(Patient::getPhoneNumber,status);
+       return   this.updateBatch(patient);
+
+   }
 }

ylsf-service/src/main/java/api/service/sf/impl/SfPlanPatientServiceImpl.java

@@ -262,7 +262,7 @@ public class SfPlanPatientServiceImpl extends BaseServiceImpl<SfPlanPatientMappe
             {
                 ov.setJzks(patientData.getJzks());
                 ov.setJzksName(patientData.getJzksName());
-                ov.setZdjb(patientData.getZdjb());
+                ov.setZdjb(patientData.getZjjzjb());
             }
             SfPlan Plan = sfPlanService.getEntity(Patients.getPlId());
             if (Plan!=null)