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

@@ -30,7 +30,7 @@ public interface MzDzfpUploadMapper extends BaseMapper<MzDzfpUpload> {
 
     @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},res_url=#{resUrl} where patient_id = #{patientId} and times =#{times} and receipt_no=#{receiptNo} and type_flag =#{typeFlag} and del_flag =#{delFlag}")
+    @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}")
     int updateFpNo(MzDzfpUpload mzDzfpUpload);
     @Select(" select dis_diag mainDiagCode ,dis_diag_comment mainDiagName from zy_dis_diag_yb where inpatient_no = #{patientId} and admiss_times =#{times} and dis_diag_no = 1 ")
     Map<String,Object> selectYbDiag(MzDzfpUpload uploadParam);

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

@@ -301,7 +301,6 @@ public class BswServerImpl implements BswServer {
                     mzDzfpUpload.setFpNo(Convert.toStr(data.get("invoice_number")));
                     mzDzfpUpload.setOpCode(Convert.toStr(data.get("invoice_code")));
                     mzDzfpUpload.setBlueIssueDate(Convert.toStr(data.get("issue_date")));
-                    mzDzfpUpload.setResUrl(Convert.toStr(data.get("invoice_url")));
                     mzDzfpUpload.setResCode(2);
                     mzDzfpUploadMapper.updateFpNo(mzDzfpUpload);
                     if (mzDzfpUpload.getTypeFlag() == 2 || mzDzfpUpload.getTypeFlag() == 4) {
@@ -853,7 +852,7 @@ public class BswServerImpl implements BswServer {
         List<MzDzfpUpload> mzDzfpUploadList = mzDzfpUploadMapper.selectList(getQueryWrapper(uploadParam));
         String requestId = null;
         if (CollUtil.isNotEmpty(mzDzfpUploadList)) {
-            if (StrUtil.isNotBlank(mzDzfpUploadList.get(0).getResUrl())) {
+            if (StrUtil.isNotBlank(mzDzfpUploadList.get(0).getFpNo())) {
                 return R.ok().put("data", mzDzfpUploadList.get(0));
             }
             MzDzfpUpload dzfpState = getDzfpState(mzDzfpUploadList.get(0), 1);
@@ -921,11 +920,11 @@ public class BswServerImpl implements BswServer {
         AssertUtil.isNotBlank(zyActpatient, "没有查到住院信息");
         ZdUnitCode zdUnitCode = zdUnitCodeService.queryByCode(zyActpatient.getDept());
         AssertUtil.isNotBlank(zdUnitCode, "没有查到住院科室信息");
-//        Map<String, Object> diagMap = mzDzfpUploadMapper.selectYbDiag(uploadParam);
-//        if (CollUtil.isEmpty(diagMap)) {
-//            diagMap = mzDzfpUploadMapper.selectCaseDisdiag(uploadParam);
-//        }
-//        AssertUtil.isNotBlank(diagMap, "没有查到主诊断信息");
+        Map<String, Object> diagMap = mzDzfpUploadMapper.selectYbDiag(uploadParam);
+        if (CollUtil.isEmpty(diagMap)) {
+            diagMap = mzDzfpUploadMapper.selectCaseDisdiag(uploadParam);
+        }
+        AssertUtil.isNotBlank(diagMap, "没有查到主诊断信息");
         List<BillItem> billItems = mzBillItemMapper.selectZyBillItemOri();
         Map<String, BillItem> billItemMap = billItems.stream().collect(Collectors.toMap(BillItem::getName, billItem -> billItem));
         SetlInfo setlInfo = mzDzfpUploadMapper.selectSetlInfo(uploadParam.getPatientId(), uploadParam.getTimes(), uploadParam.getReceiptNo());
@@ -976,8 +975,8 @@ public class BswServerImpl implements BswServer {
                     .certSetlType("2")
                     .build());
         }
-//        mzInvoiceInfo.getSetlInfo().setMainDiagCode(Convert.toStr(diagMap.get("mainDiagCode")));
-//        mzInvoiceInfo.getSetlInfo().setMainDiagName(Convert.toStr(diagMap.get("mainDiagName")));
+        mzInvoiceInfo.getSetlInfo().setMainDiagCode(Convert.toStr(diagMap.get("mainDiagCode")));
+        mzInvoiceInfo.getSetlInfo().setMainDiagName(Convert.toStr(diagMap.get("mainDiagName")));
         mzInvoiceInfo.setMdtrtInfo(MdtrtInfo.builder()
                 .begntime(DateUtil.formatDateTime(zyActpatient.getAdmissDate()))
                 .endtime(DateUtil.formatDateTime(DateUtil.offsetMinute(zyActpatient.getAdmissDate(), 2)))