diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6d460f5..fde5de9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -28,4 +28,6 @@
     String OPERATOR_DISCOUNT_PERMISSION = "operatorDiscountPermission";
     //负责人折扣权限
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
+    //标准装置-申请类型
+    String STANDARD_APPLY_TYPE = "standardApplyType";
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6d460f5..fde5de9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -28,4 +28,6 @@
     String OPERATOR_DISCOUNT_PERMISSION = "operatorDiscountPermission";
     //负责人折扣权限
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
+    //标准装置-申请类型
+    String STANDARD_APPLY_TYPE = "standardApplyType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
index ca5da26..8b45093 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
@@ -112,11 +112,11 @@
 
     @TableField(value = "main_examiner")
     @ApiModelProperty(value = "是否主考人", dataType = "String")
-    private Integer mainExaminer;
+    private String mainExaminer;
 
     @TableField(value = "special_operator")
     @ApiModelProperty(value = "是否特操人", dataType = "String")
-    private Integer specialOperator;
+    private String specialOperator;
 
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6d460f5..fde5de9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -28,4 +28,6 @@
     String OPERATOR_DISCOUNT_PERMISSION = "operatorDiscountPermission";
     //负责人折扣权限
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
+    //标准装置-申请类型
+    String STANDARD_APPLY_TYPE = "standardApplyType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
index ca5da26..8b45093 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
@@ -112,11 +112,11 @@
 
     @TableField(value = "main_examiner")
     @ApiModelProperty(value = "是否主考人", dataType = "String")
-    private Integer mainExaminer;
+    private String mainExaminer;
 
     @TableField(value = "special_operator")
     @ApiModelProperty(value = "是否特操人", dataType = "String")
-    private Integer specialOperator;
+    private String specialOperator;
 
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 938a7f7..d1f64d0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -89,11 +89,6 @@
         MeterCertificate meterCertificate = meterCertificateMapper.selectById(idDto.getId());
         // 通过证书信息中的staffId获取对应的人员信息
         MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(meterCertificate.getStaffId());
-        // 将人员信息中的字典值替换
-        meterStaff.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterStaff.getEducation()));
-        meterStaff.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,meterStaff.getTechnologyJob()));
-        meterStaff.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterStaff.getAdministrationJob()));
-        meterStaff.setDeptId(deptMapper.selectById(meterStaff.getDeptId()).getFullName());
         meterCertificate.setMeterStaff(meterStaff);
         return ReturnUtil.success(meterCertificate);
     }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6d460f5..fde5de9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -28,4 +28,6 @@
     String OPERATOR_DISCOUNT_PERMISSION = "operatorDiscountPermission";
     //负责人折扣权限
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
+    //标准装置-申请类型
+    String STANDARD_APPLY_TYPE = "standardApplyType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
index ca5da26..8b45093 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
@@ -112,11 +112,11 @@
 
     @TableField(value = "main_examiner")
     @ApiModelProperty(value = "是否主考人", dataType = "String")
-    private Integer mainExaminer;
+    private String mainExaminer;
 
     @TableField(value = "special_operator")
     @ApiModelProperty(value = "是否特操人", dataType = "String")
-    private Integer specialOperator;
+    private String specialOperator;
 
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 938a7f7..d1f64d0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -89,11 +89,6 @@
         MeterCertificate meterCertificate = meterCertificateMapper.selectById(idDto.getId());
         // 通过证书信息中的staffId获取对应的人员信息
         MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(meterCertificate.getStaffId());
-        // 将人员信息中的字典值替换
-        meterStaff.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterStaff.getEducation()));
-        meterStaff.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,meterStaff.getTechnologyJob()));
-        meterStaff.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterStaff.getAdministrationJob()));
-        meterStaff.setDeptId(deptMapper.selectById(meterStaff.getDeptId()).getFullName());
         meterCertificate.setMeterStaff(meterStaff);
         return ReturnUtil.success(meterCertificate);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
