停止医嘱

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyiji/QueRenYiZhuShouFeiDao.java

@@ -221,7 +221,7 @@ public interface QueRenYiZhuShouFeiDao {
             "</set>" +
             "WHERE act_order_no = #{item.actOrderNo} " +
             "AND inpatient_no = #{item.inpatientNo} AND admiss_times = #{item.admissTimes} " +
-//            "and CONVERT(varchar(100), occ_time, 20) = #{item.occTime} " +
+            "and CONVERT(VARCHAR(19), occ_time, 120) = #{item.occTime} " +
             "and act_order_no = #{item.actOrderNo} " +
 //            "and charge_code = #{item.chargeCode}" +
             "</foreach>" +

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

@@ -215,6 +215,10 @@ public interface YiZhuLuRuDao {
             "    physician_name       = (select top (1) rtrim(name) " +
             "                            from a_employee_mi with (NOLOCK) " +
             "                            where code = physician) /* 开这个医嘱的医生 */,  " +
+            "    end_physician_name       = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = end_physician) /* 设置这个医嘱结束时间的医生 */," +
+            "                           exec_unit,\n" +
             "                           exec_unit, " +
             "    exec_unit_name       = (select top (1) rtrim(name) " +
             "                            from zd_unit_code with (NOLOCK) " +
@@ -335,6 +339,10 @@ public interface YiZhuLuRuDao {
             "                            from a_employee_mi with (NOLOCK)\n" +
             "                            where code = physician) /* 开这个医嘱的医生 */,\n" +
             "                           exec_unit,\n" +
+            "    end_physician_name       = (select top (1) rtrim(name)\n" +
+            "                            from a_employee_mi with (NOLOCK)\n" +
+            "                            where code = end_physician) /* 设置这个医嘱结束时间的医生 */,\n" +
+            "                           exec_unit,\n" +
             "    exec_unit_name       = (select top (1) rtrim(name)\n" +
             "                            from zd_unit_code with (NOLOCK)\n" +
             "                            where code = exec_unit),\n" +
@@ -418,6 +426,7 @@ public interface YiZhuLuRuDao {
             "update yz_act_order " +
             "set modifier = #{userCode}, " +
             " end_time = #{item.endTime}, " +
+            " end_physician = #{userCode}, " +
             " print_order_change = '', " +
             " print_order_change_end = '' " +
             "where inpatient_no = #{patNo} " +
@@ -1877,7 +1886,7 @@ public interface YiZhuLuRuDao {
             "       ps_result_time,\n" +
             "       kf_flag,\n" +
             "       modifier_oper,\n" +
-            "       pass_flag,\n" +
+            "       #{pa.passFlag},\n" +
             "       pass_id,\n" +
             "       pass_date,\n" +
             "       pass_comment,\n" +

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

@@ -130,6 +130,11 @@ public class XinZhenYiZhu {
 
     private String consultPhysician;
 
+    /**
+     * 停止医嘱医生
+     */
+    private String endPhysician;
+
     /**
      * 开限制用药时的上级医生的工号
      */

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

@@ -116,6 +116,11 @@ public class XinZhenYzActOrder implements Serializable {
      */
     private String physician;
     private String physicianName;
+    /**
+     * 设置医嘱结束时间的医生
+     */
+    private String endPhysician;
+    private String endPhysicianName;
 
     /**
      * 药品规格
@@ -405,6 +410,9 @@ public class XinZhenYzActOrder implements Serializable {
     //医嘱费用子项数量
     private String zxCount;
 
+    //带出临时医嘱标志
+    private String passFlag;
+
     /**
      * 普通医生有限制用药，上级医生可以临时给权限
      */

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

@@ -1946,6 +1946,7 @@ public class YiZhuLuRuServer {
                         xinZhenYzActOrder.setActOrderNo(startOrderNo.get());
                         //使用这个字段暂时存放长期医嘱号
                         xinZhenYzActOrder.setExcluActOrderNo(item.getActOrderNo());
+                        xinZhenYzActOrder.setPassFlag("附带临时医嘱_"+item.getActOrderNo());
                         xinZhenYzActOrder.setStartTime(Date.from(Instant.parse(dateList.get(i))));
                         resultOrderList.add(xinZhenYzActOrder);
                         childOrderList.stream().forEach(e->{
@@ -1955,6 +1956,7 @@ public class YiZhuLuRuServer {
                             xinZhenYzActOrderE.setActOrderNo(startOrderNo.get());
                             //使用这个字段暂时存放长期医嘱号
                             xinZhenYzActOrderE.setExcluActOrderNo(e.getActOrderNo());
+                            xinZhenYzActOrderE.setPassFlag("附带临时医嘱_"+e.getActOrderNo());
                             xinZhenYzActOrderE.setStartTime(xinZhenYzActOrder.getStartTime());
                             resultOrderList.add(xinZhenYzActOrderE);
                         });