jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

住院条码修改

Browse Source
This commit is contained in:
jiangs 2026-01-09 16:58:04 +08:00
parent a2c98a7105
commit 676418446c
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java
View File

@ -522,4 +522,13 @@ public class LisUtil {
// 检查目标字符串是否大于等于start且小于等于end
return target.compareTo(start) >= 0 && target.compareTo(end) <= 0;
}
public static String isBank(Object param){
String s = String.valueOf(param);
if(s.equals("null")){
return "";
}else{
return s;
}
}
}

27
zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.czlis.interfaceCommon.pojo.inter.GetReqInterface;
import com.czlis.interfaceCommon.pojo.inter.SetReqStatus;
import com.czlis.interfaceCommon.utils.CommonUtil;
import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
import com.czlis.interfaceCommon.utils.LisUtil;
import com.czlis.interfaceCommon.utils.ReportUtil;
import com.czlis.zycx.mapper.ZycxMapper;
import com.czlis.zycx.pojo.QuerySqdVO;
@ -21,10 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Slf4j
@Service
@ -54,7 +52,26 @@ public class ZycxServiceImpl implements ZycxService {
webGetBarcode.setQueryType(querySqdVO.getQueryType());
webGetBarcode.setQueryValue(querySqdVO.getQueryValue());
webGetBarcode.setZt(querySqdVO.getZt());
return zycxMapper.getSQDInfo(webGetBarcode);
List<Web_getBarcode> sqdInfoList = zycxMapper.getSQDInfo(webGetBarcode);
//排序
sqdInfoList.sort(new Comparator<Web_getBarcode>() {
@Override
public int compare(Web_getBarcode o1, Web_getBarcode o2) {
String ch1 = LisUtil.isBank(o1.getCh()).trim();
String ch2 = LisUtil.isBank(o2.getCh()).trim();
int i = ch1.compareTo(ch2);
if(i == 0){
Date sqsj1 = o1.getSqsj();
Date sqsj2 = o2.getSqsj();
int i1 = sqsj1.compareTo(sqsj2);
return i1;
}else{
return i;
}
}
});
return sqdInfoList;
}
@Override