添加员工和修改员工

src/main/java/thyyxxk/webserver/constants/RestrictedDrugLevels.java

@@ -4,13 +4,12 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.extern.slf4j.Slf4j;
 import thyyxxk.webserver.utils.StringUtil;
 
-@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 @Slf4j
 public enum RestrictedDrugLevels {
 
     UNRESTRICTED_USE_OF_MEDICINES("0", "非限制使用药品"),
-    RESTRICTED_USE_OF_MEDICINES("1", "非限制使用药品"),
-    SPECIAL_USE_MEDICINES("2", "非限制使用药品");
+    RESTRICTED_USE_OF_MEDICINES("1", "限制使用药品"),
+    SPECIAL_USE_MEDICINES("2", "特殊使用药品");
 
     private final String code;
 

src/main/java/thyyxxk/webserver/controller/settings/SettingsController.java

@@ -134,8 +134,13 @@ public class SettingsController {
         return service.saveRoleVueMenus(param);
     }
 
-    @PostMapping("/savePersonnelInformation")
-    public ResultVo<String> savePersonnelInformation(@RequestBody UserInfo userInfo) {
-        return service.savePersonnelInformation(userInfo);
+    @PostMapping("/modifyEmployeeInfo")
+    public ResultVo<String> modifyEmployeeInfo(@RequestBody UserInfo userInfo) {
+        return service.modifyEmployeeInfo(userInfo);
+    }
+
+    @PostMapping("/saveEmployeeInfo")
+    public ResultVo<String> saveEmployeeInfo(@RequestBody UserInfo userInfo) {
+        return service.saveEmployeeInfo(userInfo);
     }
 }

src/main/java/thyyxxk/webserver/dao/his/settings/SettingsDao.java

@@ -191,4 +191,16 @@ public interface SettingsDao {
             "set ${sql} where code = #{code}")
     void modifyPersonnelInformation(@Param("sql") String sql,
                                     @Param("code") String code);
+
+    @Select("select count(1) from a_employee_mi where code_rs = #{codeRs}")
+    int doesThePersonnelNumberExist(String codeRs);
+
+    @Insert("insert into a_employee_mi (code, name, code_rs, emp_tit_code, emp_po_code, yb_code, " +
+            "                           dept_code, mark, ifcadre, order_yn, ysjb, " +
+            "                           gh_charge_type, login_flag, doctor_xz_yp, del_flag, " +
+            "                           social_no, phone_no,  py_code, d_code) " +
+            "values (#{code}, #{name}, #{codeRs}, #{empTitCode}, #{empPoCode}, #{ybCode}, #{deptCode}, #{mark}, #{ifcadre}, " +
+            "        #{orderYn}, #{ysjb}, #{ghChargeType}, #{loginFlag}, #{doctorXzYp}, #{delFlag}, #{socialNo}, #{phoneNo}, " +
+            "        #{pyCode}, #{dCode})")
+    void saveEmployeeInfo(UserInfo info);
 }

src/main/java/thyyxxk/webserver/entity/login/PersonnelQueryConditions.java

@@ -14,5 +14,6 @@ public class PersonnelQueryConditions {
     private Integer isThereAMedicalInsuranceCode;
     private Integer pageSize;
     private Integer currentPage;
+    private String ybCode;
     private long total;
 }

src/main/java/thyyxxk/webserver/entity/login/UserInfo.java

@@ -17,8 +17,6 @@ import java.util.Objects;
 @Accessors(chain = true)
 public class UserInfo {
 
-    private Boolean oldData;
-
     /**
      * 编码
      */
@@ -27,6 +25,7 @@ public class UserInfo {
     /**
      * 名字
      */
+    @ColumnName
     private String name;
     private String password;
 
@@ -37,12 +36,14 @@ public class UserInfo {
     /**
      * 技术职称
      */
+    @ColumnName
     private String empTitCode;
     private String title;
 
     /**
      * 职务
      */
+    @ColumnName
     private String empPoCode;
     private String position;
 
@@ -53,6 +54,7 @@ public class UserInfo {
     /**
      * 医保编码
      */
+    @ColumnName
     private String ybCode;
 
     @ColumnName
@@ -69,9 +71,9 @@ public class UserInfo {
     /**
      * 干工标志
      */
-    @ColumnName(name = "ifcadre")
-    private String ifcader;
-    private String ifcaderName;
+    @ColumnName
+    private String ifcadre;
+    private String ifcadreName;
 
     /**
      * 拼音 五笔码
@@ -87,36 +89,43 @@ public class UserInfo {
      * 病历级别
      * {@link Ysjb}
      */
+    @ColumnName
     private String ysjb;
 
     /**
      * 挂号号别
      */
+    @ColumnName
     private String ghChargeType;
     private String ghChargeTypeName;
     /**
      * 病区允许就诊 1 允许 2 不允许
      */
+    @ColumnName
     private String loginFlag;
     /**
      * 限制药品级别
      * {@link RestrictedDrugLevels}
      */
+    @ColumnName
     private String doctorXzYp;
 
     /**
      * 停用标志
      */
+    @ColumnName
     private String delFlag;
 
     /**
      * 身份证
      */
+    @ColumnName
     private String socialNo;
 
     /**
      * 手机号码
      */
+    @ColumnName
     private String phoneNo;
 
 
@@ -138,6 +147,6 @@ public class UserInfo {
                 return "毒麻药处方权";
             }
         }
-        return orderYn;
+        return "";
     }
 }