瀏覽代碼

Merge branch 'dev' of trick9191/wlyy2.0 into dev

trick9191 5 年之前
父節點
當前提交
dbaeb3a910

+ 21 - 6
business/base-service/src/main/java/com/yihu/jw/internet/service/DataGeneratorService.java

@ -4,15 +4,19 @@ import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
import com.yihu.jw.hospital.prescription.dao.*;
import com.yihu.jw.internet.dao.IntUpErrorLogDao;
import com.yihu.jw.internet.entity.InternetUpErrorLogDO;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionInfoVO;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -44,6 +48,8 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
    private BaseDoctorDao baseDoctorDao;
    @Autowired
    private BaseDoctorHospitalDao baseDoctorHospitalDao;
    @Autowired
    private BasePatientDao basePatientDao;
    /**
     * 生成数据,测试监管平台数据上传
@ -64,8 +70,10 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
        while (it.hasNext()){
            PatientMappingDO patientMappingDO = (PatientMappingDO)it.next();
            BasePatientDO patientDO = basePatientDao.findById(patientMappingDO.getPatient());
            //1.生成门诊记录
            WlyyOutpatientDO wlyyOutpatientDO = getOutPatient(patientMappingDO,doctorDO,hospitalDO,date);
            WlyyOutpatientDO wlyyOutpatientDO = getOutPatient(patientDO,doctorDO,hospitalDO,date);
            //2.生成处方记录
            WlyyPrescriptionDO prescriptionDO = getPrescription(wlyyOutpatientDO,date);
@ -88,21 +96,28 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
     * @param date
     * @return
     */
    public WlyyOutpatientDO getOutPatient(PatientMappingDO patientDO,BaseDoctorDO doctorDO,BaseDoctorHospitalDO hospitalDO,String date){
    public WlyyOutpatientDO getOutPatient(BasePatientDO patientDO,BaseDoctorDO doctorDO,BaseDoctorHospitalDO hospitalDO,String date){
        WlyyOutpatientDO outpatientDO = new WlyyOutpatientDO();
        outpatientDO.setStatus("2");
        outpatientDO.setPatient(patientDO.getPatient());
        outpatientDO.setPatientName(patientDO.getPatientName());
        outpatientDO.setIdcard(patientDO.getIdcard());
        outpatientDO.setPatient(patientDO.getId());
        outpatientDO.setPatientName(patientDO.getName());
        outpatientDO.setMobile(patientDO.getMobile());
        String idcard = patientDO.getIdcard();
        outpatientDO.setIdcard(idcard);
        //模拟社保卡,并非正式
        if(StringUtils.isNotBlank(idcard)){
            outpatientDO.setCardNo("D"+ idcard.substring(idcard.length()-8,idcard.length()));
        }
        outpatientDO.setDoctor(doctorDO.getId());
        outpatientDO.setDoctorName(doctorDO.getName());
        outpatientDO.setDept(hospitalDO.getDeptCode());
        outpatientDO.setDeptName(hospitalDO.getDeptName());
        outpatientDO.setHospital(hospitalDO.getOrgCode());
        outpatientDO.setHospital(hospitalDO.getOrgName());
        outpatientDO.setHospitalName(hospitalDO.getOrgName());
        outpatientDO.setCreateTime(DateUtil.strToDate(date+" 09:30:00"));
        outpatientDO.setAdmDate(DateUtil.strToDate(date+" 09:30:00"));