Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/AfterwardsAuditMapper.java

@@ -83,7 +83,7 @@ public interface AfterwardsAuditMapper extends BaseMapper<AfterwardsAudit> {
      * @param id
      * @return
      */
-    List<MedicalInsuranceProjectDetailsResponse> loadMedicalInsuranceProjectDetails(@Param("id") Integer id);
+    List<MedicalInsuranceProjectDetailsResponse> loadMedicalInsuranceProjectDetails(@Param("patientId") String patientId);
 
     List<InpatientSettlementMasterResponse> loadInpatientSettlementMaster(@Param("id") Integer id);
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/AfterwardsAuditMapper.xml

@@ -283,8 +283,10 @@
         FROM
             hospitalizatio_settle_detail
         WHERE
-            zyh = (SELECT outpatient_number FROM afterwards_audit AS ad WHERE ad.id = #{id,jdbcType=INTEGER})
+
+            patient_id = #{patientId}
     </select>
+<!--    &#45;&#45;             zyh = (SELECT outpatient_number FROM afterwards_audit AS ad WHERE ad.id = #{id,jdbcType=INTEGER})-->
 
     <!-- 根据事后工单id 查询结算主单数据 -->
     <select id="loadInpatientSettlementMaster"

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditServiceImpl.java

@@ -421,7 +421,7 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
             }
 
         }
-        return null;
+        return medicalOrderInfoResponses;
     }
 
     /**
@@ -485,8 +485,9 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     public InpatientSettlementDetailResponse loadInpatientSettlementDetail(Integer id) {
         // 获取患者信息
         PatientInfoResponse patientInfo = baseMapper.loadInpatientSettlementInfo(id);
+        String patientId = patientInfo.getPersonalCode();
         // 获取医保项目明细
-        List<MedicalInsuranceProjectDetailsResponse> medicalInsuranceProjects  = baseMapper.loadMedicalInsuranceProjectDetails(id);
+        List<MedicalInsuranceProjectDetailsResponse> medicalInsuranceProjects  = baseMapper.loadMedicalInsuranceProjectDetails(patientId);
         InpatientSettlementDetailResponse r = new InpatientSettlementDetailResponse();
         r.setPatientInfo(patientInfo);
         r.setHospitalizationSettleDetailResponse(medicalInsuranceProjects);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/ViolationAnalysisServiceImpl.java

@@ -19,6 +19,7 @@ import org.jeecg.modules.medical.common.bo.mid.AuditMidDetailListResponse;
 import org.jeecg.modules.medical.common.bo.mid.request.AuditMidDetailListRequest;
 import org.jeecg.modules.medical.common.bo.mid.response.*;
 import org.jeecg.modules.medical.entity.AdvanceWarningAuditDetail;
+import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.PrescriptionOrder;
 import org.jeecg.modules.medical.service.*;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
@@ -334,12 +335,22 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
 
     @Override
     public List<PrescriptionOrder> loadPrescriptionOrderInfo(Integer detialId) {
+        String prescriptionNumber = "";
         AfterwardsAuditDetail byId = afterwardsAuditDetailService.getById(detialId);
-        if (null == byId) {
+        if (byId == null) {
+            //TODo 临时用
+            AfterwardsAudit byId1 = afterwardsAuditService.getById(detialId);
+            if (byId1 != null) {
+                prescriptionNumber = byId1.getPrescriptionNumber();
+            }
+        } else {
+            prescriptionNumber = byId.getPrescriptionNumber();
+        }
+        if (!StringUtils.hasText(prescriptionNumber)) {
             throw new JeecgBootException("找不到主单记录");
         }
         LambdaQueryWrapper<PrescriptionOrder> queryWrapper = Wrappers.<PrescriptionOrder>lambdaQuery()
-                .eq(PrescriptionOrder::getOrderNumber, byId.getPrescriptionNumber());
+                .eq(PrescriptionOrder::getOrderNumber, prescriptionNumber);
         return prescriptionOrderService.list(queryWrapper);
 
     }