zhaops před 4 roky
rodič
revize
fb0e432e09

+ 10 - 10
src/main/java/com/diagbot/entity/DeptConfig.java

@@ -59,29 +59,29 @@ public class DeptConfig implements Serializable {
     private Long hospitalId;
 
     /**
-     * 医院项目名称
+     * 医院科室名称
      */
-    @Excel(name = "HIS名称", width = 40, orderNum = "1")
-    @NotBlank(message = "请输入医院端项目名称")
+    @Excel(name = "医院科室名称", width = 40, orderNum = "1")
+    @NotBlank(message = "请输入医院科室名称")
     private String hisName;
 
     /**
-     * 医院项目编码
+     * 医院科室编码
      */
-    @Excel(name = "HIS编码", width = 40, orderNum = "2")
+    @Excel(name = "医院科室编码", width = 40, orderNum = "2")
     private String hisCode;
 
     /**
-     * 标准名称
+     * 标准科室名称
      */
-    @Excel(name = "标准名称", width = 40, orderNum = "4")
-    @NotBlank(message = "请输入标准术语名称")
+    @Excel(name = "标准科室名称", width = 40, orderNum = "4")
+    @NotBlank(message = "请输入标准科室名称")
     private String uniqueName;
 
     /**
-     * 标准编码
+     * 对应项编码
      */
-    @Excel(name = "标准编码", width = 40, orderNum = "3")
+    @Excel(name = "对应项编码", width = 40, orderNum = "3")
     private String uniqueCode;
 
     public Long getId() {

+ 8 - 8
src/main/java/com/diagbot/entity/DiseaseConfig.java

@@ -59,23 +59,23 @@ public class DiseaseConfig implements Serializable {
     private Long hospitalId;
 
     /**
-     * his名称
+     * 医院诊断名称
      */
-    @Excel(name = "HIS名称", width = 40, orderNum = "1")
-    @NotBlank(message = "请输入医院端项目名称")
+    @Excel(name = "医院诊断名称", width = 40, orderNum = "1")
+    @NotBlank(message = "请输入医院诊断名称")
     private String hisName;
 
     /**
-     * 标准名
+     * 标准诊断
      */
-    @Excel(name = "标准名称", width = 40, orderNum = "3")
-    @NotBlank(message = "请输入标准术语名称")
+    @Excel(name = "标准诊断名称", width = 40, orderNum = "3")
+    @NotBlank(message = "请输入标准诊断名称")
     private String uniqueName;
 
     /**
-     * ICD编码
+     * ICD-10编码
      */
-    @Excel(name = "ICD编码", width = 40, orderNum = "2")
+    @Excel(name = "ICD-10编码", width = 40, orderNum = "2")
     private String icdCode;
 
     public Long getId() {

+ 7 - 7
src/main/java/com/diagbot/entity/DrugConfig.java

@@ -59,23 +59,23 @@ public class DrugConfig implements Serializable {
     private Long hospitalId;
 
     /**
-     * his名称
+     * 医院药品名称
      */
-    @Excel(name = "HIS名称", width = 40, orderNum = "1")
-    @NotBlank(message = "请输入医院端项目名称")
+    @Excel(name = "医院药品名称", width = 40, orderNum = "1")
+    @NotBlank(message = "请输入医院药品名称")
     private String hisName;
 
     /**
-     * 标准名
+     * 标准药品
      */
-    @Excel(name = "标准名称", width = 40, orderNum = "4")
-    @NotBlank(message = "请输入标准术语名称")
+    @Excel(name = "标准药品名称", width = 40, orderNum = "4")
+    @NotBlank(message = "请输入标准药品名称")
     private String uniqueName;
 
     /**
      * 标准编码
      */
-    @Excel(name = "标准编码", width = 40, orderNum = "3")
+    @Excel(name = "对应项编码", width = 40, orderNum = "3")
     private String uniqueCode;
 
     /**

+ 11 - 11
src/main/java/com/diagbot/entity/LisConfig.java

@@ -61,29 +61,29 @@ public class LisConfig implements Serializable {
     private Long hospitalId;
 
     /**
-     * his大项名称
+     * 检验套餐
      */
-    @Excel(name = "his大项名称", width = 40, orderNum = "1")
-    @NotBlank(message = "请输入大项名称")
+    @Excel(name = "检验套餐", width = 40, orderNum = "1")
+    @NotBlank(message = "请输入检验套餐")
     private String hisName;
 
     /**
-     * his小项名称
+     * 检验细项
      */
-    @Excel(name = "his小项名称", width = 40, orderNum = "2")
+    @Excel(name = "检验细项", width = 40, orderNum = "2")
     private String hisDetailName;
 
     /**
-     * 标准
+     * 标准检验项目
      */
-    @Excel(name = "标准", width = 40, orderNum = "4")
-    @NotBlank(message = "请输入公表名称")
+    @Excel(name = "标准检验项目", width = 40, orderNum = "4")
+    @NotBlank(message = "请输入标准检验项目")
     private String uniqueName;
 
     /**
-     * 标准编码
+     * 对应项目编码
      */
-    @Excel(name = "标准编码", width = 40, orderNum = "3")
+    @Excel(name = "对应项目编码", width = 40, orderNum = "3")
     private String uniqueCode;
 
     public Long getId() {
@@ -190,4 +190,4 @@ public class LisConfig implements Serializable {
                 ", uniqueCode=" + uniqueCode +
                 "}";
     }
-}
+}

+ 8 - 8
src/main/java/com/diagbot/entity/OperationConfig.java

@@ -59,23 +59,23 @@ public class OperationConfig implements Serializable {
     private Long hospitalId;
 
     /**
-     * his名称
+     * 医院手术/操作名称
      */
-    @Excel(name = "HIS名称", width = 40, orderNum = "1")
-    @NotBlank(message = "请输入医院端项目名称")
+    @Excel(name = "医院手术/操作名称", width = 40, orderNum = "1")
+    @NotBlank(message = "请输入医院手术/操作名称")
     private String hisName;
 
     /**
-     * 标准名
+     * 标准手术/操作
      */
-    @Excel(name = "标准名称", width = 40, orderNum = "3")
-    @NotBlank(message = "请输入标准术语名称")
+    @Excel(name = "标准手术/操作名称", width = 40, orderNum = "3")
+    @NotBlank(message = "请输入标准手术/操作名称")
     private String uniqueName;
 
     /**
-     * 标准编码
+     * 对应项编码
      */
-    @Excel(name = "标准编码", width = 40, orderNum = "2")
+    @Excel(name = "对应项编码", width = 40, orderNum = "2")
     private String uniqueCode;
 
     public Long getId() {

+ 8 - 8
src/main/java/com/diagbot/entity/PacsConfig.java

@@ -59,23 +59,23 @@ public class PacsConfig implements Serializable {
     private Long hospitalId;
 
     /**
-     * his名称
+     * 医院检查项目
      */
-    @Excel(name = "HIS名称", width = 40, orderNum = "1")
-    @NotBlank(message = "请输入医院端项目名称")
+    @Excel(name = "医院检查项目", width = 40, orderNum = "1")
+    @NotBlank(message = "请输入医院检查项目")
     private String hisName;
 
     /**
-     * 标准
+     * 标准检查项目
      */
-    @Excel(name = "标准名称", width = 40, orderNum = "3")
-    @NotBlank(message = "请输入标准术语名称")
+    @Excel(name = "标准检查项目", width = 40, orderNum = "3")
+    @NotBlank(message = "请输入标准检查项目")
     private String uniqueName;
 
     /**
-     * 标准编码
+     * 对应项编码
      */
-    @Excel(name = "标准编码", width = 40, orderNum = "2")
+    @Excel(name = "对应项编码", width = 40, orderNum = "2")
     private String uniqueCode;
 
     public Long getId() {

+ 8 - 8
src/main/java/com/diagbot/entity/TransfusionConfig.java

@@ -59,23 +59,23 @@ public class TransfusionConfig implements Serializable {
     private Long hospitalId;
 
     /**
-     * 医院项目名称
+     * 医院用血类型
      */
-    @Excel(name = "HIS名称", width = 40, orderNum = "1")
-    @NotBlank(message = "请输入医院端项目名称")
+    @Excel(name = "医院用血类型", width = 40, orderNum = "1")
+    @NotBlank(message = "请输入医院用血类型")
     private String hisName;
 
     /**
-     * 标准名称
+     * 标准用血术语
      */
-    @Excel(name = "标准名称", width = 40, orderNum = "3")
-    @NotBlank(message = "请输入标准术语名称")
+    @Excel(name = "标准用血术语", width = 40, orderNum = "3")
+    @NotBlank(message = "请输入标准用血术语")
     private String uniqueName;
 
     /**
-     * 标准编码
+     * 对应项编码
      */
-    @Excel(name = "标准编码", width = 40, orderNum = "2")
+    @Excel(name = "对应项编码", width = 40, orderNum = "2")
     private String uniqueCode;
 
     public Long getId() {

+ 1 - 1
src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -10,7 +10,7 @@ import lombok.Setter;
  */
 public enum ConceptTypeEnum implements KeyedNamed {
     LisPack(1, "检验套餐"),
-    Lis(2, "检验细"),
+    Lis(2, "检验细"),
     Pacs(3, "检查"),
     Disease(4, "诊断"),
     Drug(5, "药品"),

+ 1 - 1
src/main/java/com/diagbot/enums/StaticTypeEnum.java

@@ -13,7 +13,7 @@ public enum StaticTypeEnum implements KeyedNamed {
     Disease(1, "诊断"),
     Drug(2, "药品"),
     LisPack(3, "检验套餐"),
-    Lis(4, "检验细"),
+    Lis(4, "检验细"),
     Pacs(5, "检查"),
     Opeartion(6, "手术和操作");