Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/controller/dictionary/YiBaoKeShiPiPeiController.java

@@ -40,8 +40,9 @@ public class YiBaoKeShiPiPeiController {
     @GetMapping("/piPeiKeShi")
     public ResultVo<Integer> piPeiKeShi(@RequestParam("benYuanCode") String benYuanCode,
                                         @RequestParam("yiBaoCode") String yiBaoCode,
+                                        @RequestParam("yiBaoName") String yiBaoName,
                                         @RequestParam("flag") Integer flag) {
-        return service.piPeiKeShi(benYuanCode, yiBaoCode, flag);
+        return service.piPeiKeShi(benYuanCode, yiBaoCode, yiBaoName, flag);
     }
 
 

src/main/java/thyyxxk/webserver/dao/his/dictionary/YibaoKeShiPiPeiDao.java

@@ -47,7 +47,9 @@ public interface YibaoKeShiPiPeiDao {
      * @param benYuanCode 本院编码
      * @param yiBaoCode   医保编码
      */
-    @Update("update zd_unit_code set si_caty = #{yiBaoCode} where code = #{benYuanCode}")
+    @Update("update zd_unit_code set si_caty=#{yiBaoCode}, " +
+            "si_caty_name=#{yiBaoName} where code = #{benYuanCode}")
     void piPeiKeShi(@Param("benYuanCode") String benYuanCode,
-                    @Param("yiBaoCode") String yiBaoCode);
+                    @Param("yiBaoCode") String yiBaoCode,
+                    @Param("yiBaoName") String yiBaoName);
 }

src/main/java/thyyxxk/webserver/service/dictionary/YiBaoKeShiPiPeiService.java

@@ -51,14 +51,14 @@ public class YiBaoKeShiPiPeiService {
      * @param flag        判断是删除 还是 匹配
      * @return 返回提示信息
      */
-    public ResultVo<Integer> piPeiKeShi(String benYuanCode, String yiBaoCode, Integer flag) {
+    public ResultVo<Integer> piPeiKeShi(String benYuanCode, String yiBaoCode, String yiBaoName, Integer flag) {
         if (flag == 1) {
             log.info("匹配医保科室编码 ==> 操作人：{}，本院编码：{}，医保编码：{}", TokenUtil.getInstance().getTokenUserId(), benYuanCode, yiBaoCode);
-            dao.piPeiKeShi(benYuanCode, yiBaoCode);
+            dao.piPeiKeShi(benYuanCode, yiBaoCode, yiBaoName);
             return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE, "匹配成功。");
         } else {
             log.info("删除医保科室匹配关系 ==> 操作人：{}，本院编码：{}，医保编码：{}", TokenUtil.getInstance().getTokenUserId(), benYuanCode, yiBaoCode);
-            dao.piPeiKeShi(benYuanCode, null);
+            dao.piPeiKeShi(benYuanCode, null, null);
             return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE, "删除匹配成功。");
         }
     }