Browse Source

发药参数设置添加数据验证

WANGJIALIANG 4 years ago
parent
commit
ac49cbdc6f

+ 2 - 2
src/main/java/cn/hnthyy/thmz/controller/NavigationController.java

@@ -559,12 +559,12 @@ public class NavigationController {
         return "mz/to-medicine";
     }
     /**
-     * 发药提醒测试
+     * 发药叫号
      *
      * @return
      */
     @RequestMapping("/pharmacy-cell-number")
-    public String toMedicineTest(HttpServletRequest httpServletRequest) throws Exception {
+    public String pharmacyCellNumber(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getRoleUrls(httpServletRequest);
         if (!urls.contains("/thmz/pharmacy-cell-number")) {
             throw new Exception("您没有此模块的权限,请联系管理员开通!");

+ 25 - 0
src/main/java/cn/hnthyy/thmz/controller/mz/DispensingWindowsController.java

@@ -48,6 +48,31 @@ public class DispensingWindowsController {
             resultMap.put("message", "保存发药员设置失败,窗口号为空");
             return resultMap;
         }
+        if(dispensingWindows.getMzCfPrintIndex()==null){
+            resultMap.put("code", -1);
+            resultMap.put("message", "保存发药员设置失败,门诊处方打印机为空");
+            return resultMap;
+        }
+        if(dispensingWindows.getEkCfPrintIndex()==null){
+            resultMap.put("code", -1);
+            resultMap.put("message", "保存发药员设置失败,儿科处方打印机为空");
+            return resultMap;
+        }
+        if(dispensingWindows.getJzCfPrintIndex()==null){
+            resultMap.put("code", -1);
+            resultMap.put("message", "保存发药员设置失败,急诊处方打印机为空");
+            return resultMap;
+        }
+        if(dispensingWindows.getZsdPrintIndex()==null){
+            resultMap.put("code", -1);
+            resultMap.put("message", "保存发药员设置失败,注射单打印机为空");
+            return resultMap;
+        }
+        if(dispensingWindows.getBqPrintIndex()==null){
+            resultMap.put("code", -1);
+            resultMap.put("message", "保存发药员设置失败,标签打印机为空");
+            return resultMap;
+        }
         if(dispensingWindows.getGroupNo()==null){
             resultMap.put("code", -1);
             resultMap.put("message", "保存发药员设置失败,药房为空");

+ 1 - 4
src/main/resources/static/js/fy_config.js

@@ -19,8 +19,7 @@ $(function (){
     /**
      * 提交按钮点击事件
      */
-    $("#send").on("click",function (t) {
-        //
+    $("#send").on("click",function () {
         var data = {
             "groupNo": $("#groupNoSelect").val(),
             "windowsNo":$("#winNo").val(),
@@ -30,8 +29,6 @@ $(function (){
             "zsdPrintIndex": $("#printSelect_zsd").val(),
             "bqPrintIndex": $("#printSelect_bq").val()
         };
-        console.log("表单数据");
-        console.log(data);
         $.ajax({
             type: "POST",
             contentType: "application/json;charset=UTF-8",