|
|
@@ -21,7 +21,7 @@ public class DataTask implements ITask {
|
|
|
public void run() {
|
|
|
// TODO Auto-generated method stub
|
|
|
DataService dService = ServiceFactory.getService(DataService.class);
|
|
|
- JSONArray jsonArray = dService.getExamList(30);
|
|
|
+ JSONArray jsonArray = dService.getExamList(40);
|
|
|
for (Object object : jsonArray) {
|
|
|
JSONObject jsonObject = JSON.parseObject(object.toString());
|
|
|
Record record = Db.use("connected").findFirst("select * from reportinfo where AccessionNumber=?", jsonObject.getString("accession_num"));
|
|
|
@@ -36,15 +36,15 @@ public class DataTask implements ITask {
|
|
|
//报告医生姓名
|
|
|
params.put("report_doctor_name", "");
|
|
|
//报告时间
|
|
|
- params.put("report_datetime", parseStringToDate(record.getStr("PostExamApproveDate")));
|
|
|
+ params.put("report_datetime", parseStringToDate(record.getStr("PostExamApproveDate") + " " + record.getStr("PostExamApproveTime")));
|
|
|
//审核医生姓名
|
|
|
params.put("review_doctor_name", "");
|
|
|
//审核时间
|
|
|
- params.put("review_datetime", parseStringToDate(record.getStr("PostExamApproveDate")));
|
|
|
+ params.put("review_datetime", parseStringToDate(record.getStr("PostExamApproveDate") + " " + record.getStr("PostExamApproveTime")));
|
|
|
//确认医生姓名
|
|
|
params.put("confirm_doctor_name", "");
|
|
|
//确认时间
|
|
|
- params.put("confirm_datetime", parseStringToDate(record.getStr("PostExamApproveDate")));
|
|
|
+ params.put("confirm_datetime", parseStringToDate(record.getStr("PostExamApproveDate") + " " + record.getStr("PostExamApproveTime")));
|
|
|
//意见建议
|
|
|
params.put("impression", record.getStr("ReportResult"));
|
|
|
//影像所见
|
|
|
@@ -83,7 +83,7 @@ public class DataTask implements ITask {
|
|
|
if (dateStr == null) {
|
|
|
return "";
|
|
|
}
|
|
|
- SimpleDateFormat sdf= new SimpleDateFormat("yyyy/MM/dd");
|
|
|
+ SimpleDateFormat sdf= new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
|
|
Date date = null;
|
|
|
String dateString = null;
|
|
|
try {
|
