|
@@ -70,6 +70,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
|
|
|
@Autowired
|
|
|
private AHomePageFacade aHomePageFacade;
|
|
|
+
|
|
|
+ public static final Map<String,String> CITY_MAP = MapUtil.getMap("cityCode.json");
|
|
|
/**
|
|
|
* 终末质控-同步前一天的病历记录
|
|
|
*/
|
|
@@ -279,24 +281,56 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
aHomePageVO.setFileCode(paramsObj.getString("病案号"));
|
|
|
aHomePageVO.setName(paramsObj.getString("姓名"));
|
|
|
aHomePageVO.setSex(paramsObj.getString("性别"));
|
|
|
- aHomePageVO.setBirthday(paramsObj.getString("出生日期").replace("年","-").replace("月","-").replace("日","-"));
|
|
|
- aHomePageVO.setAge(paramsObj.getString("年龄新"));//待定
|
|
|
- aHomePageVO.setAgeUnit("");//待定
|
|
|
+ if(StringUtil.isNotEmpty(paramsObj.getString("出生日期").replaceAll("[\u4e00-\u9fa5]","").trim())){
|
|
|
+ aHomePageVO.setBirthday(paramsObj.getString("出生日期").replaceAll("[\u4e00-\u9fa5]","-"));
|
|
|
+ }
|
|
|
+ aHomePageVO.setAge(paramsObj.getString("新生儿年龄").replaceAll("[\u4e00-\u9fa5]",""));
|
|
|
+ if(paramsObj.getString("新生儿年龄").contains("天")){
|
|
|
+ aHomePageVO.setAgeUnit("天");
|
|
|
+ }else if(paramsObj.getString("新生儿年龄").contains("月")){
|
|
|
+ aHomePageVO.setAgeUnit("月");
|
|
|
+ }else {
|
|
|
+ aHomePageVO.setAgeUnit("岁");
|
|
|
+ }
|
|
|
aHomePageVO.setNationality(paramsObj.getString("国籍"));
|
|
|
- aHomePageVO.setNewbornMonth("");//待定
|
|
|
- aHomePageVO.setNewbornDay("");//待定
|
|
|
aHomePageVO.setNewbornWeight(paramsObj.getString("新生儿出生体重"));
|
|
|
- aHomePageVO.setNewbornBehospitalWeight("");//待定
|
|
|
- aHomePageVO.setBornAddress("");//待定
|
|
|
- aHomePageVO.setBornPlace(paramsObj.getString("籍贯_市"));//待定
|
|
|
+ //aHomePageVO.setNewbornBehospitalWeight("");
|
|
|
+ String[] provinceList = paramsObj.getString("省").split(" ");
|
|
|
+ String[] cityList = paramsObj.getString("市").split(" ");
|
|
|
+ String[] areaList = paramsObj.getString("县").split(" ");
|
|
|
+ if(provinceList.length > 0){
|
|
|
+ if(provinceList[0].length() > 1){
|
|
|
+ aHomePageVO.setBornAddress(CITY_MAP.get(provinceList[0]) == null ? "" : CITY_MAP.get(provinceList[0]));
|
|
|
+ }
|
|
|
+ if(provinceList[1].length() > 1){
|
|
|
+ aHomePageVO.setResidenceAddress(CITY_MAP.get(provinceList[1]) == null ? "" : CITY_MAP.get(provinceList[1]));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(cityList.length > 0){
|
|
|
+ if(cityList[0].length() > 1){
|
|
|
+ aHomePageVO.setBornAddress(aHomePageVO.getBornAddress() + (CITY_MAP.get(cityList[0]) == null ? "" : CITY_MAP.get(cityList[0])));
|
|
|
+ }
|
|
|
+ if(cityList[1].length() > 1){
|
|
|
+ aHomePageVO.setResidenceAddress(aHomePageVO.getResidenceAddress() + (CITY_MAP.get(cityList[1]) == null ? "" : CITY_MAP.get(cityList[1])));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(areaList.length > 0){
|
|
|
+ if(areaList[0].length() > 1){
|
|
|
+ aHomePageVO.setBornAddress(aHomePageVO.getBornAddress() + (CITY_MAP.get(areaList[0]) == null ? "" : CITY_MAP.get(areaList[0])));
|
|
|
+ }
|
|
|
+ if(areaList[1].length() > 1){
|
|
|
+ aHomePageVO.setResidenceAddress(aHomePageVO.getResidenceAddress() + (CITY_MAP.get(areaList[1]) == null ? "" : CITY_MAP.get(areaList[1])));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ aHomePageVO.setResidenceAddress(aHomePageVO.getResidenceAddress()+paramsObj.getString("户口地址其它"));
|
|
|
+ aHomePageVO.setBornPlace(CITY_MAP.get(paramsObj.getString("籍贯_省")) + CITY_MAP.get(paramsObj.getString("籍贯_市")));
|
|
|
aHomePageVO.setNation(paramsObj.getString("民族"));
|
|
|
aHomePageVO.setIdentityCardNo(paramsObj.getString("身份证号"));
|
|
|
aHomePageVO.setJobType(paramsObj.getString("职业"));
|
|
|
aHomePageVO.setMarriage(paramsObj.getString("婚姻"));//待定
|
|
|
- aHomePageVO.setCurAddress(paramsObj.getString("现住址_县"));
|
|
|
+ aHomePageVO.setCurAddress(CITY_MAP.get(paramsObj.getString("现住址_省"))+CITY_MAP.get(paramsObj.getString("现住址_市"))+CITY_MAP.get(paramsObj.getString("现住址_县"))+paramsObj.getString("现住址其它"));
|
|
|
aHomePageVO.setCurPhone(paramsObj.getString("现住址电话"));
|
|
|
aHomePageVO.setCurPostCode(paramsObj.getString("现住址邮编"));
|
|
|
- aHomePageVO.setResidenceAddress("");//待定
|
|
|
aHomePageVO.setResidencePostCode(paramsObj.getString("户口地址邮编"));
|
|
|
aHomePageVO.setWorkAddress(paramsObj.getString("工作单位"));
|
|
|
aHomePageVO.setWorkPhone(paramsObj.getString("工作单位电话"));
|
|
@@ -305,14 +339,20 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
aHomePageVO.setContactRelation(paramsObj.getString("联系人关系"));
|
|
|
aHomePageVO.setContactAddress(paramsObj.getString("联系人地址"));
|
|
|
aHomePageVO.setContactPhone(paramsObj.getString("联系人电话"));
|
|
|
- aHomePageVO.setBehospitalWay(paramsObj.getString("入院途径"));
|
|
|
- aHomePageVO.setBehospitalDate(paramsObj.getString("入院时间"));//待定 2020年12月15日 09时56分
|
|
|
+ if(StringUtil.isNotBlank(paramsObj.getString("入院途径"))){
|
|
|
+ aHomePageVO.setBehospitalWay(paramsObj.getString("入院途径").split(" ")[0]);
|
|
|
+ }
|
|
|
+ if(YWDateUtils.isDate(paramsObj.getString("入院时间"),"yyyy年MM月dd日 HH时mm分")){
|
|
|
+ aHomePageVO.setBehospitalDate(DateUtil.format(YWDateUtils.parseDateTime(paramsObj.getString("入院时间")),DateUtil.DATE_TIME_FORMAT));
|
|
|
+ }
|
|
|
aHomePageVO.setBehospitalDept(paramsObj.getString("入院科别"));
|
|
|
aHomePageVO.setBehospitalWard(paramsObj.getString("入院病房"));
|
|
|
//aHomePageVO.setBehospitalBedId();
|
|
|
//aHomePageVO.setBehospitalBedCode();
|
|
|
aHomePageVO.setChangeDept(paramsObj.getString("转科科别"));
|
|
|
- aHomePageVO.setLeaveHospitalDate(paramsObj.getString("出院时间"));//待定
|
|
|
+ if(YWDateUtils.isDate(paramsObj.getString("出院时间"),"yyyy年MM月dd日 HH时mm分")){
|
|
|
+ aHomePageVO.setLeaveHospitalDate(DateUtil.format(YWDateUtils.parseDateTime(paramsObj.getString("出院时间")),DateUtil.DATE_TIME_FORMAT));
|
|
|
+ }
|
|
|
aHomePageVO.setLeaveHospitalDept(paramsObj.getString("出院科别"));
|
|
|
aHomePageVO.setLeaveHospitalWard(paramsObj.getString("出院病房"));
|
|
|
//aHomePageVO.setLeaveHospitalBedId();
|
|
@@ -401,7 +441,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
AHomeOperationVO aHomeOperationVO = new AHomeOperationVO();
|
|
|
aHomeOperationVO.setHomePageId(behospitalCode);
|
|
|
aHomeOperationVO.setHospitalId(hospitalId);
|
|
|
- //aHomeOperationVO.setOperationOrderNo();//非空字段
|
|
|
+ aHomeOperationVO.setOperationOrderNo(String.valueOf(i));
|
|
|
aHomeOperationVO.setOperationDate(((JSONArray) operationList).getJSONObject(i).getString("手术日期"));//待定2020-08-11
|
|
|
aHomeOperationVO.setOperationCode(((JSONArray) operationList).getJSONObject(i).getString("手术编码"));
|
|
|
aHomeOperationVO.setOperationDoctorId(((JSONArray) operationList).getJSONObject(i).getString("手术医生ID"));
|
|
@@ -416,6 +456,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
|
|
|
operationInfo.add(aHomeOperationVO);
|
|
|
}
|
|
|
+ aHomePageVO.setOperations(operationInfo);
|
|
|
}
|
|
|
List<Object> diagnoseList = paramsObj.getJSONArray("出院诊断");
|
|
|
if(diagnoseList.size() > 0){
|
|
@@ -424,7 +465,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
AHomeDiagnoseVO aHomeDiagnoseVO = new AHomeDiagnoseVO();
|
|
|
aHomeDiagnoseVO.setHomePageId(behospitalCode);
|
|
|
aHomeDiagnoseVO.setHospitalId(hospitalId);
|
|
|
- //aHomeDiagnoseVO.setDiagnoseOrderNo();//非空字段
|
|
|
+ aHomeDiagnoseVO.setDiagnoseOrderNo(String.valueOf(i));//非空字段
|
|
|
aHomeDiagnoseVO.setDiagnoseType(i == 0 ? "主要诊断" : "其他诊断");
|
|
|
//aHomeDiagnoseVO.setDiagnoseTypeShort();
|
|
|
aHomeDiagnoseVO.setDiagnoseName(((JSONArray) operationList).getJSONObject(i).getString("诊断名称"));
|
|
@@ -434,6 +475,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
aHomeDiagnoseVO.setIcdCode(((JSONArray) operationList).getJSONObject(i).getString("诊断编码"));
|
|
|
leaveDiags.add(aHomeDiagnoseVO);
|
|
|
}
|
|
|
+ aHomePageVO.setLeaveDiags(leaveDiags);
|
|
|
}
|
|
|
aHomePageVOList.add(aHomePageVO);
|
|
|
return aHomePageVOList;
|