增加病人查询条件

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

@@ -41,7 +41,8 @@ public class MzChargeDetailController {
     private MzReceiptSerialService mzReceiptSerialService;
     @Autowired
     private YpZdDictService ypZdDictService;
-
+    @Autowired
+    private MzPatientMiService mzPatientMiService;
     /**
      * 查询费用列表
      *
@@ -59,14 +60,22 @@ public class MzChargeDetailController {
             }
             PageViewVo pageViewVo = new PageViewVo();
             MzChargeDetail mzChargeDetail = mzChargeDetailPageDto.getMzChargeDetail();
-            List<MzChargeDetail> mzChargeDetails;
+            List<MzChargeDetail> mzChargeDetails=new ArrayList<>();
             if (PayMarkEnum.NO_CHARGE.code.equals(mzChargeDetail.getPayMark())) {
-                if (StringUtils.isBlank(mzChargeDetail.getPatientId())) {
-                    resultMap.put("code", -1);
-                    // resultMap.put("message", "查询待缴费列表时，病人编号不能为空");
-                    return resultMap;
+                if (StringUtils.isNotBlank(mzChargeDetail.getPatientId())) {
+                    mzChargeDetails.addAll( mzChargeDetailService.unPaidToFullChargeDetail(mzChargeDetail.getPatientId()));
+                }
+                if(StringUtils.isNotBlank(mzChargeDetail.getName())){
+                    List<MzPatientMi> mzPatientMis=mzPatientMiService.queryByName(mzChargeDetail.getName());
+                    if(mzPatientMis!=null && mzPatientMis.size()>0){
+                        for (MzPatientMi m:mzPatientMis){
+                            if(m!=null && StringUtils.isNotBlank(m.getPatientId())){
+                                mzChargeDetails.addAll(mzChargeDetailService.unPaidToFullChargeDetail(m.getPatientId()));
+                            }
+                        }
+                    }
                 }
-                mzChargeDetails = mzChargeDetailService.unPaidToFullChargeDetail(mzChargeDetail.getPatientId());
+                //if(StringUtils.isNotBlank(mzChargeDetail.get()))
                 pageViewVo.setPageSize(100);
                 pageViewVo.setTotal(mzChargeDetails.size());
             } else {

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

@@ -685,7 +685,7 @@ public interface ChargeFeeVoMapper {
             "SELECT " +
                     "receipt_bill= rtrim(mzy_reqrec.receipt_bill)," +
                     "         rtrim(mzy_reqrec.name) name," +
-                    "         mzy_reqrec.req_fee+mzy_reqrec.oth_fee+mzy_reqrec.clinic_fee  as total_charge " +
+                    "         ABS(mzy_reqrec.req_fee)+ABS(mzy_reqrec.oth_fee)+ABS(mzy_reqrec.clinic_fee)  as total_charge " +
                     "FROM mzy_reqrec " +
                     "where cancel_mark <![CDATA[<>]]> '0'  and times <![CDATA[<]]> 0 " +
                     "<when test='userIdCode!=null'>",

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

@@ -9,6 +9,6 @@ public interface JyZdTubeChargeMapper {
      * @param code
      * @return
      */
-    @Select("select rtrim(code) code,rtrim(charge_code) charge_code,amount from jy_zd_tube_charge where code=#{code,jdbcType=CHAR}")
+    @Select("select rtrim(code) code,rtrim(charge_code) charge_code,amount from jy_zd_tube_charge where code=#{code,jdbcType=CHAR} and charge_code <> '' and charge_code is not null ")
     JyZdTubeCharge selectJyZdTubeChargeByCode(@Param("code") String code);
 }

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

@@ -14,7 +14,7 @@ public interface MzPatientMiService {
 
 
     /**
-     * 按照病人姓名模糊查询病人信息
+     * 分页按照病人姓名模糊查询病人信息
      * @param name
      * @return
      */
@@ -71,4 +71,12 @@ public interface MzPatientMiService {
      * @return
      */
     int clearIcCardNo(String patientId);
+
+
+    /**
+     * 按照病人姓名模糊查询病人信息
+     * @param name
+     * @return
+     */
+    List<MzPatientMi> queryByName(String name);
 }

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

@@ -73,5 +73,13 @@ public class MzPatientMiServiceImpl implements MzPatientMiService {
         return mzPatientMiMapper.clearIcCardNo(patientId);
     }
 
+    @Override
+    public List<MzPatientMi> queryByName(String name) {
+        if (StringUtils.isNotBlank(name)){
+            name="%"+name+"%";
+        }
+        return mzPatientMiMapper.selectByNameFuzzy(name,0,1000);
+    }
+
 
 }

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

@@ -754,7 +754,7 @@ function formatCheck() {
  */
 function queryUserInfoByCardNo() {
     var cardNo = $("#cardNo").val();
-    if (cardNo.length == 8) {
+    if (cardNo.indexOf("-")>0 || cardNo.length == 8) {
         $("#cardNo").attr("title", cardNo);
         $.ajax({
             type: "GET",

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

@@ -398,6 +398,10 @@ function initFeeTable() {
                     "rows": {}   //数据
                 };
             }
+            if(ress.pageViewVo.total==0){
+                $("#cardNo").val(null);
+                $("#name").val(null);
+            }
             return {
                 "total": ress.pageViewVo.total,//总页数
                 "rows": ress.pageViewVo.data   //数据
@@ -637,7 +641,10 @@ function cardNoChange() {
  */
 function queryUserInfoByCardNo() {
     var cardNo = $("#cardNo").val();
-    if (cardNo.length == 8) {
+    if(cardNo.indexOf("-")>0){
+        $("#patientId").val(cardNo);
+        initFeeTable();
+    } else  if (cardNo.length == 8) {
         $("#cardNo").attr("title", cardNo);
         $.ajax({
             type: "GET",
@@ -666,9 +673,6 @@ function queryUserInfoByCardNo() {
                 }
             }
         });
-    }else if(cardNo.indexOf("-")>0){
-        $("#patientId").val(cardNo);
-        initFeeTable();
     }
 }