Merge branch 'dev-1.1.4' into 'dev-1.1.4'

中药发药问题修改

See merge request hurugang/thmz_system!41

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -589,7 +589,6 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
         YzActOrderCy yzActOrderCy = yzActOrderCyMapper.selectYzActOrderCyByPageNo(pageNo);
         Integer ledgerSn = zyLedgerFileMapper.selectMaxLedgerSn(yzActOrderCy.getInpatientNo(), yzActOrderCy.getAdmissTimes());
         List<YzActOrderCyDetail> yzActOrderCyDetails = yzActOrderCyDetailMapper.selectYzActOrderCyDetail(yzActOrderCy.getOrderNo());
-        List<ZyDetailCharge> zyDetailCharges = zyDetailChargeMapper.selectZyDetailCharge(yzActOrderCy.getInpatientNo(), yzActOrderCy.getAdmissTimes(), ledgerSn);
         BigDecimal multiply = yzActOrderCy.getOrderJe().multiply(BigDecimal.valueOf(yzActOrderCy.getQuantity()));
         ZyActpatient zyActpatient = zyActpatientMapper.selectByInpatientNo(ZyActpatient.ZY_ACTPATIENT, yzActOrderCy.getInpatientNo(), yzActOrderCy.getAdmissTimes());
         String tableName = null != zyActpatient ? ZyActpatient.ZY_ACTPATIENT : ZyActpatient.ZY_INACTPATIENT;
@@ -659,7 +658,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
             ypZyPatient.setGroupNo(yzActOrderCy.getGroupNo());
             ypZyPatient.setSerial(yzActOrderCyDetail.getSerial());
             ypZyPatient.setDoctorName(yzActOrderCy.getDoctorCode());
-            ypZyPatient.setZySerialNo(zyDetailCharges.get(0).getZySerialNo());
+            ypZyPatient.setZySerialNo(zyActpatient.getZySerialNo());
             ypZyPatientMapper.insertYpZyPatient(ypZyPatient);
             if(yzActOrderCy.getSourceFlag() == 1 && isTy == 0){
                 ZyDetailCharge zyDetailChargeNew = new ZyDetailCharge();