瀏覽代碼

口腔科的费用生成时病房都设置成口腔科而非口腔科病室。

lighter 4 年之前
父節點
當前提交
c6ce2f7d9f

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>9.7.5</version>
+    <version>9.7.6</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

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

@@ -25,7 +25,7 @@ public interface MakeDbzFeesDao {
             "rtrim(isnull(operation, '')) as operation, " +
             "rtrim(refer_physician) referPhysician, " +
             "rtrim(consult_physician) consultPhysician, " +
-            "ledgerSn=(select max(ledger_sn) from zy_ledger_file  " +
+            "ledgerSn=(select max(ledger_sn) from zy_ledger_file " +
             "where inpatient_no=a.inpatient_no and admiss_times=a.admiss_times), " +
             "maxDetailSn=(select max(detail_sn) from zy_detail_charge " +
             "where inpatient_no=a.inpatient_no and admiss_times=a.admiss_times) " +

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

@@ -117,6 +117,9 @@ public class MakeDbzFeesService {
         if (null == inpatientInfo) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有找到此患者的在院信息!请确认此患者已经办理住院。");
         }
+        if ("1090000".equals(inpatientInfo.getDeptCode())) {
+            inpatientInfo.setWardCode("1090000");
+        }
         inpatientInfo.setStaffId(TokenUtil.getTokenUserId());
         AtomicInteger detailSn = new AtomicInteger(inpatientInfo.getMaxDetailSn());
         List<ZyDetailCharge> zyFees = new ArrayList<>();