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

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -57,8 +58,9 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
     * @param date 生成日期，“yyyy-MM-dd”
     * @return
     */
    public String setData(String doctor,String date){
    public List<WlyyOutpatientDO> setData(String doctor,String date){
        List<WlyyOutpatientDO> outpatientDOs = new ArrayList<>();
        //居民门诊记录数据源
        Iterable<PatientMappingDO> patientMappingDOs = patientMappingDao.findAll();
        Iterator it = patientMappingDOs.iterator();
@@ -87,13 +89,16 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
                //5.门诊预约
                getRegisterDO(wlyyOutpatientDO,date);
                outpatientDOs.add(wlyyOutpatientDO);
            }
        }
        return "success";
        return outpatientDOs;
    }
    public String delData(String doctor,String date){
    public List<WlyyOutpatientDO> delData(String doctor,String date){
        //居民门诊记录数据源
        Iterable<PatientMappingDO> patientMappingDOs = patientMappingDao.findAll();
        Iterator it = patientMappingDOs.iterator();
@@ -129,7 +134,7 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
            prescriptionDao.delete(prescriptionDOs);
        }
        return "success";
        return outpatientDOs;
    }
    /**
@@ -159,6 +164,8 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
        outpatientDO.setDeptName(hospitalDO.getDeptName());
        outpatientDO.setHospital(hospitalDO.getOrgCode());
        outpatientDO.setHospitalName(hospitalDO.getOrgName());
        outpatientDO.setOutpatientType("1");
        outpatientDO.setDescription("头晕，没有食欲");
        outpatientDO.setCreateTime(DateUtil.strToDate(date+" 09:30:00"));
        outpatientDO.setConDate(DateUtil.strToDate(date+" 09:30:00"));

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetService.java

@@ -645,10 +645,10 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                "      ,a.symptoms,d.sex,d.mobile,d.idcard as patIdCard,d.city_code, e.dept_code, e.dept_name\n" +
                "  from wlyy_consult a \n" +
                "      ,wlyy_consult_team b\n" +
                "        LEFT JOIN base_doctor c on c.id = b.doctor\n" +
                "        LEFT JOIN base_patient d on d.id = b.patient\n" +
                "        LEFT JOIN base_doctor_hospital e on e.doctor_code = b.doctor\n" +
                " where a.id = b.consult ";
                "         JOIN base_doctor c on c.id = b.doctor\n" +
                "         JOIN base_patient d on d.id = b.patient\n" +
                "         JOIN base_doctor_hospital e on e.doctor_code = b.doctor\n" +
                " where a.id = b.consult AND a.symptoms <>'' AND a.symptoms IS NOT NULL ";
        if(StringUtils.isNotBlank(startDate)){
            sql =  sql + "  and a.czrq >=  '" + startDate + "' ";

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -2109,7 +2109,9 @@ public class ImService {
				}else{}
			}else if("2" == outpatient.getOutpatientType()){
				ct.setType(12);//协同门诊
			}else{}
			}else{
				ct.setType(1);//协同门诊
			}
			
			BaseDoctorDO doctor = baseDoctorDao.findById(outpatient.getDoctor());
//			doctorCode = doctor.getCode();

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/web/quota/JobController.java

@@ -1,5 +1,7 @@
package com.yihu.jw.web.quota;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.im.service.ImService;
import com.yihu.jw.internet.service.DataGeneratorService;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.job.PrescriptionOverdueJob;
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.UUID;
/**
@@ -34,6 +37,8 @@ public class JobController extends BaseController {
    private final JobService jobService;
    private final QuartzHelper quartzHelper;
    @Autowired
    private ImService imService;
    @Autowired
    private InternetService internetService;
@@ -290,7 +295,11 @@ public class JobController extends BaseController {
    @ApiOperation("生成数据")
    public String setData(String doctor,String date) {
        try {
            dataGeneratorService.setData(doctor,date);
            //生成门诊记录
            List<WlyyOutpatientDO> list = dataGeneratorService.setData(doctor,date);
            //生成咨询数据
            imService.setJobData(list,date);
            return write(200, "数据已经生成");
        } catch (Exception e) {
            error(e);
@@ -302,7 +311,9 @@ public class JobController extends BaseController {
    @ApiOperation("删除数据")
    public String delData(String doctor,String date) {
        try {
            dataGeneratorService.delData(doctor,date);
            List<WlyyOutpatientDO> list = dataGeneratorService.delData(doctor,date);
            imService.deleteJobData(list,date);
            return write(200, "数据已经删除");
        } catch (Exception e) {
            error(e);