Selaa lähdekoodia

代码和命名优化

lighter 2 vuotta sitten
vanhempi
commit
d3312c8058

+ 1 - 2
src/main/java/thyyxxk/webserver/dao/his/datamodify/ZyDetailChargeDao.java

@@ -37,7 +37,6 @@ public interface ZyDetailChargeDao {
      * @param page         分页的条件
      * @param chargeCodeMx 收费项目码
      * @param inpatientNo  住院号
-     * @return 数据
      */
     @Select("select admiss_times,ledger_sn,detail_sn,charge_date,rtrim(inpatient_no) as inpatient_no," +
             "a.serial,infant_flag,charge_status, " +
@@ -56,7 +55,7 @@ public interface ZyDetailChargeDao {
             "where inpatient_no=#{inpatientNo} and charge_code_mx=#{chargeCodeMx} and " +
             "admiss_times=(select admiss_times from zy_actpatient where inpatient_no=a.inpatient_no) " +
             "and ledger_sn=(select max(ledger_sn) from zy_ledger_file where inpatient_no=a.inpatient_no and admiss_times=a.admiss_times)")
-    IPage<ZyDetailCharge> queryHospitalizationExpenses(IPage<ZyDetailCharge> page,
+    void queryHospitalizationExpenses(IPage<ZyDetailCharge> page,
                                                        @Param("inpatientNo") String inpatientNo,
                                                        @Param("chargeCodeMx") String chargeCodeMx);
 }

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/makedbzfees/MakeDbzFeesDao.java

@@ -43,7 +43,7 @@ public interface MakeDbzFeesDao {
             "#{info.consultPhysician},#{fee.execDept})" +
             "</foreach>" +
             "</script>")
-    void insertInfoZyDetailCharge(@Param("info") InpatientInfo info, @Param("list")List<ZyDetailCharge> zyFees);
+    void insertZyDetailChargeForSingleDisease(@Param("info") InpatientInfo info, @Param("list")List<ZyDetailCharge> zyFees);
 
     @Select("select rtrim(specification) from yp_zd_dict with(nolock) where code=#{code} and serial=#{serial}")
     String selectSpecification(@Param("code") String code, @Param("serial") String serial);

+ 3 - 3
src/main/java/thyyxxk/webserver/service/makedbzfees/MakeDbzFeesService.java

@@ -161,18 +161,18 @@ public class MakeDbzFeesService {
 
     private void batchIntoZyDetailCharge(List<ZyDetailCharge> zyFees, InpatientInfo inpatientInfo) {
         if (zyFees.size() <= Capacity.TWENTY) {
-            dao.insertInfoZyDetailCharge(inpatientInfo, zyFees);
+            dao.insertZyDetailChargeForSingleDisease(inpatientInfo, zyFees);
         } else {
             List<ZyDetailCharge> tempList = new ArrayList<>();
             for (ZyDetailCharge item : zyFees) {
                 tempList.add(item);
                 if (tempList.size() == 20) {
-                    dao.insertInfoZyDetailCharge(inpatientInfo, tempList);
+                    dao.insertZyDetailChargeForSingleDisease(inpatientInfo, tempList);
                     tempList.clear();
                 }
             }
             if (!tempList.isEmpty()) {
-                dao.insertInfoZyDetailCharge(inpatientInfo, tempList);
+                dao.insertZyDetailChargeForSingleDisease(inpatientInfo, tempList);
             }
         }
     }