smartor/src/main/java/com/smartor/domain/ServiceThirdData.java
@@ -75,6 +75,12 @@ @ApiModelProperty("备注") @Excel(name = "备注") private String remark; /** * 备注 */ @ApiModelProperty("备注") @Excel(name = "备注") private Long userInfoId; } smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
@@ -72,7 +72,7 @@ hospitalUserinfo.setCreateTime(formattedDate); //只有入院才会往userInfo里写用户信息 if (serviceThirdData.getDataType().equals("ADT^A01") && StringUtils.isNotBlank(hospitalUserinfo.getPatientID())) { if (serviceThirdData.getDataType().equals("ADT^A03") && StringUtils.isNotBlank(hospitalUserinfo.getPatientID())) { //先判断一下，patientid是否已经在表中存在，如果存在，就不插入了，不存在，就插入 HospitalUserinfo hospitalUserinfo1 = new HospitalUserinfo(); hospitalUserinfo1.setPatientID(hospitalUserinfo.getPatientID()); @@ -81,6 +81,7 @@ iHospitalUserinfoService.insertHospitalUserinfo(hospitalUserinfo); } else { iHospitalUserinfoService.updateHospitalUserinfoByPatientID(hospitalUserinfo); hospitalUserinfo.setID(hospitalUserinfos.get(0).getID()); } } @@ -97,6 +98,7 @@ if (StringUtils.isEmpty(hospitalUserinfo.getPatientID())) { serviceThirdData2.setRemark("PatientID为空"); } serviceThirdData2.setUserInfoId(hospitalUserinfo.getID()); int ii = serviceThirdDataMapper.updateIsDeal(serviceThirdData2); System.out.println("是否修改成功：" + ii); } catch (HL7Exception e) { smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A01.java
@@ -22,7 +22,7 @@ import java.util.Date; import java.util.List; //出院数据 //入院数据 public class ADT_A01 { //解析PID public List<Object> explainPID(Message message, String dataInfo) throws HL7Exception { @@ -463,7 +463,8 @@ //数据入库 HospitalRecord hospitalRecord = new HospitalRecord(); hospitalRecord.setCreateTime(new Date()); hospitalRecord.setPatientID(patientID); // hospitalRecord.setPatientID(patientID); hospitalRecord.setPatientID(id1); hospitalRecord.setOpreationTime(new Date()); //就诊号 hospitalRecord.setOutMedNO(id1); @@ -499,7 +500,8 @@ HospitalUserinfo hospitalUserinfo = new HospitalUserinfo(); // hospitalUserinfo.setCreateTime(null); hospitalUserinfo.setPatientID(patientID); // hospitalUserinfo.setPatientID(patientID); hospitalUserinfo.setPatientID(id1); hospitalUserinfo.setRegDate(rkdate); hospitalUserinfo.setIdentityID(SSNNumberPatient); hospitalUserinfo.setPatName(patientName); smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A03.java
@@ -425,7 +425,8 @@ //数据入库 HospitalRecord hospitalRecord = new HospitalRecord(); hospitalRecord.setCreateTime(new Date()); hospitalRecord.setPatientID(patientID); // hospitalRecord.setPatientID(patientID); hospitalRecord.setPatientID(id1); hospitalRecord.setOpreationTime(new Date()); //就诊号 hospitalRecord.setOutMedNO(id1); @@ -462,7 +463,8 @@ HospitalUserinfo hospitalUserinfo = new HospitalUserinfo(); // hospitalUserinfo.setCreateTime(null); hospitalUserinfo.setPatientID(patientID); // hospitalUserinfo.setPatientID(patientID); hospitalUserinfo.setPatientID(id1); hospitalUserinfo.setRegDate(rkdate); hospitalUserinfo.setIdentityID(SSNNumberPatient); hospitalUserinfo.setPatName(patientName); smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml
@@ -12,6 +12,7 @@ <result property="factory" column="factory"/> <result property="createTime" column="create_time"/> <result property="isDeal" column="is_deal"/> <result property="userInfoId" column="user_info_id"/> </resultMap> <sql id="selectServiceThirdDataVo"> @@ -22,6 +23,7 @@ factory, create_time, is_deal, user_info_id, remark from service_third_data </sql> @@ -104,6 +106,7 @@ update service_third_data <trim prefix="SET" suffixOverrides=","> is_deal=1, user_info_id=#{userInfoId} <if test="remark != null and remark != ''">remark = #{remark}</if> </trim> where id = #{id}
