Browse Source

结算计算预交金时只算status=1的

lighter 8 months ago
parent
commit
79f5620e44

+ 0 - 8
src/main/java/thyyxxk/webserver/controller/inpatient/DismissController.java

@@ -1,22 +1,14 @@
 package thyyxxk.webserver.controller.inpatient;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.config.auth.PassToken;
-import thyyxxk.webserver.config.exception.ExceptionEnum;
-import thyyxxk.webserver.constants.sidicts.MedType;
-import thyyxxk.webserver.dao.his.inpatient.PatientDao;
 import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.medicalinsurance.inpatient.ZyPatientInfo;
 import thyyxxk.webserver.entity.inpatient.dismiss.*;
 import thyyxxk.webserver.entity.inpatient.patient.Patient;
-import thyyxxk.webserver.service.medicalinsurance.SiZyService;
 import thyyxxk.webserver.service.inpatient.DismissService;
 import thyyxxk.webserver.utils.ResultVoUtil;
-import thyyxxk.webserver.utils.StringUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
 import java.util.List;

+ 0 - 1
src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiInjuryController.java

@@ -20,7 +20,6 @@ import thyyxxk.webserver.entity.medicalinsurance.setlinfo.FundDetail;
 import thyyxxk.webserver.service.externalhttp.SiInjuryFeeUpld;
 import thyyxxk.webserver.service.externalhttp.SiInjurySystem;
 import thyyxxk.webserver.service.inpatient.DismissService;
-import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
 import java.util.List;

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/inpatient/DismissDao.java

@@ -387,7 +387,7 @@ public interface DismissDao {
 
     @Select("select cast(isnull(sum(depo_amount),0) as varchar(16)) from zy_deposit_file where " +
             "inpatient_no=#{patNo} and admiss_times=#{times} and ledger_sn=#{ledgerSn} and " +
-            "depo_type!='B' and status in (1,2) ")
+            "depo_type!='B' and status=1 ")
     String selectDepositSumamt(@Param("patNo") String patNo,
                                @Param("times") int times,
                                @Param("ledgerSn") int ledgerSn);