修改bug4133 4120

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

@@ -126,16 +126,16 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
      * @return
      */
     public Boolean insertByHospital(InsertByHospitalVO insertByHospitalVO){
-        if(insertByHospitalVO.getId()==null){
+
             QueryWrapper<QcCasesEntry> qcCasesEntryWrapper = new QueryWrapper<>();
             qcCasesEntryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                    .ne("id",insertByHospitalVO.getId()==null? -1:insertByHospitalVO.getId())
                     .eq("name",insertByHospitalVO.getName())
                     .eq("cases_id",insertByHospitalVO.getCasesId());
             int sum = qcCacesEntryFacade.count(qcCasesEntryWrapper);
             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);

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

@@ -31,10 +31,10 @@
             AND b.id = #{modeId}
         </if>
         <if test="name != null and name != ''">
-            AND a.name LIKE CONCAT('%',#{name},'%')
+            AND  UPPER(a.name) LIKE CONCAT('%', UPPER(trim(#{name})), '%')
         </if>
         <if test="code != null and code != ''">
-            AND a.code = #{code}
+            AND  UPPER(a.code) LIKE CONCAT('%', UPPER(trim(#{code})), '%')
         </if>
         ORDER BY a.gmt_modified DESC
     </select>
@@ -54,7 +54,7 @@
             AND b.id = #{modeId}
         </if>
         <if test="name != null and name != ''">
-            AND a.name LIKE CONCAT('%',#{name},'%')
+            AND  UPPER(a.name) LIKE CONCAT('%', UPPER(trim(#{name})), '%')
         </if>
         <if test="code != null and code != ''">
             AND a.code = #{code}