医嘱变更优化

src/main/java/thyyxxk/webserver/dao/his/executeItem/YzChangeDao.java

@@ -30,11 +30,11 @@ public interface YzChangeDao {
             "<if test= \" changeClass=='0'.toString or changeClass=='3'.toString or changeClass=='4'.toString or changeClass=='7'.toString  \">" +
             "       case" +
             "           when yz_act_order.parent_no is null then rtrim(" +
-            "                       ltrim(yz_act_order.order_name) + '(' + ltrim(yz_act_order.drug_specification) + ')')" +
-            "           else ' ▲' + rtrim(ltrim(yz_act_order.order_name) + '(' + ltrim(yz_act_order.drug_specification) + ')') end act_order_name," +
+            "                       ltrim(isnull(yz_act_order.order_name,'')) + '(' + ltrim(isnull(yz_act_order.drug_specification,'')) + ')')" +
+            "           else ' ▲' + rtrim(ltrim(isnull(yz_act_order.order_name,'')) + '(' + ltrim(isnull(yz_act_order.drug_specification,'')) + ')') end act_order_name," +
             " </if>"+
             "<if test= \" changeClass=='1'.toString or changeClass=='2'.toString or changeClass=='5'.toString or changeClass=='6'.toString or changeClass=='8'.toString  \">" +
-            "  rtrim(ltrim(yz_act_order.order_name)+'('+ltrim(yz_act_order.drug_specification)+')') act_order_name,"+
+            "  rtrim(ltrim(yz_act_order.order_name)+'('+ltrim(isnull(yz_act_order.drug_specification,''))+')') act_order_name,"+
             " </if>"+
             "<if test= \" changeClass=='0'.toString \">" +
             "       case isnull(rtrim(convert(char, yz_act_order.dose)), '')" +
@@ -162,10 +162,10 @@ public interface YzChangeDao {
             "       zy_actpatient.name," +
             "       case" +
             "           when parent_no is null then rtrim(" +
-            "                       ltrim(yz_erase_order.order_name) + '(' + ltrim(yz_erase_order.drug_specification) + ')')" +
+            "                       ltrim(isnull(yz_erase_order.order_name,'')) + '(' + ltrim(isnull(yz_erase_order.drug_specification,'')) + ')')" +
             "           else ' ▲' +" +
-            "                rtrim(ltrim(yz_erase_order.order_name) + '(' + ltrim(yz_erase_order.drug_specification) + ')') end act_order_name," +
-            "       '(撤销)' + case when status_flag > '2' then '(已执行)' else ' ' end +" +
+            "                rtrim(ltrim(yz_erase_order.order_name) + '(' + ltrim(isnull(yz_erase_order.drug_specification,'')) + ')') end act_order_name," +
+            "       '(撤销)' + case when status_flag &gt; '2' then '(已执行)' else ' ' end +" +
             "       rtrim(isnull(rtrim(convert(char, yz_erase_order.dose)) ," +
             "                    isnull(rtrim(convert(char, yz_erase_order.drug_quan)), '1')) + isnull(ltrim(yz_erase_order.dose_unit),'') +" +
             "             + ltrim(isnull(yz_erase_order.instruction, ''))) dose," +
@@ -251,7 +251,7 @@ public interface YzChangeDao {
             " print_order_change = 'p', print_order_change_end = 'p', executer2 = #{userId}"+
             "</if>"+
             "<if test=\" tableName !='yz_erase_order' \">" +
-             " print_order_change_end = 'p', executer2 = #{userId}"+
+             " print_order_change_end = 'p', print_order_change = 'p',executer1=#{userId}, executer2 = #{userId}"+
             "</if>"+
             " where act_order_no in (${actOrderNoList})"+
             " </script>")