Browse Source

优化bug

wangfeng 5 years ago
parent
commit
0b11991ff4

+ 11 - 0
mrman-service/src/main/java/com/diagbot/facade/CasesEntryHospitalFacade.java

@@ -9,6 +9,8 @@ import com.diagbot.entity.CasesEntryHospital;
 import com.diagbot.entity.QcCases;
 import com.diagbot.entity.QcCasesEntry;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.CasesEntryHospitalService;
 import com.diagbot.service.impl.CasesEntryHospitalServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -124,6 +126,15 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
      * @return
      */
     public Boolean insertByHospital(InsertByHospitalVO insertByHospitalVO){
+        if(!insertByHospitalVO.getId().equals(null)){
+            QueryWrapper<QcCasesEntry> qcCasesEntryWrapper = new QueryWrapper<>();
+            qcCasesEntryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                    .eq("name",insertByHospitalVO.getName());
+            int sum = qcCacesEntryFacade.count();
+            if (sum != 0) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "该条目名称存在");
+            }
+        }
         QueryWrapper<QcCasesEntry> qcCasesEntryQueryWrapper = new QueryWrapper<>();
         qcCasesEntryQueryWrapper.eq("id",insertByHospitalVO.getId());
         List<QcCasesEntry> qcCasesEntries = qcCacesEntryFacade.list(qcCasesEntryQueryWrapper);

+ 3 - 1
mrman-service/src/main/java/com/diagbot/vo/InsertByHospitalVO.java

@@ -4,6 +4,7 @@ import com.diagbot.entity.CasesEntryHospital;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -41,9 +42,10 @@ public class InsertByHospitalVO {
      * 病历id
      */
     private Long casesId;
-
+    @NotNull(message = "请输入条目名称")
     private String casesName;
 
+    @NotNull(message = "请输入所属模块")
     private String code;
 
     /**

+ 1 - 1
mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -36,7 +36,7 @@
         <if test="code != null and code != ''">
             AND a.code = #{code}
         </if>
-        ORDER BY a.cases_id,a.id
+        ORDER BY a.gmt_modified
     </select>
 
     <select id="getQcCasesEntryIndex" resultType="com.diagbot.dto.QcCasesEntryAllDTO">