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

src/main/java/thyyxxk/webserver/dao/his/PublicDao.java

@@ -371,4 +371,11 @@ public interface PublicDao {
             "</script>")
     List<YaoPinXiangMu> huoQuXiangMuXinXi(List<String> code);
 
+
+    @Select("select code " +
+            "from a_employee_mi " +
+            "where dept_code = #{wardCode} " +
+            "  and isnull(del_flag, '0') <> '1'")
+    List<String> huoQuHuanZheBingFangDeHuShi(String wardCode);
+
 }

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/XinZhenYiZhu.java

@@ -67,6 +67,11 @@ public class XinZhenYiZhu {
      */
     private String smallDept;
 
+    /**
+     * 床位
+     */
+    private String bedNo;
+
 
     @NotNull(message = "上传数据不能为空")
     private List<XinZhenYzActOrder> list;

src/main/java/thyyxxk/webserver/service/PublicServer.java

@@ -1,6 +1,7 @@
 package thyyxxk.webserver.service;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
@@ -22,6 +23,7 @@ import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.YshYjReq;
 import thyyxxk.webserver.entity.zhuyuanyisheng.shoushu.OpRecord;
 import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.YaoPinXiangMu;
 import thyyxxk.webserver.utils.*;
+import thyyxxk.webserver.websocket.WebSocketServer;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -524,5 +526,26 @@ public class PublicServer {
                 "<span style='color:red'>" + xinXi + "</span><br>";
     }
 
+
+    /**
+     * @param wardCode 患者病房
+     * @param content  内容
+     * @param title    标题
+     * @param patId    患者组合id（住院号_住院次数）
+     */
+    public void faSongXiaoXi(String wardCode, List<String> content, String title, String patId) {
+        List<String> huShiBianMa = dao.huoQuHuanZheBingFangDeHuShi(wardCode);
+        JSONObject obj = new JSONObject();
+        obj.put("name", "systemNotification");
+        obj.put("type", "error");
+        obj.put("message", "您有新的通知请及时查看。");
+        String message = obj.toJSONString();
+        for (String s : huShiBianMa) {
+            WebSocketServer.sendMessageByUserCode(s, message);
+        }
+
+
+    }
+
 }
 

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingServer.java

@@ -21,6 +21,7 @@ import thyyxxk.webserver.utils.*;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -354,10 +355,11 @@ public class JianYanJianChaShenQingServer {
     public ResultVo<String> baoCunJianYanJianCha(TianJiaJianChaJianYan param) {
         log.info("param:{}", JSON.toJSONString(param));
         if (ListUtil.isBlank(param.getList())) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先悬着要上传的数据。");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择需要保存的数据。");
         }
         XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
         publicServer.huanZheJieSuan(param.getInpatientNo(), param.getAdmissTimes());
+        List<String> xm = new ArrayList<>();
         int index = 1;
         StringBuilder cuoWuXinXi = new StringBuilder();
         for (YshYjReq item : param.getList()) {
@@ -400,9 +402,15 @@ public class JianYanJianChaShenQingServer {
                 item.setActOrderNo(BigDecimal.valueOf(publicServer.getActOrderNo()));
                 item.setReqNo(publicServer.getReqPageNo());
             }
+            xm.add(item.getOrderCode().trim());
             index++;
         }
-        if (cuoWuXinXi.length() > 0) {
+        String tingYong = publicServer.xiangMuXianZhi(xm, true);
+        if (StringUtil.notBlank(tingYong)) {
+            throw new BizException(ExceptionEnum.LOGICAL_HTML_ERROR, tingYong);
+        }
+
+        if (StringUtil.notBlank(cuoWuXinXi.toString())) {
             throw new BizException(ExceptionEnum.LOGICAL_HTML_ERROR, String.valueOf(cuoWuXinXi));
         }
         String userCode = TokenUtil.getTokenUserId();

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -512,6 +512,8 @@ public class YiZhuLuRuServer {
         }
         dao.chaRuYiZhu(huanZheXinXi.getInpatientNo(), huanZheXinXi.getAdmissTimes(), inputCode, huanZheXinXi.getInfantFlag(), publicServer.getGroupNo(),
                 huanZheXinXi.getWardCode(), huanZheXinXi.getWardCode(), huanZheXinXi.getReferPhysician(), param.getList());
+
+
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "医嘱保存成功。");
     }