Browse Source

门诊上传优化

lihong 2 years ago
parent
commit
6bf009c196

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -260,7 +260,7 @@ public interface UpIdCollectionDao extends BaseMapper<SetlinfoUpld> {
     @Select("select rtrim(receipt_no) receipt_no  from zy_receipt where inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn} and receipt_no<>'0000000'" + "and receipt_sn = 1")
     String billNo(@Param("patNo") String patNo, @Param("times") Integer times, @Param("ledgerSn") Integer ledgerSn);
 
-    @Select("select  receipt_bill " +
+    @Select("select top 1  receipt_bill " +
             "from mz_receipt_serial " +
             "where patient_id = #{patNo} " +
             "and times = #{times} " +

+ 1 - 1
src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -935,7 +935,7 @@ public class SetlListUpldService {
      **/
     private boolean isDrghiPaymtd(List<Integer> hiPaymtds){
         if(ListUtil.notBlank(hiPaymtds)){
-           return hiPaymtds.stream().anyMatch(obj -> obj==4);
+           return hiPaymtds.stream().anyMatch(obj -> obj !=null &&  obj==4);
         }
         return false;
     }