id卡号查询开发

src/main/java/cn/hnthyy/thmz/controller/ReceiptController.java

@@ -60,12 +60,12 @@ public class ReceiptController {
         try {
             Receipt receiptDb=receiptService.queryByUserIdCode(tokenUser.getUserIdCode());
             if(receiptDb!=null){
-                if(receiptDb.getReceiptCurrent()!=null &&!receiptDb.getReceiptBegin().equals(receiptDb.getReceiptCurrent())){
-                    resultMap.put("code", -1);
-                    resultMap.put("message", "您有正在使用中的发票,请在发票使用完后再维护！");
-                    resultMap.put("data",receipt);
-                    return resultMap;
-                }
+//                if(receiptDb.getReceiptCurrent()!=null &&!receiptDb.getReceiptBegin().equals(receiptDb.getReceiptCurrent())){
+//                    resultMap.put("code", -1);
+//                    resultMap.put("message", "您有正在使用中的发票,请在发票使用完后再维护！");
+//                    resultMap.put("data",receipt);
+//                    return resultMap;
+//                }
                 receipt.setId(receiptDb.getId());
             }
             receipt.setUserIdCode(tokenUser.getUserIdCode());

src/main/java/cn/hnthyy/thmz/mapper/his/MzPatientMiMapper.java

@@ -10,13 +10,13 @@ import java.util.List;
 
 public interface MzPatientMiMapper {
     /**
-     * 按照卡号查询病人信息
+     * 按照卡号 或者病人ID 查询病人信息
      * @param icCardNo
      * @return
      */
     @Select("select rtrim(social_no) social_no,rtrim(hic_no) hic_no,rtrim(name) name,rtrim(sex) sex,lv_date,rtrim(patient_id) patient_id,rtrim(p_bar_code) p_bar_code," +
             "rtrim(baddebt_mark) baddebt_mark,rtrim(response_type) response_type,rtrim(charge_type) charge_type,times,rtrim(reqdel_mark) reqdel_mark,age,birth_day," +
-            "rtrim(ic_card_no) ic_card_no,rtrim(phone_no) phone_no,rtrim(adress) address,rtrim(yb_card_no) yb_card_no,first_date,rtrim(rel_name) rel_name,rtrim(contract_name) contract_name from mz_patient_mi  where  ic_card_no =#{icCardNo}")
+            "rtrim(ic_card_no) ic_card_no,rtrim(phone_no) phone_no,rtrim(adress) address,rtrim(yb_card_no) yb_card_no,first_date,rtrim(rel_name) rel_name,rtrim(contract_name) contract_name from mz_patient_mi  where  ic_card_no =#{icCardNo} or patient_id=#{icCardNo} ")
     MzPatientMi selectByIcCardNo(@Param("icCardNo") String icCardNo);
 
 

src/main/java/cn/hnthyy/thmz/mapper/his/MzyReqrecMapper.java

@@ -54,7 +54,7 @@ public interface MzyReqrecMapper {
             " and doctor_code =#{mzyReqrec.doctorCode,jdbcType=CHAR}",
             "</when>",
             "<when test='mzyReqrec.name!=null'>",
-            " and name like #{mzyReqrec.name,jdbcType=CHAR}",
+            " and (name like #{mzyReqrec.name,jdbcType=CHAR} or patient_id like #{mzyReqrec.name,jdbcType=CHAR})",
             "</when>",
             "<when test='mzyReqrec.visitedMark!=null'>",
             " and visited_mark =#{mzyReqrec.visitedMark,jdbcType=CHAR}",
@@ -97,7 +97,7 @@ public interface MzyReqrecMapper {
             " and doctor_code =#{mzyReqrec.doctorCode,jdbcType=CHAR}",
             "</when>",
             "<when test='mzyReqrec.name!=null'>",
-            " and name like #{mzyReqrec.name,jdbcType=CHAR}",
+            " and (name like #{mzyReqrec.name,jdbcType=CHAR} or patient_id like #{mzyReqrec.name,jdbcType=CHAR}) ",
             "</when>",
             "<when test='mzyReqrec.visitedMark!=null'>",
             " and visited_mark =#{mzyReqrec.visitedMark,jdbcType=CHAR}",

src/main/java/cn/hnthyy/thmz/service/his/MzPatientMiService.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 public interface MzPatientMiService {
     /**
-     * 按照卡号查询病人信息
+     * 按照卡号 或者病人ID 查询病人信息
      * @param icCardNo
      * @return
      */

src/main/resources/static/js/charge_list.js

@@ -98,6 +98,9 @@ function initChargeListByPatient() {
                 align: "center",
                 valign: 'middle',
                 formatter: function (value, row, index) {
+                    if(value==null || value==undefined){
+                        value="";
+                    }
                     var text = value;
                     if (row.serial_no < 0) {
                         text = '<span style="color:#ff6b91">' + value + '</span>';

src/main/resources/templates/charge_list.html

@@ -31,12 +31,12 @@
                             <input id="name" class="form-control col-md-7 col-xs-12" type="text"
                                    placeholder="姓名">
                         </div>
-                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="patientId_or_cardNo">病人ID/卡号
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="patientId_or_cardNo">病人ID/就诊卡号
                         </label>
                         <div class="col-md-2 col-sm-2 col-xs-12">
                             <input id="patientId_or_cardNo" class="form-control col-md-7 col-xs-12" type="text"
                                    onchange="setPatientId()"
-                                   placeholder="病人ID/卡号">
+                                   placeholder="病人ID/就诊卡号">
                             <input id="patientId" type="hidden">
                         </div>
                         <div class="col-md-1 col-sm-1 col-xs-12">

src/main/resources/templates/receipt.html

@@ -30,7 +30,7 @@
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="receiptCurrent">当前可用编号 <span class="required">*</span>
                         </label>
                         <div class="col-md-4 col-sm-4 col-xs-12">
-                            <input type="text" id="receiptCurrent"  class="form-control col-md-7 col-xs-12">
+                            <input type="text" id="receiptCurrent"  class="form-control col-md-7 col-xs-12" readonly>
                         </div>
                     </div>
                     <div class="item form-group">

src/main/resources/templates/registration.html

@@ -124,14 +124,14 @@
             </div>
             <div class="item form-group thmz_alert">
                 <div class="col-md-6 col-sm-6 col-xs-12 item thmz_group_alert">
-                    <label class="control-label col-md-4 col-sm-4 col-xs-12" for="cardNo">卡号 <span
+                    <label class="control-label col-md-4 col-sm-4 col-xs-12" for="cardNo">卡号/ID <span
                             class="required">*</span>
                     </label>
                     <div class="col-md-8 col-sm-8 col-xs-12">
                         <div class="input-group demo2 input-group-own">
                             <input id="cardNo" class="form-control col-md-7 col-xs-12" type="text"
                                    data-validate-length-range="1,8"
-                                   placeholder="请输入" required="required">
+                                   placeholder="ID/卡号" required="required">
                             <input type='text' class="form-control hide" id='patientId'/>
                             <span class="input-group-addon"><a href="#" style="cursor: default"><i
                                     class="fa fa-credit-card"></i></a></span>
@@ -346,10 +346,10 @@
                 </div>
                 <div class="item form-group">
                     <div class="col-md-12 col-sm-12 col-xs-12">
-                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="userNameParam">姓名 </label>
-                        <div class="col-md-3 col-sm-3 col-xs-12">
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="userNameParam">患者ID/姓名 </label>
+                        <div class="col-md-2 col-sm-2 col-xs-12">
                             <input id="userNameParam" class="form-control col-md-7 col-xs-12"
-                                   placeholder="姓名" type="text">
+                                   placeholder="患者ID/姓名" type="text">
                         </div>
                         <!--<label class="control-label col-md-1 col-sm-1 col-xs-12" for="sourceParam">来源-->
                         <!--</label>-->

src/main/resources/templates/toll_administration.html

@@ -33,10 +33,10 @@
                     <div class="form-group col-md-8 col-sm-8 col-xs-12">
                         <div class="col-md-3 col-sm-3 col-xs-12">
                         </div>
-                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="cardNo">就诊卡号
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="cardNo">卡号/ID
                         </label>
                         <div class="col-md-2 col-sm-2 col-xs-12">
-                            <input id="cardNo" class="form-control col-md-7 col-xs-12" type="text" placeholder="患者就诊卡号">
+                            <input id="cardNo" class="form-control col-md-7 col-xs-12" type="text" placeholder="患者ID/就诊卡号">
                         </div>
                         <label class="control-label col-md-1 col-sm-1 col-xs-12" for="name"
                                style="width: 6%;">姓名</label>