|
|
@@ -591,18 +591,19 @@ public class NursingManagementService {
|
|
|
List<YzTemperature> result = new ArrayList<>();
|
|
|
int subLength= getSubLength(yzTemperature.getHldType());
|
|
|
for (YzTemperature item : collect) {
|
|
|
- if (item.getOtherInfo() != null && calcuLength(item.getOtherInfo()) > subLength) {
|
|
|
- List<String> infos = subStringBytes(item.getOtherInfo(), subLength);
|
|
|
- item.setOtherInfo(infos.get(0));
|
|
|
- result.add(item);
|
|
|
- for (int i = 1; i < infos.size(); i++) {
|
|
|
- YzTemperature tempTemperature = new YzTemperature();
|
|
|
- tempTemperature.setOtherInfo(infos.get(i));
|
|
|
- result.add(tempTemperature);
|
|
|
- }
|
|
|
- } else {
|
|
|
- result.add(item);
|
|
|
- }
|
|
|
+ result.add(item);
|
|
|
+// if (item.getOtherInfo() != null && calcuLength(item.getOtherInfo()) > subLength) {
|
|
|
+// List<String> infos = subStringBytes(item.getOtherInfo(), subLength);
|
|
|
+// item.setOtherInfo(infos.get(0));
|
|
|
+// result.add(item);
|
|
|
+// for (int i = 1; i < infos.size(); i++) {
|
|
|
+// YzTemperature tempTemperature = new YzTemperature();
|
|
|
+// tempTemperature.setOtherInfo(infos.get(i));
|
|
|
+// result.add(tempTemperature);
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// result.add(item);
|
|
|
+// }
|
|
|
}
|
|
|
page.setRecords(result);
|
|
|
return page;
|
|
|
@@ -691,28 +692,29 @@ public class NursingManagementService {
|
|
|
YzTemperature yzTemperature = new YzTemperature();
|
|
|
BeanUtil.copyProperties(query,yzTemperature);
|
|
|
//兼容老系统 将措施 字符大于36个分成几条
|
|
|
- if(StrUtil.isNotBlank(yzTemperature.getOtherInfo()) && calcuLength(yzTemperature.getOtherInfo()) >36){
|
|
|
- List<String> strList = subStringBytes(yzTemperature.getOtherInfo(),36);
|
|
|
- for (int i = 0; i < strList.size(); i++) {
|
|
|
- YzTemperature temp = new YzTemperature();
|
|
|
- if(i == 0){
|
|
|
- BeanUtil.copyProperties(yzTemperature,temp);
|
|
|
- }else {
|
|
|
- temp.setUserid(yzTemperature.getUserid());
|
|
|
- temp.setInputTime(yzTemperature.getInputTime());
|
|
|
- temp.setInpatientNo(yzTemperature.getInpatientNo());
|
|
|
- temp.setAdmissTimes(yzTemperature.getAdmissTimes());
|
|
|
- temp.setWard( userCache.get(code).getDeptCode());
|
|
|
- temp.setRecDate(yzTemperature.getRecDate());
|
|
|
- temp.setRecTime(yzTemperature.getRecTime());
|
|
|
- }
|
|
|
- temp.setScdFlag(0);
|
|
|
- temp.setOtherInfo(strList.get(i));
|
|
|
- yzTemperatureMapper.insert(temp);
|
|
|
- }
|
|
|
- }else {
|
|
|
- yzTemperatureMapper.insert(yzTemperature);
|
|
|
- }
|
|
|
+// if(StrUtil.isNotBlank(yzTemperature.getOtherInfo()) && calcuLength(yzTemperature.getOtherInfo()) >36){
|
|
|
+// List<String> strList = subStringBytes(yzTemperature.getOtherInfo(),36);
|
|
|
+// for (int i = 0; i < strList.size(); i++) {
|
|
|
+// YzTemperature temp = new YzTemperature();
|
|
|
+// if(i == 0){
|
|
|
+// BeanUtil.copyProperties(yzTemperature,temp);
|
|
|
+// }else {
|
|
|
+// temp.setUserid(yzTemperature.getUserid());
|
|
|
+// temp.setInputTime(yzTemperature.getInputTime());
|
|
|
+// temp.setInpatientNo(yzTemperature.getInpatientNo());
|
|
|
+// temp.setAdmissTimes(yzTemperature.getAdmissTimes());
|
|
|
+// temp.setWard( userCache.get(code).getDeptCode());
|
|
|
+// temp.setRecDate(yzTemperature.getRecDate());
|
|
|
+// temp.setRecTime(yzTemperature.getRecTime());
|
|
|
+// }
|
|
|
+// temp.setScdFlag(0);
|
|
|
+// temp.setOtherInfo(strList.get(i));
|
|
|
+// yzTemperatureMapper.insert(temp);
|
|
|
+// }
|
|
|
+// }else {
|
|
|
+// yzTemperatureMapper.insert(yzTemperature);
|
|
|
+// }
|
|
|
+ yzTemperatureMapper.insert(yzTemperature);
|
|
|
//修正时间 1900-01-01 08:00:00 转date 有五分钟误差 修改下
|
|
|
yzTemperatureMapper.updateRecTime(query,StrUtil.format("1900-01-01 {}",query.getToStringRecTime()));
|
|
|
//保存过敏信息
|
