|
|
|
@ -437,10 +437,11 @@ public class BgtsServiceImpl implements IBgtsService {
|
|
|
|
|
String collectStartDate = String.valueOf(FileUtils.getJsonByName("collectStartDate"))+"\t00:00:00";
|
|
|
|
|
String collectEndDate = String.valueOf(FileUtils.getJsonByName("collectEndDate"))+"\t23:59:59";
|
|
|
|
|
String collectorid = String.valueOf(FileUtils.getJsonByName("collectorid"));
|
|
|
|
|
String isDead = String.valueOf(FileUtils.getJsonByName("isDead"));
|
|
|
|
|
CountDownLatch countDownLatch = new CountDownLatch(1);
|
|
|
|
|
threadPoolExecutor.execute(() -> {
|
|
|
|
|
try {
|
|
|
|
|
collectByDate(collectStartDate, collectEndDate, collectorid);
|
|
|
|
|
collectByDate(collectStartDate, collectEndDate, collectorid,isDead);
|
|
|
|
|
}catch (Exception e) {
|
|
|
|
|
logger.info("按需采集出错{}",e.getMessage());
|
|
|
|
|
}
|
|
|
|
@ -480,7 +481,7 @@ public class BgtsServiceImpl implements IBgtsService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void collectByDate(String startDate, String endDate, String collectorId) {
|
|
|
|
|
public void collectByDate(String startDate, String endDate, String collectorId,String isDead) {
|
|
|
|
|
logger.info("按需采集开始----------开始时间---" + startDate + "------结束时间---" + endDate);
|
|
|
|
|
//页码
|
|
|
|
|
int startrow;
|
|
|
|
@ -490,7 +491,13 @@ public class BgtsServiceImpl implements IBgtsService {
|
|
|
|
|
try{
|
|
|
|
|
List<Map> patientIds;
|
|
|
|
|
for (startrow = 0; ; startrow += 10) {
|
|
|
|
|
patientIds = afCollectTaskService.getjzhByDate(startDate, endDate, startrow, endrow);
|
|
|
|
|
if (("1").equals(isDead)){
|
|
|
|
|
patientIds=afCollectTaskService.getjzhByDateAndIsDead(startDate, endDate, startrow, endrow);
|
|
|
|
|
logger.info("按需采集死亡患者----");
|
|
|
|
|
}else {
|
|
|
|
|
patientIds = afCollectTaskService.getjzhByDate(startDate, endDate, startrow, endrow);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (null == patientIds || patientIds.size() <= 0) {
|
|
|
|
|
logger.info("未查询到按需采集患者!");
|
|
|
|
|
break;
|
|
|
|
@ -1142,11 +1149,20 @@ public class BgtsServiceImpl implements IBgtsService {
|
|
|
|
|
key = new String[2];
|
|
|
|
|
examNo = examInfo.element(String.valueOf(FileUtils.getJsonByName("examNo")));
|
|
|
|
|
List<Element> examItemInfo = examInfo.elements("ExamItemInfo");
|
|
|
|
|
for (Element element1 : examItemInfo) {
|
|
|
|
|
if (examNo != null) {
|
|
|
|
|
key[0] = examNo.getText();
|
|
|
|
|
if (examItemInfo.size()>1){
|
|
|
|
|
for (Element element1 : examItemInfo) {
|
|
|
|
|
if (examNo != null) {
|
|
|
|
|
key[0] = examNo.getText();
|
|
|
|
|
}
|
|
|
|
|
key[1] = element1.element(String.valueOf(FileUtils.getJsonByName("examItemName"))).getText();
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
for (Element element1 : examItemInfo) {
|
|
|
|
|
if (examNo != null) {
|
|
|
|
|
key[0] = examNo.getText();
|
|
|
|
|
}
|
|
|
|
|
key[1] = element1.element(String.valueOf(FileUtils.getJsonByName("examItemName"))).getText();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
exams.add(key);
|
|
|
|
|
}
|
|
|
|
|