实现APP用户端管理

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/app/dto/AppDoctorUserDTO.java

@@ -1,6 +1,7 @@
 package cn.tr.module.phototherapy.app.dto;
 
 import cn.tr.core.pojo.BaseDTO;
+import cn.tr.module.common.menus.SexEnum;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -29,7 +30,7 @@ public class AppDoctorUserDTO extends BaseDTO  {
     private String password;
 
     @Schema(description = "性别")
-    private String sex;
+    private SexEnum sex;
 
     @Schema(description = "医生名称")
     private String realName;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/app/dto/AppDoctorUserQueryDTO.java

@@ -1,5 +1,7 @@
 package cn.tr.module.phototherapy.app.dto;
 
+import cn.tr.module.common.menus.SexEnum;
+import cn.tr.module.phototherapy.common.enums.PatientGenderEnum;
 import lombok.ToString;
 import lombok.Data;
 
@@ -20,21 +22,10 @@ public class AppDoctorUserQueryDTO  implements Serializable{
     @Serial
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "用户名")
-    private String username;
-
     @Schema(description = "性别")
-    private String sex;
+    private Integer sex;
 
     @Schema(description = "医生名称")
     private String realName;
 
-    @Schema(description = "状态 0正常；1停用")
-    private String status;
-
-    @Schema(description = "医院id")
-    private String tenantId;
-
-    @Schema(description = "医生手机号")
-    private String doctorPhone;
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/app/service/impl/AppDoctorUserServiceImpl.java

@@ -50,12 +50,8 @@ public class AppDoctorUserServiceImpl  extends ServiceImpl<AppDoctorUserReposito
     public List<AppDoctorUserDTO> selectAppDoctorUserList(AppDoctorUserQueryDTO query){
         return AppDoctorUserMapper.INSTANCE.convertDtoList(
                 baseRepository.selectList(new LambdaQueryWrapper<AppDoctorUserPO>()
-                    .like(Objects.nonNull(query.getUsername()),AppDoctorUserPO::getUsername, query.getUsername())
-                    .like(Objects.nonNull(query.getSex()),AppDoctorUserPO::getSex, query.getSex())
+                    .eq(Objects.nonNull(query.getSex()),AppDoctorUserPO::getSex, query.getSex())
                     .like(Objects.nonNull(query.getRealName()),AppDoctorUserPO::getRealName, query.getRealName())
-                    .eq(Objects.nonNull(query.getStatus()),AppDoctorUserPO::getStatus, query.getStatus())
-                    .eq(Objects.nonNull(query.getTenantId()),AppDoctorUserPO::getTenantId, query.getTenantId())
-                    .like(Objects.nonNull(query.getDoctorPhone()),AppDoctorUserPO::getDoctorPhone, query.getDoctorPhone())
                 )
         );
     };
@@ -161,7 +157,7 @@ public class AppDoctorUserServiceImpl  extends ServiceImpl<AppDoctorUserReposito
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
         boolean result = this.removeBatchByIds(ids);
-        if (!result){
+        if (result){
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"删除失败");
         }
         SecurityUtil.getStpLogic().logout(ids);

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusClinicController.java

@@ -43,13 +43,6 @@ public class BusClinicController extends BaseController{
         return getDataTable(busClinicService.selectBusClinicList(query));
     }
 
-    @Operation(summary = "根据id查询临床表", description = "权限： phototherapy:clinic:query")
-    @GetMapping("/detail/{id}")
-    @SaCheckPermission("phototherapy:clinic:query")
-    public CommonResult<BusClinicDTO> findById(@PathVariable("id") String id){
-        return CommonResult.success(busClinicService.selectBusClinicById(id));
-    }
-
     @Operation(summary = "新增患者",description = "权限： phototherapy:clinic:add")
     @PostMapping("/addPatient")
     @SaCheckPermission("phototherapy:clinic:add")

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusTherapyPlanController.java

@@ -48,13 +48,6 @@ public class BusTherapyPlanController extends BaseController{
         return CommonResult.success(busTherapyPlanService.selectBusTherapyPlanById(id));
     }
 
-    @Operation(summary = "添加设计方案", description = "权限： phototherapy:common:add")
-    @PostMapping("/add")
-    @SaCheckPermission("phototherapy:common:add")
-    public CommonResult<Boolean> add(@RequestBody@Validated(Insert.class) BusTherapyPlanDTO source) {
-        return CommonResult.success(busTherapyPlanService.insertBusTherapyPlan(source));
-    }
-
     @Operation(summary = "批量添加治疗方案")
     @PostMapping("/addBatch")
     public CommonResult<List<BusTherapyPlanDTO>> addBatch(@RequestBody BusClinicAddDTO source) {

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusClinicAddDTO.java

@@ -6,6 +6,7 @@ import cn.tr.core.pojo.BaseDTO;
 import cn.tr.core.validation.Insert;
 import cn.tr.core.validation.Update;
 import cn.tr.module.common.menus.SexEnum;
+import cn.tr.module.phototherapy.common.enums.PhaseTypeEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -56,7 +57,7 @@ public class BusClinicAddDTO implements Serializable {
     private Date phaseStartTime;
 
     @Schema(description = "强化期阶段")
-    private String intensivePhaseType;
+    private PhaseTypeEnum intensivePhaseType;
 
     @Schema(description = "强化期阶段频率")
     private Integer intensivePhaseFreq;
@@ -65,7 +66,7 @@ public class BusClinicAddDTO implements Serializable {
     private Integer intensivePhaseDurationMin;
 
     @Schema(description = "次续期阶段")
-    private String continuousPhaseType;
+    private PhaseTypeEnum continuousPhaseType;
 
     @Schema(description = "次续期阶段频率")
     private Integer continuousPhaseFreq;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusClinicDTO.java

@@ -46,7 +46,7 @@ public class BusClinicDTO extends BaseDTO  {
     @Schema(description = "患者年龄")
     private Integer patientAge;
 
-    @Schema(description = "患者性别（0女 1男 2未知）")
+    @Schema(description = "患者性别（1男 2女 3未知）")
     private Integer patientGender;
 
     @Schema(description = "患者联系电话")

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusClinicEditDTO.java

@@ -32,7 +32,7 @@ public class BusClinicEditDTO implements Serializable {
     @Schema(description = "患者年龄")
     private Integer patientAge;
 
-    @Schema(description = "患者性别文本（0女 1男 2未知）")
+    @Schema(description = "患者性别文本（1男 2女 3未知）")
     private String patientGenderText;
 
     @Schema(description = "患者联系电话")

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusPatientListQueryDTO.java

@@ -41,6 +41,9 @@ public class BusPatientListQueryDTO implements Serializable{
     @Schema(description = "设备报警")
     private DeviceAlarmEnum deviceAlarm;
 
+    @Schema(description = "阶段类型(0 强化期 1 持续期)")
+    private PhaseTypeEnum phaseType;
+
     @Schema(description = "是否绑定")
     private IsCurrentBindEnum isCurrentBind;
 

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyPlanAddDTO.java

@@ -1,57 +0,0 @@
-package cn.tr.module.phototherapy.common.dto;
-
-import cn.tr.core.pojo.BaseDTO;
-import cn.tr.core.validation.Insert;
-import cn.tr.core.validation.Update;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.util.Date;
-
-/**
- * 治疗方案表传输对象
- *
- * @author CodeGenerator
- * @date 2026-01-13
- **/
-@Data
-@Schema(description = "新增设计方案传输对象")
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class BusTherapyPlanAddDTO extends BaseDTO  {
-    private static final long serialVersionUID = 1L;
-
-    @Schema(description = "方案医生")
-    private String planDoctor;
-
-    @Schema(description = "阶段类型")
-    private String phaseType;
-
-    @Schema(description = "阶段目标次数")
-    private Integer phaseTargetTimes;
-
-    @Schema(description = "阶段频率")
-    private Integer phaseFreq;
-
-    @Schema(description = "阶段日")
-    private Integer phaseDay;
-
-    @Schema(description = "阶段建议时长")
-    private Integer phaseDurationMin;
-
-    @Schema(description = "方案状态（0启用 1等待启用 2终止）")
-    private Integer planStatus;
-
-    @JsonFormat(pattern = "yyyy-MM-dd ")
-    @Schema(description = "阶段开始时间")
-    private Date phaseStartTime;
-
-    @Schema(description = "患者唯一标识")
-    private String patientUniqueId;
-
-}

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyPlanDTO.java

@@ -37,7 +37,7 @@ public class BusTherapyPlanDTO extends BaseDTO  {
     private String planName;
 
     @Schema(description = "阶段类型")
-    private String phaseType;
+    private Integer phaseType;
 
     @Schema(description = "阶段目标次数")
     private Integer phaseTargetTimes;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyPlanEditDTO.java

@@ -1,62 +0,0 @@
-package cn.tr.module.phototherapy.common.dto;
-
-import cn.tr.core.pojo.BaseDTO;
-import cn.tr.core.validation.Insert;
-import cn.tr.core.validation.Update;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.util.Date;
-
-/**
- * 治疗方案表修改传输对象
- *
- * @author CodeGenerator
- * @date 2026-01-13
- **/
-@Data
-@Schema(description = "设计方案修改传输对象")
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class BusTherapyPlanEditDTO extends BaseDTO  {
-    private static final long serialVersionUID = 1L;
-
-    @Schema(description = "方案医生")
-    private String planDoctor;
-
-    @Schema(description = "强化期阶段")
-    private String intensivePhaseType;
-
-    @Schema(description = "强化期阶段频率")
-    private Integer intensivePhaseFreq;
-
-    @Schema(description = "强化期阶段建议时长")
-    private Integer intensivePhaseDurationMin;
-
-    @Schema(description = "次续期阶段")
-    private String continuousPhaseType;
-
-    @Schema(description = "次续期阶段频率")
-    private Integer continuousPhaseFreq;
-
-    @Schema(description = "次续期阶段建议时长")
-    private Integer continuousPhaseDurationMin;
-
-    @Schema(description = "强化期阶段日文本（每日/隔日）")
-    private String intensivePhaseDayText;
-
-    @Schema(description = "次续期阶段日文本（每日/隔日）")
-    private String continuousPhaseDayText;
-
-    @Schema(description = "患者唯一标识")
-    private String patientUniqueId;
-
-    @Schema(description = "逻辑删除（0存在 1删除）")
-    private Integer isDelete;
-
-}

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyPlanQueryDTO.java

@@ -28,7 +28,7 @@ public class BusTherapyPlanQueryDTO  implements Serializable{
     private String planName;
 
     @Schema(description = "阶段类型")
-    private String phaseType;
+    private Integer phaseType;
 
     @Schema(description = "阶段目标次数")
     private Integer phaseTargetTimes;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/PatientTherapyDetailDTO.java

@@ -76,7 +76,7 @@ public class PatientTherapyDetailDTO {
     private TherapyPlanStatusEnum therapyPlanStatus;
 
     @Schema(description = "治疗阶段")
-    private String phaseType;
+    private PhaseTypeEnum phaseType;
 
     @Schema(description = "治疗频率")
     private Integer phaseFreq;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/TherapyRecordDetailDTO.java

@@ -1,6 +1,7 @@
 package cn.tr.module.phototherapy.common.dto;
 
 import cn.tr.core.pojo.BaseDTO;
+import cn.tr.module.phototherapy.common.enums.PhaseTypeEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -26,7 +27,7 @@ public class TherapyRecordDetailDTO {
     private Date therapyStartTime;
 
     @Schema(description = "阶段类型")
-    private String phaseType;
+    private PhaseTypeEnum phaseType;
 
     @Schema(description = "阶段频率")
     private String phaseFreq;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/enums/PatientGenderEnum.java

@@ -13,9 +13,9 @@ import lombok.Getter;
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum PatientGenderEnum implements IEnum<Integer> {
 
-    FEMALE(0, "女"),
     MALE(1, "男"),
-    UNKNOWN(2, "未知");
+    FEMALE(2, "女"),
+    UNKNOWN(3, "未知");
 
     @Getter
     @Schema(description = "性别编码")

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/enums/PhaseTypeEnum.java

@@ -0,0 +1,33 @@
+package cn.tr.module.phototherapy.common.enums;
+
+import com.baomidou.mybatisplus.annotation.IEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AlarmEnum.java
+ * @Description 光疗仪报警类型
+ * @createTime 2022年03月27日 09:49:00
+ */
+@AllArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum PhaseTypeEnum implements IEnum<Integer> {
+
+    //    以下为报警信息状态
+    INTENSIVE(0,"强化期"),
+    CONTINUOUS(1,"持续期");
+
+
+
+    @Getter
+    @Schema(defaultValue = "编码")
+    private Integer value;
+    @Getter
+    @Schema(defaultValue = "内容")
+    private String text;
+
+}

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusClinicPO.java

@@ -56,7 +56,7 @@ public class BusClinicPO extends TenantGenericEntity<String,String> {
     private Integer patientAge;
 
     /** 患者性别（0女 1男 2未知） */
-    @Schema(description = "患者性别（0女 1男 2未知）")
+    @Schema(description = "患者性别（1男 2女 3未知）")
     private Integer patientGender;
 
     /** 患者联系电话 */

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusTherapyPlanPO.java

@@ -43,7 +43,7 @@ public class BusTherapyPlanPO extends TenantGenericEntity<String,String> {
 
     /** 阶段类型 */
     @Schema(description = "阶段类型")
-    private String phaseType;
+    private Integer phaseType;
 
     /** 阶段目标次数 */
     @Schema(description = "阶段目标次数")

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusTherapyPlanServiceImpl.java

@@ -138,7 +138,7 @@ public class BusTherapyPlanServiceImpl extends ServiceImpl<BusTherapyPlanReposit
         intensivePlan.setPatientUniqueId(source.getPatientUniqueId());
         intensivePlan.setPlanDoctor(source.getPlanDoctor());
         intensivePlan.setPhaseDay(intensivePhaseDayValue);
-        intensivePlan.setPhaseType(source.getIntensivePhaseType());
+        intensivePlan.setPhaseType(source.getIntensivePhaseType().getValue());
         intensivePlan.setPhaseStartTime(source.getPhaseStartTime());
         intensivePlan.setPhaseFreq(source.getIntensivePhaseFreq());
         intensivePlan.setPhaseDurationMin(source.getIntensivePhaseDurationMin());
@@ -153,7 +153,7 @@ public class BusTherapyPlanServiceImpl extends ServiceImpl<BusTherapyPlanReposit
         continuousPlan.setPatientUniqueId(source.getPatientUniqueId());
         continuousPlan.setPlanDoctor(source.getPlanDoctor());
         continuousPlan.setPhaseDay(continuousPhaseDayValue);
-        continuousPlan.setPhaseType(source.getContinuousPhaseType());
+        continuousPlan.setPhaseType(source.getContinuousPhaseType().getValue());
 //        continuousPlan.setPhaseStartTime(source.getPhaseStartTime());
         continuousPlan.setPhaseFreq(source.getContinuousPhaseFreq());
         continuousPlan.setPhaseDurationMin(source.getContinuousPhaseDurationMin());

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/vo/PatientTherapyDetailVO.java

@@ -71,7 +71,7 @@ public class PatientTherapyDetailVO {
     private TherapyPlanStatusEnum therapyPlanStatus;
 
     @Schema(description = "治疗阶段")
-    private String phaseType;
+    private PhaseTypeEnum phaseType;
 
     @Schema(description = "治疗频率")
     private Integer phaseFreq;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/vo/TherapyRecordDetailVO.java

@@ -1,5 +1,6 @@
 package cn.tr.module.phototherapy.common.vo;
 
+import cn.tr.module.phototherapy.common.enums.PhaseTypeEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -24,7 +25,7 @@ public class TherapyRecordDetailVO {
     private Integer therapyDuration;
 
     @Schema(description = "阶段类型")
-    private String phaseType;
+    private PhaseTypeEnum phaseType;
 
     @Schema(description = "阶段频率")
     private Integer phaseFreq;

tr-modules/tr-modules-phototherapy/src/main/resources/mapper/phototherapy/BusClinicRepository.xml

@@ -89,6 +89,9 @@
             <if test="query.deviceAlarm != null">
                 and device_alarm = #{query.deviceAlarm}
             </if>
+            <if test="query.phaseType != null">
+                and phase_type = #{query.phaseType}
+            </if>
             <if test="query.lastTreatmentTime != null and query.lastTreatmentTime.size() >0">
                 and last_treatment_time &gt;= #{query.lastTreatmentTime[0]}
             </if>