Преглед на файлове

为所有内容添加修改功能。

lighter преди 4 години
родител
ревизия
c2f3c22aa9

+ 3 - 3
src/main/java/thyyxxk/webserver/controller/nationalmatch/NationalMatchController.java

@@ -50,8 +50,8 @@ public class NationalMatchController {
         return service.cancelMatch(param);
     }
 
-    @PostMapping("/updateServiceItem")
-    public ResultVo<String> updateServiceItem(@RequestBody StandardLocalItem param) {
-        return service.updateServiceItem(param);
+    @PostMapping("/updateLocalItem")
+    public ResultVo<String> updateLocalItem(@RequestBody StandardLocalItem param) {
+        return service.updateLocalItem(param);
     }
 }

+ 5 - 0
src/main/java/thyyxxk/webserver/dao/his/nationalmatch/NationalMatchDao.java

@@ -115,6 +115,11 @@ public interface NationalMatchDao {
     void cancelMatchXm(@Param("code") String code,
                        @Param("staffId") String staffId);
 
+    @Update("update yp_zd_dict set new_name=#{name},oper_id=#{staffId},oper_date=getdate() where code=#{code}")
+    void updateMedicine(@Param("name") String name,
+                        @Param("staffId") String staffId,
+                        @Param("code") String code);
+
     @Update("update zd_charge_item set new_name=#{name},charge_unit=#{unit},charge_amount=#{price},oper_id=#{staffId}," +
             "s_code=#{standardCode},discription=#{discription},oper_date=getdate() where code=#{code}")
     void updateServiceItem(@Param("name") String name,

+ 11 - 4
src/main/java/thyyxxk/webserver/service/nationalmatch/NationalMatchService.java

@@ -74,7 +74,10 @@ public class NationalMatchService {
             }
             return ResultVoUtil.success(list);
         } else if (type == NationalMatchType.HERBAL){
-            List<SiCentralHerbal> list = dao.selectNationalHerbals(param.getName());
+            String[] splits = param.getName().split("(");
+            splits = splits[0].split("\\(");
+            String name = splits[0].replaceAll("颗粒", "");
+            List<SiCentralHerbal> list = dao.selectNationalHerbals(name.trim());
             if (null == list || list.isEmpty()) {
                 return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有符合条件的国家目录。");
             }
@@ -124,10 +127,14 @@ public class NationalMatchService {
         return ResultVoUtil.success("取消匹配成功。");
     }
 
-    public ResultVo<String> updateServiceItem(StandardLocalItem param) {
+    public ResultVo<String> updateLocalItem(StandardLocalItem param) {
         String staffId = TokenUtil.getTokenUserId();
-        dao.updateServiceItem(param.getName(), param.getUnit(), param.getPrice(), staffId,
-                param.getStandardCode(), param.getSpecification(), param.getCode());
+        if (param.getType() < NationalMatchType.SERVICE) {
+            dao.updateMedicine(param.getName(), staffId, param.getCode());
+        } else {
+            dao.updateServiceItem(param.getName(), param.getUnit(), param.getPrice(), staffId,
+                    param.getStandardCode(), param.getSpecification(), param.getCode());
+        }
         log.info("【操作员:{}】修改项目:{}", staffId, param);
         return ResultVoUtil.success("修改成功。");
     }