|
@@ -498,8 +498,9 @@ public class NursingManagementService {
|
|
|
if(yzTemperature.getPrintFlag() !=null && yzTemperature.getPrintFlag()){
|
|
|
List<YzTemperature> result = new ArrayList<>();
|
|
|
for (YzTemperature item : collect) {
|
|
|
- if(item.getOtherInfo() !=null && item.getOtherInfo().length()>18){
|
|
|
- List<String> infos = usingSubstringMethod(item.getOtherInfo(), 18);
|
|
|
+ int subLength= getSubLength(yzTemperature.getHldType());
|
|
|
+ if(item.getOtherInfo() !=null && item.getOtherInfo().length()>subLength){
|
|
|
+ List<String> infos = usingSubstringMethod(item.getOtherInfo(), subLength);
|
|
|
item.setOtherInfo(infos.get(0));
|
|
|
result.add(item);
|
|
|
for (int i = 1; i <infos.size() ; i++) {
|
|
@@ -522,6 +523,23 @@ public class NursingManagementService {
|
|
|
page.setRecords(new ArrayList<>());
|
|
|
return page;
|
|
|
}
|
|
|
+ /**
|
|
|
+ * @description:获取分段
|
|
|
+ * @author: lihong
|
|
|
+ * @date: 2023/9/1 9:14
|
|
|
+ * @param: hldType
|
|
|
+ * @return: int
|
|
|
+ **/
|
|
|
+ private int getSubLength(String hldType) {
|
|
|
+ int result = 18;
|
|
|
+ if ("2".equals(hldType)) {
|
|
|
+ result = 16;
|
|
|
+ } else if ("6".equals(hldType)) {
|
|
|
+ result = 14;
|
|
|
+ }
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* @description:获取医嘱 转科 出院 下拉框
|
|
|
* @author: lihong
|
|
@@ -601,6 +619,7 @@ public class NursingManagementService {
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
public ResultVo<YzTemperature> queryScdYzTemperature(YzTemperatureVO query) {
|
|
|
AssertUtil.isnotBlank(query.getRecTime(),"时间不能为空!");
|
|
|
QueryWrapper queryWrapper = getQueryWrapper(query);
|