Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

src/main/java/cn/hnthyy/thmz/controller/yf/YfIncomingRecordsController.java

@@ -61,7 +61,7 @@ public class YfIncomingRecordsController {
                 return resultMap;
             }
             List<YpZdDict> list = ypZdDictService.queryYpBySearchText(searchTextDrug.toUpperCase());
-            for (int i = 0; i < 30; i++) {
+            for (int i = 0; i < list.size() && i< 30; i++) {
                 YpZdDict ypZdDict = list.get(i);
                 ypZdDict.setManufactoryName(ypZdManufactoryService.queryYpZdManufactoryByCode(ypZdDict.getManuCode()));
             }

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

@@ -50,7 +50,7 @@ public class YfSpecialMarkServiceImpl implements YfSpecialMarkService {
     public List<YpZdBaseYfSpecialVo> queryYpSpecialMark(String groupNo, String searchText) {
         List<YpZdBaseYfSpecialVo> ypZdBaseYfSpecialVos = new ArrayList<>();
         List<YpZdDict> ypZdDicts = ypZdDictMapper.selectYpBySearchText(searchText);
-        for (int j = 0; j < 30; j++) {
+        for (int j = 0; j < ypZdDicts.size() && j < 30; j++) {
             YpZdDict ypZdDict = ypZdDicts.get(j);
             YpZdBaseYfSpecialVo ypZdBaseYfSpecialVo = new YpZdBaseYfSpecialVo();
             YpBaseYf ypBaseYf = ypBaseYfMapper.selectYpBaseYf(ypZdDict.getCode(), ypZdDict.getSerial(), groupNo,null);

src/main/java/cn/hnthyy/thmz/service/impl/his/yp/YpZdDictServiceImpl.java

@@ -92,7 +92,7 @@ public class YpZdDictServiceImpl implements YpZdDictService {
     public List<YpZdDictVo> queryYpZdDictByLike(String searchText, String groupNo) {
         List<YpZdDict> ypZdDicts = ypZdDictMapper.selectYpZdDictByLike(searchText);
         ArrayList<YpZdDictVo> ypZdDictVos = new ArrayList<>();
-        for (int i = 0; i < 30; i++) {
+        for (int i = 0; i < ypZdDicts.size() && i < 30; i++) {
             YpZdDict yp = ypZdDicts.get(i);
             YpZdDictVo vo = new YpZdDictVo();
             BeanUtils.copyProperties(yp,vo);

src/main/java/cn/hnthyy/thmz/service/impl/thmz/DispensingSocketServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hnthyy.thmz.service.his.mz.MzChargeDetailService;
 import cn.hnthyy.thmz.service.his.mz.MzPatientMiService;
 import cn.hnthyy.thmz.service.thmz.DispensingSocketService;
 import cn.hnthyy.thmz.socket.PrescriptionPrintSocket;
+import lombok.extern.slf4j.Slf4j;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -15,7 +16,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
-
+@Slf4j
 @Service
 public class DispensingSocketServiceImpl implements DispensingSocketService {
     @Autowired
@@ -69,6 +70,7 @@ public class DispensingSocketServiceImpl implements DispensingSocketService {
 
     @Override
     public int sendToMedicineAndDispensing(String patientId, int times) {
+        log.info("缴费成功,通知药房，门诊号：{}，就诊次数：{}", patientId, times);
         //查询缴费药品的发药药房
         MzChargeDetail mzChargeDetail = new MzChargeDetail();
         mzChargeDetail.setPatientId(patientId);