检验新增数量和没有上级医生就无法确认医嘱。

src/main/java/thyyxxk/webserver/dao/his/inpatient/PatientDao.java

@@ -52,7 +52,7 @@ public interface PatientDao {
                                @Param("sql") String sql);
 
     @Select("<script>" +
-            "select inpatientNo=rtrim(a.inpatient_no),a.admiss_times,a.med_type,b.social_no,dis_date," +
+            "select inpatientNo=rtrim(a.inpatient_no),a.admiss_times,a.med_type,b.social_no,dis_date,consult_physician,dept_director," +
             "zkys= (select zkys from batj_ba2 ba where ba.zyh = a.inpatient_no and ba.zycs = a.admiss_times)," +
             "mz_no = (select rtrim(mz_no) from a_patient_mi where a_patient_mi.inpatient_no  = a.inpatient_no)," +
             "zk_ward,zk_ward_name = (select rtrim(name) from zd_unit_code where code=zk_ward), " +

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -290,7 +290,7 @@ public interface JianYanJianChaDao {
             "                        receive_flag/*1*/, req_type/*2检验3检查*/, sys_date/*getdate*/, start_time , diag_code, " +
             "                        diag_text, " +
             "                        order_type, jz_flag/*1 和 null*/, req_tz_comment/*体征信息*/, req_other_result/*相关辅检结果*/," +
-            "inspect_stuff) " +
+            "inspect_stuff,quantity) " +
             "values " +
             "<foreach collection='list' item='item' separator=','>" +
             "(#{item.reqNo}, #{inpatientNo}, #{name}, #{age}, #{admissTimes}, #{bedNo}, #{item.orderName}, " +
@@ -298,7 +298,7 @@ public interface JianYanJianChaDao {
             "        #{deptCode}, #{wardCode}, #{item.execDept}, #{reqDate}, '1', #{reqType}, #{reqDate}, #{reqDate},#{item.diagCode},#{item.diagText}, " +
             "        (select class from ${orderTypeTable} where zy_order_code = #{item.orderCode})," +
             "       #{item.jzFlag},#{item.reqTzComment},#{item.reqOtherResult}," +
-            "       #{item.inspectStuff})" +
+            "       #{item.inspectStuff},#{item.quantity})" +
             "</foreach>" +
             "</script>")
     void chaRuShenQing(@Param("list") List<YshYjReq> list,

src/main/java/thyyxxk/webserver/entity/inpatient/patient/Patient.java

@@ -184,6 +184,16 @@ public class Patient {
      */
     private String zkys;
 
+    /**
+     * 主治医生
+     */
+    private String consultPhysician;
+
+    /**
+     * 主任医生
+     */
+    private String deptDirector;
+
     public String getSexName() {
         if (sex == null) {
             return "";

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrWebSocketServer.java

@@ -22,7 +22,7 @@ public class EmrWebSocketServer {
     private static final Map<String, List<EmrSocketMessage>> CHAT_ROOM = new HashMap<>();
 
     @Autowired
-    public EmrWebSocketServer(RedisLikeService redisLikeService ) {
+    public EmrWebSocketServer(RedisLikeService redisLikeService) {
         this.redisLikeService = redisLikeService;
     }
 
@@ -41,10 +41,10 @@ public class EmrWebSocketServer {
 
     public ResultVo<Boolean> repeatedlyOpenTheSamePatient(String sid) {
         List<Session> lists = WebSocketServer.getEmrMap(sid);
-        String userCode = TokenUtil.getTokenUserId();
         if (lists == null) {
             return ResultVoUtil.success(false);
         }
+        String userCode = TokenUtil.getTokenUserId();
         for (Session item : lists) {
             String code = sessionParseUserCode(item);
             if (code.equals(userCode)) {