单价为0的不再变成0.01

pom.xml

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

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiMzDao.java

@@ -101,7 +101,7 @@ public interface SiMzDao {
     void deleteAllReceipts(String patNo, int times);
 
     @Select("select rtrim(patient_id) as patNo,times,charge_date,receipt_no, " +
-            "chargeFee=(select cast(sum(isnull(unit_price,0.01)*isnull(drug_win,1)*isnull(quantity,1)) as decimal(16,2))), " +
+            "chargeFee=(select cast(sum(isnull(unit_price,0)*isnull(drug_win,1)*isnull(quantity,1)) as decimal(16,2))), " +
             "status=(select count(1) from t_mt_receipt d where d.patient_id=a.patient_id and d.times=a.times and d.receipt_no=a.receipt_no) " +
             "from mz_charge_detail a where a.patient_id=#{patNo} and a.charge_date>=#{start} and a.charge_date<=#{end} " +
             "and pay_mark=0 and confirm_flag!=4 and isnull(cash_id,'')!='99998' group by patient_id, times, charge_date,receipt_no order by times")

src/main/java/thyyxxk/webserver/entity/makedbzfees/MzChargeDetail.java

@@ -37,9 +37,6 @@ public class MzChargeDetail {
 
     public BigDecimal getChargeFee() {
         BigDecimal price= (getUnitPrice() == null ? BigDecimal.ZERO : getUnitPrice()).setScale(2, BigDecimal.ROUND_HALF_UP);
-        if(BigDecimal.ZERO.compareTo(price)==0){
-            price=BigDecimal.valueOf(0.01);
-        }
         return price.multiply(BigDecimal.valueOf(getQuantity() == null ? 1D : getQuantity())).multiply(BigDecimal.valueOf(getDrugWin() == null ? 1D : getDrugWin()));
     }
 }

src/main/java/thyyxxk/webserver/entity/markmtfees/MzReceipt.java

@@ -140,9 +140,6 @@ public class MzReceipt {
 
     public BigDecimal getPrice() {
         BigDecimal price= (getUnitPrice() == null ? BigDecimal.ZERO : getUnitPrice()).setScale(2, RoundingMode.HALF_UP);
-        if(BigDecimal.ZERO.compareTo(price)==0){
-            price=BigDecimal.valueOf(0.01);
-        }
         return price.multiply(BigDecimal.valueOf(getDrugWin() == null ? 1D : getDrugWin()));
     }
 

src/main/java/thyyxxk/webserver/service/executeItem/StoreProcedureConvertService.java

@@ -166,10 +166,7 @@ public class StoreProcedureConvertService {
                     zyTmpReceiveData.setWardCode(zkWard);
                 }
             }
-
         }
-
-
     }
 
     /**

src/main/java/thyyxxk/webserver/service/inpatient/dismiss/ReceiveDrugService.java

@@ -1,81 +0,0 @@
-package thyyxxk.webserver.service.inpatient.dismiss;
-
-import org.springframework.stereotype.Service;
-import thyyxxk.webserver.config.exception.BizException;
-import thyyxxk.webserver.dao.his.inpatient.dismiss.ReceiveDrugDao;
-import thyyxxk.webserver.entity.inpatient.dismiss.SnAndResponce;
-import thyyxxk.webserver.entity.inpatient.dismiss.ZyInit;
-import thyyxxk.webserver.entity.inpatient.dismiss.ZyTmpReceiveData;
-import thyyxxk.webserver.utils.StringUtil;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.Date;
-import java.util.List;
-
-@Service
-public class ReceiveDrugService {
-    private final ReceiveDrugDao dao;
-
-    public ReceiveDrugService(ReceiveDrugDao dao) {
-        this.dao = dao;
-    }
-
-    public void execute(String inNo, int times) {
-        String vNo = inNo.startsWith("$") ? inNo.replace("$", "") : inNo;
-        int inHospitalState = dao.getInHospitalState(vNo, times);
-        String actTable = inHospitalState == 1 ? "zy_actpatient" : "zy_inactpatient";
-        SnAndResponce snAndResponce = dao.getSnAndResponce(vNo, times, actTable);
-        if (null == snAndResponce || null == snAndResponce.getSn()) {
-            throw new BizException("获取患者账页失败，请联系管理员。");
-        }
-        int sn = snAndResponce.getSn();
-        Date accountDate = dao.getAccountDate(vNo, times, sn);
-        String chgStatus = null == accountDate ? "2" : "1";
-        ZyInit zyInit = dao.getZyInit(inNo, times);
-        zyInit.setChgStatus(chgStatus);
-        List<ZyTmpReceiveData> zyTmpReceiveDataList = dao.getTmpReceiveData(zyInit);
-        dao.updateYpZyPatient(inNo, times);
-        if (zyTmpReceiveDataList.isEmpty()) {
-            checkInpatientOweLimit(inNo, times, accountDate);
-            return;
-        }
-        int maxDetailSn = dao.getMaxDetailSn(vNo, times, sn) + 1;
-        for (int i = 0; i < zyTmpReceiveDataList.size(); i++) {
-            ZyTmpReceiveData item = zyTmpReceiveDataList.get(i);
-            item.setLedgerSn(sn);
-            item.setDetailSn(maxDetailSn + i);
-            if (StringUtil.isBlank(item.getInfantFlag())) {
-                item.setInfantFlag("0");
-            }
-            if (StringUtil.isBlank(item.getSelfFlag())) {
-                item.setSelfFlag("0");
-            }
-            if (StringUtil.isBlank(item.getSeparateFlag())) {
-                item.setSeparateFlag("0");
-            }
-            if (StringUtil.isBlank(item.getSuppressFlag())) {
-                item.setSuppressFlag("0");
-            }
-            BigDecimal price = item.getChargeFee().setScale(2, RoundingMode.HALF_UP);
-            if (price.compareTo(new BigDecimal("0.01")) < 0) {
-                price = new BigDecimal("0.01");
-            }
-            item.setChargeFee(price.multiply(item.getOrderCount()).setScale(2, RoundingMode.HALF_UP));
-        }
-        dao.insertZyChargeFee(zyTmpReceiveDataList);
-        checkInpatientOweLimit(inNo, times, accountDate);
-    }
-
-    private void checkInpatientOweLimit(String inNo, int times, Date accountDate) {
-        if (null != accountDate) {
-            return;
-        }
-        int oweLimit = dao.getOweLimit(inNo, times);
-        if (oweLimit <= 0) {
-            dao.updateInterCode9(inNo, times);
-        } else {
-            dao.updateInterCode0(inNo, times);
-        }
-    }
-}