xiaochan 4 years ago
parent
commit
ef4c9a34fb

+ 0 - 1
src/main/java/thyyxxk/webserver/WebServerApplication.java

@@ -15,5 +15,4 @@ public class WebServerApplication {
     public static void main(String[] args) {
         SpringApplication.run(WebServerApplication.class, args);
     }
-
 }

+ 3 - 1
src/main/java/thyyxxk/webserver/controller/datamodify/YzActOrderController.java

@@ -2,9 +2,11 @@ package thyyxxk.webserver.controller.datamodify;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.pojo.ResultVo;
+import thyyxxk.webserver.pojo.datamodify.GetDropdownBox;
 import thyyxxk.webserver.pojo.datamodify.YzActOrder;
 import thyyxxk.webserver.service.datamodify.YzActOrderService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -37,7 +39,7 @@ public class YzActOrderController {
     }
 
     @GetMapping("/getDropdownBox")
-    public ResultVo<Map<String,Object>> getDropdownBox(){
+    public ResultVo<Map<String, List<GetDropdownBox>>> getDropdownBox(){
         return yz.getDropdownBox();
     }
 

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/datamodify/YzActOrderMapper.java

@@ -34,7 +34,7 @@ public interface YzActOrderMapper extends BaseMapper<YzActOrder> {
             "end_time=#{endTime},physician = #{physician},exec_unit=#{execUnit},\n" +
             "instruction=#{instruction},modifier=#{modifier},order_time=#{orderTime}\n" +
             "where act_order_no = #{actOrderNo}")
-    boolean update(YzActOrder yzActOrder);
+    boolean YzUpdate(YzActOrder yzActOrder);
 
     //获取频次
     @Select("select rtrim(code) code,rtrim(code) name from yz_order_frequency where isnull(del_flag,0) =0")

+ 5 - 3
src/main/java/thyyxxk/webserver/service/datamodify/YzActOrderService.java

@@ -6,12 +6,14 @@ import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.dao.his.datamodify.YzActOrderMapper;
 import thyyxxk.webserver.pojo.ResultVo;
+import thyyxxk.webserver.pojo.datamodify.GetDropdownBox;
 import thyyxxk.webserver.pojo.datamodify.YzActOrder;
 import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -71,12 +73,12 @@ public class YzActOrderService  {
                 data.getInstruction(),
                 data.getModifier());
 
-        dao.update(data);
+        dao.YzUpdate(data);
         return ResultVoUtil.success();
     }
 
-    public ResultVo<Map<String,Object>> getDropdownBox(){
-        Map map = new HashMap();
+    public ResultVo<Map<String, List<GetDropdownBox>>> getDropdownBox(){
+        Map<String, List<GetDropdownBox>> map = new HashMap();
         map.put("frequCode",dao.getFrequCode());
         map.put("unitCode",dao.getUnitCode());
         map.put("supplyCode",dao.getSupplyType());