浏览代码

修复费用计算存在的bug

lighter 3 年之前
父节点
当前提交
d13498fbaf

+ 1 - 1
pom.xml

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

+ 3 - 3
src/main/java/thyyxxk/webserver/dao/his/yibao/DismissDao.java

@@ -372,11 +372,11 @@ public interface DismissDao {
                               @Param("times") int times,
                               @Param("ledgerSn") int ledgerSn);
 
-    @Update("select sum(depo_amount) from zy_deposit_file where " +
+    @Select("select cast(sum(depo_amount) as varchar(16)) from zy_deposit_file where " +
             "inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn}")
     String selectDepositSumamt(@Param("patNo") String patNo,
-                             @Param("times") int times,
-                             @Param("ledgerSn") int ledgerSn);
+                                 @Param("times") int times,
+                                 @Param("ledgerSn") int ledgerSn);
 
     @Update("update zy_ledger_file set deposit=#{deposit}, balance=#{balance}, responce_type=#{restype}, " +
             "total_charge=#{map.total},charge1=#{map.001},charge2=#{map.002}, charge3=#{map.003},charge4=#{map.004}, " +

+ 0 - 2
src/main/java/thyyxxk/webserver/service/yibao/DismissService.java

@@ -7,7 +7,6 @@ import org.springframework.transaction.annotation.Transactional;
 import thyyxxk.webserver.config.exception.BizException;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
-import thyyxxk.webserver.constants.YesOrNo;
 import thyyxxk.webserver.dao.his.yibao.DismissDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.yibao.dismiss.*;
@@ -16,7 +15,6 @@ import thyyxxk.webserver.entity.yibao.patient.Patient;
 import thyyxxk.webserver.service.externalhttp.SiZySrvc;
 import thyyxxk.webserver.utils.*;
 
-import java.math.BigDecimal;
 import java.util.*;
 
 /**