|
|
@ -20,6 +20,7 @@ import com.yihu.jw.utils.JSONUtils;
|
|
|
import com.yihu.jw.utils.StringUtil;
|
|
|
import com.yihu.jw.utils.encode.AESUtils;
|
|
|
import com.yihu.mysql.query.BaseJpaService;
|
|
|
import com.ylzinfo.ehc.common.utils.DateUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@ -451,7 +452,7 @@ public class YkyyInternetService extends BaseJpaService<InternetUpErrorLogDO, In
|
|
|
jb.put("cd_org", orgCode);
|
|
|
jb.put("cd_area", orgArea);
|
|
|
jb.put("cd_orgSub", orgSub);
|
|
|
jb.put("reg_time", info.get("date") == null?"1900-01-01":info.get("date"));
|
|
|
jb.put("reg_time", info.get("date") == null?"1900-01-01": DateUtil.dateToStrLong((Date)info.get("date")));
|
|
|
jb.put("fg_visit", fgConvent(info.get("status") == null?"-1":info.get("status").toString()));
|
|
|
jb.put("reg_dep_code", info.get("dept") == null?"0":info.get("dept"));
|
|
|
jb.put("reg_dep_name", info.get("dept_name") == null?"0":info.get("dept_name"));
|
|
|
@ -817,7 +818,7 @@ public class YkyyInternetService extends BaseJpaService<InternetUpErrorLogDO, In
|
|
|
jb.put("pt_no", info.get("patientName")== null? "0":info.get("patientName"));
|
|
|
jb.put("pt_age", IdCardUtil.getAgeForIdcard(info.get("patIdCard").toString()));
|
|
|
jb.put("cost_type", "");
|
|
|
jb.put("pt_birthdate", info.get("birthday") == null? "":info.get("birthday").toString());
|
|
|
jb.put("pt_birthdate", info.get("birthday") == null? "":DateUtil.dateToStrShort((Date)info.get("birthday")));
|
|
|
jb.put("ge_code", info.get("sex")== null? "0":info.get("sex"));
|
|
|
jb.put("pt_tel",info.get("mobile") == null ? "0":info.get("mobile"));
|
|
|
jb.put("card_type", "1");
|
|
|
@ -838,7 +839,7 @@ public class YkyyInternetService extends BaseJpaService<InternetUpErrorLogDO, In
|
|
|
logger.error(e.toString());
|
|
|
}
|
|
|
|
|
|
/*if(!errorFlag){
|
|
|
if(!errorFlag){
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
jsonArray.add(jb);
|
|
|
String str = jb.toJSONString();
|
|
|
@ -851,7 +852,7 @@ public class YkyyInternetService extends BaseJpaService<InternetUpErrorLogDO, In
|
|
|
saveErrorLog(upid,"8",info.get("id").toString(),res,2);
|
|
|
error++;
|
|
|
}
|
|
|
}*/
|
|
|
}
|
|
|
}
|
|
|
/*
|
|
|
String resInfo = "此次共上传：" + total + "条数据，其中成功 ：" + success + "条，上传失败 ： " + error + "条。格式错误："+dataError+"条。";
|
