逻辑显示优化

src/main/java/cn/hnthyy/thmz/controller/yf/YfWardPrescriptionController.java

@@ -94,12 +94,17 @@ public class YfWardPrescriptionController {
             yzYpPageNos.forEach(yzYpPageNo -> {
                 ZdUnitCode zdUnitCode = zdUnitCodeService.queryByCode(yzYpPageNo.getWardCode());
                 yzYpPageNo.setWardName(zdUnitCode.getName());
+                Employee employee;
                 if(StringUtils.isNotBlank(yzYpPageNo.getCancelSubmitName())){
-                    Employee employee = employeeService.queryByUserCode(yzYpPageNo.getCancelSubmitName());
+                    employee = employeeService.queryByUserCode(yzYpPageNo.getCancelSubmitName());
                     yzYpPageNo.setCancelSubName(employee.getEmployeeName());
                 }
+                if(StringUtils.isNotBlank(yzYpPageNo.getContirmId())){
+                    employee = employeeService.queryByUserCode(yzYpPageNo.getContirmId());
+                    yzYpPageNo.setContirmName(employee.getEmployeeName());
+                }
                 if(StringUtils.isNotBlank(yzYpPageNo.getSubmitName())){
-                    Employee employee = employeeService.queryByUserCode(yzYpPageNo.getSubmitName());
+                    employee = employeeService.queryByUserCode(yzYpPageNo.getSubmitName());
                     yzYpPageNo.setSubName(employee.getEmployeeName());
                 }
             });

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

@@ -30,7 +30,8 @@ public interface YzYpPageNoMapper {
                     "       a.start_date, " +
                     "       a.end_date, " +
                     "       pay_self  =a.pay_self, " +
-                    "       page_type=page_class " +
+                    "       page_type=page_class," +
+                    "       confirm_time,contirm_id " +
                     "FROM yz_yp_page_no a WITH(NOLOCK) " +
                     "where a.group_no = #{groupNo} " +
                     "<when test='pageNo!=null'>",
@@ -126,8 +127,8 @@ public interface YzYpPageNoMapper {
      * @param submitFlag
      * @return
      */
-    @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);
+    @Delete("update yz_yp_page_no set submit_flag=#{submitFlag},contirm_id=#{userIdCode},confirm_time=GETDATE() where page_no =#{pageNo}")
+    int updateYzYpPageNo(@Param("pageNo") Integer pageNo, @Param("submitFlag") Integer submitFlag, @Param("userIdCode") String userIdCode);
 
 
     /**

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -317,7 +317,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                 savePrescription(ypZyPatients);
             }
             if(i == count || yzYpZyOrders.get(0).getPageClass().equals("T")){
-                yzYpPageNoMapper.updateYzYpPageNo(Integer.parseInt(pageNoStr), 3);
+                yzYpPageNoMapper.updateYzYpPageNo(Integer.parseInt(pageNoStr), 3,userCode);
             }
         }
         resultMap.put("code", 0);

src/main/java/cn/hnthyy/thmz/vo/YzYpPageNoVo.java

@@ -34,4 +34,8 @@ public class YzYpPageNoVo extends YzYpPageNo{
 	 * 取消人
 	 */
 	private String cancelSubName;
+	/**
+	 * 发药人
+	 */
+	private String contirmName;
 }

src/main/resources/static/js/yf/ward_prescription.js

@@ -77,11 +77,16 @@ function initButtonChange(object, realIndex) {
 function setFrom() {
     $("#wardCode").selectpicker('val',wardCode);
     if(hzFlag == 0){
-        $("#pageNoSearch").val(pageNo)
+        $("#pageNoSearch").val(pageNo);
     }
     $("#pageClassSearch").val(pageClass);
     $("#wardCode").selectpicker('refresh');
     $("#pageClassSearch").selectpicker('refresh');
+    $("#wardCode").attr('disabled',true);
+    $("#pageNoSearch").attr('disabled',true);
+    $("#pageClassSearch").attr('disabled',true);
+    $("#btn_clean").attr('disabled',true);
+    $("#btn_query").attr('disabled',true);
 }
 
 /**
@@ -234,6 +239,24 @@ function initTbTable() {
                         }
                         return "";
                     }
+                }, {
+                    field: 'contirmName',
+                    title: '发药人',
+                    align: "center",
+                    valign: 'middle',
+                    visible: $("#submitFlagSearch").val() == 3?true:false
+                }, {
+                    field: 'confirmTime',
+                    title: '发药时间',
+                    align: "center",
+                    valign: 'middle',
+                    visible: $("#submitFlagSearch").val() == 3?true:false,
+                    formatter: function (value, row, index) {
+                        if (value != null && value != "") {
+                            return format(value, "yyyy-MM-dd HH:mm:ss");
+                        }
+                        return "";
+                    }
                 }, {
                     field: 'startDate',
                     title: '开始时间',
@@ -651,11 +674,16 @@ function cleanParams() {
     //$('#reportrange span').html(moment().subtract(10, 'days').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
     $("#pageNoSearch").val(null);
     $("#pageClassSearch").val(null);
-    $("#pageClassSearch").selectpicker('refresh');
     $("#wardCode").selectpicker('val','');
-    $("#wardCode").selectpicker('refresh');
     $("#submitFlagSearch").val(1);
     $("#submitFlagSearch").selectpicker('refresh');
+    $("#wardCode").removeAttr('disabled');
+    $("#pageNoSearch").removeAttr('disabled');
+    $("#pageClassSearch").removeAttr('disabled');
+    $("#btn_query").removeAttr('disabled');
+    $("#btn_clean").removeAttr('disabled');
+    $("#wardCode").selectpicker('refresh');
+    $("#pageClassSearch").selectpicker('refresh');
 }
 
 
@@ -807,6 +835,7 @@ function printDetail(datas,kfFlag,flag) {
  *
  */
 function printDetailHtml(datas,flag) {
+    console.log(datas);
     let html = '';
     let totalMoney = 0;
     let oldInpatientNo = '';//记录上一个病人
@@ -823,7 +852,8 @@ function printDetailHtml(datas,flag) {
     }
     $(".title").text(title);
     $(".groupName").text(groupNo==71?'门诊西药房':'住院药房');
-    $(".wardName").text(datas[0].wardName);
+    let w_code = $("#wardCode").find("option:selected").text();
+    $(".wardName").text(w_code.substring(0,w_code.lastIndexOf("(")));
     $(".pageNo").text(pageNo);
     $(".printDate").html(format(new Date(),"yyyy-MM-dd HH:mm"));
     $('.sjh').remove();