技术档案优化

src/main/java/thyyxxk/webserver/controller/technologyArchives/HLTechnologyArchivesController.java

@@ -1,6 +1,6 @@
 package thyyxxk.webserver.controller.technologyArchives;
 
-import org.apache.ibatis.annotations.Param;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -227,6 +227,109 @@ public class HLTechnologyArchivesController {
         return hlservice.delTechnologyArchivesHL9ByCode(socialNo, id);
     }
 
+    @GetMapping("/selectTechnologyArchives5")
+    public ResultVo<List<TechnologyArchives5>> selectTechnologyArchives5(){
+        return hlservice.selectTechnologyArchives5();
+    }
+
+    @PostMapping("/saveTechnologyArchives5")
+    public ResultVo<Map<String, Object>> saveTechnologyArchives5(@RequestBody @Validated TechnologyArchives5 fifth){
+        return hlservice.saveTechnologyArchives5(fifth);
+    }
+
+    @GetMapping("/delTechnologyArchives5ByCode")
+    public ResultVo<Map<String, Object>> delTechnologyArchives5ByCode(@RequestParam("socialNo") String socialNo, @RequestParam("time") String time){
+        return hlservice.delTechnologyArchives5ByCode(socialNo, time);
+    }
+
+    @GetMapping("/selectTechnologyArchives7")
+    public ResultVo<List<TechnologyArchives7>> selectTechnologyArchives7(){
+        return hlservice.selectTechnologyArchives7();
+    }
+
+    @PostMapping("/saveTechnologyArchives7")
+    public ResultVo<Map<String, Object>> saveTechnologyArchives7(@RequestBody @Validated TechnologyArchives7 seventh){
+        return hlservice.saveTechnologyArchives7(seventh);
+    }
+
+    @GetMapping("/delTechnologyArchives7ByCode")
+    public ResultVo<Map<String, Object>> delTechnologyArchives7ByCode(@RequestParam("socialNo") String socialNo, @RequestParam("id") Integer id){
+        return hlservice.delTechnologyArchives7ByCode(socialNo, id);
+    }
+
+    @GetMapping("/selectTechnologyArchives10")
+    public ResultVo<List<TechnologyArchives10>> selectTechnologyArchives10(){
+        return hlservice.selectTechnologyArchives10();
+    }
+
+    @PostMapping("/saveTechnologyArchives10")
+    public ResultVo<Map<String, Object>> saveTechnologyArchives10(@RequestBody @Validated TechnologyArchives10 tenth){
+        return hlservice.saveTechnologyArchives10(tenth);
+    }
+
+    @GetMapping("/delTechnologyArchives10ByCode")
+    public ResultVo<Map<String, Object>> delTechnologyArchives10ByCode(@RequestParam("socialNo") String socialNo, @RequestParam("id") Integer id){
+        return hlservice.delTechnologyArchives10ByCode(socialNo, id);
+    }
+
+    @GetMapping("/selectTechnologyArchives12")
+    public ResultVo<List<TechnologyArchives12>> selectTechnologyArchives12(){
+        return hlservice.selectTechnologyArchives12();
+    }
+
+    @PostMapping("/saveTechnologyArchives12")
+    public ResultVo<Map<String, Object>> saveTechnologyArchives12(@RequestBody @Validated TechnologyArchives12 twelfth){
+        return hlservice.saveTechnologyArchives12(twelfth);
+    }
+
+    @GetMapping("/delTechnologyArchives12ByCode")
+    public ResultVo<Map<String, Object>> delTechnologyArchives12ByCode(@RequestParam("socialNo") String socialNo, @RequestParam("id") Integer id){
+        return hlservice.delTechnologyArchives12ByCode(socialNo, id);
+    }
+
+    @GetMapping("/selectTechnologyArchives13")
+    public ResultVo<List<TechnologyArchives13>> selectTechnologyArchives13(){
+        return hlservice.selectTechnologyArchives13();
+    }
+
+    @GetMapping("/selectAppointmentImage")
+    public ResultVo<Map<String, Object>> selectAppointmentImage(@RequestParam("socialNo") String socialNo, @RequestParam("name") String name) {
+        return hlservice.selectAppointmentImage(socialNo, name);
+    }
+    @PostMapping("/putAppointmentImage")
+    public ResultVo<Map<String, Object>> putAppointmentImage(@RequestBody MultipartFile[] file, @RequestParam("name") String name) {
+        return hlservice.putAppointmentImage(file, name);
+    }
+    @GetMapping("/setAppointmentImage")
+    public ResultVo<Map<String, Object>> setAppointmentImage(@RequestParam("socialNo") String socialNo, @RequestParam("name") String name, String url) {
+        return hlservice.setAppointmentImage(socialNo, name, url);
+    }
+
+    @PostMapping("/saveTechnologyArchives13")
+    public ResultVo<Map<String, Object>> saveTechnologyArchives13(@RequestBody @Validated TechnologyArchives13 thirteenth){
+        return hlservice.saveTechnologyArchives13(thirteenth);
+    }
+
+    @GetMapping("/delTechnologyArchives13ByCode")
+    public ResultVo<Map<String, Object>> delTechnologyArchives13ByCode(@RequestParam("socialNo") String socialNo, @RequestParam("id") Integer id){
+        return hlservice.delTechnologyArchives13ByCode(socialNo, id);
+    }
+
+    @GetMapping("/selectTechnologyArchives14")
+    public ResultVo<List<TechnologyArchives14>> selectTechnologyArchives14(){
+        return hlservice.selectTechnologyArchives14();
+    }
+
+    @PostMapping("/saveTechnologyArchives14")
+    public ResultVo<Map<String, Object>> saveTechnologyArchives14(@RequestBody @Validated TechnologyArchives14 fourteenth){
+        return hlservice.saveTechnologyArchives14(fourteenth);
+    }
+
+    @GetMapping("/delTechnologyArchives14ByCode")
+    public ResultVo<Map<String, Object>> delTechnologyArchives14ByCode(@RequestParam("socialNo") String socialNo, @RequestParam("id") Integer id){
+        return hlservice.delTechnologyArchives14ByCode(socialNo, id);
+    }
+
     @GetMapping("/selectTechnologyArchivesHLType")
     public ResultVo<Map<String, Object>> selectTechnologyArchivesHLType(@RequestParam("type") String type){
         return hlservice.selectTechnologyArchivesHLType(type);

src/main/java/thyyxxk/webserver/controller/technologyArchives/TechnologyArchivesController.java

@@ -343,6 +343,21 @@ public class TechnologyArchivesController {
         return service.delTechnologyArchives15ByCode(socialNo, id);
     }
 
+    @GetMapping("/selectTechnologyArchives16")
+    public ResultVo<List<TechnologyArchives16>> selectTechnologyArchives16(){
+        return service.selectTechnologyArchives16();
+    }
+
+    @PostMapping("/saveTechnologyArchives16")
+    public ResultVo<Map<String, Object>> saveTechnologyArchives16(@RequestBody @Validated TechnologyArchives16 sixteenth){
+        return service.saveTechnologyArchives16(sixteenth);
+    }
+
+    @GetMapping("/delTechnologyArchives16ByCode")
+    public ResultVo<Map<String, Object>> delTechnologyArchives16ByCode(@RequestParam("socialNo") String socialNo, @RequestParam("id") Integer id){
+        return service.delTechnologyArchives16ByCode(socialNo, id);
+    }
+
     @GetMapping("/selectTechnologyArchivesType")
     public ResultVo<Map<String, Object>> selectTechnologyArchivesType(@RequestParam("type") String type){
         return service.selectTechnologyArchivesType(type);

src/main/java/thyyxxk/webserver/dao/his/technologyArchives/TechnologyArchivesDao.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import thyyxxk.webserver.entity.dictionary.CodeName;
 import thyyxxk.webserver.entity.technologyArchives.TechnologyArchivesHLMain;
+import thyyxxk.webserver.entity.technologyArchives.TechnologyArchivesHLType;
 import thyyxxk.webserver.entity.technologyArchives.TechnologyArchivesMain;
 import thyyxxk.webserver.entity.technologyArchives.TechnologyArchivesType;
 
@@ -116,5 +117,5 @@ List<Map<String, Object>> selectTechnologyArchivesInfo(@Param("tableName") Strin
 //    List<Map<String, Object>> selectTechnologyArchivesHLMainInfo(@Param("tableName") String tableName, @Param("socialNo") String socialNo);
 
     @Select("select * from technology_archives_hl_type where code = #{code} ")
-    TechnologyArchivesType selectTechnologyArchivesHLTypeInfo(@Param("code") String code);
+    TechnologyArchivesHLType selectTechnologyArchivesHLTypeInfo(@Param("code") String code);
 }

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHLType.java

@@ -0,0 +1,57 @@
+package thyyxxk.webserver.entity.technologyArchives;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @ClassName TechnologyArchivesHLType
+ * @Author XU
+ * @Date 2025/5/4
+ * @Version 1.0
+ * @Description 护理技术档案分类
+ **/
+@Data
+@TableName("technology_archives_hl_type")
+public class TechnologyArchivesHLType {
+
+    /**
+     *  档案类型编码
+     */
+    @TableId(value = "code", type = IdType.NONE)
+    private String code;
+    /**
+     *  档案类型名称
+     */
+    private String name;
+    /**
+     *  档案类型（1：Ⅰ类  2：Ⅱ类）
+     */
+    private String type;
+    /**
+     *  档案类型排序
+     */
+    private String sort;
+    /**
+     *  档案类型表名
+     */
+    private String tableName;
+    /**
+     *  档案类型页面显示字段值属性集合（用，拼接）
+     */
+    private String tableProp;
+    /**
+     *  档案类型页面显示字段值名称集合（用，拼接）
+     */
+    private String tableLabel;
+    /**
+     *  档案类型页面显示不全允许鼠标悬浮显示全部信息字段属性集合
+     */
+    private String showLabel;
+    /**
+     *  档案类型统计sql（用于页面显示编码转义）
+     */
+    private String tableSql;
+
+}

src/main/java/thyyxxk/webserver/service/technologyArchives/HLTechnologyArchivesService.java

@@ -61,6 +61,18 @@ public class HLTechnologyArchivesService {
     private final TechnologyArchivesHL7Dao hl7Dao;
 
     private final TechnologyArchivesHL9Dao hl9Dao;
+
+    private final TechnologyArchives5Dao fifthDao;
+
+    private final TechnologyArchives7Dao seventhDao;
+
+    private final TechnologyArchives10Dao tenthDao;
+
+    private final TechnologyArchives12Dao twelfthDao;
+
+    private final TechnologyArchives13Dao thirteenthDao;
+
+    private final TechnologyArchives14Dao fourteenthDao;
     @Value("${is-prod}")
     private boolean isProd;
     public String uploadUrl = "http://172.16.32.197:8077/upload";
@@ -1070,7 +1082,587 @@ public class HLTechnologyArchivesService {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除开展新技术情况失败！");
         }
     }
+    /**
+     * @return TechnologyArchives5 发表论文与专著情况
+     * @Description 查询发表论文与专著情况
+     * @Author hsh
+     * @Date 2024/7/12 10:00
+     */
+    public ResultVo<List<TechnologyArchives5>> selectTechnologyArchives5() {
+        UserInfo user = userCache.getUserInfoByToken();
+        QueryWrapper<TechnologyArchives5> querywrapper = new QueryWrapper<>();
+        querywrapper.eq("account",user.getCodeRs());
+        List<TechnologyArchives5> list = fifthDao.selectList(querywrapper);
+        return ResultVoUtil.success(list);
+    }
+
+    /**
+     * @param fifth 发表论文与专著情况
+     * @return map
+     * @Description 更新发表论文与专著情况
+     * @Author hsh
+     * @Date 2024/7/12 10:06
+     */
+    public ResultVo<Map<String, Object>> saveTechnologyArchives5(TechnologyArchives5 fifth) {
+
+        if (null == fifth || fifth.getSocialNo() == null || fifth.getTime() == null) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "发表论文与专著情况信息不全，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        String socialNo = fifth.getSocialNo();
+        String time = fifth.getTime();
+        TechnologyArchives5 ta5 = fifthDao.selectTechnologyArchives5ByTime(socialNo, time);
+
+        int num;
+        try {
+            if (null != ta5) {
+                UpdateWrapper<TechnologyArchives5> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("social_no",fifth.getSocialNo());
+                updateWrapper.eq("time",fifth.getTime());
+                num = fifthDao.update(fifth, updateWrapper);
+//                num = fifthDao.updateTechnologyArchives5ByTime(fifth);
+            } else {
+                UserInfo user = userCache.getUserInfoByToken();
+                fifth.setAccount(user.getCodeRs());
+                num = fifthDao.insert(fifth);
+            }
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存发表论文与专著情况失败！");
+            }
+            resultMap.put("cg", "保存发表论文与专著情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存发表论文与专著情况失败！");
+        }
+    }
+
+    /**
+     * @param socialNo 身份证号 time 发表时间
+     * @return map
+     * @Description 根据身份证号, 发表时间删除发表论文与专著情况
+     * @Author hsh
+     * @Date 2024/7/12 10:07
+     */
+    public ResultVo<Map<String, Object>> delTechnologyArchives5ByCode(String socialNo, String time) {
+        if (StringUtil.isBlank(socialNo) || StringUtil.isBlank(time)) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有身份证号或者发表时间，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            int num = fifthDao.delTechnologyArchives5ByCode(socialNo, time);
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除发表论文与专著情况失败！");
+            }
+            resultMap.put("cg", "删除发表论文与专著情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除发表论文与专著情况失败！");
+        }
+    }
+
+    /**
+     * @return TechnologyArchives7 开展新技术情况
+     * @Description 查询开展新技术情况
+     * @Author hsh
+     * @Date 2024/7/12 15:42
+     */
+    public ResultVo<List<TechnologyArchives7>> selectTechnologyArchives7() {
+        UserInfo user = userCache.getUserInfoByToken();
+        QueryWrapper<TechnologyArchives7> querywrapper = new QueryWrapper<>();
+        querywrapper.eq("account",user.getCodeRs());
+        List<TechnologyArchives7> list = seventhDao.selectList(querywrapper);
+        return ResultVoUtil.success(list);
+    }
+
+    /**
+     * @param seventh 开展新技术情况
+     * @return map
+     * @Description 根据身份证号更新开展新技术情况
+     * @Author hsh
+     * @Date 2024/7/12 15:43
+     */
+    public ResultVo<Map<String, Object>> saveTechnologyArchives7(TechnologyArchives7 seventh) {
+
+        if (null == seventh || seventh.getSocialNo() == null) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "开展新技术情况信息不全，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        String socialNo = seventh.getSocialNo();
+        Integer id = seventh.getId();
+        TechnologyArchives7 ta7 = seventhDao.selectTechnologyArchives7ById(socialNo, id);
+
+        int num;
+        try {
+            if (null != ta7) {
+                String oldSocialNo = seventh.getOldSocialNo();
+                if (StringUtil.notBlank(oldSocialNo)) {
+                    TechnologyArchives7 oldTa7 = seventhDao.selectTechnologyArchives7ById(oldSocialNo, id);
+                    oldTa7.setSocialNo(socialNo);
+                    int maxId = seventhDao.selectTechnologyArchives7MaxId(socialNo);
+                    oldTa7.setId(maxId + 1);
+                    num = seventhDao.insert(oldTa7);
+                    seventhDao.delTechnologyArchives7ByCode(oldSocialNo, id);
+                } else {
+                    UpdateWrapper<TechnologyArchives7> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("social_no",seventh.getSocialNo());
+                    updateWrapper.eq("id",seventh.getId());
+                    num = seventhDao.update(seventh, updateWrapper);
+//                    num = seventhDao.updateTechnologyArchives7ById(seventh);
+                }
+            } else {
+                UserInfo user = userCache.getUserInfoByToken();
+                int maxId = seventhDao.selectTechnologyArchives7MaxId(socialNo);
+                seventh.setAccount(user.getCodeRs());
+                seventh.setId(maxId + 1);
+                num = seventhDao.insert(seventh);
+            }
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存开展新技术情况失败！");
+            }
+            resultMap.put("cg", "保存开展新技术情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存开展新技术情况失败！");
+        }
+    }
+
+    /**
+     * @param socialNo 身份证号 id
+     * @return map
+     * @Description 根据身份证号, id删除开展新技术情况
+     * @Author hsh
+     * @Date 2024/7/12 15:44
+     */
+    public ResultVo<Map<String, Object>> delTechnologyArchives7ByCode(String socialNo, Integer id) {
+        if (StringUtil.isBlank(socialNo)) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有身份证号，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            int num = seventhDao.delTechnologyArchives7ByCode(socialNo, id);
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除开展新技术情况失败！");
+            }
+            resultMap.put("cg", "删除开展新技术情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除开展新技术情况失败！");
+        }
+    }
+
+    /**
+     * @return TechnologyArchives10 各种医疗活动记录
+     * @Description 查询各种医疗活动记录
+     * @Author hsh
+     * @Date 2024/7/16 9:49
+     */
+    public ResultVo<List<TechnologyArchives10>> selectTechnologyArchives10() {
+        UserInfo user = userCache.getUserInfoByToken();
+        QueryWrapper<TechnologyArchives10> querywrapper = new QueryWrapper<>();
+        querywrapper.eq("account",user.getCodeRs());
+        List<TechnologyArchives10> list = tenthDao.selectList(querywrapper);
+        return ResultVoUtil.success(list);
+    }
+
+    /***
+     * @Description 根据身份证号更新各种医疗活动记录
+     * @Author hsh
+     * @param tenth 各种医疗活动记录
+     * @return map
+     * @Date 2024/7/16 9:50
+     */
+    public ResultVo<Map<String, Object>> saveTechnologyArchives10(TechnologyArchives10 tenth) {
+
+        if (null == tenth || tenth.getSocialNo() == null) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "各种医疗活动记录信息不全，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        String socialNo = tenth.getSocialNo();
+        Integer id = tenth.getId();
+        TechnologyArchives10 ta10 = tenthDao.selectTechnologyArchives10ById(socialNo, id);
+
+        int num;
+        try {
+            if (null != ta10) {
+                String oldSocialNo = tenth.getOldSocialNo();
+                if (StringUtil.notBlank(oldSocialNo)) {
+                    TechnologyArchives10 oldTa10 = tenthDao.selectTechnologyArchives10ById(oldSocialNo, id);
+                    oldTa10.setSocialNo(socialNo);
+                    int maxId = tenthDao.selectTechnologyArchives10MaxId(socialNo);
+                    oldTa10.setId(maxId + 1);
+                    num = tenthDao.insert(oldTa10);
+                    tenthDao.delTechnologyArchives10ByCode(oldSocialNo, id);
+                } else {
+                    UpdateWrapper<TechnologyArchives10> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("social_no",tenth.getSocialNo());
+                    updateWrapper.eq("id",tenth.getId());
+                    num = tenthDao.update(tenth, updateWrapper);
+                }
+            } else {
+                UserInfo user = userCache.getUserInfoByToken();
+                int maxId = tenthDao.selectTechnologyArchives10MaxId(socialNo);
+                tenth.setAccount(user.getCodeRs());
+                tenth.setId(maxId + 1);
+                num = tenthDao.insert(tenth);
+            }
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存各种医疗活动记录失败！");
+            }
+            resultMap.put("cg", "保存各种医疗活动记录成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存各种医疗活动记录失败！");
+        }
+    }
+
+    /**
+     * @param socialNo 身份证号  id
+     * @return map
+     * @Description 根据身份证号, id删除各种医疗活动记录
+     * @Author hsh
+     * @Date 2024/7/16 9:51
+     */
+    public ResultVo<Map<String, Object>> delTechnologyArchives10ByCode(String socialNo, Integer id) {
+        if (StringUtil.isBlank(socialNo)) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有身份证号，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            int num = tenthDao.delTechnologyArchives10ByCode(socialNo, id);
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除各种医疗活动记录失败！");
+            }
+            resultMap.put("cg", "删除各种医疗活动记录成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除各种医疗活动记录失败！");
+        }
+    }
+
+    /**
+     * @return TechnologyArchives12 奖惩情况
+     * @Description 查询奖惩情况
+     * @Author hsh
+     * @Date 2024/7/16 14:59
+     */
+    public ResultVo<List<TechnologyArchives12>> selectTechnologyArchives12() {
+        UserInfo user = userCache.getUserInfoByToken();
+        QueryWrapper<TechnologyArchives12> querywrapper = new QueryWrapper<>();
+        querywrapper.eq("account",user.getCodeRs());
+        List<TechnologyArchives12> list = twelfthDao.selectList(querywrapper);
+        return ResultVoUtil.success(list);
+    }
+
+    /**
+     * @param twelfth 奖惩情况
+     * @return map
+     * @Description 根据身份证号更新奖惩情况
+     * @Author hsh
+     * @Date 2024/7/16 15:00
+     */
+    public ResultVo<Map<String, Object>> saveTechnologyArchives12(TechnologyArchives12 twelfth) {
+
+        if (null == twelfth || twelfth.getSocialNo() == null) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "奖惩情况信息不全，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        String socialNo = twelfth.getSocialNo();
+        Integer id = twelfth.getId();
+        TechnologyArchives12 ta12 = twelfthDao.selectTechnologyArchives12ById(socialNo, id);
+
+        int num;
+        try {
+            if (null != ta12) {
+                String oldSocialNo = twelfth.getOldSocialNo();
+                if (StringUtil.notBlank(oldSocialNo)) {
+                    TechnologyArchives12 oldTa12 = twelfthDao.selectTechnologyArchives12ById(oldSocialNo, id);
+                    oldTa12.setSocialNo(socialNo);
+                    int maxId = twelfthDao.selectTechnologyArchives12MaxId(socialNo);
+                    oldTa12.setId(maxId + 1);
+                    num = twelfthDao.insert(oldTa12);
+                    twelfthDao.delTechnologyArchives12ByCode(oldSocialNo, id);
+                } else {
+                    UpdateWrapper<TechnologyArchives12> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("social_no",twelfth.getSocialNo());
+                    updateWrapper.eq("id",twelfth.getId());
+                    num = twelfthDao.update(twelfth, updateWrapper);
+//                    num = twelfthDao.updateTechnologyArchives12ById(twelfth);
+                }
+            } else {
+                UserInfo user = userCache.getUserInfoByToken();
+                int maxId = twelfthDao.selectTechnologyArchives12MaxId(socialNo);
+                twelfth.setAccount(user.getCodeRs());
+                twelfth.setId(maxId + 1);
+                num = twelfthDao.insert(twelfth);
+            }
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存奖惩情况失败！");
+            }
+            resultMap.put("cg", "保存奖惩情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存奖惩情况失败！");
+        }
+    }
+
+    /**
+     * @param socialNo 身份证号  id
+     * @return map
+     * @Description 根据身份证号, id删除奖惩情况
+     * @Author hsh
+     * @Date 2024/7/16 15:02
+     */
+    public ResultVo<Map<String, Object>> delTechnologyArchives12ByCode(String socialNo, Integer id) {
+        if (StringUtil.isBlank(socialNo)) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有身份证号，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            int num = twelfthDao.delTechnologyArchives12ByCode(socialNo, id);
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除奖惩情况失败！");
+            }
+            resultMap.put("cg", "删除奖惩情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除奖惩情况失败！");
+        }
+    }
+
+    /**
+     * @return TechnologyArchives13 专业学会任职情况
+     * @Description 查询专业学会任职情况
+     * @Author hsh
+     * @Date 2024/7/16 16:48
+     */
+    public ResultVo<List<TechnologyArchives13>> selectTechnologyArchives13() {
+        UserInfo user = userCache.getUserInfoByToken();
+        QueryWrapper<TechnologyArchives13> querywrapper = new QueryWrapper<>();
+        querywrapper.eq("account",user.getCodeRs());
+        List<TechnologyArchives13> list = thirteenthDao.selectList(querywrapper);
+        return ResultVoUtil.success(list);
+    }
+
+
+    /**
+     * @param socialNo 身份证号 name 专业学会名称
+     * @return map
+     * @Description 通过身份证号以及专业学会名称查找委任聘书图片
+     * @Author XU
+     * @Date 2025/4/17 15:00
+     */
+
+    public ResultVo<Map<String, Object>> selectAppointmentImage(String socialNo, String name) {
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> imgMap = thirteenthDao.selectAppointmentImage(socialNo, name);
+        map.put("data", imgMap);
+        return ResultVoUtil.success(map);
+    }
+    public ResultVo<Map<String, Object>> putAppointmentImage(MultipartFile[] files, String name) {
+        UserInfo user = userCache.getUserInfoByToken();
+        String code = user.getCodeRs();
+        String uploadDir = "/uploadimage/appoinmentImage/" + code + "/" + name;
+        Map<String, Object> map = new HashMap<>();
+        List<String> urls = new ArrayList<>();
+        System.out.println(Arrays.toString(files));
+        for (MultipartFile file : files){
+            urls.add(archiveServer.uploadFile(file, uploadDir, !isProd).getPath());
+        }
+        map.put("urls",urls);
+        return ResultVoUtil.success(map);
+    }
+
+    /**
+     * @param socialNo 身份证号 name 专业学会名称 url 图片链接
+     * @return map
+     * @Description 通过身份证号以及专业学会名称设定委任聘书
+     * @Author XU
+     * @Date 2025/4/17 14:58
+     */
+
+    public ResultVo<Map<String, Object>> setAppointmentImage(String socialNo, String name, String url) {
+        Map<String, Object> map = new HashMap<>();
+        int imgMap = thirteenthDao.updateAppointmentImage(url, socialNo, name);
+        map.put("data", imgMap);
+        return ResultVoUtil.success(map);
+    }
+
+    /**
+     * @param thirteenth 专业学会任职情况
+     * @return map
+     * @Description 根据身份证号更新专业学会任职情况
+     * @Author hsh
+     * @Date 2024/7/16 16:49
+     */
+    public ResultVo<Map<String, Object>> saveTechnologyArchives13(TechnologyArchives13 thirteenth) {
+
+        if (null == thirteenth || thirteenth.getSocialNo() == null) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "专业学会任职情况信息不全，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        String socialNo = thirteenth.getSocialNo();
+        Integer id = thirteenth.getId();
+        TechnologyArchives13 ta13 = thirteenthDao.selectTechnologyArchives13ById(socialNo, id);
+
+        int num;
+        try {
+            if (null != ta13) {
+                String oldSocialNo = thirteenth.getOldSocialNo();
+                if (StringUtil.notBlank(oldSocialNo)) {
+                    TechnologyArchives13 oldTa13 = thirteenthDao.selectTechnologyArchives13ById(oldSocialNo, id);
+                    oldTa13.setSocialNo(socialNo);
+                    int maxId = thirteenthDao.selectTechnologyArchives13MaxId(socialNo);
+                    oldTa13.setId(maxId + 1);
+                    num = thirteenthDao.insert(oldTa13);
+                    thirteenthDao.delTechnologyArchives13ByCode(oldSocialNo, id);
+                } else {
+                    UpdateWrapper<TechnologyArchives13> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("social_no",thirteenth.getSocialNo());
+                    updateWrapper.eq("id",thirteenth.getId());
+                    num = thirteenthDao.update(thirteenth, updateWrapper);
+//                    num = thirteenthDao.updateTechnologyArchives13ById(thirteenth);
+                }
+            } else {
+                UserInfo user = userCache.getUserInfoByToken();
+                int maxId = thirteenthDao.selectTechnologyArchives13MaxId(socialNo);
+                thirteenth.setAccount(user.getCodeRs());
+                thirteenth.setId(maxId + 1);
+                num = thirteenthDao.insert(thirteenth);
+            }
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存专业学会任职情况失败！");
+            }
+            resultMap.put("cg", "保存专业学会任职情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存专业学会任职情况失败！");
+        }
+    }
+
+    /**
+     * @param socialNo 身份证号  id
+     * @return map
+     * @Description 根据身份证号, id删除专业学会任职情况
+     * @Author hsh
+     * @Date 2024/7/16 16:56
+     */
+    public ResultVo<Map<String, Object>> delTechnologyArchives13ByCode(String socialNo, Integer id) {
+        if (StringUtil.isBlank(socialNo)) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有身份证号，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            int num = thirteenthDao.delTechnologyArchives13ByCode(socialNo, id);
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除专业学会任职情况失败！");
+            }
+            resultMap.put("cg", "删除专业学会任职情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除专业学会任职情况失败！");
+        }
+    }
+
+    /**
+     * @return TechnologyArchives14 继续教育学分获得情况
+     * @Description 查询继续教育学分获得情况
+     * @Author hsh
+     * @Date 2024/7/17 9:48
+     */
+    public ResultVo<List<TechnologyArchives14>> selectTechnologyArchives14() {
+        UserInfo user = userCache.getUserInfoByToken();
+        QueryWrapper<TechnologyArchives14> querywrapper = new QueryWrapper<>();
+        querywrapper.eq("account",user.getCodeRs());
+        List<TechnologyArchives14> list = fourteenthDao.selectList(querywrapper);
+        return ResultVoUtil.success(list);
+    }
+
+    /**
+     * @param fourteenth 继续教育学分获得情况
+     * @return map
+     * @Description 根据身份证号更新继续教育学分获得情况
+     * @Author hsh
+     * @Date 2024/7/17 9:49
+     */
+    public ResultVo<Map<String, Object>> saveTechnologyArchives14(TechnologyArchives14 fourteenth) {
+
+        if (null == fourteenth || fourteenth.getSocialNo() == null) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "继续教育学分获得情况信息不全，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        String socialNo = fourteenth.getSocialNo();
+        Integer id = fourteenth.getId();
+        TechnologyArchives14 ta14 = fourteenthDao.selectTechnologyArchives14ById(socialNo, id);
+
+        int num;
+        try {
+            if (null != ta14) {
+                String oldSocialNo = fourteenth.getOldSocialNo();
+                if (StringUtil.notBlank(oldSocialNo)) {
+                    TechnologyArchives14 oldTa14 = fourteenthDao.selectTechnologyArchives14ById(oldSocialNo, id);
+                    oldTa14.setSocialNo(socialNo);
+                    int maxId = fourteenthDao.selectTechnologyArchives14MaxId(socialNo);
+                    oldTa14.setId(maxId + 1);
+                    num = fourteenthDao.insert(oldTa14);
+                    fourteenthDao.delTechnologyArchives14ByCode(oldSocialNo, id);
+                } else {
+                    UpdateWrapper<TechnologyArchives14> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("social_no",fourteenth.getSocialNo());
+                    updateWrapper.eq("id",fourteenth.getId());
+                    num = fourteenthDao.update(fourteenth, updateWrapper);
+                }
+            } else {
+                UserInfo user = userCache.getUserInfoByToken();
+                int maxId = fourteenthDao.selectTechnologyArchives14MaxId(socialNo);
+                fourteenth.setAccount(user.getCodeRs());
+                fourteenth.setId(maxId + 1);
+                num = fourteenthDao.insert(fourteenth);
+            }
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存继续教育学分获得情况失败！");
+            }
+            resultMap.put("cg", "保存继续教育学分获得情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存继续教育学分获得情况失败！");
+        }
+    }
 
