住院发票

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzDzfpUploadMapper.java

@@ -25,6 +25,9 @@ public interface MzDzfpUploadMapper extends BaseMapper<MzDzfpUpload> {
     @Select("select * from mz_dzfp_upload where patient_id = #{patientId} and  times = #{times} and serial_no = #{serialNo}")
     MzDzfpUpload selectDzfpUploadAboutSerialNo(@Param("patientId") String patientId, @Param("times")Integer times, @Param("serialNo")String serialNo);
 
+    @Select("select * from zy_receipt where patient_id = #{patientId} and  admiss_times = #{times} and serial_no = #{serialNo}")
+    MzDzfpUpload selectZyReceiptAboutSerialNo(@Param("patientId") String patientId, @Param("times")Integer times, @Param("serialNo")String serialNo);
+
     @Select("select * from powersi_mip_setlinfo where med_org_ord ='${patientId}_${times}_1' and ord_state ='SETTLED' ")
     Map<String, Object> selectpowersiMipSetlinfo(@Param("patientId") String patientId, @Param("times")Integer times);
     @Update(" update mz_dzfp_upload set fp_no =#{fpNo} ,op_code=#{opCode},blue_issue_date=#{blueIssueDate} where patient_id = #{patientId} and times =#{times} and receipt_no=#{receiptNo} and type_flag =#{typeFlag} and del_flag =#{delFlag}")

src/main/java/cn/hnthyy/thmz/service/impl/his/mzdzfp/BswServerImpl.java

@@ -980,13 +980,13 @@ public class BswServerImpl implements BswServer {
         mzInvoiceInfo.setMdtrtInfo(MdtrtInfo.builder()
                 .begntime(DateUtil.formatDateTime(zyActpatient.getAdmissDate()))
                 .endtime(DateUtil.formatDateTime(DateUtil.offsetMinute(zyActpatient.getAdmissDate(), 2)))
-                .medType(StrUtil.isNotBlank(setlInfo.getMedType()) ? setlInfo.getMedType() : "11")
+                .medType(StrUtil.isNotBlank(mzInvoiceInfo.getSetlInfo().getMedType()) ? mzInvoiceInfo.getSetlInfo().getMedType() : "11")
                 .build());
-        if (StrUtil.isNotBlank(setlInfo.getBegntime())) {
-            mzInvoiceInfo.getMdtrtInfo().setBegntime(setlInfo.getBegntime());
+        if (StrUtil.isNotBlank(mzInvoiceInfo.getSetlInfo().getBegntime())) {
+            mzInvoiceInfo.getMdtrtInfo().setBegntime(mzInvoiceInfo.getSetlInfo().getBegntime());
         }
-        if (StrUtil.isNotBlank(setlInfo.getEndtime())) {
-            mzInvoiceInfo.getMdtrtInfo().setBegntime(setlInfo.getEndtime());
+        if (StrUtil.isNotBlank(mzInvoiceInfo.getSetlInfo().getEndtime())) {
+            mzInvoiceInfo.getMdtrtInfo().setBegntime(mzInvoiceInfo.getSetlInfo().getEndtime());
         }
         List<FeeDetl> feeDetlInfo = new ArrayList<>();
         List<ChargeDetailDTO> chargeDetailDTOList = new ArrayList<>();