增加病人出生日期显示

src/main/java/cn/hnthyy/thmz/service/impl/his/ChargeFeeVoServiceImpl.java

@@ -195,6 +195,5 @@ public class ChargeFeeVoServiceImpl implements ChargeFeeVoService {
         chargeFeeVoMapper.refeshZzPayManData();
         chargeFeeVoMapper.refeshRefund();
         return chargeFeeVoMapper.refeshRefundNewData();
-
     }
 }

src/main/resources/static/js/jBox/common.js

@@ -310,7 +310,23 @@ function fitPatient(res) {
             } else if (res.data[i].sex == 2) {
                 gender = '女';
             }
-            $("<tr data-target='" + res.data[i].patientId + "'><td>" + res.data[i].patientId + "</td><td>" + res.data[i].name + "</td><td>" + gender + "</td><td>" + res.data[i].icCardNo + "</td><td>" + res.data[i].socialNo + "</td></tr>").appendTo("#patientTable").bind('click', function () {
+            var icCardNo=res.data[i].icCardNo;
+            if(icCardNo==null || icCardNo=="null"){
+                icCardNo="";
+            }
+            var phoneNo=res.data[i].phoneNo;
+            if(phoneNo==null || phoneNo=="null"){
+                phoneNo="";
+            }
+            var birthDay=format(res.data[i].birthDay, "yyyy-MM-dd");
+            if(birthDay==null || birthDay=="null"){
+                birthDay="";
+            }
+            var socialNo=res.data[i].socialNo;
+            if(socialNo==null || socialNo=="null"){
+                socialNo="";
+            }
+            $("<tr data-target='" + res.data[i].patientId + "'><td>" + res.data[i].patientId + "</td><td>" + res.data[i].name + "</td><td>" + gender + "</td><td>" + icCardNo + "</td><td>" + phoneNo + "</td><td>" + birthDay + "</td><td>" + socialNo + "</td></tr>").appendTo("#patientTable").bind('click', function () {
                 $("#patientModal").modal("hide");
                 fillPatinet($(this).attr("data-target"));
             });

src/main/resources/static/js/registration.js

@@ -748,7 +748,8 @@ function formatCheck() {
  */
 function queryUserInfoByCardNo() {
     var cardNo = $("#cardNo").val();
-    if (cardNo.indexOf("-") > 0 || cardNo.length == 8) {
+    var index =cardNo.indexOf("-");
+    if ((index > 0 && index==cardNo.length-2) || cardNo.length == 8) {
         $("#cardNo").attr("title", cardNo);
         $.ajax({
             type: "GET",
@@ -1663,7 +1664,7 @@ function prn1Print(patientId, times) {
                 LODOP.ADD_PRINT_TEXT("25mm", "7mm", "40mm", "3mm", temp.name);
                 LODOP.ADD_PRINT_TEXT("25mm", "61mm", "27mm", "3mm", patientId);
                 LODOP.ADD_PRINT_TEXT("32mm", "6mm", "40mm", "3mm", "就诊科室:" + temp.unitCode);
-                LODOP.ADD_PRINT_TEXT("32mm", "46mm", "40mm", "3mm", "地点:" + res.officePos);
+                LODOP.ADD_PRINT_TEXT("32mm", "46mm", "40mm", "3mm", "地点:" + res.officePos==null?"":res.officePos);
                 LODOP.ADD_PRINT_TEXT("37mm", "6mm", "40mm", "3mm", "看诊医生:" + temp.doctorCode);
                 LODOP.ADD_PRINT_TEXT("37mm", "46mm", "40mm", "3mm", "号段:" + temp.ampm);
                 LODOP.ADD_PRINT_TEXT("42mm", "6mm", "40mm", "3mm", "号别:" + temp.chargeType);

src/main/resources/static/js/toll_administration.js

@@ -641,7 +641,8 @@ function cardNoChange() {
  */
 function queryUserInfoByCardNo() {
     var cardNo = $("#cardNo").val();
-    if(cardNo.indexOf("-")>0){
+    var index =cardNo.indexOf("-");
+    if(index > 0 && index==cardNo.length-2){
         $("#patientId").val(cardNo);
         initFeeTable();
     } else  if (cardNo.length == 8) {

src/main/resources/templates/registration.html

@@ -974,7 +974,7 @@
 <!--患者查询弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="patientModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 620px;margin-left: 200px;">
+        <div class="modal-content" style="width: 700px;margin-left: 200px;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -989,6 +989,8 @@
                             <th>患者姓名</th>
                             <th>患者性别</th>
                             <th>患者卡号</th>
+                            <th>电话号码</th>
+                            <th>出生年月</th>
                             <th>患者身份证号码</th>
                         </tr>
                         </thead>