index 5418c32..4fd8940 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
@@ -84,13 +84,7 @@
 
     @Override
     public MeterPrice selectStaffInfo(IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceMapper.selectById(String.valueOf(idDto.getId()));
-        meterPrice.setPriceType(dictService.getDictNameByCode(MeterDictEnum.PRICE_TYPE,meterPrice.getPriceType()));
-        meterPrice.setPriceItem(dictService.getDictNameByCode(MeterDictEnum.PRICE_ITEM,meterPrice.getPriceItem()));
-        meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
-        meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
-        meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));
-        return meterPrice;
+        return meterPriceMapper.selectById(String.valueOf(idDto.getId()));
     }
 
     @Override

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index 6d460f5..fde5de9 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -28,4 +28,6 @@
     String OPERATOR_DISCOUNT_PERMISSION = "operatorDiscountPermission";
     //负责人折扣权限
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
+    //标准装置-申请类型
+    String STANDARD_APPLY_TYPE = "standardApplyType";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
index ca5da26..8b45093 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterStaff.java
@@ -112,11 +112,11 @@
 
     @TableField(value = "main_examiner")
     @ApiModelProperty(value = "是否主考人", dataType = "String")
-    private Integer mainExaminer;
+    private String mainExaminer;
 
     @TableField(value = "special_operator")
     @ApiModelProperty(value = "是否特操人", dataType = "String")
-    private Integer specialOperator;
+    private String specialOperator;
 
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 938a7f7..d1f64d0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -89,11 +89,6 @@
         MeterCertificate meterCertificate = meterCertificateMapper.selectById(idDto.getId());
         // 通过证书信息中的staffId获取对应的人员信息
         MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(meterCertificate.getStaffId());
-        // 将人员信息中的字典值替换
-        meterStaff.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterStaff.getEducation()));
-        meterStaff.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,meterStaff.getTechnologyJob()));
-        meterStaff.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterStaff.getAdministrationJob()));
-        meterStaff.setDeptId(deptMapper.selectById(meterStaff.getDeptId()).getFullName());
         meterCertificate.setMeterStaff(meterStaff);
         return ReturnUtil.success(meterCertificate);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
index 5418c32..4fd8940 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
@@ -84,13 +84,7 @@
 
     @Override
     public MeterPrice selectStaffInfo(IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceMapper.selectById(String.valueOf(idDto.getId()));
-        meterPrice.setPriceType(dictService.getDictNameByCode(MeterDictEnum.PRICE_TYPE,meterPrice.getPriceType()));
-        meterPrice.setPriceItem(dictService.getDictNameByCode(MeterDictEnum.PRICE_ITEM,meterPrice.getPriceItem()));
-        meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
-        meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
-        meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));
-        return meterPrice;
+        return meterPriceMapper.selectById(String.valueOf(idDto.getId()));
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
index bf616f0..e29271d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
@@ -93,11 +93,6 @@
     public MeterStaff selectStaffInfo(IdDTO idDto) {
         // 通过id获取对应的人员信息
         MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(String.valueOf(idDto.getId()));
-        // 将人员信息中的字典值替换
-        meterStaff.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterStaff.getEducation()));
-        meterStaff.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,meterStaff.getTechnologyJob()));
-        meterStaff.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterStaff.getAdministrationJob()));
-        meterStaff.setDeptId(deptMapper.selectById(meterStaff.getDeptId()).getFullName());
         // 通过人员信息的id获取人员对应的证书列表
         QueryWrapper<MeterCertificate> wrapper = new QueryWrapper<>();
         wrapper.eq("staff_id",idDto.getId());
@@ -271,7 +266,7 @@
                 bean.setTechnologyJob(technologyJobDictMap.get(bean.getTechnologyJob()).get(0).getCode());
                 bean.setAdministrationJob(administrationJobDictMap.get(bean.getAdministrationJob()).get(0).getCode());
                 bean.setDeptId(deptMap.get(bean.getDeptId()).get(0).getId());
-                bean.setSex(bean.getSex().equals("男")?"1":"0");
+                bean.setSex(bean.getSex().equals("男")?"1":"2");
                 bean.setMainExaminer(bean.getMainExaminer().equals("是")?"0":"1");
                 bean.setSpecialOperator(bean.getSpecialOperator().equals("是")?"0":"1");
                 bean.setTechnologyExam(bean.getTechnologyExam().equals("是")?"0":"1");