+    /**
+     * @param socialNo 身份证号  id
+     * @return map
+     * @Description 根据身份证号, id删除继续教育学分获得情况
+     * @Author hsh
+     * @Date 2024/7/17 9:49
+     */
+    public ResultVo<Map<String, Object>> delTechnologyArchives14ByCode(String socialNo, Integer id) {
+        if (StringUtil.isBlank(socialNo)) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有身份证号，请检查！");
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            int num = fourteenthDao.delTechnologyArchives14ByCode(socialNo, id);
+            if (num == 0) {
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除继续教育学分获得情况失败！");
+            }
+            resultMap.put("cg", "删除继续教育学分获得情况成功！");
+            return ResultVoUtil.success(resultMap);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "删除继续教育学分获得情况失败！");
+        }
+    }
     /**
      * @param type 类型
      * @return map
@@ -1105,7 +1697,7 @@ public class HLTechnologyArchivesService {
         int dd = dao.selectHLTechnologyArchivesTypeQx(user.getCode().trim());
         Map<String, Object> map = new HashMap<>();
         List<Map<String, Object>> list;
-        TechnologyArchivesType t = dao.selectTechnologyArchivesHLTypeInfo(vo.getTextType());
+        TechnologyArchivesHLType t = dao.selectTechnologyArchivesHLTypeInfo(vo.getTextType());
         if (t == null) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有检索到登录者的技术档案。");
         }

src/main/java/thyyxxk/webserver/service/technologyArchives/TechnologyArchivesService.java

@@ -1748,7 +1748,7 @@ public class TechnologyArchivesService {
     public ResultVo<List<TechnologyArchives16>> selectTechnologyArchives16() {
         UserInfo user = userCache.getUserInfoByToken();
         QueryWrapper<TechnologyArchives16> querywrapper = new QueryWrapper<>();
-        querywrapper.eq("account",user.getCodeRs());
+        querywrapper.eq("account",user.getCode());
         List<TechnologyArchives16> list = sixteenthDao.selectList(querywrapper);
         return ResultVoUtil.success(list);
     }