|
@@ -190,7 +190,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
|
|
|
|
|
|
userInfo.setJobStyle(jobStyle);
|
|
userInfo.setJobStyle(jobStyle);
|
|
userInfo.setFocusCrowdStyle(focusCrowdStyle);
|
|
userInfo.setFocusCrowdStyle(focusCrowdStyle);
|
|
- userInfo.setDetectionFrequency(detectionNumber + "/" + detectionScope);
|
|
|
|
|
|
+ userInfo.setDetectionFrequency(detectionNumber + "<br>" + detectionScope);
|
|
userInfo.setDetectionNumber(detectionNumber);
|
|
userInfo.setDetectionNumber(detectionNumber);
|
|
userInfo.setDetectionScope(detectionScope);
|
|
userInfo.setDetectionScope(detectionScope);
|
|
userInfo.setStartTime(startTime);
|
|
userInfo.setStartTime(startTime);
|
|
@@ -206,17 +206,17 @@ public class UserInfoServiceImpl implements IUserInfoService {
|
|
if (userInfo.getIdCard().equals(odsQssHsjcxx.getSfzhm())) {
|
|
if (userInfo.getIdCard().equals(odsQssHsjcxx.getSfzhm())) {
|
|
|
|
|
|
if (StringUtils.isNotEmpty(collectPlace.toString())) {
|
|
if (StringUtils.isNotEmpty(collectPlace.toString())) {
|
|
- collectPlace.append("/");
|
|
|
|
|
|
+ collectPlace.append("<br>");
|
|
}
|
|
}
|
|
collectPlace.append(odsQssHsjcxx.getJcdd());
|
|
collectPlace.append(odsQssHsjcxx.getJcdd());
|
|
|
|
|
|
if (StringUtils.isNotEmpty(nucleicCollectTime.toString())) {
|
|
if (StringUtils.isNotEmpty(nucleicCollectTime.toString())) {
|
|
- nucleicCollectTime.append("/");
|
|
|
|
|
|
+ nucleicCollectTime.append("<br>");
|
|
}
|
|
}
|
|
nucleicCollectTime.append(odsQssHsjcxx.getCjsj());
|
|
nucleicCollectTime.append(odsQssHsjcxx.getCjsj());
|
|
|
|
|
|
if (StringUtils.isNotEmpty(nucleicResultsTime.toString())) {
|
|
if (StringUtils.isNotEmpty(nucleicResultsTime.toString())) {
|
|
- nucleicResultsTime.append("/");
|
|
|
|
|
|
+ nucleicResultsTime.append("<br>");
|
|
}
|
|
}
|
|
nucleicResultsTime.append(odsQssHsjcxx.getJgcjss());
|
|
nucleicResultsTime.append(odsQssHsjcxx.getJgcjss());
|
|
|
|
|
|
@@ -230,7 +230,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
|
|
userInfo.setCollectPlace(collectPlace.toString());
|
|
userInfo.setCollectPlace(collectPlace.toString());
|
|
userInfo.setNucleicCollectTime(nucleicCollectTime.toString());
|
|
userInfo.setNucleicCollectTime(nucleicCollectTime.toString());
|
|
userInfo.setNucleicResultsTime(nucleicResultsTime.toString());
|
|
userInfo.setNucleicResultsTime(nucleicResultsTime.toString());
|
|
- userInfo.setDetectionProgress(index + "/" + detectionNumber);
|
|
|
|
|
|
+ userInfo.setDetectionProgress(index + "<br>" + detectionNumber);
|
|
|
|
|
|
|
|
|
|
if (bl) {
|
|
if (bl) {
|