已发药单优化

src/main/java/cn/hnthyy/thmz/entity/his/yz/YzYpPageNo.java

@@ -63,7 +63,7 @@ public class YzYpPageNo {
 	 */
   private String confirmFlag;
 	/**
-	 * null
+	 * 新系统用做确认发药时间
 	 */
   private Date confirmTime;
 	/**

src/main/java/cn/hnthyy/thmz/mapper/his/yz/YzYpPageNoMapper.java

@@ -50,8 +50,18 @@ public interface YzYpPageNoMapper {
                     "</when>",
                     "<when test='submitEndDate!=null'>",
                     " and a.submit_time &lt;=#{submitEndDate,jdbcType=TIMESTAMP}",
-                    "</when>",
-                    " order by ward_code,page_no"
+                    "</when>" +
+                    "<choose>" +
+                        "<when test='submitFlag!=null and submitFlag==2'>",
+                        " order by cancel_submit_time desc",
+                        "</when>",
+                        "<when test='submitFlag!=null and submitFlag==3'>",
+                        " order by confirm_time desc",
+                        "</when>" +
+                        "<otherwise>" +
+                        " order by ward_code,page_no" +
+                        "</otherwise>",
+                    "</choose>"
             , "</script>"})
     List<YzYpPageNo> selectYzYpPageNo(YzYpPageNoVo yzYpPageNoVo);
 
@@ -116,7 +126,7 @@ public interface YzYpPageNoMapper {
      * @param submitFlag
      * @return
      */
-    @Delete("update yz_yp_page_no set submit_flag=#{submitFlag} where page_no =#{pageNo}")
+    @Delete("update yz_yp_page_no set submit_flag=#{submitFlag},confirm_time=GETDATE() where page_no =#{pageNo}")
     int updateYzYpPageNo(@Param("pageNo") Integer pageNo, @Param("submitFlag") Integer submitFlag);