代码优化

icss-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -3,6 +3,8 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.entity.HospitalInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
 import com.diagbot.vo.HospitalInfoVO;
 import org.springframework.stereotype.Component;
@@ -36,9 +38,9 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
      */
     public HospitalInfo getHospitalByCode(String code) {
         QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("code", code);
-        queryWrapper.eq("status", 1);
+        queryWrapper.eq("status", StatusEnum.Enable.getKey());
         return this.getOne(queryWrapper);
     }
 

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import com.diagbot.enums.IsDeleteEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -66,7 +67,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         Date now = new Date();
 
         QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("hospital_id", saveInquiryVO.getHospitalId());
         queryWrapper.eq("hospital_dept_id", saveInquiryVO.getHospitalDeptId());
         queryWrapper.eq("doctor_id", saveInquiryVO.getDoctorId());
@@ -125,7 +126,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     public ReadInquiryDTO readInquiry(ReadInquiryVO readInquiryVO) {
         ReadInquiryDTO readInquiryDTO = new ReadInquiryDTO();
         QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("hospital_id", readInquiryVO.getHospitalId());
         queryWrapper.eq("hospital_dept_id", readInquiryVO.getHospitalDeptId());
         queryWrapper.eq("doctor_id", readInquiryVO.getDoctorId());
@@ -143,7 +144,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     /**
      * 获取最近一次其他史信息
      *
-     * @param readInquiryVO
+     * @param getLastOtherVO
      * @return
      */
     public String getLastOther(GetLastOtherVO getLastOtherVO) {
@@ -170,7 +171,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      */
     public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
         QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("hospital_id", hisInquirysVO.getHospitalId());
         queryWrapper.eq("hospital_dept_id", hisInquirysVO.getHospitalDeptId());
         queryWrapper.eq("doctor_id", hisInquirysVO.getDoctorId());

icss-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.entity.DoctorPageMode;
 import com.diagbot.entity.PatientInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
@@ -48,7 +49,7 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
         getTopPatientInfoDTO.setRecordId(getTopPatientInfoVO.getRecordId());
         
         QueryWrapper<DoctorPageMode> doctorPageModeQe = new QueryWrapper<>();
-        doctorPageModeQe.eq("is_deleted", "N");
+        doctorPageModeQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         doctorPageModeQe.eq("doctor_id", getTopPatientInfoDTO.getDoctorId());
         DoctorPageMode doctorPageMode = doctorPageModeFacade.getOne(doctorPageModeQe);
         if(doctorPageMode!=null){
@@ -67,7 +68,7 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
      */
     public PatientInfo getPatientByCode(String hospitalCode, String patientCode) {
         QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<PatientInfo>();
-        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("hospital_code", hospitalCode);
         queryWrapper.eq("code", patientCode);
         return this.getOne(queryWrapper);

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -115,7 +115,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
     /**
      * 保存模板
      *
-     * @param templateInfoRevampVO
+     * @param templateInfosVO
      * @return
      */
     public boolean saveTemplateInfo(TemplateInfosVO templateInfosVO) {