fix sql修复

add 参数限制

nb-system/src/main/java/com/nb/bus/entity/BusClinicEntity.java

@@ -34,7 +34,7 @@ public class BusClinicEntity extends TenantGenericEntity<String,String> {
     private String surgeryName;
 
     @ApiModelProperty(value = "住院号")
-    @Length(max = 255,message = "病号长度不得超过255个字节",groups = {Insert.class,Update.class})
+    @Length(max = 20,message = "住院号号长度不得超过20个字节",groups = {Insert.class,Update.class})
     private String patientCode;
 
     @ApiModelProperty(value = "住院号id",hidden = true)

nb-system/src/main/java/com/nb/bus/entity/BusEvaluationEntity.java

@@ -28,12 +28,11 @@ import javax.validation.constraints.*;
 @ApiModel(value="评价得分", description="评价得分实体类")
 public class BusEvaluationEntity extends TenantGenericEntity<String,String> {
 
-    @ApiModelProperty(value = "病号")
-    @Length(max = 255,message = "病号长度不得超过255个字节")
+    @ApiModelProperty(value = "病人id")
     public String patientId;
 
-    @ApiModelProperty(value = "病号")
-    @Length(max = 255,message = "病号长度不得超过255个字节")
+    @ApiModelProperty(value = "住院号")
+    @Length(max = 20,message = "住院号长度不得超过255个字节")
     public String patientCode;
 
     @ApiModelProperty(value = "输注id,输注监控专用")

nb-system/src/main/java/com/nb/bus/entity/BusHospitalLogEntity.java

@@ -34,7 +34,7 @@ public class BusHospitalLogEntity extends TenantGenericEntity<String,String> {
     @ApiModelProperty("消息id")
     private String msgId;
 
-    @ApiModelProperty("标识码（设备号、病号）")
+    @ApiModelProperty("标识码（设备号、住院号）")
     private String identityCode;
 
     @ApiModelProperty("信息类型")

nb-system/src/main/java/com/nb/bus/entity/BusPatientEntity.java

@@ -25,12 +25,12 @@ import org.hibernate.validator.constraints.Length;
 @ApiModel(value="住院病人基本信息", description="住院病人基本信息实体类，这里只存储有泵监控的，无泵监控的没有病人信息，只有临床手术信息")
 @ToString
 public class BusPatientEntity extends TenantGenericEntity<String,String> {
-    @ApiModelProperty(value = "病号")
-    @Length(max = 255,message = "病号长度不得超过255个字节")
+    @ApiModelProperty(value = "住院号，格式化后的住院号")
+    @Length(max = 255,message = "住院号长度不得超过255个字节")
     private String code;
 
-    @ApiModelProperty(value = "病号")
-    @Length(max = 255,message = "病号长度不得超过255个字节")
+    @ApiModelProperty(value = "住院号，设备上传住院号")
+    @Length(max = 255,message = "住院号长度不得超过255个字节")
     private String originCode;
 
     @TableField

nb-system/src/main/java/com/nb/bus/registry/patient/ClusterPatientRegistry.java

@@ -83,12 +83,12 @@ public class ClusterPatientRegistry implements PatientRegistry {
             patientOperator.setClinicId(clinic.getId());
             if(insert){
                 try {
-                    log.info("医院[{}]新增病号数据[{}]",hospitalId,patientCode);
+                    log.info("医院[{}]新增住院号号数据[{}]",hospitalId,patientCode);
                     clinicService.save(clinic);
                     patient.setClinicId(clinic.getId());
                     patientService.save(patient);
                 }catch (DuplicateKeyException e){
-                    log.warn("病号重复插入,医院id:[{}],病号:[{}]",hospitalId,patientCode);
+                    log.warn("住院号号重复插入,医院id:[{}],病号:[{}]",hospitalId,patientCode);
                 }
             }else {
                 //填充输注信息

nb-system/src/main/java/com/nb/bus/service/LocalBusInfusionHistoryService.java

@@ -174,7 +174,7 @@ public class LocalBusInfusionHistoryService extends BaseService<BusInfusionHisto
     @Transactional(rollbackFor = Exception.class)
     public void adjustInfusionByClinic(String clinicId, String patientCode, String tenantId, Date startTime){
         Assert.hasText(clinicId,"手术id不可为空");
-        Assert.hasText(patientCode,"病号不可为空");
+        Assert.hasText(patientCode,"住院号不可为空");
         Assert.hasText(tenantId,"医院id不可为空");
         Assert.notNull(startTime,"手术开始时间不可为空");
 

nb-system/src/main/java/com/nb/bus/service/LocalBusPatientService.java

@@ -22,9 +22,9 @@ import com.nb.bus.registry.patient.PatientOperator;
 import com.nb.bus.registry.patient.PatientRegistry;
 import com.nb.bus.utils.WsPublishUtils;
 import com.nb.common.crud.BaseService;
-import com.nb.common.enums.SexEnum;
 import com.nb.common.exception.CustomException;
 import com.nb.common.result.R;
+import com.nb.common.util.ExceptionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -264,7 +264,7 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         try {
             return this.baseMapper.findByPatientId(tenantId, patientId);
         } catch (Exception e) {
-            log.error("根据病号查询临床失败,", e.getMessage());
+            log.error("根据住院号查询临床失败,【{}】", ExceptionUtil.getExceptionMsg(e));
             return null;
         }
     }