版本更新

openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml

@@ -17,5 +17,16 @@
         WHERE encounter_id = #{encounterId}
           AND tcm_flag = 0
     </delete>
+    <select id="getEncounterDiagnosisByEncounterConDefId"
+            resultType="com.openhis.administration.domain.EncounterDiagnosis">
+        SELECT *
+        FROM adm_encounter_diagnosis T1
+                 INNER JOIN cli_condition T2 ON T1.condition_id = T2.id
+        WHERE T1.encounter_id = #{encounterId}
+          AND T2.definition_id = #{conditionDefId}
+          AND T1.delete_flag = '0'
+          AND T2.delete_flag = '0'
+          AND T1.tenant_id = #{tenantId}
+    </select>
 
 </mapper>

openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml

@@ -16,6 +16,7 @@
         AND payment.delete_flag = '0'
         AND payment.status_enum IN (#{success}, #{returnAll})
         AND payment.kind_enum = #{clinic}
+        AND account.contract_no IS NOT NULL
         <if test="entererId != null">
             AND payment.enterer_id = #{entererId}
         </if>

openhis-server-new/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml

@@ -123,7 +123,9 @@
         t2.contract_no,
         t5.insutype,
         t5.med_type,
-        t7.medfee_sumamt
+        t6.kind_enum,
+        t7.medfee_sumamt,
+        t8.medfee_sumamt as return_medfee_sumamt
         FROM
         fin_payment_rec_detail t1
         LEFT JOIN adm_account t2 on t1.account_id = t2.id
@@ -132,11 +134,13 @@
         LEFT JOIN yb_clinc_reg t5 on t4.bus_no = t5.ipt_otp_no AND t4.delete_flag = '0'
         LEFT JOIN fin_payment_reconciliation t6 on t6.id = t1.reconciliation_id AND t6.delete_flag = '0'
         LEFT JOIN yb_clinc_settle t7 on t1.pay_trans_text = t7.setl_id
+        LEFT JOIN yb_clinc_un_settle t8 on t6.yb_settle_ids = t8.settle_id
         WHERE
         1=1
         AND t6.bill_date > #{startTime}
         AND t6.bill_date < #{endTime}
         AND t6.status_enum != #{draft}
+        AND t5.med_type IS NOT NULL
         AND t1.account_id IS NOT NULL
         <if test="idList != null and idList.size() > 0">
             AND t1.reconciliation_id IN
@@ -144,6 +148,5 @@
                 #{item}
             </foreach>
         </if>
-
     </select>
 </mapper>